From 0142e0f7712ea3dd5014176cc64e04598b1eb755 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Wed, 30 Nov 2022 12:35:02 -0500
Subject: [PATCH] Fix too many actions in browse source

---
 .../browse/components/BrowseSourceToolbar.kt  | 51 +++++++++++--------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
index 0d64f0b44..408ed0a86 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
@@ -1,11 +1,10 @@
 package eu.kanade.presentation.browse.components
 
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ViewList
+import androidx.compose.material.icons.filled.ViewModule
 import androidx.compose.material.icons.outlined.Help
 import androidx.compose.material.icons.outlined.Public
-import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.outlined.ViewList
-import androidx.compose.material.icons.outlined.ViewModule
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
@@ -56,33 +55,45 @@ fun BrowseSourceToolbar(
         onClickCloseSearch = navigateUp,
         actions = {
             var selectingDisplayMode by remember { mutableStateOf(false) }
+            // SY -->
+            val isConfigurableSource = source?.anyIs<ConfigurableSource>() == true
             AppBarActions(
-                // SY -->
                 actions = listOfNotNull(
                     AppBar.Action(
                         title = stringResource(R.string.action_display_mode),
-                        icon = if (displayMode == LibraryDisplayMode.List) Icons.Outlined.ViewList else Icons.Outlined.ViewModule,
+                        icon = if (displayMode == LibraryDisplayMode.List) Icons.Filled.ViewList else Icons.Filled.ViewModule,
                         onClick = { selectingDisplayMode = true },
                     ).takeIf { displayMode != null },
-                    // SY <--
                     if (isLocalSource) {
-                        AppBar.Action(
-                            title = stringResource(R.string.label_help),
-                            icon = Icons.Outlined.Help,
-                            onClick = onHelpClick,
-                        )
+                        if (isConfigurableSource && displayMode != null) {
+                            AppBar.OverflowAction(
+                                title = stringResource(R.string.label_help),
+                                onClick = onHelpClick,
+                            )
+                        } else {
+                            AppBar.Action(
+                                title = stringResource(R.string.label_help),
+                                icon = Icons.Outlined.Help,
+                                onClick = onHelpClick,
+                            )
+                        }
                     } else {
-                        AppBar.Action(
-                            title = stringResource(R.string.action_web_view),
-                            icon = Icons.Outlined.Public,
-                            onClick = onWebViewClick,
-                        )
+                        if (isConfigurableSource && displayMode != null) {
+                            AppBar.OverflowAction(
+                                title = stringResource(R.string.action_web_view),
+                                onClick = onWebViewClick,
+                            )
+                        } else {
+                            AppBar.Action(
+                                title = stringResource(R.string.action_web_view),
+                                icon = Icons.Outlined.Public,
+                                onClick = onWebViewClick,
+                            )
+                        }
                     },
-                    // SY -->
-                    if (source?.anyIs<ConfigurableSource>() ?: false) {
-                        AppBar.Action(
+                    if (isConfigurableSource) {
+                        AppBar.OverflowAction(
                             title = stringResource(R.string.action_settings),
-                            icon = Icons.Outlined.Settings,
                             onClick = onSettingsClick,
                         )
                     } else {