Merge pull request #3 from Task-Terriers/remove/TAS-41@remove-request…

…s-tab [TAS-41]: remove requests tab
Task-Terriers · Nov 17, 2023 · 53b53aa · 53b53aa
2 parents 04fabd4 + ff8194c
commit 53b53aa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/TaskTerriers/navigation/BottomTabNavigator.tsx b/TaskTerriers/navigation/BottomTabNavigator.tsx
@@ -24,7 +24,7 @@ export const BottomTabs = () => {
           headerShown: false,
         }
       }}>
-      <Tab.Screen name="Requests" component={RequestsTab} />
+      {/* <Tab.Screen name="Requests" component={RequestsTab} /> */}
       <Tab.Screen name="Services" component={ServicesTab} />
       <Tab.Screen name="Messages" component={MessagesTab} />
       <Tab.Screen name="Settings" component={SettingsTab} />

diff --git a/TaskTerriers/src/Screens/MessagesTab.tsx b/TaskTerriers/src/Screens/MessagesTab.tsx
@@ -4,6 +4,8 @@ import TaskTerriersSafeAreaView from '../Views/TaskTerriersSafeAreaView'
 import { BUColor } from '../Libs/Colors'
 import { Col } from '../StyleToProps/Col'
 import { Span } from '../StyleToProps'
+import NavigationBar from '../components/NavigationBar'
+import { IconNames } from '../components/types'
 
 interface Props {}
 
@@ -53,6 +55,7 @@ const MessagesTab = ({ navigation, route }) => {
 
   return (
     <TaskTerriersSafeAreaView style={{ flex: 1, backgroundColor: 'white' }}>
+      <NavigationBar iconName={IconNames['Message']} title={route.name} />
       <Col bgAlertMinor>
         <Span> this is the MessagesTab</Span>
       </Col>

diff --git a/TaskTerriers/src/Screens/ServicesTab.tsx b/TaskTerriers/src/Screens/ServicesTab.tsx
@@ -3,6 +3,8 @@ import { SafeAreaView, View, StyleSheet, Text, TouchableOpacity } from 'react-na
 import TaskTerriersSafeAreaView from '../Views/TaskTerriersSafeAreaView'
 import { Col } from '../StyleToProps/Col'
 import { Span } from '../StyleToProps'
+import NavigationBar from '../components/NavigationBar'
+import { IconNames } from '../components/types'
 
 interface Props {}
 
@@ -52,6 +54,7 @@ const ServicesTab = ({ navigation, route }) => {
 
   return (
     <TaskTerriersSafeAreaView style={{ flex: 1, backgroundColor: 'white' }}>
+      <NavigationBar iconName={IconNames['Service']} title={route.name} />
       <Col bgAlertMinor>
         <Span> this is the ServicesTab</Span>
       </Col>

diff --git a/TaskTerriers/src/Screens/SettingsTab.tsx b/TaskTerriers/src/Screens/SettingsTab.tsx
@@ -3,6 +3,8 @@ import { SafeAreaView, View, StyleSheet, Text, TouchableOpacity } from 'react-na
 import TaskTerriersSafeAreaView from '../Views/TaskTerriersSafeAreaView'
 import { Col } from '../StyleToProps/Col'
 import { Span } from '../StyleToProps'
+import NavigationBar from '../components/NavigationBar'
+import { IconNames } from '../components/types'
 
 interface Props {}
 
@@ -52,6 +54,7 @@ const SettingsTab = ({ navigation, route }) => {
 
   return (
     <TaskTerriersSafeAreaView style={{ flex: 1, backgroundColor: 'white' }}>
+      <NavigationBar iconName={IconNames['Setting']} title={route.name} />
       <Col bgAlertMinor>
         <Span> this is the SettingsTab</Span>
       </Col>

diff --git a/TaskTerriers/src/components/types.tsx b/TaskTerriers/src/components/types.tsx
@@ -15,7 +15,7 @@ const Size = {
   XXX_LARGE: 'xxxlarge',
 } as const
 
-const IconNames = {
+export const IconNames = {
   RequestOutline: 'help-buoy-outline',
   Request: 'help-buoy',
   SeviceOutline: 'construct-outline',