Replace useDark with useTheme - 1.185 🚀
This commit is contained in:
parent
456af73e91
commit
8ee07823aa
|
@ -1,6 +1,6 @@
|
||||||
import { createDrawerNavigator } from "@react-navigation/drawer";
|
import { createDrawerNavigator } from "@react-navigation/drawer";
|
||||||
import { StackScreenProps } from "@react-navigation/stack";
|
import { StackScreenProps } from "@react-navigation/stack";
|
||||||
import { IconButton } from "react-native-paper";
|
import { IconButton, useTheme } from "react-native-paper";
|
||||||
import ExerciseList from "./ExerciseList";
|
import ExerciseList from "./ExerciseList";
|
||||||
import GraphsList from "./GraphsList";
|
import GraphsList from "./GraphsList";
|
||||||
import InsightsPage from "./InsightsPage";
|
import InsightsPage from "./InsightsPage";
|
||||||
|
@ -8,10 +8,9 @@ import PlanList from "./PlanList";
|
||||||
import SetList from "./SetList";
|
import SetList from "./SetList";
|
||||||
import SettingsPage from "./SettingsPage";
|
import SettingsPage from "./SettingsPage";
|
||||||
import TimerPage from "./TimerPage";
|
import TimerPage from "./TimerPage";
|
||||||
|
import TimerProgress from "./TimerProgress";
|
||||||
import WeightList from "./WeightList";
|
import WeightList from "./WeightList";
|
||||||
import { DrawerParams } from "./drawer-param-list";
|
import { DrawerParams } from "./drawer-param-list";
|
||||||
import useDark from "./use-dark";
|
|
||||||
import TimerProgress from "./TimerProgress";
|
|
||||||
|
|
||||||
const Drawer = createDrawerNavigator<DrawerParams>();
|
const Drawer = createDrawerNavigator<DrawerParams>();
|
||||||
|
|
||||||
|
@ -22,7 +21,7 @@ interface AppDrawerParams {
|
||||||
export default function AppDrawer({
|
export default function AppDrawer({
|
||||||
route,
|
route,
|
||||||
}: StackScreenProps<{ startup: AppDrawerParams }>) {
|
}: StackScreenProps<{ startup: AppDrawerParams }>) {
|
||||||
const dark = useDark();
|
const { dark } = useTheme();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
import React, { ComponentProps, Ref } from "react";
|
import React, { ComponentProps, Ref } from "react";
|
||||||
import { TextInput } from "react-native-paper";
|
import { TextInput, useTheme } from "react-native-paper";
|
||||||
import { CombinedDefaultTheme } from "./App";
|
import { CombinedDefaultTheme } from "./App";
|
||||||
import { MARGIN } from "./constants";
|
import { MARGIN } from "./constants";
|
||||||
import useDark from "./use-dark";
|
|
||||||
|
|
||||||
function AppInput(
|
function AppInput(
|
||||||
props: Partial<ComponentProps<typeof TextInput>> & {
|
props: Partial<ComponentProps<typeof TextInput>> & {
|
||||||
innerRef?: Ref<any>;
|
innerRef?: Ref<any>;
|
||||||
}
|
}
|
||||||
) {
|
) {
|
||||||
const dark = useDark();
|
const { dark } = useTheme();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TextInput
|
<TextInput
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
import { NavigationProp, useNavigation } from "@react-navigation/native";
|
import { NavigationProp, useNavigation } from "@react-navigation/native";
|
||||||
import { useCallback, useMemo } from "react";
|
import { useCallback, useMemo } from "react";
|
||||||
import { Image } from "react-native";
|
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 { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
|
||||||
import GymSet from "./gym-set";
|
import GymSet from "./gym-set";
|
||||||
import useDark from "./use-dark";
|
|
||||||
import { StackParams } from "./AppStack";
|
|
||||||
|
|
||||||
export default function ExerciseItem({
|
export default function ExerciseItem({
|
||||||
item,
|
item,
|
||||||
|
@ -21,7 +20,7 @@ export default function ExerciseItem({
|
||||||
alarm: boolean;
|
alarm: boolean;
|
||||||
}) {
|
}) {
|
||||||
const navigation = useNavigation<NavigationProp<StackParams>>();
|
const navigation = useNavigation<NavigationProp<StackParams>>();
|
||||||
const dark = useDark();
|
const { dark } = useTheme();
|
||||||
|
|
||||||
const description = useMemo(() => {
|
const description = useMemo(() => {
|
||||||
const seconds = item.seconds?.toString().padStart(2, "0");
|
const seconds = item.seconds?.toString().padStart(2, "0");
|
||||||
|
|
|
@ -5,14 +5,13 @@ import {
|
||||||
} from "@react-navigation/native";
|
} from "@react-navigation/native";
|
||||||
import { useCallback, useMemo, useState } from "react";
|
import { useCallback, useMemo, useState } from "react";
|
||||||
import { Text } from "react-native";
|
import { Text } from "react-native";
|
||||||
import { List } from "react-native-paper";
|
import { List, useTheme } from "react-native-paper";
|
||||||
import { StackParams } from "./AppStack";
|
import { StackParams } from "./AppStack";
|
||||||
import { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
|
import { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
|
||||||
import { DAYS } from "./days";
|
import { DAYS } from "./days";
|
||||||
import { setRepo } from "./db";
|
import { setRepo } from "./db";
|
||||||
import GymSet, { defaultSet } from "./gym-set";
|
import GymSet, { defaultSet } from "./gym-set";
|
||||||
import { Plan } from "./plan";
|
import { Plan } from "./plan";
|
||||||
import useDark from "./use-dark";
|
|
||||||
|
|
||||||
export default function PlanItem({
|
export default function PlanItem({
|
||||||
item,
|
item,
|
||||||
|
@ -24,7 +23,7 @@ export default function PlanItem({
|
||||||
setIds: (value: number[]) => void;
|
setIds: (value: number[]) => void;
|
||||||
}) {
|
}) {
|
||||||
const [today, setToday] = useState<string>();
|
const [today, setToday] = useState<string>();
|
||||||
const dark = useDark();
|
const { dark } = useTheme();
|
||||||
const days = useMemo(() => item.days.split(","), [item.days]);
|
const days = useMemo(() => item.days.split(","), [item.days]);
|
||||||
const navigation = useNavigation<NavigationProp<StackParams>>();
|
const navigation = useNavigation<NavigationProp<StackParams>>();
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,11 @@ import { NavigationProp, useNavigation } from "@react-navigation/native";
|
||||||
import { format } from "date-fns";
|
import { format } from "date-fns";
|
||||||
import { useCallback, useMemo } from "react";
|
import { useCallback, useMemo } from "react";
|
||||||
import { Image } from "react-native";
|
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 { StackParams } from "./AppStack";
|
||||||
import { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
|
import { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
|
||||||
import GymSet from "./gym-set";
|
import GymSet from "./gym-set";
|
||||||
import Settings from "./settings";
|
import Settings from "./settings";
|
||||||
import useDark from "./use-dark";
|
|
||||||
|
|
||||||
export default function SetItem({
|
export default function SetItem({
|
||||||
item,
|
item,
|
||||||
|
@ -24,7 +23,7 @@ export default function SetItem({
|
||||||
disablePress?: boolean;
|
disablePress?: boolean;
|
||||||
customBg?: string;
|
customBg?: string;
|
||||||
}) {
|
}) {
|
||||||
const dark = useDark();
|
const { dark } = useTheme();
|
||||||
const navigation = useNavigation<NavigationProp<StackParams>>();
|
const navigation = useNavigation<NavigationProp<StackParams>>();
|
||||||
|
|
||||||
const longPress = useCallback(() => {
|
const longPress = useCallback(() => {
|
||||||
|
|
|
@ -85,8 +85,8 @@ android {
|
||||||
applicationId "com.massive"
|
applicationId "com.massive"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 36210
|
versionCode 36211
|
||||||
versionName "1.184"
|
versionName "1.185"
|
||||||
}
|
}
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "massive",
|
"name": "massive",
|
||||||
"version": "1.184",
|
"version": "1.185",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
11
use-dark.ts
11
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;
|
|
||||||
}
|
|
Loading…
Reference in New Issue