diff --git a/App.tsx b/App.tsx index 1d6f3ba..0ac6b40 100644 --- a/App.tsx +++ b/App.tsx @@ -3,9 +3,8 @@ import { DefaultTheme as NavigationDefaultTheme, NavigationContainer, } from '@react-navigation/native' -import {useEffect, useMemo, useState} from 'react' +import React, {useEffect, useMemo, useState} from 'react' import {DeviceEventEmitter, useColorScheme} from 'react-native' -import React from 'react' import { DarkTheme as PaperDarkTheme, DefaultTheme as PaperDefaultTheme, diff --git a/EditSet.tsx b/EditSet.tsx index 8e54c70..16a0081 100644 --- a/EditSet.tsx +++ b/EditSet.tsx @@ -9,12 +9,12 @@ import {useCallback, useRef, useState} from 'react' import {NativeModules, TextInput, View} from 'react-native' import DocumentPicker from 'react-native-document-picker' import {Button, Card, TouchableRipple} from 'react-native-paper' +import AppInput from './AppInput' import ConfirmDialog from './ConfirmDialog' import {MARGIN, PADDING} from './constants' import {getNow, setRepo, settingsRepo} from './db' import GymSet from './gym-set' import {HomePageParams} from './home-page-params' -import AppInput from './AppInput' import Settings from './settings' import StackHeader from './StackHeader' import {toast} from './toast' diff --git a/EditSets.tsx b/EditSets.tsx index 09834a0..04e1968 100644 --- a/EditSets.tsx +++ b/EditSets.tsx @@ -9,12 +9,12 @@ import {View} from 'react-native' import DocumentPicker from 'react-native-document-picker' import {Button, Card, TouchableRipple} from 'react-native-paper' import {In} from 'typeorm' +import AppInput from './AppInput' import ConfirmDialog from './ConfirmDialog' import {MARGIN, PADDING} from './constants' import {setRepo, settingsRepo} from './db' import GymSet from './gym-set' import {HomePageParams} from './home-page-params' -import AppInput from './AppInput' import Settings from './settings' import StackHeader from './StackHeader' diff --git a/EditWorkout.tsx b/EditWorkout.tsx index c18b008..72eb421 100644 --- a/EditWorkout.tsx +++ b/EditWorkout.tsx @@ -8,11 +8,11 @@ import {useCallback, useRef, useState} from 'react' import {ScrollView, TextInput, View} from 'react-native' import DocumentPicker from 'react-native-document-picker' import {Button, Card, TouchableRipple} from 'react-native-paper' +import AppInput from './AppInput' import ConfirmDialog from './ConfirmDialog' import {MARGIN, PADDING} from './constants' import {getNow, planRepo, setRepo, settingsRepo} from './db' import {defaultSet} from './gym-set' -import AppInput from './AppInput' import Settings from './settings' import StackHeader from './StackHeader' import {WorkoutsPageParams} from './WorkoutsPage' diff --git a/SettingsPage.tsx b/SettingsPage.tsx index d46e116..f0727af 100644 --- a/SettingsPage.tsx +++ b/SettingsPage.tsx @@ -1,6 +1,7 @@ import {NavigationProp, useNavigation} from '@react-navigation/native' import {format} from 'date-fns' import {useCallback, useEffect, useMemo, useState} from 'react' +import {useForm} from 'react-hook-form' import {NativeModules, View} from 'react-native' import DocumentPicker from 'react-native-document-picker' import {Dirs, FileSystem} from 'react-native-file-access' @@ -19,7 +20,6 @@ import Settings from './settings' import Switch from './Switch' import {toast} from './toast' import {useTheme} from './use-theme' -import {useForm} from 'react-hook-form' const twelveHours = ['P', 'Pp', 'ccc p', 'p', 'yyyy-MM-d', 'yyyy.MM.d'] const twentyFours = ['P', 'P, k:m', 'ccc k:m', 'k:m', 'yyyy-MM-d', 'yyyy.MM.d'] diff --git a/StackHeader.tsx b/StackHeader.tsx index 3b0562a..fde032c 100644 --- a/StackHeader.tsx +++ b/StackHeader.tsx @@ -1,7 +1,7 @@ import {useNavigation} from '@react-navigation/native' -import Share from 'react-native-share' import {FileSystem} from 'react-native-file-access' import {Appbar, IconButton} from 'react-native-paper' +import Share from 'react-native-share' import {captureScreen} from 'react-native-view-shot' import useDark from './use-dark' diff --git a/StartPlan.tsx b/StartPlan.tsx index 52af346..b455b3b 100644 --- a/StartPlan.tsx +++ b/StartPlan.tsx @@ -2,13 +2,13 @@ import {RouteProp, useFocusEffect, useRoute} from '@react-navigation/native' import {useCallback, useMemo, useRef, useState} from 'react' import {FlatList, NativeModules, TextInput, View} from 'react-native' import {Button, ProgressBar} from 'react-native-paper' +import AppInput from './AppInput' import {getBestSet} from './best.service' import {PADDING} from './constants' import CountMany from './count-many' import {AppDataSource} from './data-source' import {getNow, setRepo, settingsRepo} from './db' import GymSet from './gym-set' -import AppInput from './AppInput' import {PlanPageParams} from './plan-page-params' import Settings from './settings' import StackHeader from './StackHeader' diff --git a/WorkoutList.tsx b/WorkoutList.tsx index 834b83c..c068f0f 100644 --- a/WorkoutList.tsx +++ b/WorkoutList.tsx @@ -6,14 +6,14 @@ import { import {useCallback, useState} from 'react' import {FlatList} from 'react-native' import {List} from 'react-native-paper' +import {setRepo, settingsRepo} from './db' import DrawerHeader from './DrawerHeader' -import Page from './Page' import GymSet from './gym-set' +import Page from './Page' import SetList from './SetList' +import Settings from './settings' import WorkoutItem from './WorkoutItem' import {WorkoutsPageParams} from './WorkoutsPage' -import {setRepo, settingsRepo} from './db' -import Settings from './settings' const limit = 15 diff --git a/input.ts b/input.ts index 6927933..925bf55 100644 --- a/input.ts +++ b/input.ts @@ -1,5 +1,5 @@ -import Settings from './settings' import {Item} from './Select' +import Settings from './settings' export default interface Input { name: string diff --git a/jestSetup.ts b/jestSetup.ts index bb9e7cf..fdf88a0 100644 --- a/jestSetup.ts +++ b/jestSetup.ts @@ -1,5 +1,5 @@ -import 'react-native-gesture-handler/jestSetup' import {NativeModules} from 'react-native' +import 'react-native-gesture-handler/jestSetup' NativeModules.RNViewShot = NativeModules.RNViewShot || { captureScreen: jest.fn(), diff --git a/use-timer.ts b/use-timer.ts index d525735..0e29d68 100644 --- a/use-timer.ts +++ b/use-timer.ts @@ -1,5 +1,5 @@ -import {useCallback, useState} from 'react' import {useFocusEffect} from '@react-navigation/native' +import {useCallback, useState} from 'react' import {NativeEventEmitter} from 'react-native' import {TickEvent} from './TimerPage'