brandon.presley/Massive
brandon.presley
/
Massive
4
8
Fork 3
Code Issues 14 Pull Requests Activity

Simplify process of enabling rest timers

This commit is contained in:
Brandon Presley 2022-11-30 14:23:36 +13:00
parent 6676efe69f
commit 4375a9c24e
2 changed files with 63 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Page.tsx
View File

@ -1,4 +1,4 @@
import {StyleSheet, View} from 'react-native' import {StyleProp, StyleSheet, View, ViewStyle} from 'react-native'
import {Searchbar} from 'react-native-paper' import {Searchbar} from 'react-native-paper'
import {PADDING} from './constants' import {PADDING} from './constants'
import MassiveFab from './MassiveFab' import MassiveFab from './MassiveFab'
@ -8,14 +8,16 @@ export default function Page({
children, children,
term, term,
search, search,
style,
}: { }: {
children: JSX.Element | JSX.Element[] children: JSX.Element | JSX.Element[]
onAdd?: () => void onAdd?: () => void
term: string term: string
search: (value: string) => void search: (value: string) => void
style?: StyleProp<ViewStyle>
}) { }) {
return ( return (
<View style={styles.container}> <View style={[styles.view, style]}>
<Searchbar <Searchbar
placeholder="Search" placeholder="Search"
value={term} value={term}
@ -30,8 +32,8 @@ export default function Page({
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: { view: {
flexGrow: 1,
padding: PADDING, padding: PADDING,
flexGrow: 1,
}, },
}) })

21
SettingsPage.tsx
View File

@ -6,12 +6,10 @@ import {
FlatList, FlatList,
NativeModules, NativeModules,
Platform, Platform,
View,
} from 'react-native' } from 'react-native'
import DocumentPicker from 'react-native-document-picker' import DocumentPicker from 'react-native-document-picker'
import {Button} from 'react-native-paper' import {Button} from 'react-native-paper'
import {darkColors, lightColors} from './colors' import {darkColors, lightColors} from './colors'
import ConfirmDialog from './ConfirmDialog'
import {MARGIN} from './constants' import {MARGIN} from './constants'
import {settingsRepo} from './db' import {settingsRepo} from './db'
import DrawerHeader from './DrawerHeader' import DrawerHeader from './DrawerHeader'
@ -25,7 +23,6 @@ import {useTheme} from './use-theme'
const defaultFormats = ['P', 'Pp', 'ccc p', 'p'] const defaultFormats = ['P', 'Pp', 'ccc p', 'p']
export default function SettingsPage() { export default function SettingsPage() {
const [battery, setBattery] = useState(false)
const [ignoring, setIgnoring] = useState(false) const [ignoring, setIgnoring] = useState(false)
const [term, setTerm] = useState('') const [term, setTerm] = useState('')
const [vibrate, setVibrate] = useState(false) const [vibrate, setVibrate] = useState(false)
@ -76,11 +73,11 @@ export default function SettingsPage() {
timeout: 4000, timeout: 4000,
}) })
else toast('Stopped timers running after each set.') else toast('Stopped timers running after each set.')
if (enabled && !ignoring) setBattery(true) if (enabled && !ignoring) NativeModules.SettingsModule.ignoreBattery()
setAlarm(enabled) setAlarm(enabled)
settingsRepo.update({}, {alarm: enabled}) settingsRepo.update({}, {alarm: enabled})
}, },
[setBattery, ignoring], [ignoring],
) )
const changeVibrate = useCallback((enabled: boolean) => { const changeVibrate = useCallback((enabled: boolean) => {
@ -227,8 +224,7 @@ export default function SettingsPage() {
return ( return (
<> <>
<DrawerHeader name="Settings" /> <DrawerHeader name="Settings" />
<Page term={term} search={setTerm}> <Page term={term} search={setTerm} style={{flexGrow: 0}}>
<View>
<FlatList <FlatList
style={{marginTop: MARGIN}} style={{marginTop: MARGIN}}
data={switches} data={switches}
@ -284,17 +280,6 @@ export default function SettingsPage() {
Alarm sound{soundString} Alarm sound{soundString}
</Button> </Button>
)} )}
</View>
<ConfirmDialog
title="Battery optimizations"
show={battery}
setShow={setBattery}
onOk={() => {
NativeModules.SettingsModule.ignoreBattery()
setBattery(false)
}}>
Disable battery optimizations for Massive to use rest timers.
</ConfirmDialog>
</Page> </Page>
</> </>
) )