diff --git a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt index 8c848dc8..27c49c7c 100644 --- a/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt +++ b/app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt @@ -728,7 +728,6 @@ class BluetoothMeshService(private val context: Context) { ttl = MAX_TTL, senderID = myPeerID, payload = announcementData, - ) connectionManager.broadcastPacket(RoutedPacket(packet)) diff --git a/app/src/main/java/com/bitchat/android/noise/NoiseSessionManager.kt b/app/src/main/java/com/bitchat/android/noise/NoiseSessionManager.kt index a7ba2a36..2d9e06d8 100644 --- a/app/src/main/java/com/bitchat/android/noise/NoiseSessionManager.kt +++ b/app/src/main/java/com/bitchat/android/noise/NoiseSessionManager.kt @@ -36,7 +36,6 @@ class NoiseSessionManager( */ fun getSession(peerID: String): NoiseSession? { val session = sessions[peerID] - // Log.d(TAG, "getSession($peerID): ${if (session?.isEstablished() == true) "ESTABLISHED" else "NOT_FOUND"}") return session } diff --git a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt index 0a2027a5..c4dd311c 100644 --- a/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt +++ b/app/src/main/java/com/bitchat/android/ui/ChatScreen.kt @@ -88,7 +88,7 @@ fun ChatScreen(viewModel: ChatViewModel) { // Use WindowInsets to handle keyboard properly Box(modifier = Modifier.fillMaxSize()) { - val headerHeight = 36.dp + val headerHeight = 42.dp // Main content area that responds to keyboard/window insets Column( diff --git a/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt b/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt index 70592b15..61550bb7 100644 --- a/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt +++ b/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt @@ -69,7 +69,7 @@ fun SidebarOverlay( modifier = Modifier .fillMaxHeight() .weight(1f) - .background(colorScheme.surface) + .background(colorScheme.background.copy(alpha = 0.95f)) .windowInsetsPadding(WindowInsets.statusBars) // Add status bar padding ) { SidebarHeader() @@ -133,9 +133,9 @@ private fun SidebarHeader() { Row( modifier = Modifier - .height(36.dp) // Match reduced main header height + .height(42.dp) // Match reduced main header height .fillMaxWidth() - .background(colorScheme.surface.copy(alpha = 0.95f)) + .background(colorScheme.background.copy(alpha = 0.95f)) .padding(horizontal = 12.dp), verticalAlignment = Alignment.CenterVertically ) { @@ -248,9 +248,9 @@ fun PeopleSection( verticalAlignment = Alignment.CenterVertically ) { Icon( - imageVector = Icons.Default.Person, // Using Person icon for people + imageVector = Icons.Default.Group, // Using Person icon for people contentDescription = null, - modifier = Modifier.size(10.dp), + modifier = Modifier.size(12.dp), tint = colorScheme.onSurface.copy(alpha = 0.6f) ) Spacer(modifier = Modifier.width(6.dp)) diff --git a/app/src/main/java/com/bitchat/android/ui/theme/Theme.kt b/app/src/main/java/com/bitchat/android/ui/theme/Theme.kt index c35cc2aa..bd6fc793 100644 --- a/app/src/main/java/com/bitchat/android/ui/theme/Theme.kt +++ b/app/src/main/java/com/bitchat/android/ui/theme/Theme.kt @@ -9,14 +9,14 @@ import androidx.compose.ui.graphics.Color // Colors that match the iOS bitchat theme private val DarkColorScheme = darkColorScheme( - primary = Color(0xFF00FF00), // Bright green (terminal-like) + primary = Color(0xFF39FF14), // Bright green (terminal-like) onPrimary = Color.Black, - secondary = Color(0xFF00CC00), // Darker green + secondary = Color(0xFF2ECB10), // Darker green onSecondary = Color.Black, background = Color.Black, - onBackground = Color(0xFF00FF00), // Green on black + onBackground = Color(0xFF39FF14), // Green on black surface = Color(0xFF111111), // Very dark gray - onSurface = Color(0xFF00FF00), // Green text + onSurface = Color(0xFF39FF14), // Green text error = Color(0xFFFF5555), // Red for errors onError = Color.Black ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 23bd354c..699d394d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,7 +16,7 @@ Online Users No one connected Triple tap to clear all data - Your Network + Network Battery Optimization Detected