From b28457d17fffa61251ff705af466d1815262db60 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 22 Dec 2025 17:20:01 -0300
Subject: [PATCH] Move 'All Apps' to main overflow menu for now

---
 .../main/kotlin/org/fdroid/ui/discover/Discover.kt  | 13 -------------
 .../org/fdroid/ui/discover/DiscoverOverflowMenu.kt  |  5 +++--
 .../org/fdroid/ui/navigation/NavigationKey.kt       | 10 +++++++++-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
index 2a934b149..56563fff6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -17,7 +17,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -31,7 +30,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.Alignment.Companion.End
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
@@ -169,17 +167,6 @@ fun Discover(
                             onAppTap = onAppTap,
                         )
                     }
-                    val listAll = AppListType.All(
-                        title = stringResource(R.string.app_list_all),
-                    )
-                    OutlinedButton(
-                        onClick = { onListTap(listAll) },
-                        modifier = Modifier
-                            .align(End)
-                            .padding(horizontal = 16.dp),
-                    ) {
-                        Text(listAll.title)
-                    }
                 }
                 NoEnabledReposDiscoverModel -> {
                     Text(
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
index 06e0ff71e..46067a971 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
@@ -6,11 +6,12 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
 import org.fdroid.ui.navigation.NavDestinations
-import org.fdroid.ui.navigation.moreMenuItems
+import org.fdroid.ui.navigation.getMoreMenuItems
 
 @Composable
 fun DiscoverOverFlowMenu(
@@ -22,7 +23,7 @@ fun DiscoverOverFlowMenu(
         expanded = menuExpanded,
         onDismissRequest = onDismissRequest
     ) {
-        moreMenuItems.forEach { dest ->
+        getMoreMenuItems(LocalContext.current).forEach { dest ->
             DropdownMenuItem(
                 text = { Text(stringResource(dest.label)) },
                 onClick = { onItemClicked(dest) },
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt b/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
index e6ee759cf..391e03808 100644
--- a/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
@@ -1,5 +1,6 @@
 package org.fdroid.ui.navigation
 
+import android.content.Context
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Apps
@@ -72,6 +73,12 @@ sealed class NavDestinations(
     object Settings :
         NavDestinations(NavigationKey.Settings, R.string.menu_settings, Icons.Filled.Settings)
 
+    class AllApps(title: String) : NavDestinations(
+        id = NavigationKey.AppList(AppListType.All(title)),
+        label = R.string.app_list_all,
+        icon = Icons.Filled.Apps,
+    )
+
     object About : NavDestinations(NavigationKey.About, R.string.menu_about, Icons.Filled.Info)
 }
 
@@ -80,6 +87,7 @@ val topBarMenuItems = listOf(
     NavDestinations.Settings,
 )
 
-val moreMenuItems = listOf(
+fun getMoreMenuItems(context: Context) = listOf(
+    NavDestinations.AllApps(context.getString(R.string.app_list_all)),
     NavDestinations.About,
 )