diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt index 8c28d3caf..c422a679a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt @@ -572,14 +572,6 @@ fun ListContent( route = Route.EmojiPacks, ) - NavigationRow( - title = R.string.browse_emoji_sets, - icon = Icons.Outlined.EmojiEmotions, - tint = MaterialTheme.colorScheme.onBackground, - nav = nav, - route = Route.BrowseEmojiSets, - ) - NavigationRow( title = R.string.interest_sets_title, icon = Icons.Outlined.Tag, @@ -604,31 +596,6 @@ fun ListContent( route = Route.Drafts, ) - NavigationRow( - title = R.string.discover_reads, - icon = Icons.AutoMirrored.Outlined.Article, - tint = MaterialTheme.colorScheme.onBackground, - nav = nav, - route = Route.Articles, - ) - - NavigationRow( - title = R.string.pictures, - icon = Icons.Outlined.Photo, - tint = MaterialTheme.colorScheme.onBackground, - nav = nav, - route = Route.Pictures, - ) - - NavigationRow( - title = R.string.polls, - icon = R.drawable.ic_poll, - iconReference = 1, - tint = MaterialTheme.colorScheme.onBackground, - nav = nav, - route = Route.Polls, - ) - NavigationRow( title = R.string.badges, icon = Icons.Outlined.MilitaryTech, @@ -653,6 +620,31 @@ fun ListContent( route = Route.Products, ) + NavigationRow( + title = R.string.pictures, + icon = Icons.Outlined.Photo, + tint = MaterialTheme.colorScheme.onBackground, + nav = nav, + route = Route.Pictures, + ) + + NavigationRow( + title = R.string.polls, + icon = R.drawable.ic_poll, + iconReference = 1, + tint = MaterialTheme.colorScheme.onBackground, + nav = nav, + route = Route.Polls, + ) + + NavigationRow( + title = R.string.discover_reads, + icon = Icons.AutoMirrored.Outlined.Article, + tint = MaterialTheme.colorScheme.onBackground, + nav = nav, + route = Route.Articles, + ) + NavigationRow( title = R.string.shorts, icon = Icons.Outlined.PlayCircle, @@ -677,6 +669,14 @@ fun ListContent( route = Route.Wallet, ) + NavigationRow( + title = R.string.emoji_sets, + icon = Icons.Outlined.EmojiEmotions, + tint = MaterialTheme.colorScheme.onBackground, + nav = nav, + route = Route.BrowseEmojiSets, + ) + NavigationRow( title = R.string.share_hls_video, icon = Icons.Outlined.SettingsInputAntenna, diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index 83d963062..020f7908a 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -511,7 +511,7 @@ View Hashtags You do not have any bookmark lists yet. Tap the new button below to make one. - Interest Sets + Hashtag Sets You do not have any interest sets yet. Tap the new button below to make one. New Interest Set New Interest Set @@ -2430,6 +2430,7 @@ \"%1$s\" is not in your emoji list Emoji pack actions My Emoji Packs + Emojis Browse Emoji Sets Private Private emoji