Added types for navigation

revenets · revenets · commit 0badc03ccfa0 · 2024-07-12T12:05:21.000+03:00
diff --git a/constants/api.ts b/constants/api.ts
@@ -1,6 +1,6 @@
 const API = {
     QUOTE_URL: 'http://api.forismatic.com/api/1.0',
     IMAGE_URL: 'https://picsum.photos'
-}
+} as const;
 
-export { API };
+export { API };
diff --git a/constants/colors.ts b/constants/colors.ts
@@ -1,27 +1,27 @@
 const COLORS_LIGHT = {
-	appBackground: "#EEECEC",
-	primary900: "#00146D",
-	primary300: "#6d78bd",
-	primary200: "#969ecf",
-	primary100: "#B0B7E5",
-	secondary800: "#6d0014",
-	grey600: "#757575",
-	grey300: "#BDBDBD",
-	fontMain: "#000000",
-	fontInverse: "#FFFFFF",
+	APP_BACKGROUND: "#EEECEC",
+	PRIMARY__900: "#00146D",
+	PRIMARY_300: "#6d78bd",
+	PRIMARY_200: "#969ecf",
+	PRIMARY_100: "#B0B7E5",
+	SECONDARY_800: "#6d0014",
+	GREY__600: "#757575",
+	GREY_300: "#BDBDBD",
+	FONT_MAIN: "#000000",
+	FONT_INVERSE: "#FFFFFF",
 } as const;
 
 const COLORS_DARK = {
-	appBackground: "#262626",
-	primary900: "#BA68C8",
-	primary300: "#e1bee7",
-	primary200: "#514951",
-	primary100: "#351401",
-	secondary800: "#c86876",
-	grey300: "#757575",
-	grey600: "#BDBDBD",
-	fontInverse: "#000000",
-	fontMain: "#FFFFFF",
+	APP_BACKGROUND: "#262626",
+	PRIMARY_900: "#BA68C8",
+	PRIMARY_300: "#e1bee7",
+	PRIMARY_200: "#514951",
+	PRIMARY_100: "#351401",
+	SECONDARY_800: "#c86876",
+	GREY_300: "#757575",
+	GREY_600: "#BDBDBD",
+	FONT_INVERSE: "#000000",
+	FONT_MAIN: "#FFFFFF",
 } as const;
 
 export { COLORS_DARK, COLORS_LIGHT };
diff --git a/constants/index.ts b/constants/index.ts
@@ -1,2 +1,3 @@
 export { API } from './api';
 export { COLORS_DARK, COLORS_LIGHT } from './colors';
+export { ROUTE_NAME } from './routes';
diff --git a/constants/routes.ts b/constants/routes.ts
@@ -0,0 +1,8 @@
+const ROUTE_NAME = {
+    DASHBOARD: 'Dashboard',
+    SETTINGS: 'Settings',
+    ADD_INSPIRATION: 'AddInspiration',
+    BOTTOM_TABS_NAVIGATOR: 'BottomTabsNavigator',
+} as const; 
+
+export { ROUTE_NAME };
diff --git a/contexts/index.ts b/contexts/index.ts
@@ -1 +1 @@
-export { ThemeProvider, ThemeContext } from './theme-context';
+export { ThemeProvider, ThemeContext } from './theme-context';
diff --git a/contexts/theme-context.tsx b/contexts/theme-context.tsx
@@ -28,4 +28,4 @@ const ThemeProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
   );
 };
 
-export { ThemeProvider, ThemeContext };
+export { ThemeProvider, ThemeContext };
diff --git a/helpers/get-random-number.helper.ts b/helpers/get-random-number.helper.ts
@@ -6,4 +6,4 @@ const getRandomNumber = (min?: number, max?: number): number => {
     return Math.floor(Math.random() * 100);
 }
 
-export { getRandomNumber };
+export { getRandomNumber };
diff --git a/helpers/index.ts b/helpers/index.ts
@@ -1 +1 @@
-export { getRandomNumber } from './get-random-number.helper';
+export { getRandomNumber } from './get-random-number.helper';
diff --git a/hooks/index.ts b/hooks/index.ts
@@ -1 +1 @@
-export { useTheme } from './use-theme';
+export { useTheme } from './use-theme';
diff --git a/hooks/use-theme.ts b/hooks/use-theme.ts
@@ -8,4 +8,4 @@ const useTheme = () => {
   return context;
 };
 
-export { useTheme };
+export { useTheme };
diff --git a/navigation/bottom-tabs-navigator.tsx b/navigation/bottom-tabs-navigator.tsx
@@ -0,0 +1,15 @@
+import { Text } from "react-native";
+import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
+
+import { Dashboard, Settings } from '../screens';
+
+const BottomTabs = createBottomTabNavigator();
+
+const BottomTabsNavigator = () => {
+    return (
+        // Add BottomTabs.Navigator here
+        <></>
+    )
+}
+
+export { BottomTabsNavigator };
diff --git a/navigation/drawer-navigator.tsx b/navigation/drawer-navigator.tsx
diff --git a/navigation/index.ts b/navigation/index.ts
@@ -1 +1 @@
-export { RootNavigator } from './root-navigator';
+export { RootNavigator } from './root-navigator';
diff --git a/navigation/root-navigator.tsx b/navigation/root-navigator.tsx
@@ -1,8 +1,12 @@
-import { NavigationContainer } from "@react-navigation/native";
 import { StatusBar } from "expo-status-bar";
 import { SafeAreaView, useSafeAreaInsets } from "react-native-safe-area-context";
+import { NavigationContainer } from "@react-navigation/native";
+import { createNativeStackNavigator } from "@react-navigation/native-stack";
+
+import { BottomTabsNavigator } from "./bottom-tabs-navigator";
+import { RootStackParamList } from "../types";
 
-import { DrawerNavigator } from "./drawer-navigator";
+const Stack = createNativeStackNavigator<RootStackParamList>();
 
 const RootNavigator = () => {
     const insets = useSafeAreaInsets();
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,8 +10,10 @@
   },
   "dependencies": {
     "@expo/vector-icons": "^14.0.2",
-    "@react-navigation/drawer": "^6.7.0",
+    "@react-native-async-storage/async-storage": "1.23.1",
+    "@react-navigation/bottom-tabs": "^6.6.0",
     "@react-navigation/native": "^6.1.17",
+    "@react-navigation/native-stack": "^6.10.0",
     "axios": "^1.7.2",
     "expo": "~51.0.19",
     "expo-font": "~12.0.7",
@@ -20,8 +22,7 @@
     "react-native": "0.74.3",
     "react-native-gesture-handler": "~2.16.1",
     "react-native-reanimated": "~3.10.1",
-    "react-native-safe-area-context": "4.10.1",
-    "@react-native-async-storage/async-storage": "1.23.1"
+    "react-native-safe-area-context": "4.10.1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
diff --git a/screens/add-inspiration/add-inspiration.tsx b/screens/add-inspiration/add-inspiration.tsx
@@ -0,0 +1,7 @@
+const AddInspiration: React.FC = () => {
+    return (
+        <></>
+    );
+}
+
+export { AddInspiration };
diff --git a/screens/dashboard/dashboard.tsx b/screens/dashboard/dashboard.tsx
@@ -4,4 +4,4 @@ const Dashboard: React.FC = () => {
     );
 }
 
-export { Dashboard };
+export { Dashboard };
diff --git a/screens/index.ts b/screens/index.ts
@@ -1,2 +1,3 @@
 export { Settings } from './settings/settings';
-export { Dashboard } from './dashboard/dashboard';
+export { Dashboard } from './dashboard/dashboard';
+export { AddInspiration } from './add-inspiration/add-inspiration';
diff --git a/screens/settings/settings.tsx b/screens/settings/settings.tsx
@@ -4,4 +4,4 @@ const Settings: React.FC = () => {
     );
 }
 
-export { Settings };
+export { Settings };
diff --git a/types/get-image-response-dto.type.ts b/types/get-image-response-dto.type.ts
@@ -7,4 +7,4 @@ type GetImageResponseDto = {
     download_url: string
 }
 
-export type { GetImageResponseDto };
+export type { GetImageResponseDto };
diff --git a/types/get-quote-response-dto.type.ts b/types/get-quote-response-dto.type.ts
@@ -6,4 +6,4 @@ type GetQuoteResponseDto = {
     quoteLink: string
 }
 
-export { type GetQuoteResponseDto };
+export { type GetQuoteResponseDto };
diff --git a/types/index.tsx b/types/index.tsx
@@ -1,2 +1,10 @@
-export type { GetQuoteResponseDto } from './get-quote-response-dto.type';
-export type { GetImageResponseDto } from './get-image-response-dto.type';
+export type { GetQuoteResponseDto } from "./get-quote-response-dto.type";
+export type { GetImageResponseDto } from "./get-image-response-dto.type";
+export type { Inspiration } from "./inspiration.type";
+export type {
+	BottomTabsParamList,
+	BottomTabsScreenProps,
+	NavigationRoute,
+	RootStackParamList,
+	RootStackScreenProps,
+} from "./navigation.type";
diff --git a/types/inspiration.type.ts b/types/inspiration.type.ts
@@ -0,0 +1,7 @@
+type Inspiration = {
+    quote?: string;
+    quote_url?: string;
+    image_url?: string;
+}
+
+export type { Inspiration };
diff --git a/types/navigation.type.ts b/types/navigation.type.ts
@@ -0,0 +1,52 @@
+import type {
+	NavigatorScreenParams,
+	CompositeScreenProps,
+} from "@react-navigation/native";
+import type { NativeStackScreenProps } from "@react-navigation/native-stack";
+import type { BottomTabScreenProps as RNBottomTabScreenProps } from "@react-navigation/bottom-tabs";
+
+import type { ROUTE_NAME } from "../constants";
+import { Inspiration } from "./inspiration.type";
+
+type NavigationRoute = (typeof ROUTE_NAME)[keyof typeof ROUTE_NAME];
+
+type RootStackParamList = {
+	[ROUTE_NAME.BOTTOM_TABS_NAVIGATOR]: NavigatorScreenParams<BottomTabsParamList>;
+	[ROUTE_NAME.ADD_INSPIRATION]: undefined;
+};
+
+type BottomTabsParamList = {
+	[ROUTE_NAME.DASHBOARD]:
+		| {
+				inspiration?: Inspiration;
+		  }
+		| undefined;
+	[ROUTE_NAME.SETTINGS]: undefined;
+};
+
+declare global {
+	// eslint-disable-next-line @typescript-eslint/no-namespace
+	namespace ReactNavigation {
+		interface RootParamList extends RootStackParamList {}
+	}
+}
+
+type RootStackScreenProps<T extends keyof RootStackParamList> =
+	NativeStackScreenProps<RootStackParamList, T>;
+
+type BottomTabsScreenProps<T extends keyof BottomTabsParamList> =
+	CompositeScreenProps<
+		RNBottomTabScreenProps<BottomTabsParamList, T>,
+		NativeStackScreenProps<
+			RootStackParamList,
+			typeof ROUTE_NAME.BOTTOM_TABS_NAVIGATOR
+		>
+	>;
+
+export type {
+	NavigationRoute,
+	RootStackParamList,
+	BottomTabsParamList,
+	RootStackScreenProps,
+	BottomTabsScreenProps,
+};

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`export { API } from './api';`
`2`	`2`	`export { COLORS_DARK, COLORS_LIGHT } from './colors';`
	`3`	`+export { ROUTE_NAME } from './routes';`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export { ThemeProvider, ThemeContext } from './theme-context';`
	`1`	`+export { ThemeProvider, ThemeContext } from './theme-context';`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ const getRandomNumber = (min?: number, max?: number): number => {`
`6`	`6`	`return Math.floor(Math.random() * 100);`
`7`	`7`	`}`
`8`	`8`
`9`		`-export { getRandomNumber };`
	`9`	`+export { getRandomNumber };`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export { getRandomNumber } from './get-random-number.helper';`
	`1`	`+export { getRandomNumber } from './get-random-number.helper';`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export { useTheme } from './use-theme';`
	`1`	`+export { useTheme } from './use-theme';`