New update

App.tsx

@@ -1,12 +1,3 @@
-/**
- * Sample React Native App
- * https://github.com/facebook/react-native
- *
- * Generated with the TypeScript template
- * https://github.com/react-native-community/react-native-template-typescript
- *
- * @format
- */
 
 import React, {type PropsWithChildren} from 'react';
 import {

app/components/ActionBar/ActionItem.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import {Image, StyleSheet, View,TouchableOpacity} from 'react-native';
 import {moderateScale} from 'react-native-size-matters';
-// import { TouchableOpacity } from 'react-native-gesture-handler';
 
 const ActionItem = ({children,onPress}) => {
   return (

app/components/BusPod.tsx

@@ -87,16 +87,6 @@ const BusPod: FunctionComponent<any> = ({
           <Menu />
         </View>
       </View>
-      {/* <View
-        style={{
-          width: '100%',
-          backgroundColor: colors.surfaceBackground,
-          paddingVertical: '2%',
-          paddingHorizontal: '2%',
-          marginBottom: '2%',
-        }}>
-        <ActionBar />
-      </View> */}
     </TouchableOpacity>
   );
 };

app/components/Buttons/TabButton.tsx

@@ -8,7 +8,6 @@ export const TabButton = props => {
   return (
     <TouchableOpacity
       activeOpacity={1}
-      // disabled={props.disabled}
       style={[
         styles.tabButtonContainer,
         {
@@ -69,7 +68,6 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
     paddingHorizontal: moderateScale(15),
-    // backgroundColor:'#bfbfbf',
     borderRadius: moderateScale(10),
   },
   buttonWhiteTouchable: {
@@ -83,13 +81,9 @@ const styles = StyleSheet.create({
     borderRadius: moderateScale(0),
   },
   tabButtonContainer: {
-    // height: moderateScale(40),
     width: '46%',
     justifyContent: 'center',
     alignItems: 'center',
-    // paddingHorizontal: moderateScale(15),
-    // paddingBottom
-    // borderRadius: moderateScale(0),
   },
   tabButtonText: {
     fontSize: moderateScale(14),

app/components/Buttons/button.tsx

@@ -1,17 +1,17 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-import React from 'react';
-import {StyleSheet, View, Text, TouchableOpacity} from 'react-native';
-import {useTheme} from 'react-native-paper';
-import Dimensions from '../../utils/helper';
-// //Package
-import {scale, moderateScale} from 'react-native-size-matters';
-import LinearGradient from 'react-native-linear-gradient';
+import React from "react";
+import { StyleSheet, View, Text, TouchableOpacity } from "react-native";
+import { useTheme } from "react-native-paper";
+import Dimensions from "../../utils/helper";
+ //Package
+import { scale, moderateScale } from "react-native-size-matters";
+import LinearGradient from "react-native-linear-gradient";
 
 const dim = Dimensions.Screen;
 
 const ButtonThemeTypes: any = {
-  PRIMARY: 'primary',
-  SECONDARY: 'secondary',
+  PRIMARY: "primary",
+  SECONDARY: "secondary",
 };
 
 const getBackgroundColor = (buttonType: any) => {
@@ -26,29 +26,6 @@ const getBackgroundColor = (buttonType: any) => {
   }
 };
 
-//  function LongButton(props: any) {
-//   return (
-//     <TouchableOpacity
-//       disabled={props.disabled}
-//       // activeOpacity={props.disabled ? 1 : 0.8}
-//       activeOpacity={1}
-//       style={{width: '100%', zIndex: 10}}
-//       onPress={() => {
-//         props.onPress();
-//       }}>
-//       <LinearGradient
-//         colors={props.disabled ? ['grey', 'grey'] : ['#248ECD', '#144072']}
-//         start={{x: 0, y: 0}}
-//         end={{x: 1, y: 0}}
-//         style={{...styles.buttonTouchable}}>
-//         <Text numberOfLines={1} style={styles.buttonWhiteText}>
-//           {props.Label}
-//         </Text>
-//       </LinearGradient>
-//     </TouchableOpacity>
-//   );
-// }
-
 const BaseButton = ({
   width,
   height = moderateScale(40),
@@ -58,7 +35,6 @@ const BaseButton = ({
   children,
   style,
 }) => {
-  // const color = theme.colors.button?.text;
   const theme = useTheme();
   const styles = makeStyles(theme.colors);
   return (
@@ -71,15 +47,16 @@ const BaseButton = ({
           borderRadius: 5,
           width: width,
           height,
-          alignItems: 'center',
-          justifyContent: 'center',
+          alignItems: "center",
+          justifyContent: "center",
           paddingHorizontal: 2,
         },
-        {...style},
+        { ...style },
       ]}
       onPress={() => {
         onPress();
-      }}>
+      }}
+    >
       <Text numberOfLines={1} style={[styles.buttonText]}>
         {children}
       </Text>
@@ -134,37 +111,37 @@ export const Button = {
   Secondary,
 };
 
-const makeStyles = colors =>
+const makeStyles = (colors) =>
   StyleSheet.create({
     linearGradient: {
-      alignSelf: 'center',
+      alignSelf: "center",
       height: dim.height * 0.07,
       borderRadius: 30,
-      alignItems: 'center',
+      alignItems: "center",
       width: dim.width * 0.7,
-      justifyContent: 'center',
+      justifyContent: "center",
       marginTop: 10,
     },
     viewTextInput: {
-      backgroundColor: 'white',
+      backgroundColor: "white",
       height: dim.height * 0.065,
       borderRadius: 30,
-      flexDirection: 'row',
+      flexDirection: "row",
       width: dim.width * 0.69,
-      alignItems: 'center',
-      justifyContent: 'center',
+      alignItems: "center",
+      justifyContent: "center",
     },
     textCancel: {
       color: colors.primary,
-      textAlign: 'center',
-      alignSelf: 'center',
-      fontWeight: 'bold',
+      textAlign: "center",
+      alignSelf: "center",
+      fontWeight: "bold",
       fontSize: 18,
     },
     continueContainer: {
       flex: 0.5,
-      justifyContent: 'center',
-      alignItems: 'flex-end',
+      justifyContent: "center",
+      alignItems: "flex-end",
       paddingRight: scale(30),
     },
     continueButton: {
@@ -173,39 +150,39 @@ const makeStyles = colors =>
       borderRadius: 20,
     },
     continueButtonTouchable: {
-      height: '100%',
-      width: '100%',
+      height: "100%",
+      width: "100%",
       zIndex: 1,
-      flexDirection: 'row',
-      justifyContent: 'center',
-      alignItems: 'center',
+      flexDirection: "row",
+      justifyContent: "center",
+      alignItems: "center",
       borderRadius: 40,
     },
     continueButtonText: {
       fontSize: 16,
-      color: '#fafafa',
+      color: "#fafafa",
     },
     continueButtonTextContainer: {
-      width: '80%',
-      justifyContent: 'center',
-      alignItems: 'center',
-      height: '100%',
+      width: "80%",
+      justifyContent: "center",
+      alignItems: "center",
+      height: "100%",
     },
     continueButtonArrowContainer: {
-      width: '20%',
-      justifyContent: 'center',
-      alignItems: 'flex-start',
-      height: '100%',
+      width: "20%",
+      justifyContent: "center",
+      alignItems: "flex-start",
+      height: "100%",
     },
     addmemberButton: {
-      height: '50%',
-      width: '40%',
+      height: "50%",
+      width: "40%",
       borderRadius: 40,
       borderWidth: 1,
       borderColor: colors.primary,
       zIndex: 1,
-      justifyContent: 'center',
-      alignItems: 'center',
+      justifyContent: "center",
+      alignItems: "center",
     },
     addmemberButtonText: {
       fontSize: 16,
@@ -217,78 +194,77 @@ const makeStyles = colors =>
       width: dim.width,
       borderRadius: 0,
       elevation: 2,
-      justifyContent: 'center',
-      alignItems: 'center',
-      //padding3)  },
+      justifyContent: "center",
+      alignItems: "center",
     },
     datebuttonLinear: {
       height: 38,
       width: dim.width,
       borderRadius: 0,
       borderWidth: 0.75,
       borderColor: colors.primary,
-      justifyContent: 'center',
-      alignItems: 'center',
+      justifyContent: "center",
+      alignItems: "center",
     },
     buttonTouchable: {
       height: 40,
-      width: '100%',
+      width: "100%",
       zIndex: 2,
-      justifyContent: 'center',
-      alignItems: 'center',
+      justifyContent: "center",
+      alignItems: "center",
       paddingHorizontal: 15,
       borderRadius: 10,
     },
     buttonWhiteTouchable: {
       height: 40,
-      width: '49.9%',
+      width: "49.9%",
       zIndex: 2,
-      justifyContent: 'center',
-      alignItems: 'center',
+      justifyContent: "center",
+      alignItems: "center",
       paddingHorizontal: 15,
 
       borderRadius: 0,
     },
     tabButtonContainer: {
-      width: '46%',
-      justifyContent: 'center',
-      alignItems: 'center',
+      width: "46%",
+      justifyContent: "center",
+      alignItems: "center",
     },
     tabButtonText: {
       fontSize: moderateScale(14),
-      fontWeight: '500',
-      fontFamily: 'Poppins-Medium',
+      fontWeight: "500",
+      fontFamily: "Poppins-Medium",
     },
     datebuttonWhiteTouchable: {
-      height: '97%',
-      width: '98.5%',
+      height: "97%",
+      width: "98.5%",
       zIndex: 2,
-      justifyContent: 'center',
-      alignItems: 'center',
+      justifyContent: "center",
+      alignItems: "center",
       paddingHorizontal: moderateScale(15),
-      backgroundColor: 'white',
+      backgroundColor: "white",
       borderRadius: moderateScale(5),
     },
     buttonTouchable1: {
-      height: '97%',
-      width: '99%',
+      height: "97%",
+      width: "99%",
       zIndex: 2,
       paddingHorizontal: moderateScale(15),
-      justifyContent: 'center',
-      alignItems: 'center',
-      backgroundColor: '#FAFAFA',
+      justifyContent: "center",
+      alignItems: "center",
+      backgroundColor: "#FAFAFA",
       borderRadius: moderateScale(5),
     },
     buttonText: {
       fontSize: moderateScale(14),
-      fontFamily: 'Poppins-SemiBold',
-      fontWeight: '600',
+      fontFamily: "Poppins-SemiBold",
+      fontWeight: "600",
     },
     buttonWhiteText: {
       fontSize: moderateScale(16),
-      fontWeight: '500',
-      color: 'white',
-      fontFamily: 'Poppins-Medium',
+      fontWeight: "500",
+      color: "white",
+      fontFamily: "Poppins-Medium",
     },
     whitebuttonText: {
       fontSize: moderateScale(16),