From 7fc312b43f0a533706bb1e44f7eff77e3aa59d0d Mon Sep 17 00:00:00 2001 From: AbronStudio Date: Thu, 7 Aug 2025 15:14:34 +0330 Subject: [PATCH] Refactor: Update icons and background colors in ChannelSideDrawer and ChatRouterScreen This commit enhances the visual elements of the ChannelSideDrawer and ChatRouterScreen components by updating icons and background colors for improved aesthetics and consistency. - Replaced icons in ChannelSideDrawer with new resources for direct messages and friends. - Updated background colors in ChannelSideDrawer to use primaryContainer and secondaryContainer for better visual hierarchy. - Adjusted icon sizes in ChatRouterScreen's navigation bar for uniformity. - Introduced new drawable resources for bottom navigation icons, enhancing the overall UI experience. --- .../screens/chat/drawer/ChannelSideDrawer.kt | 20 ++++++++++--------- .../revolt/screens/chat/ChatRouterScreen.kt | 15 +++++++------- .../res/drawable/ic_bottom_navbar_friends.xml | 13 ++++++++++++ .../res/drawable/ic_bottom_navbar_home.xml | 9 +++++++++ .../res/drawable/ic_bottom_navbar_you.xml | 9 +++++++++ .../main/res/drawable/ic_direct_messages.xml | 9 +++++++++ app/src/main/res/drawable/ic_new_message.xml | 10 ++++++++++ 7 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 app/src/main/res/drawable/ic_bottom_navbar_friends.xml create mode 100644 app/src/main/res/drawable/ic_bottom_navbar_home.xml create mode 100644 app/src/main/res/drawable/ic_bottom_navbar_you.xml create mode 100644 app/src/main/res/drawable/ic_direct_messages.xml create mode 100644 app/src/main/res/drawable/ic_new_message.xml diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt b/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt index b6f1e3bc..02b44f11 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt @@ -208,12 +208,13 @@ fun ChannelSideDrawer( onDestinationChanged(ChatRouterDestination.Home) } .size(48.dp) - .background(MaterialTheme.colorScheme.secondaryContainer), + .background(MaterialTheme.colorScheme.primaryContainer), contentAlignment = Alignment.Center ) { Icon( - painter = painterResource(R.drawable.ic_message_text_24dp), - contentDescription = stringResource(R.string.discover_alt) + painter = painterResource(R.drawable.ic_direct_messages), + contentDescription = stringResource(R.string.discover_alt), + tint = MaterialTheme.colorScheme.onPrimaryContainer ) } } @@ -298,7 +299,7 @@ fun ChannelSideDrawer( ) } .size(48.dp) - .background(MaterialTheme.colorScheme.onPrimary), + .background(MaterialTheme.colorScheme.secondaryContainer), contentAlignment = Alignment.Center ) { Icon( @@ -317,7 +318,7 @@ fun ChannelSideDrawer( onShowAddServerSheet() } .size(48.dp) - .background(MaterialTheme.colorScheme.onPrimary), + .background(MaterialTheme.colorScheme.secondaryContainer), contentAlignment = Alignment.Center ) { Icon( @@ -563,13 +564,14 @@ fun ChannelSideDrawer( onClick = { onDestinationChanged(ChatRouterDestination.Friends) }, - containerColor = MaterialTheme.colorScheme.primary, - contentColor = MaterialTheme.colorScheme.onPrimary, + containerColor = MaterialTheme.colorScheme.primaryContainer, + contentColor = MaterialTheme.colorScheme.onPrimaryContainer, shape = CircleShape ) { Icon( - painter = painterResource(R.drawable.icn_message_24dp), - contentDescription = stringResource(R.string.message_friends) + painter = painterResource(R.drawable.ic_new_message), + contentDescription = stringResource(R.string.message_friends), + tint = MaterialTheme.colorScheme.onPrimaryContainer ) } } diff --git a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt index 4ff99153..ef660e5e 100644 --- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt @@ -17,12 +17,9 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.layout.windowInsetsPadding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Face -import androidx.compose.material.icons.filled.Home -import androidx.compose.material.icons.filled.Person import androidx.compose.material3.AlertDialog import androidx.compose.material3.BottomAppBar import androidx.compose.material3.DrawerValue @@ -56,6 +53,7 @@ import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp import androidx.core.app.NotificationManagerCompat import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.Lifecycle @@ -851,8 +849,9 @@ fun ChannelNavigator( NavigationBarItem( icon = { Icon( - imageVector = Icons.Default.Home, + painter = painterResource(R.drawable.ic_bottom_navbar_home), contentDescription = "Home", + modifier = Modifier.size(32.dp) ) }, label = { @@ -873,8 +872,9 @@ fun ChannelNavigator( NavigationBarItem( icon = { Icon( - imageVector = Icons.Default.Person, + painter = painterResource(R.drawable.ic_bottom_navbar_friends), contentDescription = "Friends", + modifier = Modifier.size(32.dp) ) }, label = { @@ -889,8 +889,9 @@ fun ChannelNavigator( NavigationBarItem( icon = { Icon( - imageVector = Icons.Default.Face, + painter = painterResource(R.drawable.ic_bottom_navbar_you), contentDescription = "You", + modifier = Modifier.size(32.dp) ) }, label = { diff --git a/app/src/main/res/drawable/ic_bottom_navbar_friends.xml b/app/src/main/res/drawable/ic_bottom_navbar_friends.xml new file mode 100644 index 00000000..c0be1b7d --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_navbar_friends.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_bottom_navbar_home.xml b/app/src/main/res/drawable/ic_bottom_navbar_home.xml new file mode 100644 index 00000000..a2bf4b8e --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_navbar_home.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bottom_navbar_you.xml b/app/src/main/res/drawable/ic_bottom_navbar_you.xml new file mode 100644 index 00000000..0fde3ffb --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_navbar_you.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_direct_messages.xml b/app/src/main/res/drawable/ic_direct_messages.xml new file mode 100644 index 00000000..5efb937d --- /dev/null +++ b/app/src/main/res/drawable/ic_direct_messages.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_new_message.xml b/app/src/main/res/drawable/ic_new_message.xml new file mode 100644 index 00000000..24b2a720 --- /dev/null +++ b/app/src/main/res/drawable/ic_new_message.xml @@ -0,0 +1,10 @@ + + +