diff --git a/DrawerMenu.tsx b/DrawerMenu.tsx
index 0189025..68dd5c9 100644
--- a/DrawerMenu.tsx
+++ b/DrawerMenu.tsx
@@ -1,5 +1,6 @@
import {NavigationProp, useNavigation} from '@react-navigation/native'
import {useCallback, useState} from 'react'
+import {Platform} from 'react-native'
import DocumentPicker from 'react-native-document-picker'
import {FileSystem} from 'react-native-file-access'
import {Divider, IconButton, Menu} from 'react-native-paper'
@@ -153,8 +154,16 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
icon="more-vert"
/>
}>
-
-
+ {Platform.OS === 'android' && (
+ <>
+
+
+ >
+ )}
- {names.length === 0 ? (
-
- ) : (
-
- )}
+
+
>
)
@@ -135,4 +121,7 @@ const styles = StyleSheet.create({
fontSize: 20,
marginBottom: MARGIN,
},
+ button: {
+ margin: MARGIN * 2,
+ },
})
diff --git a/Routes.tsx b/Routes.tsx
index b8c1cac..c524b7a 100644
--- a/Routes.tsx
+++ b/Routes.tsx
@@ -1,5 +1,6 @@
import {createDrawerNavigator} from '@react-navigation/drawer'
import {useMemo} from 'react'
+import {Platform} from 'react-native'
import {IconButton} from 'react-native-paper'
import BestPage from './BestPage'
import {DrawerParamList} from './drawer-param-list'
@@ -35,16 +36,22 @@ export default function Routes() {
swipeEdgeWidth: 1000,
headerShown: false,
}}>
- {routes.map(route => (
- ,
- }}
- />
- ))}
+ {}
+ {routes
+ .filter(route => {
+ if (Platform.OS === 'ios' && route.name === 'Timer') return false
+ return true
+ })
+ .map(route => (
+ ,
+ }}
+ />
+ ))}
)
}
diff --git a/ViewBest.tsx b/ViewBest.tsx
index 1c245b3..82ceffa 100644
--- a/ViewBest.tsx
+++ b/ViewBest.tsx
@@ -1,4 +1,3 @@
-import {Picker} from '@react-native-picker/picker'
import {RouteProp, useRoute} from '@react-navigation/native'
import {format} from 'date-fns'
import {useEffect, useState} from 'react'
@@ -10,13 +9,12 @@ import {setRepo} from './db'
import GymSet from './gym-set'
import {Metrics} from './metrics'
import {Periods} from './periods'
+import Select from './Select'
import StackHeader from './StackHeader'
-import useDark from './use-dark'
import Volume from './volume'
export default function ViewBest() {
const {params} = useRoute>()
- const dark = useDark()
const [weights, setWeights] = useState([])
const [volumes, setVolumes] = useState([])
const [metric, setMetric] = useState(Metrics.Weight)
@@ -67,24 +65,27 @@ export default function ViewBest() {
<>
- setMetric(value)}>
-
-
-
-
- setPeriod(value)}>
-
-
-
-
+