Encapsulated types

src/frontend/api/auth.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { storeObject, getObject } from './store';
-import { AuthError, AuthToken } from './types';
+import { AuthError, AuthToken } from '../types/api';
 import { CLIENT_ID, CLIENT_SECRET } from 'react-native-dotenv';
 
 const TOKEN_URL = 'http://127.0.0.1:8000/api/auth/o/token/';

src/frontend/api/index.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { getObject } from './store';
-import { AuthToken, PaginationData, TrackItem } from './types';
+import { AuthToken, PaginationData, TrackItem } from '../types/api';
 
 const list: TrackItem[] = [
   {

src/frontend/contexts/Auth.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { getToken } from '../api/auth';
 import { getObject, removeItem } from '../api/store';
-import { AuthToken } from '../api/types';
+import { AuthToken } from '../types/api';
 
 type AuthContextType = {
   authToken?: AuthToken;

src/frontend/navigation/AuthNavigator.tsx

@@ -1,6 +1,6 @@
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import * as React from 'react';
-import { RootAuthParamList } from '../types';
+import { RootAuthParamList } from '../types/navigation';
 import LoginForm from '../screens/Auth/LoginForm';
 import RegisterForm from '../screens/Auth/RegisterForm';
 

src/frontend/navigation/BottomTabNavigator.tsx

@@ -7,7 +7,11 @@ import Colors from '../constants/Colors';
 import useColorScheme from '../hooks/useColorScheme';
 import HomePage from '../screens/HomePage';
 import StatsPage from '../screens/StatsPage';
-import { RootTabParamList, RouteActionIcon, TabConfig } from '../types';
+import {
+  RootTabParamList,
+  RouteActionIcon,
+  TabConfig,
+} from '../types/navigation';
 import { Text, View } from '../components/Themed';
 import { Header, Avatar } from 'react-native-elements';
 import JournalPage from '../screens/JournalPage';

src/frontend/navigation/LinkingConfiguration.ts

@@ -7,7 +7,7 @@
 import { LinkingOptions } from '@react-navigation/native';
 import * as Linking from 'expo-linking';
 
-import { RootStackParamList } from '../types';
+import { RootStackParamList } from '../types/navigation';
 
 const linking: LinkingOptions<RootStackParamList> = {
   prefixes: [Linking.makeUrl('/')],

src/frontend/navigation/RootNavigator.tsx

@@ -1,6 +1,6 @@
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import * as React from 'react';
-import { RootLinkParamList } from '../types';
+import { RootLinkParamList } from '../types/navigation';
 import BottomTabNavigator from './BottomTabNavigator';
 import AuthNavigator from './AuthNavigator';
 import { useAuth } from '../contexts/Auth';

src/frontend/navigation/StackNavigator.tsx

@@ -2,7 +2,7 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import * as React from 'react';
 import ModalScreen from '../screens/ModalScreen';
 import NotFoundScreen from '../screens/NotFoundScreen';
-import { RootStackParamList } from '../types';
+import { RootStackParamList } from '../types/navigation';
 import RootNavigator from './RootNavigator';
 
 const Stack = createNativeStackNavigator<RootStackParamList>();

src/frontend/screens/Auth/LoginForm.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Button, Card, Input, Text } from 'react-native-elements';
-import { AuthError } from '../../api/types';
+import { AuthError } from '../../types/api';
 import { useAuth } from '../../contexts/Auth';
 import { RootAuthScreenProps } from '../../types';
 import AuthForm from './AuthForm';

src/frontend/screens/HomePage.tsx

@@ -8,7 +8,7 @@ import { ComponentTabArguments, ColorScheme } from '../types';
 import Colors from '../constants/Colors';
 import { IconButtonGroup } from '../components/IconButtonGroup';
 import { getTrackItems } from '../api';
-import { PortionItem, TrackItem, UserLog } from '../api/types';
+import { PortionItem, TrackItem, UserLog } from '../types/api';
 
 const frequencyDisplay: { [frequency: number]: string } = {
   1: 'd',

src/frontend/types/index.ts

@@ -0,0 +1,8 @@
+import { MaterialIcons } from '@expo/vector-icons';
+import { ColorSchemeName } from 'react-native';
+
+export type ColorScheme = NonNullable<ColorSchemeName>;
+
+export type MaterialIconsOptions = React.ComponentProps<
+  typeof MaterialIcons
+>['name'];

src/frontend/types.tsx → src/frontend/types/navigation.ts

@@ -3,28 +3,21 @@
  * https://reactnavigation.org/docs/typescript/
  */
 
-import { MaterialIcons } from '@expo/vector-icons';
 import { BottomTabScreenProps } from '@react-navigation/bottom-tabs';
 import {
   CompositeScreenProps,
   NavigatorScreenParams,
   ParamListBase,
 } from '@react-navigation/native';
 import { NativeStackScreenProps } from '@react-navigation/native-stack';
-import { ColorSchemeName } from 'react-native';
+import { ColorScheme, MaterialIconsOptions } from '../types';
 
 declare global {
   namespace ReactNavigation {
     interface RootParamList extends RootStackParamList {}
   }
 }
 
-export type ColorScheme = NonNullable<ColorSchemeName>;
-
-export type MaterialIconsOptions = React.ComponentProps<
-  typeof MaterialIcons
->['name'];
-
 export type RootStackParamList = {
   Root: NavigatorScreenParams<RootLinkParamList> | undefined;
   Modal: undefined;