Fix sidebar showing admin screen to all users (#1401)

LemmyNet · Feb 24, 2024 · 200c375 · 200c375
1 parent 61e384b
commit 200c375
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt b/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt
@@ -131,14 +131,7 @@ fun BottomAppBarAll(
     NavigationBar(
         modifier = modifier,
     ) {
-        // Hide tabs according to permissions
-        val tabs = when (userViewType) {
-            UserViewType.Normal -> NavTab.entries.filter { it.userViewType == UserViewType.Normal }
-            UserViewType.AdminOrMod -> NavTab.entries.filter { it.userViewType != UserViewType.AdminOnly }
-            UserViewType.AdminOnly -> NavTab.entries
-        }
-
-        for (tab in tabs) {
+        for (tab in NavTab.getEntries(userViewType)) {
             val selected = tab == selectedTab
             val iconBadgeCount = when (tab) {
                 NavTab.Inbox -> unreadCounts

diff --git a/app/src/main/java/com/jerboa/ui/components/drawer/Drawer.kt b/app/src/main/java/com/jerboa/ui/components/drawer/Drawer.kt
@@ -44,6 +44,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.jerboa.R
+import com.jerboa.datatypes.UserViewType
 import com.jerboa.datatypes.getDisplayName
 import com.jerboa.datatypes.samplePerson
 import com.jerboa.db.entity.Account
@@ -92,6 +93,7 @@ fun Drawer(
     showBottomNav: Boolean,
     closeDrawer: () -> Unit,
     onSelectTab: (NavTab) -> Unit,
+    userViewType: UserViewType,
 ) {
     var showAccountAddMode by rememberSaveable { mutableStateOf(false) }
 
@@ -124,6 +126,7 @@ fun Drawer(
         closeDrawer = closeDrawer,
         onSelectTab = onSelectTab,
         onSwitchAnon = onSwitchAnon,
+        userViewType = userViewType,
     )
 }
 
@@ -147,6 +150,7 @@ fun DrawerContent(
     closeDrawer: () -> Unit,
     onSelectTab: (NavTab) -> Unit,
     onSwitchAnon: () -> Unit,
+    userViewType: UserViewType,
 ) {
     AnimatedVisibility(
         visible = showAccountAddMode,
@@ -177,6 +181,7 @@ fun DrawerContent(
         showBottomNav = showBottomNav,
         onSelectTab = onSelectTab,
         closeDrawer = closeDrawer,
+        userViewType = userViewType,
     )
 }
 
@@ -194,6 +199,7 @@ fun DrawerItemsMain(
     showBottomNav: Boolean,
     closeDrawer: () -> Unit,
     onSelectTab: (NavTab) -> Unit,
+    userViewType: UserViewType,
 ) {
     val listState = rememberLazyListState()
 
@@ -238,7 +244,7 @@ fun DrawerItemsMain(
         }
 
         if (!showBottomNav) {
-            items(NavTab.entries) {
+            items(NavTab.getEntries(userViewType)) {
                 IconAndTextDrawerItem(
                     text = stringResource(it.textId),
                     icon = it.iconOutlined,
@@ -314,6 +320,7 @@ fun DrawerItemsMainPreview() {
         showBottomNav = false,
         closeDrawer = {},
         onSelectTab = {},
+        userViewType = UserViewType.Normal,
     )
 }
 

diff --git a/app/src/main/java/com/jerboa/ui/components/drawer/DrawerActivity.kt b/app/src/main/java/com/jerboa/ui/components/drawer/DrawerActivity.kt
@@ -9,6 +9,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import com.jerboa.api.ApiState
 import com.jerboa.closeDrawer
+import com.jerboa.datatypes.UserViewType
 import com.jerboa.db.entity.isAnon
 import com.jerboa.db.entity.isReady
 import com.jerboa.feat.BlurNSFW
@@ -34,6 +35,7 @@ fun MainDrawer(
     onSelectTab: (NavTab) -> Unit,
     blurNSFW: BlurNSFW,
     showBottomNav: Boolean,
+    userViewType: UserViewType,
 ) {
     val account = getCurrentAccount(accountViewModel)
 
@@ -108,5 +110,6 @@ fun MainDrawer(
         showBottomNav = showBottomNav,
         onSelectTab = onSelectTab,
         closeDrawer = { closeDrawer(scope, drawerState) },
+        userViewType = userViewType,
     )
 }
diff --git a/app/src/main/java/com/jerboa/ui/components/home/BottomNavActivity.kt b/app/src/main/java/com/jerboa/ui/components/home/BottomNavActivity.kt
@@ -132,6 +132,16 @@ enum class NavTab(
         userViewType = UserViewType.Normal,
         needsLogin = true,
     ),
+    ;
+
+    companion object {
+        fun getEntries(userViewType: UserViewType) =
+            when (userViewType) {
+                UserViewType.Normal -> NavTab.entries.filter { it.userViewType == UserViewType.Normal }
+                UserViewType.AdminOrMod -> NavTab.entries.filter { it.userViewType != UserViewType.AdminOnly }
+                UserViewType.AdminOnly -> NavTab.entries
+            }
+    }
 }
 
 @OptIn(
@@ -210,6 +220,7 @@ fun BottomNavActivity(
                         onCommunityClick = appState::toCommunity,
                         onSettingsClick = appState::toSettings,
                         onClickLogin = appState::toLogin,
+                        userViewType = account.userViewType(),
                     )
                 },
             )