nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes iconography inconsistency

Browse Source
This commit is contained in:
Vitor Pamplona
2026-04-22 11:22:01 -04:00
parent 4499114ab2
commit 57ff68895f
4 changed files with 56 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/bottombars/AppBottomBar.kt
+5 -22
View File
@@ -42,11 +42,9 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.vitorpamplona.amethyst.ui.navigation.routes.Route import com.vitorpamplona.amethyst.ui.navigation.routes.Route
import com.vitorpamplona.amethyst.ui.painterRes
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.stringRes import com.vitorpamplona.amethyst.ui.stringRes
import com.vitorpamplona.amethyst.ui.theme.DividerThickness import com.vitorpamplona.amethyst.ui.theme.DividerThickness
@@ -143,28 +141,13 @@ private fun NotifiableIcon(
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
) { ) {
Box(Modifier.size(Size23dp)) { Box(Modifier.size(Size23dp)) {
val tint = if (selected) MaterialTheme.colorScheme.primary else Color.Unspecified
val iconSizeModifier = Modifier.size(Size20dp) val iconSizeModifier = Modifier.size(Size20dp)
val description = stringRes(def.labelRes) val description = stringRes(def.labelRes)
when (val icon = def.icon) { Icon(
is NavBarIcon.Drawable -> { imageVector = def.icon,
Icon( contentDescription = description,
painter = painterRes(resourceId = icon.resId, icon.reference), modifier = iconSizeModifier,
contentDescription = description, )
modifier = iconSizeModifier,
tint = tint,
)
}
is NavBarIcon.Vector -> {
Icon(
imageVector = icon.vector,
contentDescription = description,
modifier = iconSizeModifier,
tint = tint,
)
}
}
AddNotifIconIfNeeded(destination, accountViewModel, Modifier.align(Alignment.TopEnd)) AddNotifIconIfNeeded(destination, accountViewModel, Modifier.align(Alignment.TopEnd))
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/bottombars/NavBarItem.kt
+36 -42
View File
@@ -20,7 +20,6 @@
*/ */
package com.vitorpamplona.amethyst.ui.navigation.bottombars package com.vitorpamplona.amethyst.ui.navigation.bottombars
import androidx.annotation.DrawableRes
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.FormatListBulleted import androidx.compose.material.icons.automirrored.filled.FormatListBulleted
import androidx.compose.material.icons.automirrored.outlined.Article import androidx.compose.material.icons.automirrored.outlined.Article
@@ -31,18 +30,24 @@ import androidx.compose.material.icons.outlined.CollectionsBookmark
import androidx.compose.material.icons.outlined.Drafts import androidx.compose.material.icons.outlined.Drafts
import androidx.compose.material.icons.outlined.EmojiEmotions import androidx.compose.material.icons.outlined.EmojiEmotions
import androidx.compose.material.icons.outlined.Groups import androidx.compose.material.icons.outlined.Groups
import androidx.compose.material.icons.outlined.Home
import androidx.compose.material.icons.outlined.Language import androidx.compose.material.icons.outlined.Language
import androidx.compose.material.icons.outlined.Mail
import androidx.compose.material.icons.outlined.Mic import androidx.compose.material.icons.outlined.Mic
import androidx.compose.material.icons.outlined.MilitaryTech import androidx.compose.material.icons.outlined.MilitaryTech
import androidx.compose.material.icons.outlined.Notifications
import androidx.compose.material.icons.outlined.Photo import androidx.compose.material.icons.outlined.Photo
import androidx.compose.material.icons.outlined.PlayCircle import androidx.compose.material.icons.outlined.PlayCircle
import androidx.compose.material.icons.outlined.Poll
import androidx.compose.material.icons.outlined.Sensors import androidx.compose.material.icons.outlined.Sensors
import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material.icons.outlined.SmartDisplay import androidx.compose.material.icons.outlined.SmartDisplay
import androidx.compose.material.icons.outlined.Storefront import androidx.compose.material.icons.outlined.Storefront
import androidx.compose.material.icons.outlined.Subscriptions
import androidx.compose.material.icons.outlined.Tag import androidx.compose.material.icons.outlined.Tag
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.isDebug
import com.vitorpamplona.amethyst.ui.navigation.routes.Route import com.vitorpamplona.amethyst.ui.navigation.routes.Route
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@@ -82,21 +87,10 @@ enum class NavBarItem {
SETTINGS, SETTINGS,
} }
sealed class NavBarIcon {
data class Drawable(
@DrawableRes val resId: Int,
val reference: Int = 0,
) : NavBarIcon()
data class Vector(
val vector: ImageVector,
) : NavBarIcon()
}
data class NavBarItemDef( data class NavBarItemDef(
val id: NavBarItem, val id: NavBarItem,
val labelRes: Int, val labelRes: Int,
val icon: NavBarIcon, val icon: ImageVector,
val resolveRoute: (AccountViewModel) -> Route, val resolveRoute: (AccountViewModel) -> Route,
) )
@@ -106,189 +100,189 @@ val NavBarCatalog: Map<NavBarItem, NavBarItemDef> =
NavBarItemDef( NavBarItemDef(
id = NavBarItem.HOME, id = NavBarItem.HOME,
labelRes = R.string.route_home, labelRes = R.string.route_home,
icon = NavBarIcon.Drawable(R.drawable.ic_home), icon = Icons.Outlined.Home,
resolveRoute = { Route.Home }, resolveRoute = { Route.Home },
), ),
NavBarItem.MESSAGES to NavBarItem.MESSAGES to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.MESSAGES, id = NavBarItem.MESSAGES,
labelRes = R.string.route_messages, labelRes = R.string.route_messages,
icon = NavBarIcon.Drawable(R.drawable.ic_dm), icon = Icons.Outlined.Mail,
resolveRoute = { Route.Message }, resolveRoute = { Route.Message },
), ),
NavBarItem.VIDEO to NavBarItem.VIDEO to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.VIDEO, id = NavBarItem.VIDEO,
labelRes = R.string.route_video, labelRes = R.string.route_video,
icon = NavBarIcon.Drawable(R.drawable.ic_video), icon = Icons.Outlined.Subscriptions,
resolveRoute = { Route.Video }, resolveRoute = { Route.Video },
), ),
NavBarItem.DISCOVER to NavBarItem.DISCOVER to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.DISCOVER, id = NavBarItem.DISCOVER,
labelRes = R.string.route_discover, labelRes = R.string.route_discover,
icon = NavBarIcon.Drawable(R.drawable.ic_sensors), icon = Icons.Outlined.Sensors,
resolveRoute = { Route.Discover }, resolveRoute = { Route.Discover },
), ),
NavBarItem.NOTIFICATIONS to NavBarItem.NOTIFICATIONS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.NOTIFICATIONS, id = NavBarItem.NOTIFICATIONS,
labelRes = R.string.route_notifications, labelRes = R.string.route_notifications,
icon = NavBarIcon.Drawable(R.drawable.ic_notifications), icon = Icons.Outlined.Notifications,
resolveRoute = { Route.Notification() }, resolveRoute = { Route.Notification() },
), ),
NavBarItem.PROFILE to NavBarItem.PROFILE to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.PROFILE, id = NavBarItem.PROFILE,
labelRes = R.string.profile, labelRes = R.string.profile,
icon = NavBarIcon.Vector(Icons.Default.AccountCircle), icon = Icons.Default.AccountCircle,
resolveRoute = { Route.Profile(it.userProfile().pubkeyHex) }, resolveRoute = { Route.Profile(it.userProfile().pubkeyHex) },
), ),
NavBarItem.MY_LISTS to NavBarItem.MY_LISTS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.MY_LISTS, id = NavBarItem.MY_LISTS,
labelRes = R.string.my_lists, labelRes = R.string.my_lists,
icon = NavBarIcon.Vector(Icons.AutoMirrored.Filled.FormatListBulleted), icon = Icons.AutoMirrored.Filled.FormatListBulleted,
resolveRoute = { Route.Lists }, resolveRoute = { Route.Lists },
), ),
NavBarItem.BOOKMARKS to NavBarItem.BOOKMARKS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.BOOKMARKS, id = NavBarItem.BOOKMARKS,
labelRes = R.string.bookmarks, labelRes = R.string.bookmarks,
icon = NavBarIcon.Vector(Icons.Outlined.CollectionsBookmark), icon = Icons.Outlined.CollectionsBookmark,
resolveRoute = { Route.BookmarkGroups }, resolveRoute = { Route.BookmarkGroups },
), ),
NavBarItem.WEB_BOOKMARKS to NavBarItem.WEB_BOOKMARKS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.WEB_BOOKMARKS, id = NavBarItem.WEB_BOOKMARKS,
labelRes = R.string.web_bookmarks, labelRes = R.string.web_bookmarks,
icon = NavBarIcon.Vector(Icons.Outlined.Language), icon = Icons.Outlined.Language,
resolveRoute = { Route.WebBookmarks }, resolveRoute = { Route.WebBookmarks },
), ),
NavBarItem.DRAFTS to NavBarItem.DRAFTS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.DRAFTS, id = NavBarItem.DRAFTS,
labelRes = R.string.drafts, labelRes = R.string.drafts,
icon = NavBarIcon.Vector(Icons.Outlined.Drafts), icon = Icons.Outlined.Drafts,
resolveRoute = { Route.Drafts }, resolveRoute = { Route.Drafts },
), ),
NavBarItem.INTEREST_SETS to NavBarItem.INTEREST_SETS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.INTEREST_SETS, id = NavBarItem.INTEREST_SETS,
labelRes = R.string.interest_sets_title, labelRes = R.string.interest_sets_title,
icon = NavBarIcon.Vector(Icons.Outlined.Tag), icon = Icons.Outlined.Tag,
resolveRoute = { Route.InterestSets }, resolveRoute = { Route.InterestSets },
), ),
NavBarItem.EMOJI_PACKS to NavBarItem.EMOJI_PACKS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.EMOJI_PACKS, id = NavBarItem.EMOJI_PACKS,
labelRes = R.string.manage_emoji_packs, labelRes = R.string.manage_emoji_packs,
icon = NavBarIcon.Vector(Icons.Outlined.EmojiEmotions), icon = Icons.Outlined.EmojiEmotions,
resolveRoute = { Route.EmojiPacks }, resolveRoute = { Route.EmojiPacks },
), ),
NavBarItem.WALLET to NavBarItem.WALLET to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.WALLET, id = NavBarItem.WALLET,
labelRes = R.string.wallet, labelRes = R.string.wallet,
icon = NavBarIcon.Vector(Icons.Outlined.AccountBalanceWallet), icon = Icons.Outlined.AccountBalanceWallet,
resolveRoute = { Route.Wallet }, resolveRoute = { Route.Wallet },
), ),
NavBarItem.COMMUNITIES to NavBarItem.COMMUNITIES to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.COMMUNITIES, id = NavBarItem.COMMUNITIES,
labelRes = R.string.communities, labelRes = R.string.communities,
icon = NavBarIcon.Vector(Icons.Outlined.Groups), icon = Icons.Outlined.Groups,
resolveRoute = { Route.Communities }, resolveRoute = { Route.Communities },
), ),
NavBarItem.ARTICLES to NavBarItem.ARTICLES to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.ARTICLES, id = NavBarItem.ARTICLES,
labelRes = R.string.discover_reads, labelRes = R.string.discover_reads,
icon = NavBarIcon.Vector(Icons.AutoMirrored.Outlined.Article), icon = Icons.AutoMirrored.Outlined.Article,
resolveRoute = { Route.Articles }, resolveRoute = { Route.Articles },
), ),
NavBarItem.PICTURES to NavBarItem.PICTURES to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.PICTURES, id = NavBarItem.PICTURES,
labelRes = R.string.pictures, labelRes = R.string.pictures,
icon = NavBarIcon.Vector(Icons.Outlined.Photo), icon = Icons.Outlined.Photo,
resolveRoute = { Route.Pictures }, resolveRoute = { Route.Pictures },
), ),
NavBarItem.SHORTS to NavBarItem.SHORTS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.SHORTS, id = NavBarItem.SHORTS,
labelRes = R.string.shorts, labelRes = R.string.shorts,
icon = NavBarIcon.Vector(Icons.Outlined.PlayCircle), icon = Icons.Outlined.PlayCircle,
resolveRoute = { Route.Shorts }, resolveRoute = { Route.Shorts },
), ),
NavBarItem.PUBLIC_CHATS to NavBarItem.PUBLIC_CHATS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.PUBLIC_CHATS, id = NavBarItem.PUBLIC_CHATS,
labelRes = R.string.public_chats, labelRes = R.string.public_chats,
icon = NavBarIcon.Vector(Icons.AutoMirrored.Outlined.Chat), icon = Icons.AutoMirrored.Outlined.Chat,
resolveRoute = { Route.PublicChats }, resolveRoute = { Route.PublicChats },
), ),
NavBarItem.FOLLOW_PACKS to NavBarItem.FOLLOW_PACKS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.FOLLOW_PACKS, id = NavBarItem.FOLLOW_PACKS,
labelRes = R.string.follow_packs, labelRes = R.string.follow_packs,
icon = NavBarIcon.Vector(Icons.Outlined.CollectionsBookmark), icon = Icons.Outlined.CollectionsBookmark,
resolveRoute = { Route.FollowPacks }, resolveRoute = { Route.FollowPacks },
), ),
NavBarItem.LIVE_STREAMS to NavBarItem.LIVE_STREAMS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.LIVE_STREAMS, id = NavBarItem.LIVE_STREAMS,
labelRes = R.string.live_streams, labelRes = R.string.live_streams,
icon = NavBarIcon.Vector(Icons.Outlined.Sensors), icon = Icons.Outlined.Sensors,
resolveRoute = { Route.LiveStreams }, resolveRoute = { Route.LiveStreams },
), ),
NavBarItem.AUDIO_ROOMS to NavBarItem.AUDIO_ROOMS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.AUDIO_ROOMS, id = NavBarItem.AUDIO_ROOMS,
labelRes = R.string.audio_rooms, labelRes = R.string.audio_rooms,
icon = NavBarIcon.Vector(Icons.Outlined.Mic), icon = Icons.Outlined.Mic,
resolveRoute = { Route.AudioRooms }, resolveRoute = { Route.AudioRooms },
), ),
NavBarItem.LONGS to NavBarItem.LONGS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.LONGS, id = NavBarItem.LONGS,
labelRes = R.string.longs, labelRes = R.string.longs,
icon = NavBarIcon.Vector(Icons.Outlined.SmartDisplay), icon = Icons.Outlined.SmartDisplay,
resolveRoute = { Route.Longs }, resolveRoute = { Route.Longs },
), ),
NavBarItem.POLLS to NavBarItem.POLLS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.POLLS, id = NavBarItem.POLLS,
labelRes = R.string.polls, labelRes = R.string.polls,
icon = NavBarIcon.Drawable(R.drawable.ic_poll, reference = 1), icon = Icons.Outlined.Poll,
resolveRoute = { Route.Polls }, resolveRoute = { Route.Polls },
), ),
NavBarItem.BADGES to NavBarItem.BADGES to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.BADGES, id = NavBarItem.BADGES,
labelRes = R.string.badges, labelRes = R.string.badges,
icon = NavBarIcon.Vector(Icons.Outlined.MilitaryTech), icon = Icons.Outlined.MilitaryTech,
resolveRoute = { Route.Badges }, resolveRoute = { Route.Badges },
), ),
NavBarItem.PRODUCTS to NavBarItem.PRODUCTS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.PRODUCTS, id = NavBarItem.PRODUCTS,
labelRes = R.string.discover_marketplace, labelRes = R.string.discover_marketplace,
icon = NavBarIcon.Vector(Icons.Outlined.Storefront), icon = Icons.Outlined.Storefront,
resolveRoute = { Route.Products }, resolveRoute = { Route.Products },
), ),
NavBarItem.EMOJI_SETS to NavBarItem.EMOJI_SETS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.EMOJI_SETS, id = NavBarItem.EMOJI_SETS,
labelRes = R.string.emoji_sets, labelRes = R.string.emoji_sets,
icon = NavBarIcon.Vector(Icons.Outlined.EmojiEmotions), icon = Icons.Outlined.EmojiEmotions,
resolveRoute = { Route.BrowseEmojiSets }, resolveRoute = { Route.BrowseEmojiSets },
), ),
NavBarItem.SETTINGS to NavBarItem.SETTINGS to
NavBarItemDef( NavBarItemDef(
id = NavBarItem.SETTINGS, id = NavBarItem.SETTINGS,
labelRes = R.string.settings, labelRes = R.string.settings,
icon = NavBarIcon.Vector(Icons.Outlined.Settings), icon = Icons.Outlined.Settings,
resolveRoute = { Route.AllSettings }, resolveRoute = { Route.AllSettings },
), ),
) )
@@ -327,7 +321,7 @@ val DrawerYouItems: List<NavBarItem> =
) )
val DrawerFeedsItems: List<NavBarItem> = val DrawerFeedsItems: List<NavBarItem> =
listOf( listOfNotNull(
NavBarItem.COMMUNITIES, NavBarItem.COMMUNITIES,
NavBarItem.ARTICLES, NavBarItem.ARTICLES,
NavBarItem.PICTURES, NavBarItem.PICTURES,
@@ -335,7 +329,7 @@ val DrawerFeedsItems: List<NavBarItem> =
NavBarItem.PUBLIC_CHATS, NavBarItem.PUBLIC_CHATS,
NavBarItem.FOLLOW_PACKS, NavBarItem.FOLLOW_PACKS,
NavBarItem.LIVE_STREAMS, NavBarItem.LIVE_STREAMS,
NavBarItem.AUDIO_ROOMS, if (isDebug) NavBarItem.AUDIO_ROOMS else null,
NavBarItem.LONGS, NavBarItem.LONGS,
NavBarItem.POLLS, NavBarItem.POLLS,
NavBarItem.BADGES, NavBarItem.BADGES,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt
+9 -30
View File
@@ -113,7 +113,6 @@ import com.vitorpamplona.amethyst.ui.navigation.bottombars.DrawerFeedsItems
import com.vitorpamplona.amethyst.ui.navigation.bottombars.DrawerNavigateItems import com.vitorpamplona.amethyst.ui.navigation.bottombars.DrawerNavigateItems
import com.vitorpamplona.amethyst.ui.navigation.bottombars.DrawerYouItems import com.vitorpamplona.amethyst.ui.navigation.bottombars.DrawerYouItems
import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarCatalog import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarCatalog
import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarIcon
import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarItem import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarItem
import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarItemDef import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarItemDef
import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav
@@ -543,14 +542,9 @@ fun ListContent(
nav: INav, nav: INav,
) { ) {
Column(modifier) { Column(modifier) {
CatalogSection(R.string.drawer_section_navigate, DrawerNavigateItems, accountViewModel, nav)
CatalogSection(R.string.drawer_section_you, DrawerYouItems, accountViewModel, nav) CatalogSection(R.string.drawer_section_you, DrawerYouItems, accountViewModel, nav)
// Audio rooms are debug-only while the WebTransport audio backend is CatalogSection(R.string.drawer_section_navigate, DrawerNavigateItems, accountViewModel, nav)
// unimplemented (see docs/plans/2026-04-22-pure-kotlin-quic-webtransport-plan.md). CatalogSection(R.string.drawer_section_feeds, DrawerFeedsItems, accountViewModel, nav)
// The Nostr-side of the feature (presence, hand-raise, chat) works, but
// without audio playback the entry is confusing to release-build users.
val feedsItems = if (isDebug) DrawerFeedsItems else DrawerFeedsItems.filter { it != NavBarItem.AUDIO_ROOMS }
CatalogSection(R.string.drawer_section_feeds, feedsItems, accountViewModel, nav)
CollapsibleSection(title = R.string.drawer_section_create) { CollapsibleSection(title = R.string.drawer_section_create) {
NavigationRow( NavigationRow(
@@ -629,28 +623,13 @@ fun CatalogNavigationRow(
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
nav: INav, nav: INav,
) { ) {
when (val icon = def.icon) { NavigationRow(
is NavBarIcon.Drawable -> { title = def.labelRes,
NavigationRow( icon = def.icon,
title = def.labelRes, tint = tint,
icon = icon.resId, nav = nav,
iconReference = icon.reference, computeRoute = { def.resolveRoute(accountViewModel) },
tint = tint, )
nav = nav,
computeRoute = { def.resolveRoute(accountViewModel) },
)
}
is NavBarIcon.Vector -> {
NavigationRow(
title = def.labelRes,
icon = icon.vector,
tint = tint,
nav = nav,
computeRoute = { def.resolveRoute(accountViewModel) },
)
}
}
} }
@Composable @Composable
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/BottomBarSettingsScreen.kt
+6 -21
View File
@@ -63,13 +63,11 @@ import androidx.compose.ui.zIndex
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarCatalog import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarCatalog
import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarIcon
import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarItem import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarItem
import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarItemDef import com.vitorpamplona.amethyst.ui.navigation.bottombars.NavBarItemDef
import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav
import com.vitorpamplona.amethyst.ui.navigation.navs.INav import com.vitorpamplona.amethyst.ui.navigation.navs.INav
import com.vitorpamplona.amethyst.ui.navigation.topbars.TopBarWithBackButton import com.vitorpamplona.amethyst.ui.navigation.topbars.TopBarWithBackButton
import com.vitorpamplona.amethyst.ui.painterRes
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
import com.vitorpamplona.amethyst.ui.stringRes import com.vitorpamplona.amethyst.ui.stringRes
@@ -370,24 +368,11 @@ private fun NavBarIconBox(def: NavBarItemDef) {
) { ) {
val description = stringRes(def.labelRes) val description = stringRes(def.labelRes)
val tint = MaterialTheme.colorScheme.onBackground val tint = MaterialTheme.colorScheme.onBackground
when (val icon = def.icon) { Icon(
is NavBarIcon.Drawable -> { imageVector = def.icon,
Icon( contentDescription = description,
painter = painterRes(icon.resId, icon.reference), modifier = Modifier.size(24.dp),
contentDescription = description, tint = tint,
modifier = Modifier.size(24.dp), )
tint = tint,
)
}
is NavBarIcon.Vector -> {
Icon(
imageVector = icon.vector,
contentDescription = description,
modifier = Modifier.size(24.dp),
tint = tint,
)
}
}
} }
} }