From efbdf8c6ffc7fd70b0a24ed318c9b1189e6a1fd0 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Thu, 10 Jul 2025 00:20:03 +0200
Subject: [PATCH] icons

---
 .../java/com/bitchat/android/ui/ChatHeader.kt | 38 ++++++++++---------
 .../bitchat/android/ui/SidebarComponents.kt   | 26 ++++++-------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt b/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt
index c79bd6f8..010fbd5d 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatHeader.kt
@@ -6,7 +6,8 @@ import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
@@ -97,18 +98,13 @@ fun PeerCounter(
         }
         
         if (hasUnreadPrivateMessages.isNotEmpty()) {
-            // Mail icon in a Box to ensure consistent 16.dp size matching the person icon
-            Box(
+            // Filled mail icon to match sidebar style
+            Icon(
+                imageVector = Icons.Filled.Email,
+                contentDescription = "Unread private messages",
                 modifier = Modifier.size(16.dp),
-                contentAlignment = Alignment.Center
-            ) {
-                Text(
-                    text = "✉",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = Color(0xFFFF8C00),
-                    fontSize = 16.sp
-                )
-            }
+                tint = Color(0xFFFF8C00) // Orange to match private message theme
+            )
             Spacer(modifier = Modifier.width(6.dp))
         }
         
@@ -229,7 +225,12 @@ private fun PrivateChatHeader(
         Spacer(modifier = Modifier.weight(1f))
         
         Row(verticalAlignment = Alignment.CenterVertically) {
-            Text("🔒", fontSize = 16.sp) // Slightly larger
+            Icon(
+                imageVector = Icons.Filled.Lock,
+                contentDescription = "Private chat",
+                modifier = Modifier.size(16.dp),
+                tint = Color(0xFFFF8C00) // Orange to match private message theme
+            )
             Spacer(modifier = Modifier.width(4.dp))
             Text(
                 text = peerNickname,
@@ -240,12 +241,13 @@ private fun PrivateChatHeader(
         
         Spacer(modifier = Modifier.weight(1f))
         
-        // Favorite button
+        // Favorite button with proper filled/outlined star
         IconButton(onClick = onToggleFavorite) {
-            Text(
-                text = if (isFavorite) "★" else "☆",
-                color = if (isFavorite) Color.Yellow else colorScheme.primary,
-                fontSize = 18.sp // Larger icon
+            Icon(
+                imageVector = if (isFavorite) Icons.Filled.Star else Icons.Outlined.Star,
+                contentDescription = if (isFavorite) "Remove from favorites" else "Add to favorites",
+                modifier = Modifier.size(18.dp), // Slightly larger than sidebar icon
+                tint = if (isFavorite) Color(0xFFFFD700) else Color(0xFF4CAF50) // Yellow for filled, green for outlined
             )
         }
     }
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 f8a2602e..a0575f0a 100644
--- a/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt
+++ b/app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
@@ -309,19 +310,14 @@ private fun PeerItem(
             .padding(horizontal = 24.dp, vertical = 8.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        // Show mail icon instead of signal strength when user has unread DMs
+        // Show filled mail icon instead of signal strength when user has unread DMs
         if (hasUnreadDM) {
-            Box(
-                modifier = Modifier.width(24.dp),
-                contentAlignment = Alignment.Center
-            ) {
-                Text(
-                    text = "✉",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = Color(0xFFFF8C00), // Orange to match private message theme
-                    fontSize = 16.sp
-                )
-            }
+            Icon(
+                imageVector = Icons.Filled.Email,
+                contentDescription = "Unread messages",
+                modifier = Modifier.size(16.dp),
+                tint = Color(0xFFFF8C00) // Orange to match private message theme
+            )
         } else {
             // Signal strength indicators
             SignalStrengthIndicator(
@@ -340,16 +336,16 @@ private fun PeerItem(
             modifier = Modifier.weight(1f)
         )
         
-        // Favorite star
+        // Favorite star with proper filled/outlined states
         IconButton(
             onClick = onToggleFavorite,
             modifier = Modifier.size(24.dp)
         ) {
             Icon(
-                imageVector = Icons.Default.Star,
+                imageVector = if (isFavorite) Icons.Filled.Star else Icons.Outlined.Star,
                 contentDescription = if (isFavorite) "Remove from favorites" else "Add to favorites",
                 modifier = Modifier.size(16.dp),
-                tint = if (isFavorite) colorScheme.primary else colorScheme.onSurface.copy(alpha = 0.3f)
+                tint = if (isFavorite) Color(0xFFFFD700) else Color(0xFF4CAF50) // Yellow for filled, green for outlined
             )
         }
     }