Skip to content

Colota - Android GPS Location tracker

fix: persist dark mode toggle across app restarts Closes #276

Max Dietrichf6637753da3e
diff --git a/apps/mobile/src/hooks/__tests__/useTheme.test.tsx b/apps/mobile/src/hooks/__tests__/useTheme.test.tsx
index 0372aacb..124195be 100644
--- a/apps/mobile/src/hooks/__tests__/useTheme.test.tsx
+++ b/apps/mobile/src/hooks/__tests__/useTheme.test.tsx
@@ -1,9 +1,18 @@
import React from "react"
-import { renderHook, act } from "@testing-library/react-native"
+import { renderHook, act, waitFor } from "@testing-library/react-native"
import { Appearance } from "react-native"
+import NativeLocationService from "../../services/NativeLocationService"
import { ThemeProvider, useTheme } from "../useTheme"
+jest.mock("../../services/NativeLocationService", () => ({
+ __esModule: true,
+ default: {
+ getSetting: jest.fn().mockResolvedValue(null),
+ saveSetting: jest.fn().mockResolvedValue(undefined)
+ }
+}))
+
let appearanceListener: ((prefs: { colorScheme: string | null }) => void) | null = null
jest.spyOn(Appearance, "getColorScheme").mockReturnValue("light")
@@ -17,6 +26,8 @@ const wrapper = ({ children }: { children: React.ReactNode }) => <ThemeProvider>
beforeEach(() => {
appearanceListener = null
;(Appearance.getColorScheme as jest.Mock).mockReturnValue("light")
+ ;(NativeLocationService.getSetting as jest.Mock).mockResolvedValue(null)
+ ;(NativeLocationService.saveSetting as jest.Mock).mockClear()
})
describe("useTheme", () => {
@@ -107,6 +118,38 @@ describe("useTheme", () => {
expect(result.current.mode).toBe("dark")
})
+ it("persists theme mode when toggled", () => {
+ const { result } = renderHook(() => useTheme(), { wrapper })
+
+ act(() => {
+ result.current.toggleTheme()
+ })
+
+ expect(NativeLocationService.saveSetting).toHaveBeenCalledWith("themeMode", "dark")
+ })
+
+ it("restores persisted dark theme on mount", async () => {
+ ;(NativeLocationService.getSetting as jest.Mock).mockResolvedValue("dark")
+
+ const { result } = renderHook(() => useTheme(), { wrapper })
+
+ await waitFor(() => {
+ expect(result.current.mode).toBe("dark")
+ })
+ expect(result.current.isDark).toBe(true)
+ })
+
+ it("restores persisted light theme on mount", async () => {
+ ;(Appearance.getColorScheme as jest.Mock).mockReturnValue("dark")
+ ;(NativeLocationService.getSetting as jest.Mock).mockResolvedValue("light")
+
+ const { result } = renderHook(() => useTheme(), { wrapper })
+
+ await waitFor(() => {
+ expect(result.current.mode).toBe("light")
+ })
+ })
+
it("provides different color objects for light and dark modes", () => {
const { result } = renderHook(() => useTheme(), { wrapper })
diff --git a/apps/mobile/src/hooks/useTheme.tsx b/apps/mobile/src/hooks/useTheme.tsx
index 1b9dc22d..3a55ea52 100644
--- a/apps/mobile/src/hooks/useTheme.tsx
+++ b/apps/mobile/src/hooks/useTheme.tsx
@@ -7,6 +7,9 @@ import React, { useState, useEffect, useContext, createContext, ReactNode, useMe
import { Appearance, ColorSchemeName } from "react-native"
import { ThemeColors, ThemeMode } from "../types/global"
import { darkColors, lightColors } from "../styles/colors"
+import NativeLocationService from "../services/NativeLocationService"
+
+const THEME_MODE_KEY = "themeMode"
/**
* Extended theme context with additional utilities
@@ -46,6 +49,16 @@ export const ThemeProvider = ({ children }: { children: ReactNode }) => {
const [hasManualOverride, setHasManualOverride] = useState(false)
const [mode, setMode] = useState<ThemeMode>(() => normalizeScheme(Appearance.getColorScheme()))
+ // Restore persisted theme preference on mount
+ useEffect(() => {
+ NativeLocationService.getSetting(THEME_MODE_KEY).then((saved) => {
+ if (saved === "light" || saved === "dark") {
+ setHasManualOverride(true)
+ setMode(saved)
+ }
+ })
+ }, [])
+
// Listen to system theme changes
useEffect(() => {
const subscription = Appearance.addChangeListener(({ colorScheme }) => {
@@ -62,7 +75,11 @@ export const ThemeProvider = ({ children }: { children: ReactNode }) => {
*/
const toggleTheme = useCallback(() => {
setHasManualOverride(true)
- setMode((prev: string) => (prev === "light" ? "dark" : "light"))
+ setMode((prev: string) => {
+ const next = prev === "light" ? "dark" : "light"
+ NativeLocationService.saveSetting(THEME_MODE_KEY, next)
+ return next
+ })
}, [])
const colors = useMemo(() => (mode === "dark" ? darkColors : lightColors), [mode])