Add some fix for icons in IOS, try to android

CodingFactory-Repos · Feb 28, 2024 · f868e23 · f868e23
1 parent b3c06c5
commit f868e23
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 8 deletions.
diff --git a/android/app/src/assets/fonts/AntDesign.ttf b/android/app/src/assets/fonts/AntDesign.ttf
diff --git a/android/app/src/assets/fonts/Entypo.ttf b/android/app/src/assets/fonts/Entypo.ttf
diff --git a/android/app/src/assets/fonts/EvilIcons.ttf b/android/app/src/assets/fonts/EvilIcons.ttf
diff --git a/android/app/src/assets/fonts/Feather.ttf b/android/app/src/assets/fonts/Feather.ttf
diff --git a/android/app/src/assets/fonts/FontAwesome.ttf b/android/app/src/assets/fonts/FontAwesome.ttf
diff --git a/android/app/src/assets/fonts/FontAwesome5_Brands.ttf b/android/app/src/assets/fonts/FontAwesome5_Brands.ttf
diff --git a/android/app/src/assets/fonts/FontAwesome5_Regular.ttf b/android/app/src/assets/fonts/FontAwesome5_Regular.ttf
diff --git a/android/app/src/assets/fonts/FontAwesome5_Solid.ttf b/android/app/src/assets/fonts/FontAwesome5_Solid.ttf
diff --git a/android/app/src/assets/fonts/FontAwesome6_Brands.ttf b/android/app/src/assets/fonts/FontAwesome6_Brands.ttf
diff --git a/android/app/src/assets/fonts/FontAwesome6_Regular.ttf b/android/app/src/assets/fonts/FontAwesome6_Regular.ttf
diff --git a/android/app/src/assets/fonts/FontAwesome6_Solid.ttf b/android/app/src/assets/fonts/FontAwesome6_Solid.ttf
diff --git a/android/app/src/assets/fonts/Fontisto.ttf b/android/app/src/assets/fonts/Fontisto.ttf
diff --git a/android/app/src/assets/fonts/Foundation.ttf b/android/app/src/assets/fonts/Foundation.ttf
diff --git a/android/app/src/assets/fonts/Ionicons.ttf b/android/app/src/assets/fonts/Ionicons.ttf
diff --git a/android/app/src/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/assets/fonts/MaterialCommunityIcons.ttf
diff --git a/android/app/src/assets/fonts/MaterialIcons.ttf b/android/app/src/assets/fonts/MaterialIcons.ttf
diff --git a/android/app/src/assets/fonts/Octicons.ttf b/android/app/src/assets/fonts/Octicons.ttf
diff --git a/android/app/src/assets/fonts/SimpleLineIcons.ttf b/android/app/src/assets/fonts/SimpleLineIcons.ttf
diff --git a/android/app/src/assets/fonts/Zocial.ttf b/android/app/src/assets/fonts/Zocial.ttf
diff --git a/android/build.gradle b/android/build.gradle
@@ -17,5 +17,4 @@ buildscript {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }
 }
-
 apply plugin: "com.facebook.react.rootproject"
diff --git a/src/components/navigators/TabBarNavigation/TabNavigator.tsx b/src/components/navigators/TabBarNavigation/TabNavigator.tsx
@@ -1,6 +1,6 @@
 import React, {useEffect} from 'react';
 import {ColorValue} from 'react-native';
-import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 import {getFocusedRouteNameFromRoute} from '@react-navigation/native';
 import {useNavigation} from '@react-navigation/native';
 
@@ -33,37 +33,48 @@ const TabNavigator = () => {
 
   const renderIcon =
     (name: string) =>
-    // eslint-disable-next-line react/no-unstable-nested-components
     ({color, size}: {color: ColorValue; size: number}) =>
-      <Icon name={name} color={color} size={size} />;
+      <MaterialCommunityIcons name={name} color={color} size={size} />;
   return (
     <Tab.Navigator initialRouteName="Carrot">
       <Tab.Screen
         name="Carrot"
         component={CarrotScreen}
         options={{
-          tabBarIcon: renderIcon('carrot'),
+          tabBarLabel: 'Last Scan',
+          tabBarIcon: ({color, size}) => (
+            <MaterialCommunityIcons name="home" color={color} size={size} />
+          ),
         }}
       />
       <Tab.Screen
         name="Plate"
         component={PlateScreen}
         options={{
-          tabBarIcon: renderIcon('food'),
+          tabBarLabel: 'Plats',
+          tabBarIcon: ({color, size}) => (
+            <MaterialCommunityIcons name="home" color={color} size={size} />
+          ),
         }}
       />
       <Tab.Screen
         name="QRScan"
         component={QRScanScreen}
         options={{
-          tabBarIcon: renderIcon('qrcode-scan'),
+          tabBarLabel: 'QRScan',
+          tabBarIcon: ({color, size}) => (
+            <MaterialCommunityIcons name="home" color={color} size={size} />
+          ),
         }}
       />
       <Tab.Screen
         name="Search"
         component={SearchScreen}
         options={{
-          tabBarIcon: renderIcon('magnify'),
+          tabBarLabel: 'Search',
+          tabBarIcon: ({color, size}) => (
+            <MaterialCommunityIcons name="home" color={color} size={size} />
+          ),
         }}
       />
       <Tab.Screen
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,5 +17,4 @@ buildscript { @@
             classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
         }
     }
     apply plugin: "com.facebook.react.rootproject"