Release v2.1.9: UI Refactoring and Theme Color Consistency

.dockerignore

@@ -0,0 +1,84 @@
+# Dependencies
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Build outputs
+android/app/build/
+android/build/
+android/.gradle/
+android/app/release/
+ios/build/
+ios/Pods/
+ios/*.xcworkspace/xcuserdata/
+ios/*.xcodeproj/xcuserdata/
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Git
+.git/
+.gitignore
+.gitattributes
+
+# Docker
+Dockerfile
+.dockerignore
+docker-apk-builder.sh
+
+# Documentation
+*.md
+!BBMTLib/README.md
+!BBMTLib/RECOVER.md
+!BBMTLib/NOSTR_MESSAGE_ENCRYPTION_FLOW.md
+
+# Test files
+__tests__/
+*.test.tsx
+*.test.ts
+*.spec.ts
+*.spec.tsx
+
+# CI/CD
+.github/
+.gitlab-ci.yml
+.travis.yml
+
+# Misc
+.env
+.env.local
+*.log
+build.log
+
+# Docker inline cache directory (should not be in build context)
+.docker-cache/
+
+# Already built artifacts
+*.apk
+*.aab
+*.aar
+*.jar
+*.xcframework
+BBMTLib/tss.aar
+BBMTLib/tss-sources.jar
+BBMTLib/Tss.xcframework/
+
+# Fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/
+
+# Release artifacts
+android/app-release.apk.sha256
+android/app-release.apk.sha256.asc
+android/mapping.txt
+

.gitignore

@@ -382,4 +382,8 @@ PR_SUMMARY.md
 PR_README.md
 
 # third_party
-third_party/
+third_party/
+
+# Docker cache
+.docker-cache/
+build.log

App.tsx

@@ -11,7 +11,7 @@ import LoadingScreen from './screens/LoadingScreen';
 import Zeroconf, {ImplType} from 'react-native-zeroconf';
 import ReactNativeBiometrics, {BiometryTypes} from 'react-native-biometrics';
 import DeviceInfo from 'react-native-device-info';
-import {ThemeProvider} from './theme';
+import {ThemeProvider, useTheme} from './theme';
 import {WalletProvider} from './context/WalletContext';
 import {UserProvider} from './context/UserContext';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
@@ -31,6 +31,7 @@ import {NativeModules} from 'react-native';
 import {dbg, pinRemoteIP, getPinnedRemoteIPs} from './utils';
 import MobilesPairing from './screens/MobilesPairing';
 import MobileNostrPairing from './screens/MobileNostrPairing';
+import {CustomHeader} from './components/Header';
 
 // Initialize react-native-screens for Fabric compatibility
 enableScreens(true);
@@ -41,6 +42,14 @@ const rnBiometrics = new ReactNativeBiometrics({allowDeviceCredentials: true});
 const zeroconf = new Zeroconf();
 const zeroOut = new Zeroconf();
 
+// Custom header components with configurable height
+const HomeHeader = (props: any) => <CustomHeader {...props} height={60} />;
+const PSBTHeader = (props: any) => <CustomHeader {...props} height={60} />;
+const SettingsHeader = (props: any) => <CustomHeader {...props} height={60} />;
+const WelcomeHeader = (props: any) => <CustomHeader {...props} height={60} />;
+const DevicesPairingHeader = (props: any) => <CustomHeader {...props} height={60} />;
+const NostrConnectHeader = (props: any) => <CustomHeader {...props} height={60} />;
+
 const App = () => {
   const [initialRoute, setInitialRoute] = useState<string | null>(null);
   const [isAuthenticated, setIsAuthenticated] = useState(false);
@@ -301,9 +310,13 @@ const App = () => {
       isAuthenticated,
     );
     return (
-      <ThemeProvider>
-        <LoadingScreen onRetry={handleRetryAuthentication} />
-      </ThemeProvider>
+      <ErrorBoundary>
+        <SafeAreaProvider>
+          <ThemeProvider>
+            <LoadingScreen onRetry={handleRetryAuthentication} />
+          </ThemeProvider>
+        </SafeAreaProvider>
+      </ErrorBoundary>
     );
   }
 
@@ -313,23 +326,43 @@ const App = () => {
     <ErrorBoundary>
       <SafeAreaProvider>
         <ThemeProvider>
-          <UserProvider>
-            <WalletProvider>
-              <View style={styles.navigationContainer}>
+          <AppContent initialRoute={initialRoute} />
+        </ThemeProvider>
+      </SafeAreaProvider>
+    </ErrorBoundary>
+  );
+};
+
+const AppContent = ({initialRoute}: {initialRoute: string | null}) => {
+  const {theme} = useTheme();
+
+  const dynamicStyles = {
+    navigationContainer: {
+      ...styles.navigationContainer,
+      backgroundColor: theme.colors.background,
+    },
+  };
+
+  return (
+    <UserProvider>
+      <WalletProvider>
+        <View style={dynamicStyles.navigationContainer}>
                 <NavigationContainer>
                   <Stack.Navigator
-                    initialRouteName={initialRoute}
+                    initialRouteName={initialRoute || undefined}
                     screenOptions={{
                       headerShown: false,
-                      contentStyle: {backgroundColor: '#ffffff'},
+                      headerTitleAlign: 'left',
                     }}>
                     <Stack.Screen
                       name="PSBT"
                       component={PSBTScreen}
                       options={{
                         headerShown: true,
                         headerLeft: () => null,
-                        contentStyle: {backgroundColor: '#ffffff'},
+                        headerTitle: '',
+                        headerTitleAlign: 'left',
+                        header: PSBTHeader,
                       }}
                     />
                     <Stack.Screen
@@ -338,56 +371,58 @@ const App = () => {
                       options={{
                         headerShown: true,
                         headerLeft: () => null,
-                        contentStyle: {backgroundColor: '#ffffff'},
+                        headerTitle: '',
+                        headerTitleAlign: 'left',
+                        header: HomeHeader,
                       }}
                     />
                     <Stack.Screen
                       name="Welcome"
                       component={ShowcaseScreen}
                       options={{
-                        headerShown: true,
-                        contentStyle: {backgroundColor: '#ffffff'},
+                        header: WelcomeHeader,
+                        title: 'Welcome',
                       }}
                     />
                     <Stack.Screen
                       name="Settings"
                       component={WalletSettings}
                       options={{
                         headerShown: true,
-                        contentStyle: {backgroundColor: '#ffffff'},
+                        header: SettingsHeader,
+                        title: 'Settings',
                       }}
                     />
                     <Stack.Screen
                       name="Devices Pairing"
                       component={MobilesPairing}
                       options={{
                         headerShown: true,
-                        contentStyle: {backgroundColor: '#ffffff'},
+                        header: DevicesPairingHeader,
+                        title: 'Devices Pairing',
                       }}
                     />
                     <Stack.Screen
                       name="Nostr Connect"
                       component={MobileNostrPairing}
                       options={{
                         headerShown: true,
-                        contentStyle: {backgroundColor: '#ffffff'},
+                        header: NostrConnectHeader,
+                        title: 'Nostr Connect',
                       }}
                     />
                   </Stack.Navigator>
                 </NavigationContainer>
               </View>
             </WalletProvider>
           </UserProvider>
-        </ThemeProvider>
-      </SafeAreaProvider>
-    </ErrorBoundary>
   );
 };
 
 const styles = StyleSheet.create({
   navigationContainer: {
     flex: 1,
-    backgroundColor: '#ffffff',
+    // backgroundColor will be set dynamically based on theme
   },
 });