From ba24649a52a0dc36641ed9a5a6c83b87924e5b5c Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Wed, 15 Nov 2023 11:21:49 +1300 Subject: [PATCH] Organize imports --- App.tsx | 2 +- AppDrawer.tsx | 2 +- AppStack.tsx | 4 ++-- EditExercises.tsx | 2 +- EditPlan.tsx | 3 +-- EditSet.tsx | 6 +++--- EditSets.tsx | 4 ++-- EditWeight.tsx | 2 +- GraphsList.tsx | 2 +- PlanList.tsx | 2 +- SetList.tsx | 8 ++++---- SettingsPage.tsx | 10 +++++----- StartPlan.tsx | 6 +++--- TimerProgress.tsx | 2 +- ViewGraph.tsx | 4 ++-- WeightItem.tsx | 2 +- WeightList.tsx | 2 +- data-source.ts | 6 +++--- 18 files changed, 34 insertions(+), 35 deletions(-) diff --git a/App.tsx b/App.tsx index 3c597ae..3e49a5b 100644 --- a/App.tsx +++ b/App.tsx @@ -1,7 +1,7 @@ import { - NavigationContainer, DarkTheme as NavigationDarkTheme, DefaultTheme as NavigationDefaultTheme, + NavigationContainer, } from "@react-navigation/native"; import React, { useEffect, useMemo, useState } from "react"; import { useColorScheme } from "react-native"; diff --git a/AppDrawer.tsx b/AppDrawer.tsx index c6fd850..e6c3e91 100644 --- a/AppDrawer.tsx +++ b/AppDrawer.tsx @@ -1,6 +1,7 @@ import { createDrawerNavigator } from "@react-navigation/drawer"; import { StackScreenProps } from "@react-navigation/stack"; import { IconButton, useTheme } from "react-native-paper"; +import { DrawerParams } from "./drawer-params"; import ExerciseList from "./ExerciseList"; import GraphsList from "./GraphsList"; import InsightsPage from "./InsightsPage"; @@ -10,7 +11,6 @@ import SettingsPage from "./SettingsPage"; import TimerPage from "./TimerPage"; import TimerProgress from "./TimerProgress"; import WeightList from "./WeightList"; -import { DrawerParams } from "./drawer-params"; const Drawer = createDrawerNavigator(); diff --git a/AppStack.tsx b/AppStack.tsx index bac5e3a..176ecad 100644 --- a/AppStack.tsx +++ b/AppStack.tsx @@ -6,12 +6,12 @@ import EditPlan from "./EditPlan"; import EditSet from "./EditSet"; import EditSets from "./EditSets"; import EditWeight from "./EditWeight"; +import GymSet from "./gym-set"; +import { Plan } from "./plan"; import StartPlan from "./StartPlan"; import ViewGraph from "./ViewGraph"; import ViewSetList from "./ViewSetList"; import ViewWeightGraph from "./ViewWeightGraph"; -import GymSet from "./gym-set"; -import { Plan } from "./plan"; import Weight from "./weight"; export type StackParams = { diff --git a/EditExercises.tsx b/EditExercises.tsx index 9d72495..60b4e40 100644 --- a/EditExercises.tsx +++ b/EditExercises.tsx @@ -13,12 +13,12 @@ import { In } from "typeorm"; import AppInput from "./AppInput"; import { StackParams } from "./AppStack"; import ConfirmDialog from "./ConfirmDialog"; -import StackHeader from "./StackHeader"; import { MARGIN, PADDING } from "./constants"; import { planRepo, setRepo, settingsRepo } from "./db"; import { DrawerParams } from "./drawer-params"; import { fixNumeric } from "./fix-numeric"; import Settings from "./settings"; +import StackHeader from "./StackHeader"; import { toast } from "./toast"; export default function EditExercises() { diff --git a/EditPlan.tsx b/EditPlan.tsx index d27c4bb..2240ecb 100644 --- a/EditPlan.tsx +++ b/EditPlan.tsx @@ -7,11 +7,11 @@ import { import { useCallback, useEffect, useState } from "react"; import { Pressable, StyleSheet, View } from "react-native"; import { + ActivityIndicator, Button, IconButton, Switch as PaperSwitch, Text, - ActivityIndicator, } from "react-native-paper"; import ReorderableList, { ReorderableListRenderItemInfo, @@ -25,7 +25,6 @@ import { DrawerParams } from "./drawer-params"; import GymSet, { defaultSet } from "./gym-set"; import StackHeader from "./StackHeader"; import Switch from "./Switch"; -import { ProgressCircle } from "react-native-svg-charts"; export default function EditPlan() { const { params } = useRoute>(); diff --git a/EditSet.tsx b/EditSet.tsx index f868f8a..3561b3b 100644 --- a/EditSet.tsx +++ b/EditSet.tsx @@ -17,20 +17,20 @@ import { Menu, TouchableRipple, } from "react-native-paper"; +import { check, PERMISSIONS, request, RESULTS } from "react-native-permissions"; import AppInput from "./AppInput"; import { StackParams } from "./AppStack"; import ConfirmDialog from "./ConfirmDialog"; import { MARGIN, PADDING } from "./constants"; +import { convert } from "./conversions"; import { getNow, setRepo, settingsRepo } from "./db"; import { DrawerParams } from "./drawer-params"; import { fixNumeric } from "./fix-numeric"; import GymSet from "./gym-set"; +import Select from "./Select"; import Settings from "./settings"; import StackHeader from "./StackHeader"; import { toast } from "./toast"; -import Select from "./Select"; -import { PERMISSIONS, RESULTS, check, request } from "react-native-permissions"; -import { convert } from "./conversions"; export default function EditSet() { const { params } = useRoute>(); diff --git a/EditSets.tsx b/EditSets.tsx index e15af92..06d08ab 100644 --- a/EditSets.tsx +++ b/EditSets.tsx @@ -13,13 +13,13 @@ import { In } from "typeorm"; import AppInput from "./AppInput"; import { StackParams } from "./AppStack"; import ConfirmDialog from "./ConfirmDialog"; -import Select from "./Select"; -import StackHeader from "./StackHeader"; import { MARGIN, PADDING } from "./constants"; import { setRepo, settingsRepo } from "./db"; import { DrawerParams } from "./drawer-params"; import GymSet from "./gym-set"; +import Select from "./Select"; import Settings from "./settings"; +import StackHeader from "./StackHeader"; export default function EditSets() { const { params } = useRoute>(); diff --git a/EditWeight.tsx b/EditWeight.tsx index 198c8f2..abd3318 100644 --- a/EditWeight.tsx +++ b/EditWeight.tsx @@ -17,11 +17,11 @@ import { MARGIN, PADDING } from "./constants"; import { AppDataSource } from "./data-source"; import { getNow, settingsRepo, weightRepo } from "./db"; import { DrawerParams } from "./drawer-params"; +import Select from "./Select"; import Settings from "./settings"; import StackHeader from "./StackHeader"; import { toast } from "./toast"; import Weight from "./weight"; -import Select from "./Select"; export default function EditWeight() { const { params } = useRoute>(); diff --git a/GraphsList.tsx b/GraphsList.tsx index e09b4b0..5a9de60 100644 --- a/GraphsList.tsx +++ b/GraphsList.tsx @@ -6,6 +6,7 @@ import { import { useCallback, useState } from "react"; import { FlatList, Image } from "react-native"; import { List } from "react-native-paper"; +import { StackParams } from "./AppStack"; import { getBestSets } from "./best.service"; import { LIMIT } from "./constants"; import { settingsRepo } from "./db"; @@ -13,7 +14,6 @@ import DrawerHeader from "./DrawerHeader"; import GymSet from "./gym-set"; import Page from "./Page"; import Settings from "./settings"; -import { StackParams } from "./AppStack"; export default function GraphsList() { const [bests, setBests] = useState(); diff --git a/PlanList.tsx b/PlanList.tsx index 10c36ea..012c6db 100644 --- a/PlanList.tsx +++ b/PlanList.tsx @@ -12,7 +12,7 @@ import { planRepo } from "./db"; import DrawerHeader from "./DrawerHeader"; import ListMenu from "./ListMenu"; import Page from "./Page"; -import { Plan, defaultPlan } from "./plan"; +import { defaultPlan, Plan } from "./plan"; import PlanItem from "./PlanItem"; export default function PlanList() { diff --git a/SetList.tsx b/SetList.tsx index be29500..f94a339 100644 --- a/SetList.tsx +++ b/SetList.tsx @@ -5,16 +5,16 @@ import { } from "@react-navigation/native"; import { useCallback, useState } from "react"; import { FlatList } from "react-native"; -import { List, ActivityIndicator } from "react-native-paper"; +import { ActivityIndicator, List } from "react-native-paper"; import { Like } from "typeorm"; import { StackParams } from "./AppStack"; +import { LIMIT } from "./constants"; +import { getNow, setRepo, settingsRepo } from "./db"; import DrawerHeader from "./DrawerHeader"; +import GymSet, { defaultSet } from "./gym-set"; import ListMenu from "./ListMenu"; import Page from "./Page"; import SetItem from "./SetItem"; -import { LIMIT } from "./constants"; -import { getNow, setRepo, settingsRepo } from "./db"; -import GymSet, { defaultSet } from "./gym-set"; import Settings from "./settings"; export default function SetList() { diff --git a/SettingsPage.tsx b/SettingsPage.tsx index dc027f4..37210bc 100644 --- a/SettingsPage.tsx +++ b/SettingsPage.tsx @@ -6,19 +6,19 @@ import { FlatList, NativeModules } from "react-native"; import DocumentPicker from "react-native-document-picker"; import { Dirs, FileSystem } from "react-native-file-access"; import { Button } from "react-native-paper"; -import { PERMISSIONS, RESULTS, check, request } from "react-native-permissions"; +import { check, PERMISSIONS, request, RESULTS } from "react-native-permissions"; import AppInput from "./AppInput"; import ConfirmDialog from "./ConfirmDialog"; -import DrawerHeader from "./DrawerHeader"; -import Page from "./Page"; -import Select from "./Select"; -import Switch from "./Switch"; import { PADDING } from "./constants"; import { AppDataSource } from "./data-source"; import { setRepo, settingsRepo } from "./db"; import { DrawerParams } from "./drawer-params"; +import DrawerHeader from "./DrawerHeader"; import { darkOptions, lightOptions, themeOptions } from "./options"; +import Page from "./Page"; +import Select from "./Select"; import Settings from "./settings"; +import Switch from "./Switch"; import { toast } from "./toast"; import { useAppTheme } from "./use-theme"; diff --git a/StartPlan.tsx b/StartPlan.tsx index 1f7068f..c23d795 100644 --- a/StartPlan.tsx +++ b/StartPlan.tsx @@ -13,22 +13,22 @@ import { IconButton, ProgressBar, } from "react-native-paper"; +import { check, PERMISSIONS, request, RESULTS } from "react-native-permissions"; import AppInput from "./AppInput"; import { StackParams } from "./AppStack"; import { getBestSet } from "./best.service"; import { PADDING } from "./constants"; +import { convert } from "./conversions"; import CountMany from "./count-many"; import { AppDataSource } from "./data-source"; import { getNow, setRepo, settingsRepo } from "./db"; import { fixNumeric } from "./fix-numeric"; import GymSet from "./gym-set"; +import Select from "./Select"; import Settings from "./settings"; import StackHeader from "./StackHeader"; import StartPlanItem from "./StartPlanItem"; import { toast } from "./toast"; -import { PERMISSIONS, RESULTS, check, request } from "react-native-permissions"; -import Select from "./Select"; -import { convert } from "./conversions"; export default function StartPlan() { const { params } = useRoute>(); diff --git a/TimerProgress.tsx b/TimerProgress.tsx index 9d3c0b5..2b52b10 100644 --- a/TimerProgress.tsx +++ b/TimerProgress.tsx @@ -1,8 +1,8 @@ import { useFocusEffect } from "@react-navigation/native"; import { useCallback, useState } from "react"; import { ProgressBar } from "react-native-paper"; -import { TickEvent } from "./TimerPage"; import { emitter } from "./emitter"; +import { TickEvent } from "./TimerPage"; export default function TimerProgress() { const [progress, setProgress] = useState(0); diff --git a/ViewGraph.tsx b/ViewGraph.tsx index 0c69e37..5a7e2a3 100644 --- a/ViewGraph.tsx +++ b/ViewGraph.tsx @@ -3,9 +3,10 @@ import { format } from "date-fns"; import { useEffect, useMemo, useState } from "react"; import { View } from "react-native"; import { FileSystem } from "react-native-file-access"; -import { IconButton, List, ActivityIndicator } from "react-native-paper"; +import { ActivityIndicator, IconButton, List } from "react-native-paper"; import Share from "react-native-share"; import { captureScreen } from "react-native-view-shot"; +import { StackParams } from "./AppStack"; import Chart from "./Chart"; import { PADDING } from "./constants"; import { setRepo } from "./db"; @@ -15,7 +16,6 @@ import { Periods } from "./periods"; import Select from "./Select"; import StackHeader from "./StackHeader"; import Volume from "./volume"; -import { StackParams } from "./AppStack"; export default function ViewGraph() { const { params } = useRoute>(); diff --git a/WeightItem.tsx b/WeightItem.tsx index f5e6b89..feb8433 100644 --- a/WeightItem.tsx +++ b/WeightItem.tsx @@ -2,9 +2,9 @@ import { NavigationProp, useNavigation } from "@react-navigation/native"; import { format } from "date-fns"; import { useCallback, useMemo } from "react"; import { List, Text } from "react-native-paper"; +import { StackParams } from "./AppStack"; import Settings from "./settings"; import Weight from "./weight"; -import { StackParams } from "./AppStack"; export default function WeightItem({ item, diff --git a/WeightList.tsx b/WeightList.tsx index e86c059..0254848 100644 --- a/WeightList.tsx +++ b/WeightList.tsx @@ -7,6 +7,7 @@ import { useCallback, useState } from "react"; import { FlatList } from "react-native"; import { IconButton, List } from "react-native-paper"; import { Like } from "typeorm"; +import { StackParams } from "./AppStack"; import { LIMIT } from "./constants"; import { getNow, settingsRepo, weightRepo } from "./db"; import DrawerHeader from "./DrawerHeader"; @@ -14,7 +15,6 @@ import Page from "./Page"; import Settings from "./settings"; import { default as Weight, defaultWeight } from "./weight"; import WeightItem from "./WeightItem"; -import { StackParams } from "./AppStack"; export default function WeightList() { const [refreshing, setRefreshing] = useState(false); diff --git a/data-source.ts b/data-source.ts index 2f57630..42ca0aa 100644 --- a/data-source.ts +++ b/data-source.ts @@ -30,13 +30,13 @@ import { weight1697766633971 } from "./migrations/1697766633971-weight"; import { exercises1699508495726 } from "./migrations/1699508495726-exercises"; import { exercisesFix1699613077628 } from "./migrations/1699613077628-exercises-fix"; import { settingsDuration1699743753975 } from "./migrations/1699743753975-settings-duration"; -import { Plan } from "./plan"; -import Settings from "./settings"; -import Weight from "./weight"; import { settingsStartup1699783784680 } from "./migrations/1699783784680-settings-startup"; import { settingsBackupDir1699839054226 } from "./migrations/1699839054226-settings-backup-dir"; import { homeHistoryStartup1699853245534 } from "./migrations/1699853245534-home-history-startup"; import { autoConvert1699948105001 } from "./migrations/1699948105001-auto-convert"; +import { Plan } from "./plan"; +import Settings from "./settings"; +import Weight from "./weight"; export const AppDataSource = new DataSource({ type: "react-native",