Add Translations, App Info Bottom Sheet, Edge-to-Edge and Predictive Back Gestures

app/src/main/AndroidManifest.xml

@@ -40,6 +40,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.BitchatAndroid"
+        android:localeConfig="@xml/locales_config"
+        android:enableOnBackInvokedCallback="true"
         tools:targetApi="31">
         <activity
             android:name=".ui.GeohashPickerActivity"

app/src/main/java/com/bitchat/android/onboarding/BatteryOptimizationScreen.kt

@@ -86,23 +86,23 @@ private fun BatteryOptimizationEnabledContent(
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Text(
-                text = "bitchat",
+                text = stringResource(R.string.app_name),
                 style = MaterialTheme.typography.headlineLarge.copy(
                     fontFamily = FontFamily.Monospace,
                     fontWeight = FontWeight.Bold,
                     color = colorScheme.primary
                 )
             )
-            
+
             Spacer(modifier = Modifier.height(16.dp))
-            
+
             Icon(
                 imageVector = Icons.Outlined.BatteryAlert,
                 contentDescription = "Battery Optimization",
                 modifier = Modifier.size(64.dp),
                 tint = colorScheme.error
             )
-            
+
             Text(
                 text = stringResource(R.string.battery_optimization_detected),
                 style = MaterialTheme.typography.headlineSmall.copy(
@@ -111,15 +111,15 @@ private fun BatteryOptimizationEnabledContent(
                 ),
                 textAlign = TextAlign.Center
             )
-            
+
             Text(
                 text = stringResource(R.string.battery_optimization_explanation),
                 style = MaterialTheme.typography.bodyLarge.copy(
                     color = colorScheme.onSurfaceVariant
                 ),
                 textAlign = TextAlign.Center
             )
-            
+
             Card(
                 modifier = Modifier.fillMaxWidth(),
                 colors = CardDefaults.cardColors(
@@ -137,7 +137,7 @@ private fun BatteryOptimizationEnabledContent(
                             color = colorScheme.onSurface
                         )
                     )
-                    
+
                     Text(
                         text = stringResource(R.string.battery_optimization_benefits),
                         style = MaterialTheme.typography.bodyMedium.copy(
@@ -146,7 +146,7 @@ private fun BatteryOptimizationEnabledContent(
                     )
                 }
             }
-            
+
             Text(
                 text = stringResource(R.string.battery_optimization_note),
                 style = MaterialTheme.typography.bodySmall.copy(
@@ -210,14 +210,14 @@ private fun BatteryOptimizationCheckingContent(
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Text(
-            text = "bitchat",
+            text = stringResource(R.string.app_name),
             style = MaterialTheme.typography.headlineLarge.copy(
                 fontFamily = FontFamily.Monospace,
                 fontWeight = FontWeight.Bold,
                 color = colorScheme.primary
             )
         )
-        
+
         val infiniteTransition = rememberInfiniteTransition(label = "rotation")
         val rotation by infiniteTransition.animateFloat(
             initialValue = 0f,
@@ -228,7 +228,7 @@ private fun BatteryOptimizationCheckingContent(
             ),
             label = "rotation"
         )
-        
+
         Icon(
             imageVector = Icons.Filled.BatteryStd,
             contentDescription = "Checking Battery Optimization",
@@ -267,14 +267,14 @@ private fun BatteryOptimizationNotSupportedContent(
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Text(
-            text = "bitchat",
+            text = stringResource(R.string.app_name),
             style = MaterialTheme.typography.headlineLarge.copy(
                 fontFamily = FontFamily.Monospace,
                 fontWeight = FontWeight.Bold,
                 color = colorScheme.primary
             )
         )
-        
+
         Icon(
             imageVector = Icons.Filled.CheckCircle,
             contentDescription = "Battery Optimization Not Supported",

app/src/main/java/com/bitchat/android/onboarding/BluetoothCheckScreen.kt

@@ -10,10 +10,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.bitchat.android.R
+import com.bitchat.android.ui.theme.BitchatTheme
 
 /**
  * Screen shown when checking Bluetooth status or requesting Bluetooth enable
@@ -69,13 +72,13 @@ private fun BluetoothDisabledContent(
         // Bluetooth icon - using Bluetooth outlined icon in app's green color
         Icon(
             imageVector = Icons.Outlined.Bluetooth,
-            contentDescription = "Bluetooth",
+            contentDescription = stringResource(R.string.bluetooth_icon_description),
             modifier = Modifier.size(64.dp),
             tint = Color(0xFF00C851) // App's main green color
         )
 
         Text(
-            text = "Bluetooth Required",
+            text = stringResource(R.string.bluetooth_required_title),
             style = MaterialTheme.typography.headlineSmall.copy(
                 fontFamily = FontFamily.Monospace,
                 fontWeight = FontWeight.Bold,
@@ -96,7 +99,7 @@ private fun BluetoothDisabledContent(
                 verticalArrangement = Arrangement.spacedBy(8.dp)
             ) {
                 Text(
-                    text = "bitchat needs Bluetooth to:",
+                    text = stringResource(R.string.bluetooth_required_message),
                     style = MaterialTheme.typography.bodyMedium.copy(
                         fontWeight = FontWeight.Medium,
                         color = colorScheme.onSurface
@@ -106,10 +109,7 @@ private fun BluetoothDisabledContent(
                 )
 
                 Text(
-                    text = "• Discover nearby users\n" +
-                            "• Create mesh network connections\n" +
-                            "• Send and receive messages\n" +
-                            "• Work without internet or servers",
+                    text = stringResource(R.string.bluetooth_required_details),
                     style = MaterialTheme.typography.bodySmall.copy(
                         fontFamily = FontFamily.Monospace,
                         color = colorScheme.onSurface.copy(alpha = 0.8f)
@@ -133,7 +133,7 @@ private fun BluetoothDisabledContent(
                     )
                 ) {
                     Text(
-                        text = "Enable Bluetooth",
+                        text = stringResource(R.string.enable_bluetooth),
                         style = MaterialTheme.typography.bodyMedium.copy(
                             fontFamily = FontFamily.Monospace,
                             fontWeight = FontWeight.Bold
@@ -184,7 +184,7 @@ private fun BluetoothNotSupportedContent(
         }
 
         Text(
-            text = "Bluetooth Not Supported",
+            text = stringResource(R.string.bluetooth_not_supported_title),
             style = MaterialTheme.typography.headlineSmall.copy(
                 fontFamily = FontFamily.Monospace,
                 fontWeight = FontWeight.Bold,
@@ -201,7 +201,7 @@ private fun BluetoothNotSupportedContent(
             elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
         ) {
             Text(
-                text = "This device doesn't support Bluetooth Low Energy (BLE), which is required for bitchat to function.\n\nbitchat needs BLE to create mesh networks and communicate with nearby devices without internet.",
+                text = stringResource(R.string.bluetooth_not_supported_message),
                 style = MaterialTheme.typography.bodyMedium.copy(
                     fontFamily = FontFamily.Monospace,
                     color = colorScheme.onSurface
@@ -222,7 +222,7 @@ private fun BluetoothCheckingContent(
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Text(
-            text = "bitchat",
+            text = stringResource(R.string.app_name),
             style = MaterialTheme.typography.headlineLarge.copy(
                 fontFamily = FontFamily.Monospace,
                 fontWeight = FontWeight.Bold,
@@ -234,7 +234,7 @@ private fun BluetoothCheckingContent(
         BluetoothLoadingIndicator()
 
         Text(
-            text = "Checking Bluetooth status...",
+            text = stringResource(R.string.checking_bluetooth_status),
             style = MaterialTheme.typography.bodyLarge.copy(
                 fontFamily = FontFamily.Monospace,
                 color = colorScheme.onSurface.copy(alpha = 0.7f)

app/src/main/java/com/bitchat/android/onboarding/InitializingScreen.kt

@@ -8,10 +8,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.bitchat.android.R
 
 /**
  * Loading screen shown during app initialization after permissions are granted
@@ -59,7 +62,7 @@ fun InitializingScreen(modifier: Modifier) {
         ) {
             // App title
             Text(
-                text = "bitchat",
+                text = stringResource(R.string.app_name),
                 style = MaterialTheme.typography.headlineLarge.copy(
                     fontFamily = FontFamily.Monospace,
                     fontWeight = FontWeight.Bold,
@@ -88,7 +91,7 @@ fun InitializingScreen(modifier: Modifier) {
                 horizontalArrangement = Arrangement.Center
             ) {
                 Text(
-                    text = "Initializing mesh network",
+                    text = stringResource(R.string.initializing_mesh_network),
                     style = MaterialTheme.typography.bodyLarge.copy(
                         fontFamily = FontFamily.Monospace,
                         color = colorScheme.onSurface.copy(alpha = 0.7f)
@@ -123,7 +126,7 @@ fun InitializingScreen(modifier: Modifier) {
                     horizontalAlignment = Alignment.CenterHorizontally
                 ) {
                     Text(
-                        text = "Setting up Bluetooth mesh networking...",
+                        text = stringResource(R.string.setting_up_bluetooth_mesh),
                         style = MaterialTheme.typography.bodyMedium.copy(
                             fontFamily = FontFamily.Monospace,
                             color = colorScheme.onSurface.copy(alpha = 0.8f)
@@ -132,7 +135,7 @@ fun InitializingScreen(modifier: Modifier) {
                     )
 
                     Text(
-                        text = "This should only take a few seconds",
+                        text = stringResource(R.string.setup_duration),
                         style = MaterialTheme.typography.bodySmall.copy(
                             fontFamily = FontFamily.Monospace,
                             color = colorScheme.onSurface.copy(alpha = 0.6f)
@@ -180,7 +183,7 @@ fun InitializationErrorScreen(
             }
 
             Text(
-                text = "Setup Not Complete",
+                text = stringResource(R.string.setup_not_complete),
                 style = MaterialTheme.typography.headlineSmall.copy(
                     fontFamily = FontFamily.Monospace,
                     fontWeight = FontWeight.Bold,
@@ -216,7 +219,7 @@ fun InitializationErrorScreen(
                     modifier = Modifier.fillMaxWidth()
                 ) {
                     Text(
-                        text = "Try Again",
+                        text = stringResource(R.string.try_again),
                         style = MaterialTheme.typography.bodyMedium.copy(
                             fontFamily = FontFamily.Monospace,
                             fontWeight = FontWeight.Bold
@@ -230,7 +233,7 @@ fun InitializationErrorScreen(
                     modifier = Modifier.fillMaxWidth()
                 ) {
                     Text(
-                        text = "Open Settings",
+                        text = stringResource(R.string.open_settings),
                         style = MaterialTheme.typography.bodyMedium.copy(
                             fontFamily = FontFamily.Monospace
                         ),