chore: Move Link & router code to /navigation

features/app-core/hooks/useUniversalRouteParams.ts → features/app-core/navigation/useRouteParams.ts

@@ -1,9 +1,9 @@
 import { useLocalSearchParams } from 'expo-router'
-import type { UniversalRouteScreenProps } from './useUniversalRouteParams.types'
+import type { UniversalRouteScreenProps } from './useRouteParams.types'
 
-/** --- useUniversalRouteParams() -------------------------------------------------------------- */
+/** --- useRouteParams() -------------------------------------------------------------- */
 /** -i- Gets the route search and query params on both web and mobile */
-export const useUniversalRouteParams = (routeScreenProps: UniversalRouteScreenProps) => {
+export const useRouteParams = (routeScreenProps: UniversalRouteScreenProps) => {
   const { params, searchParams } = routeScreenProps
   const expoRouterParams = useLocalSearchParams()
   return {

features/app-core/navigation/useRouteParams.web.ts

@@ -0,0 +1,8 @@
+import type { UniversalRouteScreenProps } from './useRouteParams.types'
+
+/** --- useRouteParams() -------------------------------------------------------------- */
+/** -i- Gets the route search and query params on both web and mobile */
+export const useRouteParams = (routeScreenProps: UniversalRouteScreenProps) => {
+  const { params, searchParams } = routeScreenProps
+  return { ...params, ...searchParams }
+}

features/app-core/hooks/useUniversalRouter.ts → features/app-core/navigation/useRouter.ts

@@ -1,9 +1,9 @@
 import { router } from 'expo-router'
-import { UniversalRouterMethods } from './useUniversalRouter.types'
+import { UniversalRouterMethods } from './useRouter.types'
 
-/* --- useUniversalRouter() -------------------------------------------------------------------- */
+/* --- useRouter() ----------------------------------------------------------------------------- */
 
-export const useUniversalRouter = () => {
+export const useRouter = () => {
     return {
         push: router.push,
         navigate: router.navigate,

features/app-core/hooks/useUniversalRouter.web.ts → features/app-core/navigation/useRouter.web.ts

@@ -1,12 +1,11 @@
-import { useRouter } from 'next/navigation'
-import { UniversalRouterMethods } from './useUniversalRouter.types'
-import { useUniversalRouteParams } from './useUniversalRouteParams'
+import { useRouter as useNextRouter } from 'next/navigation'
+import { UniversalRouterMethods } from './useRouter.types'
 
-/* --- useUniversalRouter() -------------------------------------------------------------------- */
+/* --- useRouter() -------------------------------------------------------------------- */
 
-export const useUniversalRouter = () => {
+export const useRouter = () => {
     // Hooks
-    const nextRouter = useRouter()
+    const nextRouter = useNextRouter()
 
     // -- Helpers --
 

features/app-core/screens/HomeScreen.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { StyleSheet, Text, View } from 'react-native'
-import { Link } from '../components/Link'
+import { Link } from '../navigation/Link'
 
 /* --- <HomeScreen/> --------------------------------------------------------------------------- */
 

features/app-core/screens/SlugScreen.tsx

@@ -1,15 +1,15 @@
 import React from 'react'
 import { StyleSheet, Text, View } from 'react-native'
-import { useUniversalRouteParams } from '@app/core/hooks/useUniversalRouteParams'
-import { Link } from '../components/Link'
-import { useUniversalRouter } from '../hooks/useUniversalRouter'
+import { useRouteParams } from '@app/core/navigation/useRouteParams'
+import { Link } from '../navigation/Link'
+import { useRouter } from '../navigation/useRouter'
 
 /* --- <SlugScreen/> --------------------------------------------------------------------------- */
 
 const SlugScreen = (props) => {
   // Routing
-  const { slug, count = '' } = useUniversalRouteParams(props)
-  const { canGoBack, back, push, navigate, replace, setParams } = useUniversalRouter()
+  const { slug, count = '' } = useRouteParams(props)
+  const { canGoBack, back, push, navigate, replace, setParams } = useRouter()
 
   // Vars
   const showBackButton = canGoBack()