Replace useDark with useTheme - 1.185 🚀

AppDrawer.tsx

@@ -1,6 +1,6 @@
 import { createDrawerNavigator } from "@react-navigation/drawer";
 import { StackScreenProps } from "@react-navigation/stack";
-import { IconButton } from "react-native-paper";
+import { IconButton, useTheme } from "react-native-paper";
 import ExerciseList from "./ExerciseList";
 import GraphsList from "./GraphsList";
 import InsightsPage from "./InsightsPage";
@@ -8,10 +8,9 @@ import PlanList from "./PlanList";
 import SetList from "./SetList";
 import SettingsPage from "./SettingsPage";
 import TimerPage from "./TimerPage";
+import TimerProgress from "./TimerProgress";
 import WeightList from "./WeightList";
 import { DrawerParams } from "./drawer-param-list";
-import useDark from "./use-dark";
-import TimerProgress from "./TimerProgress";
 
 const Drawer = createDrawerNavigator<DrawerParams>();
 
@@ -22,7 +21,7 @@ interface AppDrawerParams {
 export default function AppDrawer({
   route,
 }: StackScreenProps<{ startup: AppDrawerParams }>) {
-  const dark = useDark();
+  const { dark } = useTheme();
 
   return (
     <>

AppInput.tsx

@@ -1,15 +1,14 @@
 import React, { ComponentProps, Ref } from "react";
-import { TextInput } from "react-native-paper";
+import { TextInput, useTheme } from "react-native-paper";
 import { CombinedDefaultTheme } from "./App";
 import { MARGIN } from "./constants";
-import useDark from "./use-dark";
 
 function AppInput(
   props: Partial<ComponentProps<typeof TextInput>> & {
     innerRef?: Ref<any>;
   }
 ) {
-  const dark = useDark();
+  const { dark } = useTheme();
 
   return (
     <TextInput

ExerciseItem.tsx

@@ -1,11 +1,10 @@
 import { NavigationProp, useNavigation } from "@react-navigation/native";
 import { useCallback, useMemo } from "react";
 import { Image } from "react-native";
-import { List } from "react-native-paper";
+import { List, useTheme } from "react-native-paper";
+import { StackParams } from "./AppStack";
 import { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
 import GymSet from "./gym-set";
-import useDark from "./use-dark";
-import { StackParams } from "./AppStack";
 
 export default function ExerciseItem({
   item,
@@ -21,7 +20,7 @@ export default function ExerciseItem({
   alarm: boolean;
 }) {
   const navigation = useNavigation<NavigationProp<StackParams>>();
-  const dark = useDark();
+  const { dark } = useTheme();
 
   const description = useMemo(() => {
     const seconds = item.seconds?.toString().padStart(2, "0");

PlanItem.tsx

@@ -5,14 +5,13 @@ import {
 } from "@react-navigation/native";
 import { useCallback, useMemo, useState } from "react";
 import { Text } from "react-native";
-import { List } from "react-native-paper";
+import { List, useTheme } from "react-native-paper";
 import { StackParams } from "./AppStack";
 import { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
 import { DAYS } from "./days";
 import { setRepo } from "./db";
 import GymSet, { defaultSet } from "./gym-set";
 import { Plan } from "./plan";
-import useDark from "./use-dark";
 
 export default function PlanItem({
   item,
@@ -24,7 +23,7 @@ export default function PlanItem({
   setIds: (value: number[]) => void;
 }) {
   const [today, setToday] = useState<string>();
-  const dark = useDark();
+  const { dark } = useTheme();
   const days = useMemo(() => item.days.split(","), [item.days]);
   const navigation = useNavigation<NavigationProp<StackParams>>();
 

SetItem.tsx

@@ -2,12 +2,11 @@ import { NavigationProp, useNavigation } from "@react-navigation/native";
 import { format } from "date-fns";
 import { useCallback, useMemo } from "react";
 import { Image } from "react-native";
-import { List, Text } from "react-native-paper";
+import { List, Text, useTheme } from "react-native-paper";
 import { StackParams } from "./AppStack";
 import { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
 import GymSet from "./gym-set";
 import Settings from "./settings";
-import useDark from "./use-dark";
 
 export default function SetItem({
   item,
@@ -24,7 +23,7 @@ export default function SetItem({
   disablePress?: boolean;
   customBg?: string;
 }) {
-  const dark = useDark();
+  const { dark } = useTheme();
   const navigation = useNavigation<NavigationProp<StackParams>>();
 
   const longPress = useCallback(() => {

android/app/build.gradle

@@ -85,8 +85,8 @@ android {
         applicationId "com.massive"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 36210
-        versionName "1.184"
+        versionCode 36211
+        versionName "1.185"
     }
     signingConfigs {
         release {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "massive",
-  "version": "1.184",
+  "version": "1.185",
   "private": true,
   "license": "GPL-3.0-only",
   "scripts": {

use-dark.ts

@@ -1,11 +0,0 @@
-import { useColorScheme } from "react-native";
-import { useAppTheme } from "./use-theme";
-
-export default function useDark() {
-  const dark = useColorScheme() === "dark";
-  const { theme } = useAppTheme();
-
-  if (theme === "dark") return true;
-  if (theme === "light") return false;
-  return dark;
-}