Add custom app icons and fix bottom navigation safe area

android/.gitignore

@@ -38,4 +38,14 @@ yarn-error.*
 
 # generated native folders
 /ios
-/android
+# Ignore most of android except app icons
+/android/*
+!/android/app/
+/android/app/*
+!/android/app/src/
+/android/app/src/*
+!/android/app/src/main/
+/android/app/src/main/*
+!/android/app/src/main/res/
+/android/app/src/main/res/*
+!/android/app/src/main/res/mipmap-*/

android/App.js

@@ -54,7 +54,10 @@ import slip10 from "micro-key-producer/slip10.js";
 import { randomBytes, secretbox } from "tweetnacl";
 import bs58 from "bs58";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
-import { SafeAreaProvider } from "react-native-safe-area-context";
+import {
+  SafeAreaProvider,
+  useSafeAreaInsets,
+} from "react-native-safe-area-context";
 // Replaced @gorhom/bottom-sheet with simple Modal-based implementation
 import BottomSheet, {
   SimpleBottomSheetView as BottomSheetView,
@@ -301,6 +304,9 @@ const NETWORKS = [
 const apolloClient = createApolloClient("backpack-android", "1.0.0");
 
 function AppContent() {
+  // Get safe area insets
+  const insets = useSafeAreaInsets();
+
   // Authentication states
   const [authState, setAuthState] = useState("loading"); // 'loading', 'setup', 'locked', 'unlocked'
   const [password, setPassword] = useState(null);
@@ -3575,7 +3581,7 @@ function AppContent() {
           </ScrollView>
 
           {/* Bottom Tab Bar */}
-          <View style={styles.bottomTabBar}>
+          <View style={[styles.bottomTabBar, { paddingBottom: insets.bottom }]}>
             <TouchableOpacity
               style={styles.bottomTabItem}
               onPress={() => {
@@ -6954,12 +6960,10 @@ const styles = StyleSheet.create({
     flexDirection: "row",
     backgroundColor: "transparent",
     borderTopWidth: 0,
-    paddingBottom: 35,
     paddingTop: 0,
     paddingHorizontal: 20,
     justifyContent: "space-around",
     alignItems: "flex-start",
-    height: 86,
   },
   bottomTabItem: {
     flex: 1,

android/android/app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
       <data android:scheme="https"/>
     </intent>
   </queries>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:supportsRtl="true" android:enableOnBackInvokedCallback="false" android:usesCleartextTraffic="true">
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:supportsRtl="true" android:enableOnBackInvokedCallback="false">
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>

android/package.json

@@ -41,7 +41,7 @@
     "react-native-qrcode-svg": "^6.3.20",
     "react-native-quick-crypto": "^0.7.17",
     "react-native-reanimated": "~4.1.1",
-    "react-native-safe-area-context": "^5.6.2",
+    "react-native-safe-area-context": "github:AppAndFlow/react-native-safe-area-context",
     "react-native-screens": "^4.18.0",
     "react-native-svg": "15.12.1",
     "react-native-webview": "^13.16.0",

android/yarn.lock

@@ -5015,10 +5015,9 @@ react-native-quick-crypto@^0.7.17:
     react-native-is-edge-to-edge "^1.2.1"
     semver "7.7.2"
 
-react-native-safe-area-context@*, react-native-safe-area-context@^5.6.2:
+react-native-safe-area-context@*, "react-native-safe-area-context@github:AppAndFlow/react-native-safe-area-context":
   version "5.6.2"
-  resolved "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-5.6.2.tgz"
-  integrity sha512-4XGqMNj5qjUTYywJqpdWZ9IG8jgkS3h06sfVjfw5yZQZfWnRFXczi0GnYyFyCc2EBps/qFmoCH8fez//WumdVg==
+  resolved "git+ssh://git@github.com/AppAndFlow/react-native-safe-area-context.git#8b2267a4726b7520e82d35f26d23bacce9ec44c9"
 
 react-native-screens@^4.18.0:
   version "4.18.0"