chore: create nav options

digidem · May 1, 2024 · 9e45209 · 9e45209
1 parent b9a170b
commit 9e45209
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/src/frontend/Navigation/ScreenGroups/AppScreens.tsx b/src/frontend/Navigation/ScreenGroups/AppScreens.tsx
@@ -6,7 +6,7 @@ import {NavigatorScreenParams} from '@react-navigation/native';
 import * as React from 'react';
 import {HomeHeader} from '../../sharedComponents/HomeHeader';
 import {RootStack} from '../AppStack';
-import {MessageDescriptor, useIntl} from 'react-intl';
+import {MessageDescriptor} from 'react-intl';
 import {MapScreen} from '../../screens/MapScreen';
 import {CameraScreen} from '../../screens/CameraScreen';
 import {ObservationEdit} from '../../screens/ObservationEdit';
@@ -20,7 +20,10 @@ import {AuthScreen} from '../../screens/AuthScreen';
 import {ObscurePasscode} from '../../screens/ObscurePasscode';
 import {Settings} from '../../screens/Settings';
 import {PresetChooser} from '../../screens/PresetChooser';
-import {ObservationsList} from '../../screens/ObservationsList';
+import {
+  CreateNavigationOptions as CreateObservationsListNavOptions,
+  ObservationsList,
+} from '../../screens/ObservationsList';
 import {ObservationScreen} from '../../screens/Observation';
 import {AppSettings} from '../../screens/Settings/AppSettings';
 import {ProjectSettings} from '../../screens/Settings/ProjectSettings';
@@ -63,8 +66,6 @@ import {
   SyncScreen,
   createNavigationOptions as createSyncNavOptions,
 } from '../../screens/Sync';
-import {ObservationsListBarIcon} from './TabBar/ObservationsListTabBarIcon';
-import {ObservationListHeaderLeft} from '../../screens/ObservationsList/ObservationListHeaderLeft';
 
 export const TAB_BAR_HEIGHT = 70;
 
@@ -144,7 +145,6 @@ const Tab = createBottomTabNavigator<HomeTabsList>();
 
 const HomeTabs = () => {
   const {handleTabPress} = useCurrentTab();
-  const {formatMessage} = useIntl();
 
   return (
     <Tab.Navigator
@@ -162,18 +162,7 @@ const HomeTabs = () => {
       <Tab.Screen
         name="ObservationsList"
         component={ObservationsList}
-        options={{
-          tabBarIcon: ObservationsListBarIcon,
-          headerLeft: ObservationListHeaderLeft,
-          headerTransparent: false,
-          headerTitle: formatMessage(ObservationsList.navTitle),
-          headerShadowVisible: true,
-          headerStyle: {
-            elevation: 15,
-            shadowOpacity: 0,
-            borderBottomWidth: 1,
-          },
-        }}
+        options={CreateObservationsListNavOptions()}
       />
       <Tab.Screen
         name="Map"

diff --git a/src/frontend/Navigation/ScreenGroups/TabBar/ObservationsListTabBarIcon.tsx b/src/frontend/Navigation/ScreenGroups/TabBar/ObservationsListTabBarIcon.tsx
@@ -10,6 +10,7 @@ export const ObservationsListBarIcon: FC<TabBarIconProps> = props => {
   return (
     <ObservationListIcon
       {...props}
+      height={25}
       stroke={
         props.focused && currentTab !== 'Tracking' ? COMAPEO_BLUE : MEDIUM_GREY
       }