diff --git a/App.tsx b/App.tsx index 50ab44d..212b79c 100644 --- a/App.tsx +++ b/App.tsx @@ -9,6 +9,7 @@ import { MD3DarkTheme as PaperDarkTheme, MD3LightTheme as PaperDefaultTheme, Provider as PaperProvider, + ProgressBar, Snackbar, } from "react-native-paper"; import MaterialIcon from "react-native-vector-icons/MaterialCommunityIcons"; @@ -18,6 +19,8 @@ import { emitter } from "./emitter"; import { TOAST } from "./toast"; import { ThemeContext } from "./use-theme"; import AppStack from "./AppStack"; +import useTimer from "./use-timer"; +import { TickEvent } from "./TimerPage"; export const CombinedDefaultTheme = { ...NavigationDefaultTheme, @@ -42,6 +45,7 @@ const App = () => { const [initialized, setInitialized] = useState(false); const [snackbar, setSnackbar] = useState(""); const [appTheme, setAppTheme] = useState("system"); + const [progress, setProgress] = useState(0); const [lightColor, setLightColor] = useState( CombinedDefaultTheme.colors.primary @@ -60,13 +64,15 @@ const App = () => { if (settings.darkColor) setDarkColor(settings.darkColor); setInitialized(true); })(); - const description = emitter.addListener( - TOAST, - ({ value }: { value: string }) => { + const descriptions = [ + emitter.addListener(TOAST, ({ value }: { value: string }) => { setSnackbar(value); - } - ); - return description.remove; + }), + emitter.addListener("tick", (event: TickEvent) => { + setProgress((Number(event.minutes) * 60 + Number(event.seconds)) / 210); + }), + ]; + return () => descriptions.forEach((description) => description.remove()); }, []); const paperTheme = useMemo(() => { @@ -122,6 +128,8 @@ const App = () => { > {snackbar} + + {progress > 0 && } ); }; diff --git a/android/app/build.gradle b/android/app/build.gradle index 1b5c20f..49a2375 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -85,8 +85,8 @@ android { applicationId "com.massive" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 36200 - versionName "1.174" + versionCode 36201 + versionName "1.175" } signingConfigs { release { diff --git a/package.json b/package.json index 4fab3cd..bcb6f1a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "massive", - "version": "1.174", + "version": "1.175", "private": true, "license": "GPL-3.0-only", "scripts": {