From 88f817e5caf73d92876bda7b923a26380d7122c9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 26 Nov 2025 18:45:37 -0300
Subject: [PATCH 001/180] [db] allow providing PackageInfo maps to avoid
 hammering PackageManager

The app may maintain PackageInfo for apps already, so there's no need to keep asking the system for it. We could instead just work with what we already have.

Also, we discovered that chunking the package names isn't needed for newer Android versions. This is only relevant for whom has more than 999 apps installed.
---
 .../org/fdroid/database/AppListItemsTest.kt   | 136 +++++++++++++++---
 .../main/java/org/fdroid/database/AppDao.kt   |  36 ++++-
 .../java/org/fdroid/database/AppPrefsDao.kt   |  11 +-
 .../java/org/fdroid/database/VersionDao.kt    |   4 +-
 4 files changed, 161 insertions(+), 26 deletions(-)

diff --git a/libs/database/src/dbTest/java/org/fdroid/database/AppListItemsTest.kt b/libs/database/src/dbTest/java/org/fdroid/database/AppListItemsTest.kt
index 460a1f462..d25bae15f 100644
--- a/libs/database/src/dbTest/java/org/fdroid/database/AppListItemsTest.kt
+++ b/libs/database/src/dbTest/java/org/fdroid/database/AppListItemsTest.kt
@@ -6,6 +6,8 @@ import androidx.core.content.pm.PackageInfoCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.every
 import io.mockk.mockk
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.database.AppListSortOrder.LAST_UPDATED
 import org.fdroid.database.AppListSortOrder.NAME
@@ -17,7 +19,6 @@ import org.fdroid.test.TestUtils.getRandomString
 import org.fdroid.test.TestVersionUtils.getRandomPackageVersionV2
 import org.junit.Test
 import org.junit.runner.RunWith
-import kotlin.collections.map
 import kotlin.random.Random
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -74,8 +75,10 @@ internal class AppListItemsTest : AppTest() {
         appDao.getAppListItems(pm, "Two", NAME).getOrFail().let { apps ->
             assertEquals(1, apps.size)
             assertEquals(app2, apps[0])
-            assertEquals(PackageInfoCompat.getLongVersionCode(packageInfo2),
-                apps[0].installedVersionCode)
+            assertEquals(
+                PackageInfoCompat.getLongVersionCode(packageInfo2),
+                apps[0].installedVersionCode
+            )
             assertEquals(packageInfo2.versionName, apps[0].installedVersionName)
         }
 
@@ -127,8 +130,10 @@ internal class AppListItemsTest : AppTest() {
         appDao.getAppListItems(pm, "A", "Two", NAME).getOrFail().let { apps ->
             assertEquals(1, apps.size)
             assertEquals(app2, apps[0])
-            assertEquals(PackageInfoCompat.getLongVersionCode(packageInfo2),
-                apps[0].installedVersionCode)
+            assertEquals(
+                PackageInfoCompat.getLongVersionCode(packageInfo2),
+                apps[0].installedVersionCode
+            )
             assertEquals(packageInfo2.versionName, apps[0].installedVersionName)
         }
 
@@ -190,8 +195,10 @@ internal class AppListItemsTest : AppTest() {
             assertEquals(2, apps.size)
             assertEquals(app3a, apps[0])
             assertEquals(app2, apps[1])
-            assertEquals(PackageInfoCompat.getLongVersionCode(packageInfo2),
-                apps[1].installedVersionCode)
+            assertEquals(
+                PackageInfoCompat.getLongVersionCode(packageInfo2),
+                apps[1].installedVersionCode
+            )
             assertEquals(packageInfo2.versionName, apps[1].installedVersionName)
         }
 
@@ -201,8 +208,10 @@ internal class AppListItemsTest : AppTest() {
             val sortedApps = apps.sortedBy { it.lastUpdated }
             assertEquals(app2, sortedApps[0])
             assertEquals(app3a, sortedApps[1])
-            assertEquals(PackageInfoCompat.getLongVersionCode(packageInfo2),
-                sortedApps[0].installedVersionCode)
+            assertEquals(
+                PackageInfoCompat.getLongVersionCode(packageInfo2),
+                sortedApps[0].installedVersionCode
+            )
             assertEquals(packageInfo2.versionName, sortedApps[0].installedVersionName)
         }
 
@@ -577,6 +586,50 @@ internal class AppListItemsTest : AppTest() {
         }
     }
 
+    @Test
+    fun testGetInstalledAppListItemsFlow() = runBlocking {
+        // insert three apps
+        val repoId = repoDao.insertOrReplace(getRandomRepo())
+        appDao.insert(repoId, packageName1, app1, locales)
+        appDao.insert(repoId, packageName2, app2, locales)
+        appDao.insert(repoId, packageName3, app3, locales)
+
+        // define packageInfo for each test
+        val packageInfo1 = PackageInfo().apply {
+            packageName = packageName1
+            versionName = getRandomString()
+            versionCode = Random.nextInt(1, Int.MAX_VALUE)
+        }
+        val packageInfo2 = PackageInfo().apply { packageName = packageName2 }
+        val packageInfo3 = PackageInfo().apply { packageName = packageName3 }
+
+        // all apps get returned, if we consider all of them installed
+        val pmInfoMap1 = mapOf(
+            packageName1 to packageInfo1,
+            packageName2 to packageInfo2,
+            packageName3 to packageInfo3,
+        )
+        assertEquals(3, appDao.getInstalledAppListItems(pmInfoMap1).first().size)
+
+        // one apps get returned, if we consider only that one installed
+        val pmInfoMap2 = mapOf(packageName1 to packageInfo1)
+        appDao.getInstalledAppListItems(pmInfoMap2).first().let { apps ->
+            assertEquals(1, apps.size)
+            assertEquals(app1, apps[0])
+            // version code and version name gets taken from supplied packageInfo
+            assertEquals(
+                PackageInfoCompat.getLongVersionCode(packageInfo1),
+                apps[0].installedVersionCode
+            )
+            assertEquals(packageInfo1.versionName, apps[0].installedVersionName)
+        }
+
+        // no app gets returned, if we consider none installed
+        appDao.getInstalledAppListItems(emptyMap()).first().let { apps ->
+            assertEquals(0, apps.size)
+        }
+    }
+
     @Test
     fun testGetInstalledAppListItemsMaxVars() {
         // insert an app
@@ -592,12 +645,12 @@ internal class AppListItemsTest : AppTest() {
         }
         val packageInfo = packageInfoCreator(packageName)
 
-        // sqlite has a maximum number of 999 variables that can be used in a query
+        // sqlite (before 3.32.0) has a maximum number of 999 variables that can be used in a query
         // one additional package info is added to the package lists with each test case
         val listPackageInfo = listOf(packageInfo)
-        val packageInfoOk = MutableList(998) { packageInfoCreator(getRandomString()) }
-        val packageInfoNotOk1 = MutableList(999) { packageInfoCreator(getRandomString()) }
-        val packageInfoNotOk2 = MutableList(5000) { packageInfoCreator(getRandomString()) }
+        val packageInfoOk = MutableList(998) { packageInfoCreator("${it + 1}") }
+        val packageInfoNotOk1 = MutableList(999) { packageInfoCreator("${it + 1}") }
+        val packageInfoNotOk2 = MutableList(5000) { packageInfoCreator("${it + 1}") }
 
         // app gets returned no matter how many packages are installed
         every { pm.getInstalledPackages(0) } returns packageInfoOk + listPackageInfo
@@ -616,6 +669,51 @@ internal class AppListItemsTest : AppTest() {
         assertNotNull(appDao.getInstalledAppListItems(pm).getOrFail()[0].installedVersionName)
     }
 
+    @Test
+    fun testGetInstalledAppListItemsFlowMaxVars(): Unit = runBlocking {
+        // insert an app
+        val repoId = repoDao.insertOrReplace(getRandomRepo())
+        appDao.insert(repoId, packageName, app1, locales)
+
+        val packageInfoCreator = { name: String ->
+            PackageInfo().apply {
+                packageName = name
+                versionName = name
+                versionCode = Random.nextInt(1, Int.MAX_VALUE)
+            }
+        }
+        val packageInfo = packageInfoCreator(packageName)
+        // sqlite (before 3.32.0) has a maximum number of 999 variables that can be used in a query
+        // one additional package info is added to the package lists with each test case
+        val packageInfoOk = mutableMapOf<String, PackageInfo>().apply {
+            for (i in 2..999) set("$i", packageInfoCreator("$i"))
+            set(packageName, packageInfo)
+        }
+        val packageInfoNotOk1 = mutableMapOf<String, PackageInfo>().apply {
+            for (i in 2..1000) set("$i", packageInfoCreator("$i"))
+            set(packageName, packageInfo)
+        }
+        val packageInfoNotOk2 = mutableMapOf<String, PackageInfo>().apply {
+            for (i in 2..5000) set("$i", packageInfoCreator("$i"))
+            set(packageName, packageInfo)
+        }
+        // app gets returned no matter how many packages are installed
+        assertEquals(1, appDao.getInstalledAppListItems(packageInfoOk).first().size)
+        assertEquals(1, appDao.getInstalledAppListItems(packageInfoNotOk1).first().size)
+        assertEquals(1, appDao.getInstalledAppListItems(packageInfoNotOk2).first().size)
+
+        // ensure they have version info set
+        assertNotNull(
+            appDao.getInstalledAppListItems(packageInfoOk).first()[0].installedVersionName
+        )
+        assertNotNull(
+            appDao.getInstalledAppListItems(packageInfoNotOk1).first()[0].installedVersionName
+        )
+        assertNotNull(
+            appDao.getInstalledAppListItems(packageInfoNotOk2).first()[0].installedVersionName
+        )
+    }
+
     // region author tests
     @Test
     fun testAuthor_NoApp() {
@@ -625,8 +723,10 @@ internal class AppListItemsTest : AppTest() {
 
         assertFalse(appDao.hasAuthorMoreThanOneApp(author).getOrFail())
         assertTrue(appDao.getAppListItemsForAuthor(pm, author, null, NAME).getOrFail().isEmpty())
-        assertTrue(appDao.getAppListItemsForAuthor(pm, author, null, LAST_UPDATED)
-            .getOrFail().isEmpty())
+        assertTrue(
+            appDao.getAppListItemsForAuthor(pm, author, null, LAST_UPDATED)
+                .getOrFail().isEmpty()
+        )
     }
 
     @Test
@@ -640,8 +740,10 @@ internal class AppListItemsTest : AppTest() {
         assertFalse(appDao.hasAuthorMoreThanOneApp(author).getOrFail())
         val appsForAuthor = appDao.getAppListItemsForAuthor(pm, author, null, NAME).getOrFail()
         assertEquals(1, appsForAuthor.size)
-        assertEquals(1, appDao.getAppListItemsForAuthor(pm, author, null, LAST_UPDATED)
-            .getOrFail().size)
+        assertEquals(
+            1, appDao.getAppListItemsForAuthor(pm, author, null, LAST_UPDATED)
+                .getOrFail().size
+        )
         assertEquals(packageName, appsForAuthor[0].packageName)
     }
 
diff --git a/libs/database/src/main/java/org/fdroid/database/AppDao.kt b/libs/database/src/main/java/org/fdroid/database/AppDao.kt
index 9541bdfae..125e72bcb 100644
--- a/libs/database/src/main/java/org/fdroid/database/AppDao.kt
+++ b/libs/database/src/main/java/org/fdroid/database/AppDao.kt
@@ -3,12 +3,14 @@ package org.fdroid.database
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.Resources
+import android.os.Build.VERSION.SDK_INT
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.core.os.ConfigurationCompat.getLocales
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.asFlow
 import androidx.lifecycle.map
 import androidx.room.Dao
 import androidx.room.Insert
@@ -189,6 +191,9 @@ public interface AppDao {
     public fun hasAuthorMoreThanOneApp(author: String): LiveData<Boolean>
 
     public fun getInstalledAppListItems(packageManager: PackageManager): LiveData<List<AppListItem>>
+    public fun getInstalledAppListItems(
+        packageInfoMap: Map<String, PackageInfo>,
+    ): Flow<List<AppListItem>>
 
     public suspend fun getAppSearchItems(searchQuery: String): List<AppSearchItem>
 
@@ -682,8 +687,14 @@ internal interface AppDaoInt : AppDao {
 
     private fun LiveData<List<AppListItem>>.map(
         packageManager: PackageManager,
-        installedPackages: Map<String, PackageInfo> = packageManager.getInstalledPackages(0)
-            .associateBy { packageInfo -> packageInfo.packageName },
+    ): LiveData<List<AppListItem>> {
+        val installedPackages = packageManager.getInstalledPackages(0)
+            .associateBy { packageInfo -> packageInfo.packageName }
+        return map(installedPackages)
+    }
+
+    private fun LiveData<List<AppListItem>>.map(
+        installedPackages: Map<String, PackageInfo>,
     ) = map { items ->
         items.map { item ->
             val packageInfo = installedPackages[item.packageName]
@@ -823,15 +834,30 @@ internal interface AppDaoInt : AppDao {
         val installedPackages = packageManager.getInstalledPackages(0)
             .associateBy { packageInfo -> packageInfo.packageName }
         val packageNames = installedPackages.keys.toList()
-        return if (packageNames.size <= 999) {
-            getAppListItems(packageNames).map(packageManager, installedPackages)
+        // since sqlite 3.32.0 the max variables number was increased to 32766
+        return if (packageNames.size <= 999 || SDK_INT >= 31) {
+            getAppListItems(packageNames).map(installedPackages)
         } else {
             AppListLiveData().apply {
                 packageNames.chunked(999) { addSource(getAppListItems(it)) }
-            }.map(packageManager, installedPackages)
+            }.map(installedPackages)
         }
     }
 
+    override fun getInstalledAppListItems(
+        packageInfoMap: Map<String, PackageInfo>,
+    ): Flow<List<AppListItem>> {
+        val packageNames = packageInfoMap.keys.toList()
+        // since sqlite 3.32.0 the max variables number was increased to 32766
+        return if (packageNames.size <= 999 || SDK_INT >= 31) {
+            getAppListItems(packageNames).map(packageInfoMap)
+        } else {
+            AppListLiveData().apply {
+                packageNames.chunked(999) { addSource(getAppListItems(it)) }
+            }.map(packageInfoMap)
+        }.asFlow()
+    }
+
     private class AppListLiveData : MediatorLiveData<List<AppListItem>>() {
         private val list = ArrayList<LiveData<List<AppListItem>>>()
 
diff --git a/libs/database/src/main/java/org/fdroid/database/AppPrefsDao.kt b/libs/database/src/main/java/org/fdroid/database/AppPrefsDao.kt
index 8a55d9cf2..cca5fdd0e 100644
--- a/libs/database/src/main/java/org/fdroid/database/AppPrefsDao.kt
+++ b/libs/database/src/main/java/org/fdroid/database/AppPrefsDao.kt
@@ -1,5 +1,6 @@
 package org.fdroid.database
 
+import android.os.Build.VERSION.SDK_INT
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.distinctUntilChanged
 import androidx.lifecycle.map
@@ -30,9 +31,13 @@ internal interface AppPrefsDaoInt : AppPrefsDao {
     fun getAppPrefsOrNull(packageName: String): AppPrefs?
 
     fun getPreferredRepos(packageNames: List<String>): Map<String, Long> {
-        return if (packageNames.size <= 999) getPreferredReposInternal(packageNames)
-        else HashMap<String, Long>(packageNames.size).also { map ->
-            packageNames.chunked(999).forEach { map.putAll(getPreferredReposInternal(it)) }
+        // since sqlite 3.32.0 the max variables number was increased to 32766
+        return if (packageNames.size <= 999 || SDK_INT >= 31) {
+            getPreferredReposInternal(packageNames)
+        } else {
+            HashMap<String, Long>(packageNames.size).also { map ->
+                packageNames.chunked(999).forEach { map.putAll(getPreferredReposInternal(it)) }
+            }
         }
     }
 
diff --git a/libs/database/src/main/java/org/fdroid/database/VersionDao.kt b/libs/database/src/main/java/org/fdroid/database/VersionDao.kt
index a67493972..71be99dc3 100644
--- a/libs/database/src/main/java/org/fdroid/database/VersionDao.kt
+++ b/libs/database/src/main/java/org/fdroid/database/VersionDao.kt
@@ -1,5 +1,6 @@
 package org.fdroid.database
 
+import android.os.Build.VERSION.SDK_INT
 import androidx.lifecycle.LiveData
 import androidx.room.Dao
 import androidx.room.Insert
@@ -196,7 +197,8 @@ internal interface VersionDaoInt : VersionDao {
      * so takes [AppPrefs.ignoreVersionCodeUpdate] into account.
      */
     fun getVersions(packageNames: List<String>): List<Version> {
-        return if (packageNames.size <= 999) getVersionsInternal(packageNames)
+        // since sqlite 3.32.0 (in SDK 31 the max variables number was increased to 32766
+        return if (packageNames.size <= 999 || SDK_INT >= 31) getVersionsInternal(packageNames)
         else packageNames.chunked(999).flatMap { getVersionsInternal(it) }
     }
 

From 8b4e42935ee5e84c53899023cfc607881ba20afd Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 28 Nov 2025 16:14:37 -0300
Subject: [PATCH 002/180] [db] Add new DbAppChecker which finds updates and
 apps with issues

This is similar to DbUpdateChecker which only finds updates.
---
 .../src/main/java/org/fdroid/database/App.kt  |   2 +
 .../org/fdroid/database/AppCheckResult.kt     |  54 ++++
 .../java/org/fdroid/database/DbAppChecker.kt  | 242 ++++++++++++++++++
 .../org/fdroid/database/DbUpdateChecker.kt    |   1 +
 .../main/java/org/fdroid/index/RepoManager.kt |   5 +-
 libs/index/api/android/index.api              |   2 +
 .../kotlin/org/fdroid/UpdateChecker.kt        |  35 ++-
 7 files changed, 332 insertions(+), 9 deletions(-)
 create mode 100644 libs/database/src/main/java/org/fdroid/database/AppCheckResult.kt
 create mode 100644 libs/database/src/main/java/org/fdroid/database/DbAppChecker.kt

diff --git a/libs/database/src/main/java/org/fdroid/database/App.kt b/libs/database/src/main/java/org/fdroid/database/App.kt
index fed489aa6..a9609f9f2 100644
--- a/libs/database/src/main/java/org/fdroid/database/App.kt
+++ b/libs/database/src/main/java/org/fdroid/database/App.kt
@@ -397,11 +397,13 @@ public data class UpdatableApp internal constructor(
     public val installedVersionCode: Long,
     public val installedVersionName: String,
     public val update: AppVersion,
+    @Deprecated("Use AppWithIssue instead: UpdateInOtherRepo")
     public val isFromPreferredRepo: Boolean,
     /**
      * If true, this is not necessarily an update (contrary to the class name),
      * but an app with the `KnownVuln` anti-feature.
      */
+    @Deprecated("Use AppWithIssue instead: KnownVulnerability")
     public val hasKnownVulnerability: Boolean,
     public override val name: String? = null,
     public override val summary: String? = null,
diff --git a/libs/database/src/main/java/org/fdroid/database/AppCheckResult.kt b/libs/database/src/main/java/org/fdroid/database/AppCheckResult.kt
new file mode 100644
index 000000000..e642cf47b
--- /dev/null
+++ b/libs/database/src/main/java/org/fdroid/database/AppCheckResult.kt
@@ -0,0 +1,54 @@
+package org.fdroid.database
+
+public data class AppCheckResult(
+    val updates: List<UpdatableApp>,
+    val issues: List<AppWithIssue>,
+)
+
+public sealed interface AppWithIssue {
+    public val packageName: String
+    public val installVersionName: String
+    public val issue: AppIssue
+}
+
+public data class AvailableAppWithIssue(
+    val app: AppOverviewItem,
+    override val installVersionName: String,
+    val installVersionCode: Long,
+    override val issue: AppIssue,
+) : AppWithIssue {
+    override val packageName: String = app.packageName
+}
+
+public data class UnavailableAppWithIssue(
+    override val packageName: String,
+    val name: CharSequence?,
+    override val installVersionName: String,
+    val installVersionCode: Long,
+) : AppWithIssue {
+    override val issue: AppIssue = NotAvailable
+}
+
+public sealed interface AppIssue
+
+/**
+ * An app that we installed in the past, but is no longer available in any (enabled) repository.
+ */
+public data object NotAvailable : AppIssue
+
+/**
+ * An app that can not get updated, because all versions have an incompatible signer.
+ * There may be compatible versions in another repo.
+ */
+public data class NoCompatibleSigner(val repoIdWithCompatibleSigner: Long? = null) : AppIssue
+
+/**
+ * An app that could get updated, but only from another repo.
+ */
+public data class UpdateInOtherRepo(val repoIdWithUpdate: Long) : AppIssue
+
+/**
+ * Has a known vulnerability and should either get updated or uninstalled.
+ * @param fromPreferredRepo true if the preferred repo had marked the app with known vulnerability.
+ */
+public data class KnownVulnerability(val fromPreferredRepo: Boolean) : AppIssue
diff --git a/libs/database/src/main/java/org/fdroid/database/DbAppChecker.kt b/libs/database/src/main/java/org/fdroid/database/DbAppChecker.kt
new file mode 100644
index 000000000..3a149abe1
--- /dev/null
+++ b/libs/database/src/main/java/org/fdroid/database/DbAppChecker.kt
@@ -0,0 +1,242 @@
+package org.fdroid.database
+
+import android.content.Context
+import android.content.pm.ApplicationInfo.FLAG_SYSTEM
+import android.content.pm.PackageInfo
+import android.os.Build.VERSION.SDK_INT
+import androidx.core.content.pm.PackageInfoCompat.getLongVersionCode
+import org.fdroid.CompatibilityChecker
+import org.fdroid.CompatibilityCheckerImpl
+import org.fdroid.UpdateChecker
+import org.fdroid.index.IndexUtils.getPackageSigner
+
+public class DbAppChecker(
+    db: FDroidDatabase,
+    private val context: Context,
+    compatibilityChecker: CompatibilityChecker = CompatibilityCheckerImpl(context.packageManager),
+    private val updateChecker: UpdateChecker = UpdateChecker(compatibilityChecker),
+) {
+    private val appDao = db.getAppDao() as AppDaoInt
+    private val versionDao = db.getVersionDao() as VersionDaoInt
+    private val appPrefsDao = db.getAppPrefsDao() as AppPrefsDaoInt
+
+    /**
+     * Gets all apps that somehow have a special status that warrants the user's attention.
+     * These can include apps that:
+     * * have updates available ([UpdatableApp])
+     * * can not be updated, because we don't have those apps anymore ([NotAvailable])
+     * * can not be updated, because all versions have incompatible signer ([NoCompatibleSigner])
+     * * could get updated from another repo ([UpdateInOtherRepo])
+     * * have known vulnerabilities ([KnownVulnerability])
+     */
+    public fun getApps(packageInfoMap: Map<String, PackageInfo>): AppCheckResult {
+        val updatableApps = ArrayList<UpdatableApp>()
+        val appsWithIssue = ArrayList<AppWithIssue>()
+
+        // get all versions for all packages (irrespective of preferred repo)
+        // and make them accessible per packageName
+        val packageNames = packageInfoMap.keys.toList()
+        val versionsByPackage = HashMap<String, ArrayList<Version>>(packageNames.size)
+        // TODO add test for an app ignoring all updates, this won't return versions here
+        versionDao.getVersions(packageNames).forEach { version ->
+            val versions = versionsByPackage.getOrPut(version.packageName) { ArrayList() }
+            versions.add(version)
+        }
+        // go through all apps (packages) and check for updates
+        val preferredRepos = appPrefsDao.getPreferredRepos(packageNames)
+        packageInfoMap.forEach packages@{ (packageName, packageInfo) ->
+            // get versions for this app and try to find an update in them
+            val versions = versionsByPackage[packageName]
+            val flags = packageInfo.applicationInfo?.flags ?: 0
+            if (versions.isNullOrEmpty() && flags and FLAG_SYSTEM == 0) {
+                // we have no versions and no system app,
+                // so check if we maybe had installed this app in the past
+                getUnavailableApp(packageInfo, preferredRepos)?.let { unavailableApp ->
+                    appsWithIssue.add(unavailableApp)
+                }
+                return@packages // continue
+            }
+            // we ignore system apps without version
+            if (versions == null) return@packages // continue
+            // get all updates from the versions we found
+            // these can be from other repos, have incompatible signers or just are KnownVuln
+            val updates = updateChecker.getUpdates(
+                versions = versions,
+                allowedSignersGetter = null, // all signers are allowed
+                installedVersionCode = getLongVersionCode(packageInfo),
+                allowedReleaseChannels = null,
+                includeKnownVulnerabilities = true,
+                preferencesGetter = { appPrefsDao.getAppPrefsOrNull(packageName) },
+            ).toList()
+            // if there are no updates available, there's nothing left to do for us
+            if (updates.isEmpty()) return@packages
+            // we have updates, so now get some data for us to judge those updates
+
+            // get preferred repo for the current app
+            val preferredRepoId = preferredRepos[packageName]
+                ?: error("No preferred repo for $packageName")
+
+            // get allowed signers for current app
+            // always gives us the oldest signer, even if they rotated certs by now
+            @Suppress("DEPRECATION")
+            val allowedSigners = packageInfo.signatures?.map {
+                getPackageSigner(it.toByteArray())
+            }?.toSet() ?: error("Got no signatures for $packageName")
+
+            // happy path is a preferred and compatible update, so we look for those first
+            // for simplicity and safety, we tell the user to make those updates first
+            updates.forEach { update ->
+                if (update.isOk(preferredRepoId, allowedSigners)) {
+                    getUpdatableApp(
+                        version = update,
+                        installedVersionCode = getLongVersionCode(packageInfo),
+                        installedVersionName = packageInfo.versionName ?: "???",
+                    )?.let { app -> updatableApps.add(app) }
+                    return@packages
+                }
+            }
+
+            // we do have update(s), but there's an issue with them, find out what
+            // for simplicity, we only consider the issue of the most recent version
+            val update = updates[0]
+            val updateSigners = update.signer?.sha256?.toSet()
+            val hasCompatibleSigner =
+                updateSigners == null || updateSigners.intersect(allowedSigners).isNotEmpty()
+            val app = appDao.getAppOverviewItem(preferredRepoId, packageName) ?: return@packages
+
+            // find out the specific issue
+            val appWithIssue = if (update.hasKnownVulnerability) {
+                AvailableAppWithIssue(
+                    app = app,
+                    installVersionName = packageInfo.versionName ?: "???",
+                    installVersionCode = getLongVersionCode(packageInfo),
+                    issue = KnownVulnerability(preferredRepoId == update.repoId),
+                )
+            } else if (hasCompatibleSigner) {
+                // the signer is compatible, so the update must come from a non-preferred repo
+                AvailableAppWithIssue(
+                    app = app,
+                    installVersionName = packageInfo.versionName ?: "???",
+                    installVersionCode = getLongVersionCode(packageInfo),
+                    issue = UpdateInOtherRepo(update.repoId),
+                )
+            } else {
+                // no update with compatible signer available,
+                // check if there's a compatible signer available in a non-preferred repo
+                val repoIdWithCompatibleSigner = updates.find {
+                    val signers = it.signer?.sha256?.toSet()
+                    signers == null || signers.intersect(allowedSigners).isNotEmpty()
+                }?.repoId
+                if (repoIdWithCompatibleSigner == null) {
+                    // all updates are not compatible, we only warn about this,
+                    // if all versions in the preferred repo aren't compatible
+                    val allIncompatible = versions.all { version ->
+                        version.repoId != preferredRepoId ||
+                            !version.isOk(preferredRepoId, allowedSigners)
+                    }
+                    if (allIncompatible) {
+                        // most likely the wrong repo was preferred, try to find the right one
+                        val repoId = versions.find {
+                            // treat the current repo as preferred, so we only look at signers
+                            it.isOk(it.repoId, allowedSigners)
+                        }?.repoId
+                        AvailableAppWithIssue(
+                            app = app,
+                            installVersionName = packageInfo.versionName ?: "???",
+                            installVersionCode = getLongVersionCode(packageInfo),
+                            issue = NoCompatibleSigner(repoId),
+                        )
+                    } else null
+                } else {
+                    AvailableAppWithIssue(
+                        app = app,
+                        installVersionName = packageInfo.versionName ?: "???",
+                        installVersionCode = getLongVersionCode(packageInfo),
+                        issue = NoCompatibleSigner(repoIdWithCompatibleSigner),
+                    )
+                }
+            }
+            appWithIssue?.let { appsWithIssue.add(it) }
+        }
+        return AppCheckResult(
+            updates = updatableApps,
+            issues = appsWithIssue,
+        )
+    }
+
+    /**
+     * Returns a [UnavailableAppWithIssue], in case the app provided with [packageInfo]
+     * was installed by us in the past.
+     */
+    private fun getUnavailableApp(
+        packageInfo: PackageInfo,
+        preferredRepos: Map<String, Long>,
+    ): UnavailableAppWithIssue? {
+        // check if we installed the app or are the current update owner of this app
+        val weInstalledApp = if (SDK_INT >= 30) {
+            val installInfo = context.packageManager.getInstallSourceInfo(packageInfo.packageName)
+            context.packageName == installInfo.initiatingPackageName ||
+                context.packageName == installInfo.installingPackageName ||
+                (SDK_INT >= 34 && context.packageName == installInfo.updateOwnerPackageName)
+        } else {
+            @Suppress("DEPRECATION") // no other choice to use this for old API versions
+            val installer = context.packageManager.getInstallerPackageName(packageInfo.packageName)
+            context.packageName == installer
+        }
+        if (weInstalledApp) {
+            // we had installed this app, check if we maybe just got no versions
+            val app = preferredRepos[packageInfo.packageName]?.let { repoId ->
+                appDao.getAppOverviewItem(repoId, packageInfo.packageName)
+            }
+            // we still have the app, so we just didn't get versions for it,
+            // like when the user was ignoring all updates for the app
+            if (app != null) return null
+            // warn the user that this app isn't available anymore
+            val notAvailable = UnavailableAppWithIssue(
+                packageName = packageInfo.packageName,
+                name = packageInfo.applicationInfo?.loadLabel(context.packageManager),
+                installVersionName = packageInfo.versionName ?: "???",
+                installVersionCode = getLongVersionCode(packageInfo),
+            )
+            return notAvailable
+        }
+        return null
+    }
+
+    /**
+     * @return true if this version is an update from the preferred repo with a compatible signer
+     * and not a known vulnerable version.
+     */
+    private fun Version.isOk(preferredRepoId: Long, signers: Set<String>): Boolean {
+        val ourSigners = signer?.sha256?.toSet()
+        return preferredRepoId == repoId &&
+            !hasKnownVulnerability &&
+            (ourSigners == null || ourSigners.intersect(signers).isNotEmpty())
+    }
+
+    private fun getUpdatableApp(
+        version: Version,
+        installedVersionCode: Long,
+        installedVersionName: String,
+    ): UpdatableApp? {
+        val versionedStrings = versionDao.getVersionedStrings(
+            repoId = version.repoId,
+            packageName = version.packageName,
+            versionId = version.versionId,
+        )
+        val appOverviewItem =
+            appDao.getAppOverviewItem(version.repoId, version.packageName) ?: return null
+        return UpdatableApp(
+            repoId = version.repoId,
+            packageName = version.packageName,
+            installedVersionCode = installedVersionCode,
+            installedVersionName = installedVersionName,
+            update = version.toAppVersion(versionedStrings),
+            isFromPreferredRepo = true,
+            hasKnownVulnerability = version.hasKnownVulnerability,
+            name = appOverviewItem.name,
+            summary = appOverviewItem.summary,
+            localizedIcon = appOverviewItem.localizedIcon,
+        )
+    }
+}
diff --git a/libs/database/src/main/java/org/fdroid/database/DbUpdateChecker.kt b/libs/database/src/main/java/org/fdroid/database/DbUpdateChecker.kt
index 9a04ce1cf..7af7fde9a 100644
--- a/libs/database/src/main/java/org/fdroid/database/DbUpdateChecker.kt
+++ b/libs/database/src/main/java/org/fdroid/database/DbUpdateChecker.kt
@@ -10,6 +10,7 @@ import org.fdroid.CompatibilityCheckerImpl
 import org.fdroid.PackagePreference
 import org.fdroid.UpdateChecker
 
+@Deprecated("Use DbAppChecker instead")
 public class DbUpdateChecker @JvmOverloads constructor(
     db: FDroidDatabase,
     private val packageManager: PackageManager,
diff --git a/libs/database/src/main/java/org/fdroid/index/RepoManager.kt b/libs/database/src/main/java/org/fdroid/index/RepoManager.kt
index 1c47a150a..273324e98 100644
--- a/libs/database/src/main/java/org/fdroid/index/RepoManager.kt
+++ b/libs/database/src/main/java/org/fdroid/index/RepoManager.kt
@@ -10,6 +10,7 @@ import androidx.lifecycle.asLiveData
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -203,8 +204,8 @@ public class RepoManager @JvmOverloads constructor(
     }
 
     @AnyThread
-    public fun setPreferredRepoId(packageName: String, repoId: Long) {
-        GlobalScope.launch(coroutineContext) {
+    public fun setPreferredRepoId(packageName: String, repoId: Long): Job {
+        return GlobalScope.launch(coroutineContext) {
             db.runInTransaction {
                 val appPrefs = appPrefsDao.getAppPrefsOrNull(packageName) ?: AppPrefs(packageName)
                 appPrefsDao.update(appPrefs.copy(preferredRepoId = repoId))
diff --git a/libs/index/api/android/index.api b/libs/index/api/android/index.api
index 0ac289286..de1c69fc2 100644
--- a/libs/index/api/android/index.api
+++ b/libs/index/api/android/index.api
@@ -36,6 +36,8 @@ public final class org/fdroid/UpdateChecker {
 	public final fun getUpdate (Ljava/util/List;Lkotlin/jvm/functions/Function0;JLjava/util/List;ZLkotlin/jvm/functions/Function0;)Lorg/fdroid/index/v2/PackageVersion;
 	public static synthetic fun getUpdate$default (Lorg/fdroid/UpdateChecker;Ljava/util/List;Landroid/content/pm/PackageInfo;Ljava/util/List;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lorg/fdroid/index/v2/PackageVersion;
 	public static synthetic fun getUpdate$default (Lorg/fdroid/UpdateChecker;Ljava/util/List;Lkotlin/jvm/functions/Function0;JLjava/util/List;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lorg/fdroid/index/v2/PackageVersion;
+	public final fun getUpdates (Ljava/util/List;Lkotlin/jvm/functions/Function0;JLjava/util/List;ZLkotlin/jvm/functions/Function0;)Lkotlin/sequences/Sequence;
+	public static synthetic fun getUpdates$default (Lorg/fdroid/UpdateChecker;Ljava/util/List;Lkotlin/jvm/functions/Function0;JLjava/util/List;ZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/sequences/Sequence;
 }
 
 public final class org/fdroid/index/IndexConverter {
diff --git a/libs/index/src/androidMain/kotlin/org/fdroid/UpdateChecker.kt b/libs/index/src/androidMain/kotlin/org/fdroid/UpdateChecker.kt
index dbee9c3f3..cfb415df1 100644
--- a/libs/index/src/androidMain/kotlin/org/fdroid/UpdateChecker.kt
+++ b/libs/index/src/androidMain/kotlin/org/fdroid/UpdateChecker.kt
@@ -93,7 +93,29 @@ public class UpdateChecker(
         allowedReleaseChannels: List<String>? = null,
         includeKnownVulnerabilities: Boolean = false,
         preferencesGetter: (() -> PackagePreference?)? = null,
-    ): T? {
+    ): T? = getUpdates(
+        versions = versions,
+        allowedSignersGetter = allowedSignersGetter,
+        installedVersionCode = installedVersionCode,
+        allowedReleaseChannels = allowedReleaseChannels,
+        includeKnownVulnerabilities = includeKnownVulnerabilities,
+        preferencesGetter = preferencesGetter,
+    ).firstOrNull() // just return matching update with highest version code, don't look at others
+
+    /**
+     * Same as [getUpdate], but gets a list of all possible updates
+     * beginning from highest version code.
+     *
+     * This usually isn't useful unless you need to pick a certain update with your own criteria.
+     */
+    public fun <T : PackageVersion> getUpdates(
+        versions: List<T>,
+        allowedSignersGetter: (() -> Set<String>?)? = null,
+        installedVersionCode: Long = 0,
+        allowedReleaseChannels: List<String>? = null,
+        includeKnownVulnerabilities: Boolean = false,
+        preferencesGetter: (() -> PackagePreference?)? = null,
+    ): Sequence<T> = sequence {
         // getting signers is rather expensive, so we only do that when there's update candidates
         val allowedSigners by lazy { allowedSignersGetter?.let { it() } }
         versions.iterator().forEach versions@{ version ->
@@ -101,9 +123,9 @@ public class UpdateChecker(
             if (includeKnownVulnerabilities &&
                 version.versionCode == installedVersionCode &&
                 version.hasKnownVulnerability
-            ) return version
+            ) yield(version)
             // if version code is not higher than installed skip package as list is sorted
-            if (version.versionCode <= installedVersionCode) return null
+            if (version.versionCode <= installedVersionCode) return@sequence
             // we don't support versions that have multiple signers
             if (version.signer?.hasMultipleSigners == true) return@versions
             // skip incompatible versions
@@ -115,7 +137,7 @@ public class UpdateChecker(
             // check if release channel of version is allowed
             val hasAllowedReleaseChannel = hasAllowedReleaseChannel(
                 allowedReleaseChannels = allowedReleaseChannels?.toMutableSet() ?: LinkedHashSet(),
-                versionReleaseChannels = version.releaseChannels,
+                versionReleaseChannels = version.releaseChannels?.toSet(),
                 packagePreference = packagePreference,
             )
             if (!hasAllowedReleaseChannel) return@versions
@@ -126,14 +148,13 @@ public class UpdateChecker(
                 if (versionSigners.intersect(allowedSigners!!).isEmpty()) return@versions
             }
             // no need to see other versions, we got the highest version code per sorting
-            return version
+            yield(version)
         }
-        return null
     }
 
     private fun hasAllowedReleaseChannel(
         allowedReleaseChannels: MutableSet<String>,
-        versionReleaseChannels: List<String>?,
+        versionReleaseChannels: Set<String>?,
         packagePreference: PackagePreference?,
     ): Boolean {
         // no channels (aka stable version) is always allowed

From 41653a80a0739ad610ba2d1cb5eb6803749478f3 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 9 Dec 2025 10:21:51 -0300
Subject: [PATCH 003/180] [db] add a way to get apps for a list of package
 names

this will be used to get the apps most downloaded
---
 .../main/java/org/fdroid/database/AppDao.kt   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/libs/database/src/main/java/org/fdroid/database/AppDao.kt b/libs/database/src/main/java/org/fdroid/database/AppDao.kt
index 125e72bcb..8dc055689 100644
--- a/libs/database/src/main/java/org/fdroid/database/AppDao.kt
+++ b/libs/database/src/main/java/org/fdroid/database/AppDao.kt
@@ -134,6 +134,11 @@ public interface AppDao {
      */
     public suspend fun getAppsByRepository(repoId: Long): List<AppOverviewItem>
 
+    /**
+     * Returns apps for the given [packageNames].
+     */
+    public suspend fun getApps(packageNames: List<String>): List<AppOverviewItem>
+
     /**
      * Same as [getNewApps], but returns an observable [Flow].
      */
@@ -144,6 +149,11 @@ public interface AppDao {
      */
     public fun getRecentlyUpdatedAppsFlow(limit: Int = 200): Flow<List<AppOverviewItem>>
 
+    /**
+     * Returns apps for the given [packageNames].
+     */
+    public fun getAppsFlow(packageNames: List<String>): Flow<List<AppOverviewItem>>
+
     /**
      * Returns a list of all [AppListItem] sorted by the given [sortOrder],
      * or a subset of [AppListItem]s filtered by the given [searchQuery] if it is non-null.
@@ -520,6 +530,20 @@ internal interface AppDaoInt : AppDao {
         WHERE repoId = :repoId""")
     override suspend fun getAppsByRepository(repoId: Long): List<AppOverviewItem>
 
+    override suspend fun getApps(packageNames: List<String>): List<AppOverviewItem> {
+        val placeholders = buildString {
+            repeat(packageNames.size) { append("?,") }
+        }.trimEnd(',')
+        val query = getAppsQuery(
+            "packageName IN ($placeholders) ORDER BY app.lastUpdated DESC"
+        ) { statement ->
+            packageNames.forEachIndexed { i, packageName ->
+                statement.bindText(i + 1, packageName)
+            }
+        }
+        return getApps(query)
+    }
+
     override fun getNewAppsFlow(maxAgeInDays: Long): Flow<List<AppOverviewItem>> {
         val query =
             getAppsQuery(
@@ -542,6 +566,20 @@ internal interface AppDaoInt : AppDao {
         return getAppsFlow(query)
     }
 
+    override fun getAppsFlow(packageNames: List<String>): Flow<List<AppOverviewItem>> {
+        val placeholders = buildString {
+            repeat(packageNames.size) { append("?,") }
+        }.trimEnd(',')
+        val query = getAppsQuery(
+            "packageName IN ($placeholders) ORDER BY app.lastUpdated DESC"
+        ) { statement ->
+            packageNames.forEachIndexed { i, packageName ->
+                statement.bindText(i + 1, packageName)
+            }
+        }
+        return getAppsFlow(query)
+    }
+
     private fun getAppsQuery(
         whereQuery: String,
         onBindStatement: (SQLiteStatement) -> Unit,

From 29e2d15386ece40002f499d23df6ea5b8df5bad4 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 10 Dec 2025 11:14:19 -0300
Subject: [PATCH 004/180] [db] Update repositoriesState atomically in
 RepoManager

Otherwise, concurrency issues may cause a broken state such as the same repo being in the list two times.
---
 .../src/main/java/org/fdroid/index/RepoManager.kt    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/database/src/main/java/org/fdroid/index/RepoManager.kt b/libs/database/src/main/java/org/fdroid/index/RepoManager.kt
index 273324e98..5a8cdf2da 100644
--- a/libs/database/src/main/java/org/fdroid/index/RepoManager.kt
+++ b/libs/database/src/main/java/org/fdroid/index/RepoManager.kt
@@ -87,13 +87,13 @@ public class RepoManager @JvmOverloads constructor(
     init {
         // we need to load the repositories first off the UiThread, so it doesn't deadlock
         GlobalScope.launch(coroutineContext) {
-            _repositoriesState.value = repositoryDao.getRepositories()
+            _repositoriesState.update { repositoryDao.getRepositories() }
             repoCountDownLatch.countDown()
             withContext(Dispatchers.Main) {
                 // keep observing the repos from the DB
                 // and update internal cache when changes happen
                 db.getRepositoryDao().getLiveRepositories().observeForever { repositories ->
-                    _repositoriesState.value = repositories
+                    _repositoriesState.update { repositories }
                 }
             }
         }
@@ -149,7 +149,7 @@ public class RepoManager @JvmOverloads constructor(
         // while this will get updated automatically, getting the update may be slow,
         // so to speed up the UI, we emit the state change right away (deletion is unlikely to fail)
         _repositoriesState.update {
-            _repositoriesState.value.filter { repo ->
+            it.filter { repo ->
                 // keep only repos that are not the deleted one
                 repo.repoId != repoId
             }
@@ -186,8 +186,10 @@ public class RepoManager @JvmOverloads constructor(
             val addedRepo = repoAdder.addFetchedRepository()
             // if repo was added, update state right away, so it becomes available asap
             if (addedRepo != null) withContext(Dispatchers.Main) {
-                _repositoriesState.value = _repositoriesState.value.toMutableList().apply {
-                    add(addedRepo)
+                _repositoriesState.update {
+                    it.toMutableList().apply {
+                        add(addedRepo)
+                    }
                 }
             }
         }

From 15ad121fc8e5b07cde8fd7d3bbce7717a10b48d9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 13 Feb 2025 11:52:30 -0300
Subject: [PATCH 005/180] next

---
 basic/.gitignore                              |   1 +
 basic/build.gradle.kts                        |  66 ++++++
 basic/proguard-rules.pro                      |  21 ++
 basic/src/main/AndroidManifest.xml            |  23 ++
 .../java/org/fdroid/basic/MainActivity.kt     |  17 ++
 .../fdroid/basic/ui/icons/PackageVariant.kt   |  94 ++++++++
 .../java/org/fdroid/basic/ui/main/Apps.kt     | 134 +++++++++++
 .../java/org/fdroid/basic/ui/main/Main.kt     |  97 ++++++++
 .../fdroid/basic/ui/main/MainOverflowMenu.kt  |  51 +++++
 .../fdroid/basic/ui/main/apps/AppDetails.kt   |  55 +++++
 .../org/fdroid/basic/ui/main/apps/AppList.kt  | 111 +++++++++
 .../basic/ui/main/apps/AppNavigationItem.kt   |  11 +
 .../basic/ui/main/apps/AppSearchInputField.kt |  90 ++++++++
 .../fdroid/basic/ui/main/apps/AppsFilter.kt   | 212 ++++++++++++++++++
 .../fdroid/basic/ui/main/apps/AppsSearch.kt   |  89 ++++++++
 .../java/org/fdroid/basic/ui/theme/Color.kt   |   1 +
 .../java/org/fdroid/basic/ui/theme/Theme.kt   |   1 +
 .../src/main/java/org/fdroid/fdroid/Compat.kt |   9 +
 .../drawable-v24/ic_launcher_foreground.xml   |  30 +++
 .../res/drawable/ic_launcher_background.xml   | 170 ++++++++++++++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   6 +
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   6 +
 basic/src/main/res/values/colors.xml          |  10 +
 basic/src/main/res/values/strings-next.xml    |   6 +
 basic/src/main/res/values/strings.xml         |   1 +
 basic/src/main/res/values/themes.xml          |   5 +
 gradle/libs.versions.toml                     |  13 +-
 settings.gradle                               |   2 +
 28 files changed, 1331 insertions(+), 1 deletion(-)
 create mode 100644 basic/.gitignore
 create mode 100644 basic/build.gradle.kts
 create mode 100644 basic/proguard-rules.pro
 create mode 100644 basic/src/main/AndroidManifest.xml
 create mode 100644 basic/src/main/java/org/fdroid/basic/MainActivity.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/icons/PackageVariant.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
 create mode 120000 basic/src/main/java/org/fdroid/basic/ui/theme/Color.kt
 create mode 120000 basic/src/main/java/org/fdroid/basic/ui/theme/Theme.kt
 create mode 100644 basic/src/main/java/org/fdroid/fdroid/Compat.kt
 create mode 100644 basic/src/main/res/drawable-v24/ic_launcher_foreground.xml
 create mode 100644 basic/src/main/res/drawable/ic_launcher_background.xml
 create mode 100644 basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 basic/src/main/res/values/colors.xml
 create mode 100644 basic/src/main/res/values/strings-next.xml
 create mode 120000 basic/src/main/res/values/strings.xml
 create mode 100644 basic/src/main/res/values/themes.xml

diff --git a/basic/.gitignore b/basic/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/basic/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
new file mode 100644
index 000000000..0df56bbb3
--- /dev/null
+++ b/basic/build.gradle.kts
@@ -0,0 +1,66 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.jetbrains.kotlin.parcelize)
+    alias(libs.plugins.jetbrains.compose.compiler)
+}
+
+android {
+    namespace = "org.fdroid.basic"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        applicationId = "org.fdroid.next"
+        minSdk = 23
+        targetSdk = 36
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+    buildFeatures {
+        compose = true
+    }
+}
+
+dependencies {
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.compose.material.icons.extended)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material3.adaptive)
+    implementation(libs.androidx.compose.material3.adaptive.layout)
+    implementation(libs.androidx.compose.material3.adaptive.navigation)
+    implementation(libs.androidx.compose.material3.adaptive.navigation.suite.android)
+
+    testImplementation(libs.junit)
+
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+}
diff --git a/basic/proguard-rules.pro b/basic/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/basic/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/basic/src/main/AndroidManifest.xml b/basic/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..dde1136bb
--- /dev/null
+++ b/basic/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Fdroidclient">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.Fdroidclient">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/basic/src/main/java/org/fdroid/basic/MainActivity.kt b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
new file mode 100644
index 000000000..97e4d9c75
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
@@ -0,0 +1,17 @@
+package org.fdroid.basic
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import org.fdroid.basic.ui.main.Main
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContent {
+            Main()
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/icons/PackageVariant.kt b/basic/src/main/java/org/fdroid/basic/ui/icons/PackageVariant.kt
new file mode 100644
index 000000000..d05c34437
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/icons/PackageVariant.kt
@@ -0,0 +1,94 @@
+package org.fdroid.basic.ui.icons
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
+import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.ImageVector.Builder
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+val PackageVariant: ImageVector
+    get() {
+        if (_PackageVariant != null) {
+            return _PackageVariant!!
+        }
+        _PackageVariant = Builder(
+            name = "packageVariant", defaultWidth = 24.0.dp, defaultHeight
+            = 24.0.dp, viewportWidth = 24.0f, viewportHeight = 24.0f
+        ).apply {
+            path(
+                fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
+                strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
+                pathFillType = NonZero
+            ) {
+                moveTo(2.0f, 10.96f)
+                curveTo(1.5f, 10.68f, 1.35f, 10.07f, 1.63f, 9.59f)
+                lineTo(3.13f, 7.0f)
+                curveTo(3.24f, 6.8f, 3.41f, 6.66f, 3.6f, 6.58f)
+                lineTo(11.43f, 2.18f)
+                curveTo(11.59f, 2.06f, 11.79f, 2.0f, 12.0f, 2.0f)
+                curveTo(12.21f, 2.0f, 12.41f, 2.06f, 12.57f, 2.18f)
+                lineTo(20.47f, 6.62f)
+                curveTo(20.66f, 6.72f, 20.82f, 6.88f, 20.91f, 7.08f)
+                lineTo(22.36f, 9.6f)
+                curveTo(22.64f, 10.08f, 22.47f, 10.69f, 22.0f, 10.96f)
+                lineTo(21.0f, 11.54f)
+                verticalLineTo(16.5f)
+                curveTo(21.0f, 16.88f, 20.79f, 17.21f, 20.47f, 17.38f)
+                lineTo(12.57f, 21.82f)
+                curveTo(12.41f, 21.94f, 12.21f, 22.0f, 12.0f, 22.0f)
+                curveTo(11.79f, 22.0f, 11.59f, 21.94f, 11.43f, 21.82f)
+                lineTo(3.53f, 17.38f)
+                curveTo(3.21f, 17.21f, 3.0f, 16.88f, 3.0f, 16.5f)
+                verticalLineTo(10.96f)
+                curveTo(2.7f, 11.13f, 2.32f, 11.14f, 2.0f, 10.96f)
+                moveTo(12.0f, 4.15f)
+                verticalLineTo(4.15f)
+                lineTo(12.0f, 10.85f)
+                verticalLineTo(10.85f)
+                lineTo(17.96f, 7.5f)
+                lineTo(12.0f, 4.15f)
+                moveTo(5.0f, 15.91f)
+                lineTo(11.0f, 19.29f)
+                verticalLineTo(12.58f)
+                lineTo(5.0f, 9.21f)
+                verticalLineTo(15.91f)
+                moveTo(19.0f, 15.91f)
+                verticalLineTo(12.69f)
+                lineTo(14.0f, 15.59f)
+                curveTo(13.67f, 15.77f, 13.3f, 15.76f, 13.0f, 15.6f)
+                verticalLineTo(19.29f)
+                lineTo(19.0f, 15.91f)
+                moveTo(13.85f, 13.36f)
+                lineTo(20.13f, 9.73f)
+                lineTo(19.55f, 8.72f)
+                lineTo(13.27f, 12.35f)
+                lineTo(13.85f, 13.36f)
+                close()
+            }
+        }
+            .build()
+        return _PackageVariant!!
+    }
+
+private var _PackageVariant: ImageVector? = null
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        Box(modifier = Modifier.padding(12.dp)) {
+            Image(imageVector = PackageVariant, contentDescription = "")
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
new file mode 100644
index 000000000..730710ccb
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
@@ -0,0 +1,134 @@
+package org.fdroid.basic.ui.main
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.layout.AnimatedPane
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Detail
+import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
+import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewScreenSizes
+import kotlinx.coroutines.launch
+import org.fdroid.basic.R
+import org.fdroid.basic.ui.main.apps.AppDetails
+import org.fdroid.basic.ui.main.apps.AppList
+import org.fdroid.basic.ui.main.apps.AppNavigationItem
+import org.fdroid.basic.ui.main.apps.AppsFilter
+import org.fdroid.basic.ui.main.apps.AppsSearch
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+enum class Sort {
+    NAME,
+    LATEST,
+}
+
+const val NUM_ITEMS = 42
+
+@Composable
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+fun Apps(modifier: Modifier) {
+    val navigator = rememberListDetailPaneScaffoldNavigator<AppNavigationItem>()
+    val scope = rememberCoroutineScope()
+    BackHandler(enabled = navigator.canNavigateBack()) {
+        scope.launch {
+            navigator.navigateBack()
+        }
+    }
+    val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
+    ListDetailPaneScaffold(
+        directive = navigator.scaffoldDirective,
+        value = navigator.scaffoldValue,
+        listPane = {
+            AnimatedPane {
+                Column(
+                    modifier.fillMaxSize()
+                ) {
+                    var filterExpanded by rememberSaveable { mutableStateOf(true) }
+                    var sortBy by rememberSaveable { mutableStateOf(Sort.NAME) }
+                    var onlyInstalledApps by rememberSaveable { mutableStateOf(false) }
+                    val addedCategories = remember { mutableStateListOf<String>() }
+                    val addedRepos = remember { mutableStateListOf<String>() }
+                    val categories = listOf(
+                        stringResource(R.string.category_Time),
+                        stringResource(R.string.category_Games),
+                        stringResource(R.string.category_Money),
+                        stringResource(R.string.category_Reading),
+                        stringResource(R.string.category_Theming),
+                        stringResource(R.string.category_Connectivity),
+                        stringResource(R.string.category_Internet),
+                        stringResource(R.string.category_Navigation),
+                        stringResource(R.string.category_Multimedia),
+                        stringResource(R.string.category_Phone_SMS),
+                        stringResource(R.string.category_Science_Education),
+                        stringResource(R.string.category_Security),
+                        stringResource(R.string.category_Sports_Health),
+                        stringResource(R.string.category_System),
+                        stringResource(R.string.category_Writing),
+                    )
+                    AppsSearch(
+                        onlyInstalledApps = onlyInstalledApps,
+                        addedCategories = addedCategories,
+                        addedRepos = addedRepos,
+                        toggleFilter = { filterExpanded = !filterExpanded },
+                    )
+                    AppsFilter(
+                        filterExpanded = filterExpanded,
+                        sortBy = sortBy,
+                        onlyInstalledApps = onlyInstalledApps,
+                        addedCategories = addedCategories,
+                        addedRepos = addedRepos,
+                        categories = categories,
+                        onSortByChanged = { sortBy = it },
+                        toggleOnlyInstalledApps = {
+                            onlyInstalledApps = !onlyInstalledApps
+                        },
+                    )
+                    AppList(
+                        onlyInstalledApps = onlyInstalledApps,
+                        sortBy = sortBy,
+                        addedCategories = addedCategories,
+                        categories = categories,
+                        currentItem = if (isDetailVisible) {
+                            navigator.currentDestination?.contentKey
+                        } else {
+                            null
+                        },
+                    ) {
+                        scope.launch { navigator.navigateTo(Detail, it) }
+                    }
+                }
+            }
+        },
+        detailPane = {
+            AnimatedPane {
+                navigator.currentDestination?.contentKey?.let {
+                    AppDetails(
+                        appItem = it,
+                    )
+                }
+            }
+        },
+    )
+}
+
+@Preview
+@PreviewScreenSizes
+@Composable
+fun AppsPreview() {
+    FDroidContent {
+        Apps(Modifier)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
new file mode 100644
index 000000000..4f5673b99
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -0,0 +1,97 @@
+package org.fdroid.basic.ui.main
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Apps
+import androidx.compose.material.icons.filled.Update
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewScreenSizes
+import androidx.window.core.layout.WindowWidthSizeClass
+import org.fdroid.basic.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+enum class AppDestinations(
+    @StringRes val label: Int,
+    val icon: ImageVector,
+) {
+    APPS(R.string.apps, Icons.Filled.Apps),
+    UPDATES(R.string.updates, Icons.Filled.Update),
+}
+
+@Composable
+fun Main() {
+    var currentDestination by rememberSaveable { mutableStateOf(AppDestinations.APPS) }
+    FDroidContent {
+        val adaptiveInfo = currentWindowAdaptiveInfo()
+        val customNavSuiteType = with(adaptiveInfo) {
+            when (windowSizeClass.windowWidthSizeClass) {
+                WindowWidthSizeClass.COMPACT -> NavigationSuiteType.NavigationBar
+                else -> NavigationSuiteType.NavigationRail
+            }
+        }
+        NavigationSuiteScaffold(
+            modifier = Modifier.fillMaxSize(),
+            layoutType = customNavSuiteType,
+            navigationSuiteColors = NavigationSuiteDefaults.colors(
+                navigationBarContainerColor = Color.Transparent,
+            ),
+            navigationSuiteItems = {
+                AppDestinations.entries.forEach { dest ->
+                    item(
+                        icon = {
+                            BadgedBox(
+                                badge = {
+                                    if (dest == AppDestinations.UPDATES) {
+                                        Badge {
+                                            Text(text = "13")
+                                        }
+                                    }
+                                }
+                            ) {
+                                Icon(
+                                    dest.icon,
+                                    contentDescription = stringResource(dest.label)
+                                )
+                            }
+                        },
+                        label = { Text(stringResource(dest.label)) },
+                        selected = dest == currentDestination,
+                        onClick = { currentDestination = dest }
+                    )
+                }
+            }
+        ) {
+            if (currentDestination == AppDestinations.APPS) Apps(Modifier)
+            else Text(
+                text = "TODO",
+                modifier = Modifier.safeDrawingPadding(),
+            )
+        }
+    }
+}
+
+@Preview
+@PreviewScreenSizes
+@Composable
+fun MainPreview() {
+    Main()
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt b/basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt
new file mode 100644
index 000000000..ad24ba461
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt
@@ -0,0 +1,51 @@
+package org.fdroid.basic.ui.main
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import org.fdroid.basic.R
+import org.fdroid.basic.ui.icons.PackageVariant
+
+@Composable
+fun MainOverFlowMenu(menuExpanded: Boolean, onDismissRequest: () -> Unit) {
+    DropdownMenu(
+        expanded = menuExpanded,
+        onDismissRequest = onDismissRequest) {
+        DropdownMenuItem(
+            text = { Text(stringResource(R.string.app_details_repositories)) },
+            onClick = { },
+            leadingIcon = {
+                Icon(
+                    PackageVariant,
+                    contentDescription = null
+                )
+            }
+        )
+        DropdownMenuItem(
+            text = { Text(stringResource(R.string.menu_settings)) },
+            onClick = { },
+            leadingIcon = {
+                Icon(
+                    Icons.Filled.Settings,
+                    contentDescription = null
+                )
+            }
+        )
+        DropdownMenuItem(
+            text = { Text("About") },
+            onClick = { },
+            leadingIcon = {
+                Icon(
+                    Icons.Filled.Info,
+                    contentDescription = null
+                )
+            }
+        )
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt
new file mode 100644
index 000000000..1671dc9ac
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt
@@ -0,0 +1,55 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun AppDetails(
+    appItem: AppNavigationItem,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier
+            .safeDrawingPadding()
+            .padding(16.dp),
+        horizontalArrangement = spacedBy(8.dp),
+    ) {
+        Icon(
+            Icons.Filled.Android,
+            tint = MaterialTheme.colorScheme.secondary,
+            contentDescription = null,
+            modifier = Modifier.size(48.dp),
+        )
+        Column {
+            Text(appItem.name, style = MaterialTheme.typography.headlineMedium)
+            Text(appItem.summary, style = MaterialTheme.typography.bodyMedium)
+        }
+    }
+}
+
+@Preview
+@Composable
+fun AppDetailsPreview() {
+    FDroidContent {
+        val item = AppNavigationItem(
+            packageName = "foo",
+            name = "bar",
+            summary = "This is a nice app!",
+        )
+        AppDetails(item)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
new file mode 100644
index 000000000..3d74d8ab4
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
@@ -0,0 +1,111 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.animation.ExperimentalSharedTransitionApi
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material.icons.filled.NewReleases
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.ui.main.NUM_ITEMS
+import org.fdroid.basic.ui.main.Sort
+
+@Composable
+fun AppList(
+    onlyInstalledApps: Boolean,
+    sortBy: Sort,
+    addedCategories: List<String>,
+    categories: List<String>,
+    currentItem: AppNavigationItem?,
+    onItemClick: (AppNavigationItem) -> Unit,
+) {
+    LazyColumn(
+        contentPadding = PaddingValues(vertical = 8.dp),
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+        modifier = Modifier.then(
+            if (currentItem == null) Modifier
+            else Modifier.selectableGroup()
+        ),
+    ) {
+        repeat(NUM_ITEMS) { idx ->
+            if (onlyInstalledApps && idx % 2 > 0) return@repeat
+            val i = if (sortBy == Sort.NAME) idx else NUM_ITEMS - idx
+            val category = categories.getOrElse(i) { categories.random() }
+            if (addedCategories.isNotEmpty() && category !in addedCategories) return@repeat
+            item {
+                val navItem = AppNavigationItem(
+                    packageName = "$i",
+                    name = "App $i",
+                    summary = "Summary of the app • $category",
+                )
+                val isSelected = currentItem?.packageName == navItem.packageName
+                val interactionModifier = if (currentItem == null) {
+                    Modifier.clickable(
+                        onClick = { onItemClick(navItem) }
+                    )
+                } else {
+                    Modifier.selectable(
+                        selected = isSelected,
+                        onClick = { onItemClick(navItem) }
+                    )
+                }
+                ListItem(
+                    headlineContent = { Text(navItem.name) },
+                    supportingContent = { Text(navItem.summary) },
+                    leadingContent = {
+                        BadgedBox(badge = {
+                            if (i <= 3) Icon(
+                                imageVector = Icons.Filled.NewReleases,
+                                tint = MaterialTheme.colorScheme.primary,
+                                contentDescription = null, modifier = Modifier.size(24.dp),
+                            )
+                        }) {
+                            Icon(
+                                Icons.Filled.Android,
+                                tint = MaterialTheme.colorScheme.secondary,
+                                contentDescription = null,
+                            )
+                        }
+                    },
+                    colors = ListItemDefaults.colors(
+                        containerColor = if (isSelected) {
+                            MaterialTheme.colorScheme.surfaceVariant
+                        } else {
+                            Color.Transparent
+                        }
+                    ),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(
+                            horizontal = 8.dp,
+                            vertical = 4.dp
+                        )
+                        .then(interactionModifier)
+                )
+            }
+        }
+        item {
+            Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt
new file mode 100644
index 000000000..7a7e9f0f9
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt
@@ -0,0 +1,11 @@
+package org.fdroid.basic.ui.main.apps
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+class AppNavigationItem(
+    val packageName: String,
+    val name: String,
+    val summary: String,
+): Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
new file mode 100644
index 000000000..3cd638025
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
@@ -0,0 +1,90 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.text.input.TextFieldState
+import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material.icons.filled.FilterList
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SearchBarDefaults
+import androidx.compose.material3.SearchBarState
+import androidx.compose.material3.SearchBarValue
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import kotlinx.coroutines.launch
+import org.fdroid.basic.ui.main.MainOverFlowMenu
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun AppSearchInputField(
+    searchBarState: SearchBarState,
+    textFieldState: TextFieldState,
+    toggleFilter: () -> Unit,
+    showFilterBadge: Boolean
+) {
+    val scope = rememberCoroutineScope()
+    var menuExpanded by remember { mutableStateOf(false) }
+    SearchBarDefaults.InputField(
+        modifier = Modifier,
+        searchBarState = searchBarState,
+        textFieldState = textFieldState,
+        onSearch = {
+            scope.launch { searchBarState.animateToCollapsed() }
+        },
+        placeholder = { Text("Search...") },
+        leadingIcon = {
+            if (searchBarState.currentValue == SearchBarValue.Expanded) {
+                IconButton(
+                    onClick = { scope.launch { searchBarState.animateToCollapsed() } }
+                ) {
+                    Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
+                }
+            } else {
+                Icon(Icons.Default.Search, contentDescription = null)
+            }
+        },
+        trailingIcon = {
+            if (searchBarState.currentValue == SearchBarValue.Expanded) {
+                IconButton(onClick = { textFieldState.setTextAndPlaceCursorAtEnd("") }) {
+                    Icon(
+                        Icons.Filled.Clear,
+                        contentDescription = null,
+                    )
+                }
+            } else Row {
+                IconButton(onClick = toggleFilter) {
+                    BadgedBox(badge = {
+                        if (showFilterBadge) Badge(containerColor = MaterialTheme.colorScheme.secondary)
+                    }) {
+                        Icon(
+                            Icons.Filled.FilterList,
+                            contentDescription = null,
+                        )
+                    }
+                }
+                IconButton(onClick = { menuExpanded = true }) {
+                    Icon(
+                        Icons.Default.MoreVert,
+                        contentDescription = null,
+                    )
+                }
+                MainOverFlowMenu(menuExpanded) { menuExpanded = false }
+            }
+        }
+    )
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
new file mode 100644
index 000000000..267c8c29a
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
@@ -0,0 +1,212 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AccessTime
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material.icons.filled.Done
+import androidx.compose.material.icons.filled.SortByAlpha
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.FilterChipDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.R
+import org.fdroid.basic.ui.main.Sort
+
+@Composable
+fun ColumnScope.AppsFilter(
+    filterExpanded: Boolean,
+    sortBy: Sort,
+    onlyInstalledApps: Boolean,
+    addedCategories: MutableList<String>,
+    addedRepos: MutableList<String>,
+    categories: List<String>,
+    onSortByChanged: (Sort) -> Unit,
+    toggleOnlyInstalledApps: () -> Unit,
+) {
+    AnimatedVisibility(filterExpanded) {
+        FlowRow(
+            modifier = Modifier
+                .padding(horizontal = 16.dp),
+            horizontalArrangement = spacedBy(16.dp),
+        ) {
+            var sortByMenuExpanded by remember { mutableStateOf(false) }
+            var repoMenuExpanded by remember { mutableStateOf(false) }
+            var categoryMenuExpanded by remember { mutableStateOf(false) }
+            addedCategories.forEach { category ->
+                FilterChip(
+                    selected = true,
+                    trailingIcon = {
+                        Icon(
+                            Icons.Filled.Clear,
+                            null,
+                            modifier = Modifier.size(FilterChipDefaults.IconSize)
+                        )
+                    },
+                    label = {
+                        Text(category)
+                    },
+                    onClick = {
+                        addedCategories.remove(category)
+                    }
+                )
+            }
+            addedRepos.forEach { repo ->
+                FilterChip(
+                    selected = true,
+                    trailingIcon = {
+                        Icon(
+                            Icons.Filled.Clear,
+                            null,
+                            modifier = Modifier.size(FilterChipDefaults.IconSize)
+                        )
+                    },
+                    label = {
+                        Text(repo)
+                    },
+                    onClick = {
+                        addedRepos.remove(repo)
+                    }
+                )
+            }
+            FilterChip(
+                selected = false,
+                leadingIcon = {
+                    val vector = when (sortBy) {
+                        Sort.NAME -> Icons.Filled.SortByAlpha
+                        Sort.LATEST -> Icons.Filled.AccessTime
+                    }
+                    Icon(vector, null, modifier = Modifier.size(FilterChipDefaults.IconSize))
+                },
+                trailingIcon = {
+                    Icon(Icons.Filled.ArrowDropDown, null)
+                },
+                label = {
+                    val s = when (sortBy) {
+                        Sort.NAME -> "Sort by name"
+                        Sort.LATEST -> "Sort by latest"
+                    }
+                    Text(s)
+                    DropdownMenu(
+                        expanded = sortByMenuExpanded,
+                        onDismissRequest = { sortByMenuExpanded = false },
+                    ) {
+                        DropdownMenuItem(
+                            text = { Text("Sort by name") },
+                            leadingIcon = {
+                                Icon(Icons.Filled.SortByAlpha, null)
+                            },
+                            onClick = {
+                                onSortByChanged(Sort.NAME)
+                                sortByMenuExpanded = false
+                            },
+                        )
+                        DropdownMenuItem(
+                            text = { Text("Sort by latest") },
+                            leadingIcon = {
+                                Icon(Icons.Filled.AccessTime, null)
+                            },
+                            onClick = {
+                                onSortByChanged(Sort.LATEST)
+                                sortByMenuExpanded = false
+                            },
+                        )
+                    }
+                },
+                onClick = { sortByMenuExpanded = !sortByMenuExpanded },
+            )
+            FilterChip(
+                selected = onlyInstalledApps,
+                leadingIcon = if (onlyInstalledApps) {
+                    {
+                        Icon(
+                            imageVector = Icons.Filled.Done,
+                            contentDescription = null,
+                            modifier = Modifier.size(FilterChipDefaults.IconSize),
+                        )
+                    }
+                } else null,
+                label = { Text(stringResource(R.string.app_installed)) },
+                onClick = toggleOnlyInstalledApps,
+            )
+            FilterChip(
+                selected = false,
+                leadingIcon = {
+                    Icon(
+                        Icons.Filled.Add,
+                        null,
+                        modifier = Modifier.size(FilterChipDefaults.IconSize)
+                    )
+                },
+                label = {
+                    Text("Category")
+                    DropdownMenu(
+                        expanded = categoryMenuExpanded,
+                        onDismissRequest = { categoryMenuExpanded = false },
+                    ) {
+                        categories.forEach { category ->
+                            DropdownMenuItem(
+                                text = { Text(category) },
+                                onClick = {
+                                    addedCategories.add(category)
+                                    categoryMenuExpanded = false
+                                },
+                            )
+                        }
+                    }
+                },
+                onClick = { categoryMenuExpanded = !categoryMenuExpanded },
+            )
+            FilterChip(
+                selected = false,
+                leadingIcon = {
+                    Icon(
+                        Icons.Filled.Add,
+                        null,
+                        modifier = Modifier.size(FilterChipDefaults.IconSize)
+                    )
+                },
+                label = {
+                    Text("Repository")
+                    DropdownMenu(
+                        expanded = repoMenuExpanded,
+                        onDismissRequest = { repoMenuExpanded = false },
+                    ) {
+                        val repos = listOf(
+                            "F-Droid",
+                            "Guardian Project",
+                            "IzzyOnDroid",
+                        )
+                        repos.forEach { category ->
+                            DropdownMenuItem(
+                                text = { Text(category) },
+                                onClick = {
+                                    addedRepos.add(category)
+                                    repoMenuExpanded = false
+                                },
+                            )
+                        }
+                    }
+                },
+                onClick = { repoMenuExpanded = !repoMenuExpanded },
+            )
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
new file mode 100644
index 000000000..78cfdeaff
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
@@ -0,0 +1,89 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Star
+import androidx.compose.material3.ExpandedFullScreenSearchBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.SearchBarDefaults
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopSearchBar
+import androidx.compose.material3.rememberSearchBarState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun AppsSearch(
+    onlyInstalledApps: Boolean,
+    addedCategories: List<String>,
+    addedRepos: List<String>,
+    toggleFilter: () -> Unit,
+) {
+    val textFieldState = rememberTextFieldState()
+    val scrollBehavior = SearchBarDefaults.enterAlwaysSearchBarScrollBehavior()
+    val searchBarState = rememberSearchBarState()
+    val scope = rememberCoroutineScope()
+    val inputField = @Composable {
+        AppSearchInputField(
+            searchBarState = searchBarState,
+            textFieldState = textFieldState,
+            toggleFilter = toggleFilter,
+            showFilterBadge = addedRepos.isNotEmpty() || addedCategories.isNotEmpty() ||
+                onlyInstalledApps,
+        )
+    }
+    TopSearchBar(
+        modifier = Modifier,
+        state = searchBarState,
+        scrollBehavior = scrollBehavior,
+        windowInsets = WindowInsets.systemBars,
+        inputField = inputField,
+    )
+    ExpandedFullScreenSearchBar(
+        state = searchBarState,
+        inputField = inputField,
+    ) {
+        Column(Modifier.verticalScroll(rememberScrollState())) {
+            repeat(4) { idx ->
+                val resultText = "Suggestion $idx"
+                ListItem(headlineContent = { Text(resultText) },
+                    supportingContent = { Text("Additional info") },
+                    leadingContent = {
+                        Icon(
+                            Icons.Filled.Star,
+                            contentDescription = null
+                        )
+                    },
+                    colors = ListItemDefaults.colors(containerColor = Color.Transparent),
+                    modifier = Modifier
+                        .clickable {
+                            textFieldState.setTextAndPlaceCursorAtEnd(resultText)
+                            scope.launch { searchBarState.animateToCollapsed() }
+                        }
+                        .fillMaxWidth()
+                        .padding(
+                            horizontal = 16.dp,
+                            vertical = 4.dp
+                        )
+                )
+            }
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/theme/Color.kt b/basic/src/main/java/org/fdroid/basic/ui/theme/Color.kt
new file mode 120000
index 000000000..9d0fa521d
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/theme/Color.kt
@@ -0,0 +1 @@
+../../../../../../../../../app/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt
\ No newline at end of file
diff --git a/basic/src/main/java/org/fdroid/basic/ui/theme/Theme.kt b/basic/src/main/java/org/fdroid/basic/ui/theme/Theme.kt
new file mode 120000
index 000000000..895916611
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/theme/Theme.kt
@@ -0,0 +1 @@
+../../../../../../../../../app/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt
\ No newline at end of file
diff --git a/basic/src/main/java/org/fdroid/fdroid/Compat.kt b/basic/src/main/java/org/fdroid/fdroid/Compat.kt
new file mode 100644
index 000000000..dc4e8d31d
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/fdroid/Compat.kt
@@ -0,0 +1,9 @@
+package org.fdroid.fdroid
+
+object Preferences {
+
+    fun get(): Preferences = Preferences
+
+    val isPureBlack: Boolean = true
+
+}
diff --git a/basic/src/main/res/drawable-v24/ic_launcher_foreground.xml b/basic/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..7706ab9e6
--- /dev/null
+++ b/basic/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/basic/src/main/res/drawable/ic_launcher_background.xml b/basic/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..07d5da9cb
--- /dev/null
+++ b/basic/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..b3e26b4c6
--- /dev/null
+++ b/basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..b3e26b4c6
--- /dev/null
+++ b/basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/basic/src/main/res/values/colors.xml b/basic/src/main/res/values/colors.xml
new file mode 100644
index 000000000..ca1931bca
--- /dev/null
+++ b/basic/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
diff --git a/basic/src/main/res/values/strings-next.xml b/basic/src/main/res/values/strings-next.xml
new file mode 100644
index 000000000..c5faad631
--- /dev/null
+++ b/basic/src/main/res/values/strings-next.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">F-Droid Next</string>
+
+</resources>
diff --git a/basic/src/main/res/values/strings.xml b/basic/src/main/res/values/strings.xml
new file mode 120000
index 000000000..83c4d8695
--- /dev/null
+++ b/basic/src/main/res/values/strings.xml
@@ -0,0 +1 @@
+../../../../../app/src/main/res/values/strings.xml
\ No newline at end of file
diff --git a/basic/src/main/res/values/themes.xml b/basic/src/main/res/values/themes.xml
new file mode 100644
index 000000000..859ec354d
--- /dev/null
+++ b/basic/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Fdroidclient" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d2926e2f..1c4fa4cea 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -82,6 +82,7 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
 
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxCoreKtx" }
 androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidxLifecycleLivedataKtx" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycleLivedataKtx" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidxConstraintlayout" }
 androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "androidxSwipeRefreshLayout" }
 androidx-gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = "androidxGridlayout" }
@@ -96,12 +97,19 @@ androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 
-androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom-alpha", version.ref = "androidxComposeBom" } # TODO remove -alpha
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose" }
 androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
+androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" }
+androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation" }
+androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout" }
+androidx-compose-material3-adaptive-navigation-suite-android = { module = "androidx.compose.material3:material3-adaptive-navigation-suite-android" }
+
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanistDrawablepainter" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivityCompose" }
 
@@ -162,6 +170,8 @@ turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
 json = { module = "org.json:json", version.ref = "json" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
@@ -170,6 +180,7 @@ android-ksp = { id = "com.google.devtools.ksp", version.ref = "androidKspPlugin"
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 jetbrains-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 jetbrains-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+jetbrains-kotlin-parcelize = { id = "kotlin-parcelize" }
 jetbrains-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 jetbrains-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
diff --git a/settings.gradle b/settings.gradle
index 23b740ff3..b728621ec 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,3 +12,5 @@ include ':libs:sharedTest'
 include ':libs:download'
 include ':libs:index'
 include ':libs:database'
+
+include ':basic'

From 632243def1bfd34f92cfbd606ecc1ed706455b91 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 22 Apr 2025 16:08:33 -0300
Subject: [PATCH 006/180] improve search and filtering code

---
 basic/build.gradle.kts                        |  2 +
 .../java/org/fdroid/basic/MainActivity.kt     | 15 ++-
 .../java/org/fdroid/basic/MainViewModel.kt    | 96 +++++++++++++++++++
 .../java/org/fdroid/basic/ui/main/Apps.kt     | 84 ++++++++--------
 .../java/org/fdroid/basic/ui/main/Main.kt     | 33 ++++++-
 .../fdroid/basic/ui/main/apps/AppDetails.kt   |  1 +
 .../org/fdroid/basic/ui/main/apps/AppItem.kt  | 79 +++++++++++++++
 .../org/fdroid/basic/ui/main/apps/AppList.kt  | 87 ++++-------------
 .../basic/ui/main/apps/AppNavigationItem.kt   |  1 +
 .../fdroid/basic/ui/main/apps/AppsFilter.kt   | 38 ++++----
 .../fdroid/basic/ui/main/apps/AppsSearch.kt   | 49 ++++------
 .../basic/ui/main/apps/FilterPresenter.kt     | 49 ++++++++++
 gradle/libs.versions.toml                     |  2 +
 13 files changed, 374 insertions(+), 162 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/MainViewModel.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/FilterPresenter.kt

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index 0df56bbb3..3427a441b 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -49,11 +49,13 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.compose.material.icons.extended)
     implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.material3.adaptive.layout)
     implementation(libs.androidx.compose.material3.adaptive.navigation)
     implementation(libs.androidx.compose.material3.adaptive.navigation.suite.android)
+    implementation(libs.molecule.runtime)
 
     testImplementation(libs.junit)
 
diff --git a/basic/src/main/java/org/fdroid/basic/MainActivity.kt b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
index 97e4d9c75..f08b9f7b1 100644
--- a/basic/src/main/java/org/fdroid/basic/MainActivity.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
@@ -4,14 +4,27 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.runtime.collectAsState
+import androidx.lifecycle.viewmodel.compose.viewModel
 import org.fdroid.basic.ui.main.Main
+import org.fdroid.basic.ui.main.Sort
+import org.fdroid.basic.ui.main.apps.FilterInfo
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
-            Main()
+            val viewModel: MainViewModel = viewModel()
+            val filterInfo = object : FilterInfo {
+                override val model = viewModel.filterModel.collectAsState().value
+                override fun sortBy(sort: Sort) = viewModel.sortBy(sort)
+                override fun addCategory(category: String) = viewModel.addCategory(category)
+                override fun removeCategory(category: String) = viewModel.removeCategory(category)
+                override fun showOnlyInstalledApps(onlyInstalled: Boolean) =
+                    viewModel.showOnlyInstalledApps(onlyInstalled)
+            }
+            Main(filterInfo)
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
new file mode 100644
index 000000000..b24c33366
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -0,0 +1,96 @@
+package org.fdroid.basic
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import app.cash.molecule.AndroidUiDispatcher
+import app.cash.molecule.RecompositionMode.ContextClock
+import app.cash.molecule.launchMolecule
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.update
+import org.fdroid.basic.ui.main.NUM_ITEMS
+import org.fdroid.basic.ui.main.Sort
+import org.fdroid.basic.ui.main.apps.AppNavigationItem
+import org.fdroid.basic.ui.main.apps.FilterModel
+import org.fdroid.basic.ui.main.apps.FilterPresenter
+
+class MainViewModel(app: Application) : AndroidViewModel(app) {
+
+    private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+    val categories = listOf(
+        app.getString(R.string.category_Time),
+        app.getString(R.string.category_Games),
+        app.getString(R.string.category_Money),
+        app.getString(R.string.category_Reading),
+        app.getString(R.string.category_Theming),
+        app.getString(R.string.category_Connectivity),
+        app.getString(R.string.category_Internet),
+        app.getString(R.string.category_Navigation),
+        app.getString(R.string.category_Multimedia),
+        app.getString(R.string.category_Phone_SMS),
+        app.getString(R.string.category_Science_Education),
+        app.getString(R.string.category_Security),
+        app.getString(R.string.category_Sports_Health),
+        app.getString(R.string.category_System),
+        app.getString(R.string.category_Writing),
+    )
+
+    val initialApps = buildList {
+        repeat(NUM_ITEMS) { i ->
+            val category = categories.getOrElse(i) { categories.random() }
+            val navItem = AppNavigationItem(
+                packageName = "$i",
+                name = "App $i",
+                summary = "Summary of the app • $category",
+                isNew = i > NUM_ITEMS - 4,
+            )
+            add(navItem)
+        }
+    }
+
+    private val _onlyInstalledApps = MutableStateFlow(false)
+    val onlyInstalledApps = _onlyInstalledApps.asStateFlow<Boolean>()
+    private val _sortBy = MutableStateFlow<Sort>(Sort.NAME)
+    val sortBy = _sortBy.asStateFlow<Sort>()
+    private val _addedCategories = MutableStateFlow<List<String>>(emptyList())
+    val addedCategories = _addedCategories.asStateFlow<List<String>>()
+
+    val filterModel: StateFlow<FilterModel> = scope.launchMolecule(mode = ContextClock) {
+        FilterPresenter(
+            appsFlow = flow { emit(initialApps) },
+            onlyInstalledAppsFlow = onlyInstalledApps,
+            sortByFlow = sortBy,
+            allCategories = categories,
+            addedCategoriesFlow = addedCategories,
+        )
+    }
+
+    fun sortBy(sort: Sort) {
+        _sortBy.update { sort }
+    }
+
+    fun addCategory(category: String) {
+        _addedCategories.update {
+            addedCategories.value.toMutableList().apply {
+                add(category)
+            }
+        }
+    }
+
+    fun removeCategory(category: String) {
+        _addedCategories.update {
+            addedCategories.value.toMutableList().apply {
+                remove(category)
+            }
+        }
+    }
+
+    fun showOnlyInstalledApps(onlyInstalled: Boolean) {
+        _onlyInstalledApps.update { onlyInstalled }
+    }
+
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
index 730710ccb..6fa7bd9f3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
@@ -3,6 +3,8 @@ package org.fdroid.basic.ui.main
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.AnimatedPane
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
@@ -18,16 +20,17 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
+import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
-import org.fdroid.basic.R
 import org.fdroid.basic.ui.main.apps.AppDetails
 import org.fdroid.basic.ui.main.apps.AppList
 import org.fdroid.basic.ui.main.apps.AppNavigationItem
 import org.fdroid.basic.ui.main.apps.AppsFilter
 import org.fdroid.basic.ui.main.apps.AppsSearch
+import org.fdroid.basic.ui.main.apps.FilterInfo
+import org.fdroid.basic.ui.main.apps.FilterModel
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 enum class Sort {
@@ -39,7 +42,11 @@ const val NUM_ITEMS = 42
 
 @Composable
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
-fun Apps(modifier: Modifier) {
+fun Apps(
+    apps: List<AppNavigationItem>,
+    filterInfo: FilterInfo,
+    modifier: Modifier,
+) {
     val navigator = rememberListDetailPaneScaffoldNavigator<AppNavigationItem>()
     val scope = rememberCoroutineScope()
     BackHandler(enabled = navigator.canNavigateBack()) {
@@ -56,51 +63,24 @@ fun Apps(modifier: Modifier) {
                 Column(
                     modifier.fillMaxSize()
                 ) {
-                    var filterExpanded by rememberSaveable { mutableStateOf(true) }
-                    var sortBy by rememberSaveable { mutableStateOf(Sort.NAME) }
-                    var onlyInstalledApps by rememberSaveable { mutableStateOf(false) }
-                    val addedCategories = remember { mutableStateListOf<String>() }
+                    var filterExpanded by rememberSaveable { mutableStateOf(false) }
                     val addedRepos = remember { mutableStateListOf<String>() }
-                    val categories = listOf(
-                        stringResource(R.string.category_Time),
-                        stringResource(R.string.category_Games),
-                        stringResource(R.string.category_Money),
-                        stringResource(R.string.category_Reading),
-                        stringResource(R.string.category_Theming),
-                        stringResource(R.string.category_Connectivity),
-                        stringResource(R.string.category_Internet),
-                        stringResource(R.string.category_Navigation),
-                        stringResource(R.string.category_Multimedia),
-                        stringResource(R.string.category_Phone_SMS),
-                        stringResource(R.string.category_Science_Education),
-                        stringResource(R.string.category_Security),
-                        stringResource(R.string.category_Sports_Health),
-                        stringResource(R.string.category_System),
-                        stringResource(R.string.category_Writing),
-                    )
+                    val showFilterBadge = addedRepos.isNotEmpty() ||
+                        filterInfo.model.addedCategories.isNotEmpty() ||
+                        filterInfo.model.onlyInstalledApps
                     AppsSearch(
-                        onlyInstalledApps = onlyInstalledApps,
-                        addedCategories = addedCategories,
-                        addedRepos = addedRepos,
+                        showFilterBadge = showFilterBadge,
                         toggleFilter = { filterExpanded = !filterExpanded },
-                    )
+                    ) {
+                        scope.launch { navigator.navigateTo(Detail, it) }
+                    }
                     AppsFilter(
                         filterExpanded = filterExpanded,
-                        sortBy = sortBy,
-                        onlyInstalledApps = onlyInstalledApps,
-                        addedCategories = addedCategories,
+                        filter = filterInfo,
                         addedRepos = addedRepos,
-                        categories = categories,
-                        onSortByChanged = { sortBy = it },
-                        toggleOnlyInstalledApps = {
-                            onlyInstalledApps = !onlyInstalledApps
-                        },
                     )
                     AppList(
-                        onlyInstalledApps = onlyInstalledApps,
-                        sortBy = sortBy,
-                        addedCategories = addedCategories,
-                        categories = categories,
+                        apps = apps,
                         currentItem = if (isDetailVisible) {
                             navigator.currentDestination?.contentKey
                         } else {
@@ -118,7 +98,7 @@ fun Apps(modifier: Modifier) {
                     AppDetails(
                         appItem = it,
                     )
-                }
+                } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
             }
         },
     )
@@ -129,6 +109,26 @@ fun Apps(modifier: Modifier) {
 @Composable
 fun AppsPreview() {
     FDroidContent {
-        Apps(Modifier)
+        val apps = listOf(
+            AppNavigationItem("", "foo", "bar", false),
+            AppNavigationItem("", "foo", "bar", false),
+            AppNavigationItem("", "foo", "bar", false),
+        )
+        val filterInfo = object : FilterInfo {
+            override val model = FilterModel(
+                isLoading = false,
+                apps = apps,
+                onlyInstalledApps = false,
+                sortBy = Sort.NAME,
+                allCategories = listOf("foo", "bar"),
+                addedCategories = emptyList(),
+            )
+
+            override fun sortBy(sort: Sort) {}
+            override fun addCategory(category: String) {}
+            override fun removeCategory(category: String) {}
+            override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
+        }
+        Apps(apps, filterInfo, Modifier)
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index 4f5673b99..a87074818 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -27,6 +27,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.window.core.layout.WindowWidthSizeClass
 import org.fdroid.basic.R
+import org.fdroid.basic.ui.main.apps.AppNavigationItem
+import org.fdroid.basic.ui.main.apps.FilterInfo
+import org.fdroid.basic.ui.main.apps.FilterModel
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 enum class AppDestinations(
@@ -38,7 +41,7 @@ enum class AppDestinations(
 }
 
 @Composable
-fun Main() {
+fun Main(filterInfo: FilterInfo) {
     var currentDestination by rememberSaveable { mutableStateOf(AppDestinations.APPS) }
     FDroidContent {
         val adaptiveInfo = currentWindowAdaptiveInfo()
@@ -80,7 +83,11 @@ fun Main() {
                 }
             }
         ) {
-            if (currentDestination == AppDestinations.APPS) Apps(Modifier)
+            if (currentDestination == AppDestinations.APPS) Apps(
+                apps = filterInfo.model.apps,
+                filterInfo = filterInfo,
+                modifier = Modifier,
+            )
             else Text(
                 text = "TODO",
                 modifier = Modifier.safeDrawingPadding(),
@@ -93,5 +100,25 @@ fun Main() {
 @PreviewScreenSizes
 @Composable
 fun MainPreview() {
-    Main()
+    val apps = listOf(
+        AppNavigationItem("", "foo", "bar", false),
+        AppNavigationItem("", "foo", "bar", false),
+        AppNavigationItem("", "foo", "bar", false),
+    )
+    val filterInfo = object : FilterInfo {
+        override val model = FilterModel(
+            isLoading = false,
+            apps = apps,
+            onlyInstalledApps = false,
+            sortBy = Sort.NAME,
+            allCategories = listOf("foo", "bar"),
+            addedCategories = emptyList(),
+        )
+
+        override fun sortBy(sort: Sort) {}
+        override fun addCategory(category: String) {}
+        override fun removeCategory(category: String) {}
+        override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
+    }
+    Main(filterInfo)
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt
index 1671dc9ac..690dba9ff 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt
@@ -49,6 +49,7 @@ fun AppDetailsPreview() {
             packageName = "foo",
             name = "bar",
             summary = "This is a nice app!",
+            isNew = false,
         )
         AppDetails(item)
     }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt
new file mode 100644
index 000000000..2973c48d1
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt
@@ -0,0 +1,79 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material.icons.filled.NewReleases
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun AppItem(
+    name: String,
+    summary: String,
+    isNew: Boolean,
+    isSelected: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        headlineContent = { Text(name) },
+        supportingContent = { Text(summary) },
+        leadingContent = {
+            BadgedBox(badge = {
+                if (isNew) Icon(
+                    imageVector = Icons.Filled.NewReleases,
+                    tint = MaterialTheme.colorScheme.primary,
+                    contentDescription = null, modifier = Modifier.size(24.dp),
+                )
+            }) {
+                Icon(
+                    Icons.Filled.Android,
+                    tint = MaterialTheme.colorScheme.secondary,
+                    contentDescription = null,
+                )
+            }
+        },
+        colors = ListItemDefaults.colors(
+            containerColor = if (isSelected) {
+                MaterialTheme.colorScheme.surfaceVariant
+            } else {
+                Color.Transparent
+            }
+        ),
+        modifier = modifier,
+    )
+}
+
+@Preview
+@Composable
+fun AppItemPreview() {
+    FDroidContent {
+        AppItem("This is app 1", "It has summary 2", false, false)
+    }
+}
+
+@Preview
+@Composable
+fun AppItemPreviewNew() {
+    FDroidContent {
+        AppItem("This is app 1", "It has summary 2", true, false)
+    }
+}
+
+@Preview
+@Composable
+fun AppItemPreviewSelected() {
+    FDroidContent {
+        AppItem("This is app 1", "It has summary 2", false, true)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
index 3d74d8ab4..269623fe1 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
@@ -1,6 +1,5 @@
 package org.fdroid.basic.ui.main.apps
 
-import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
@@ -8,34 +7,19 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Android
-import androidx.compose.material.icons.filled.NewReleases
-import androidx.compose.material3.BadgedBox
-import androidx.compose.material3.Icon
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.ListItemDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.ui.main.NUM_ITEMS
-import org.fdroid.basic.ui.main.Sort
 
 @Composable
 fun AppList(
-    onlyInstalledApps: Boolean,
-    sortBy: Sort,
-    addedCategories: List<String>,
-    categories: List<String>,
+    apps: List<AppNavigationItem>,
     currentItem: AppNavigationItem?,
     onItemClick: (AppNavigationItem) -> Unit,
 ) {
@@ -47,62 +31,23 @@ fun AppList(
             else Modifier.selectableGroup()
         ),
     ) {
-        repeat(NUM_ITEMS) { idx ->
-            if (onlyInstalledApps && idx % 2 > 0) return@repeat
-            val i = if (sortBy == Sort.NAME) idx else NUM_ITEMS - idx
-            val category = categories.getOrElse(i) { categories.random() }
-            if (addedCategories.isNotEmpty() && category !in addedCategories) return@repeat
-            item {
-                val navItem = AppNavigationItem(
-                    packageName = "$i",
-                    name = "App $i",
-                    summary = "Summary of the app • $category",
+        items(apps) { navItem ->
+            val isSelected = currentItem?.packageName == navItem.packageName
+            val interactionModifier = if (currentItem == null) {
+                Modifier.clickable(
+                    onClick = { onItemClick(navItem) }
                 )
-                val isSelected = currentItem?.packageName == navItem.packageName
-                val interactionModifier = if (currentItem == null) {
-                    Modifier.clickable(
-                        onClick = { onItemClick(navItem) }
-                    )
-                } else {
-                    Modifier.selectable(
-                        selected = isSelected,
-                        onClick = { onItemClick(navItem) }
-                    )
-                }
-                ListItem(
-                    headlineContent = { Text(navItem.name) },
-                    supportingContent = { Text(navItem.summary) },
-                    leadingContent = {
-                        BadgedBox(badge = {
-                            if (i <= 3) Icon(
-                                imageVector = Icons.Filled.NewReleases,
-                                tint = MaterialTheme.colorScheme.primary,
-                                contentDescription = null, modifier = Modifier.size(24.dp),
-                            )
-                        }) {
-                            Icon(
-                                Icons.Filled.Android,
-                                tint = MaterialTheme.colorScheme.secondary,
-                                contentDescription = null,
-                            )
-                        }
-                    },
-                    colors = ListItemDefaults.colors(
-                        containerColor = if (isSelected) {
-                            MaterialTheme.colorScheme.surfaceVariant
-                        } else {
-                            Color.Transparent
-                        }
-                    ),
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(
-                            horizontal = 8.dp,
-                            vertical = 4.dp
-                        )
-                        .then(interactionModifier)
+            } else {
+                Modifier.selectable(
+                    selected = isSelected,
+                    onClick = { onItemClick(navItem) }
                 )
             }
+            val modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp)
+                .then(interactionModifier)
+            AppItem(navItem.name, navItem.summary, navItem.isNew, isSelected, modifier)
         }
         item {
             Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt
index 7a7e9f0f9..0ce464ae0 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt
@@ -8,4 +8,5 @@ class AppNavigationItem(
     val packageName: String,
     val name: String,
     val summary: String,
+    val isNew: Boolean,
 ): Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
index 267c8c29a..01286ab79 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
@@ -30,16 +30,20 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.basic.R
 import org.fdroid.basic.ui.main.Sort
 
+interface FilterInfo {
+    val model: FilterModel
+
+    fun sortBy(sort: Sort)
+    fun addCategory(category: String)
+    fun removeCategory(category: String)
+    fun showOnlyInstalledApps(onlyInstalled: Boolean)
+}
+
 @Composable
 fun ColumnScope.AppsFilter(
     filterExpanded: Boolean,
-    sortBy: Sort,
-    onlyInstalledApps: Boolean,
-    addedCategories: MutableList<String>,
+    filter: FilterInfo,
     addedRepos: MutableList<String>,
-    categories: List<String>,
-    onSortByChanged: (Sort) -> Unit,
-    toggleOnlyInstalledApps: () -> Unit,
 ) {
     AnimatedVisibility(filterExpanded) {
         FlowRow(
@@ -50,7 +54,7 @@ fun ColumnScope.AppsFilter(
             var sortByMenuExpanded by remember { mutableStateOf(false) }
             var repoMenuExpanded by remember { mutableStateOf(false) }
             var categoryMenuExpanded by remember { mutableStateOf(false) }
-            addedCategories.forEach { category ->
+            filter.model.addedCategories.forEach { category ->
                 FilterChip(
                     selected = true,
                     trailingIcon = {
@@ -64,7 +68,7 @@ fun ColumnScope.AppsFilter(
                         Text(category)
                     },
                     onClick = {
-                        addedCategories.remove(category)
+                        filter.removeCategory(category)
                     }
                 )
             }
@@ -89,7 +93,7 @@ fun ColumnScope.AppsFilter(
             FilterChip(
                 selected = false,
                 leadingIcon = {
-                    val vector = when (sortBy) {
+                    val vector = when (filter.model.sortBy) {
                         Sort.NAME -> Icons.Filled.SortByAlpha
                         Sort.LATEST -> Icons.Filled.AccessTime
                     }
@@ -99,7 +103,7 @@ fun ColumnScope.AppsFilter(
                     Icon(Icons.Filled.ArrowDropDown, null)
                 },
                 label = {
-                    val s = when (sortBy) {
+                    val s = when (filter.model.sortBy) {
                         Sort.NAME -> "Sort by name"
                         Sort.LATEST -> "Sort by latest"
                     }
@@ -114,7 +118,7 @@ fun ColumnScope.AppsFilter(
                                 Icon(Icons.Filled.SortByAlpha, null)
                             },
                             onClick = {
-                                onSortByChanged(Sort.NAME)
+                                filter.sortBy(Sort.NAME)
                                 sortByMenuExpanded = false
                             },
                         )
@@ -124,7 +128,7 @@ fun ColumnScope.AppsFilter(
                                 Icon(Icons.Filled.AccessTime, null)
                             },
                             onClick = {
-                                onSortByChanged(Sort.LATEST)
+                                filter.sortBy(Sort.LATEST)
                                 sortByMenuExpanded = false
                             },
                         )
@@ -133,8 +137,8 @@ fun ColumnScope.AppsFilter(
                 onClick = { sortByMenuExpanded = !sortByMenuExpanded },
             )
             FilterChip(
-                selected = onlyInstalledApps,
-                leadingIcon = if (onlyInstalledApps) {
+                selected = filter.model.onlyInstalledApps,
+                leadingIcon = if (filter.model.onlyInstalledApps) {
                     {
                         Icon(
                             imageVector = Icons.Filled.Done,
@@ -144,7 +148,7 @@ fun ColumnScope.AppsFilter(
                     }
                 } else null,
                 label = { Text(stringResource(R.string.app_installed)) },
-                onClick = toggleOnlyInstalledApps,
+                onClick = { filter.showOnlyInstalledApps(!filter.model.onlyInstalledApps) },
             )
             FilterChip(
                 selected = false,
@@ -161,11 +165,11 @@ fun ColumnScope.AppsFilter(
                         expanded = categoryMenuExpanded,
                         onDismissRequest = { categoryMenuExpanded = false },
                     ) {
-                        categories.forEach { category ->
+                        filter.model.allCategories.forEach { category ->
                             DropdownMenuItem(
                                 text = { Text(category) },
                                 onClick = {
-                                    addedCategories.add(category)
+                                    filter.addCategory(category)
                                     categoryMenuExpanded = false
                                 },
                             )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
index 78cfdeaff..5c7c84b32 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
@@ -8,33 +8,24 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Star
-import androidx.compose.material3.ExpandedFullScreenSearchBar
+import androidx.compose.material3.ExpandedDockedSearchBar
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.SearchBarDefaults
-import androidx.compose.material3.Text
 import androidx.compose.material3.TopSearchBar
 import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppsSearch(
-    onlyInstalledApps: Boolean,
-    addedCategories: List<String>,
-    addedRepos: List<String>,
+    showFilterBadge: Boolean,
     toggleFilter: () -> Unit,
+    onItemClick: (AppNavigationItem) -> Unit,
 ) {
     val textFieldState = rememberTextFieldState()
     val scrollBehavior = SearchBarDefaults.enterAlwaysSearchBarScrollBehavior()
@@ -45,8 +36,7 @@ fun AppsSearch(
             searchBarState = searchBarState,
             textFieldState = textFieldState,
             toggleFilter = toggleFilter,
-            showFilterBadge = addedRepos.isNotEmpty() || addedCategories.isNotEmpty() ||
-                onlyInstalledApps,
+            showFilterBadge = showFilterBadge,
         )
     }
     TopSearchBar(
@@ -56,26 +46,29 @@ fun AppsSearch(
         windowInsets = WindowInsets.systemBars,
         inputField = inputField,
     )
-    ExpandedFullScreenSearchBar(
+    ExpandedDockedSearchBar(
         state = searchBarState,
         inputField = inputField,
     ) {
         Column(Modifier.verticalScroll(rememberScrollState())) {
-            repeat(4) { idx ->
-                val resultText = "Suggestion $idx"
-                ListItem(headlineContent = { Text(resultText) },
-                    supportingContent = { Text("Additional info") },
-                    leadingContent = {
-                        Icon(
-                            Icons.Filled.Star,
-                            contentDescription = null
-                        )
-                    },
-                    colors = ListItemDefaults.colors(containerColor = Color.Transparent),
+            repeat(4) { i ->
+                val navItem = AppNavigationItem(
+                    packageName = "$i",
+                    name = "App $i",
+                    summary = "Summary of the app",
+                    isNew = false,
+                )
+                AppItem(
+                    name = navItem.name,
+                    summary = navItem.summary,
+                    isNew = navItem.isNew,
+                    isSelected = false,
                     modifier = Modifier
                         .clickable {
-                            textFieldState.setTextAndPlaceCursorAtEnd(resultText)
-                            scope.launch { searchBarState.animateToCollapsed() }
+                            scope.launch {
+                                searchBarState.animateToCollapsed()
+                                onItemClick(navItem)
+                            }
                         }
                         .fillMaxWidth()
                         .padding(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/FilterPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/FilterPresenter.kt
new file mode 100644
index 000000000..67af918df
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/FilterPresenter.kt
@@ -0,0 +1,49 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
+import org.fdroid.basic.ui.main.Sort
+
+@Composable
+fun FilterPresenter(
+    appsFlow: Flow<List<AppNavigationItem>>,
+    onlyInstalledAppsFlow: StateFlow<Boolean>,
+    sortByFlow: StateFlow<Sort>,
+    allCategories: List<String>,
+    addedCategoriesFlow: StateFlow<List<String>>,
+): FilterModel {
+    val apps = appsFlow.collectAsState(null).value
+    val onlyInstalledApps = onlyInstalledAppsFlow.collectAsState().value
+    val sortBy = sortByFlow.collectAsState().value
+    val addedCategories = addedCategoriesFlow.collectAsState().value
+
+    val newApps = apps?.filter { app ->
+        if (onlyInstalledApps) app.packageName.toInt() % 2 > 0 else true
+    }?.filter { app ->
+        addedCategories.isEmpty() || addedCategories.any { app.summary.contains(it) }
+    } ?: emptyList()
+
+    return FilterModel(
+        isLoading = apps == null,
+        apps = if (sortBy == Sort.NAME) {
+            newApps.sortedBy { it.packageName.toInt() }
+        } else {
+            newApps.sortedByDescending { it.packageName.toInt() }
+        },
+        onlyInstalledApps = onlyInstalledApps,
+        sortBy = sortBy,
+        allCategories = allCategories,
+        addedCategories = addedCategories,
+    )
+}
+
+data class FilterModel(
+    val isLoading: Boolean,
+    val apps: List<AppNavigationItem>,
+    val onlyInstalledApps: Boolean,
+    val sortBy: Sort,
+    val allCategories: List<String>,
+    val addedCategories: List<String>,
+)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1c4fa4cea..1de62c88f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,6 +15,7 @@ okhttp = "4.12.0"
 room = "2.8.3"
 glide = "5.0.5"
 glideCompose = "1.0.0-beta08"
+molecule = "2.2.0"
 
 androidxCoreKtx = "1.17.0"
 androidxAppcompat = "1.7.1"
@@ -120,6 +121,7 @@ glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref =
 glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glideCompose" }
 glide-annotations = { module = "com.github.bumptech.glide:annotations", version.ref = "glide" }
 
+molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
 guardianproject-netcipher = { module = "info.guardianproject.netcipher:netcipher", version.ref = "guardianprojectNetcipher" }
 guardianproject-panic = { module = "info.guardianproject.panic:panic", version.ref = "guardianprojectPanic" }
 nanohttpd = { module = "org.nanohttpd:nanohttpd", version.ref = "nanohttpd" }

From 41870f74044d55f48214fe2ca2e1b30511d80257 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 23 Apr 2025 17:50:49 -0300
Subject: [PATCH 007/180] implement updates tab

---
 basic/build.gradle.kts                        |  8 +-
 .../java/org/fdroid/basic/MainActivity.kt     |  4 +-
 .../java/org/fdroid/basic/MainViewModel.kt    | 44 ++++++++++
 .../java/org/fdroid/basic/ui/main/Main.kt     | 15 ++--
 .../java/org/fdroid/basic/ui/main/Updates.kt  | 62 +++++++++++++
 .../basic/ui/main/updates/UpdatableApp.kt     |  9 ++
 .../basic/ui/main/updates/UpdatableAppRow.kt  | 86 +++++++++++++++++++
 7 files changed, 218 insertions(+), 10 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/Updates.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableApp.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index 3427a441b..519491ff6 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -38,6 +38,11 @@ android {
     buildFeatures {
         compose = true
     }
+    packaging {
+        resources {
+            excludes += listOf("META-INF/LICENSE.md", "META-INF/LICENSE-notice.md")
+        }
+    }
 }
 
 dependencies {
@@ -48,7 +53,6 @@ dependencies {
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.compose.material.icons.extended)
-    implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
@@ -57,6 +61,8 @@ dependencies {
     implementation(libs.androidx.compose.material3.adaptive.navigation.suite.android)
     implementation(libs.molecule.runtime)
 
+    debugImplementation(libs.androidx.compose.ui.tooling.preview)
+
     testImplementation(libs.junit)
 
     androidTestImplementation(libs.androidx.test.ext.junit)
diff --git a/basic/src/main/java/org/fdroid/basic/MainActivity.kt b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
index f08b9f7b1..b0b9737e3 100644
--- a/basic/src/main/java/org/fdroid/basic/MainActivity.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
@@ -16,6 +16,8 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             val viewModel: MainViewModel = viewModel()
+            val numUpdates = viewModel.numUpdates.collectAsState(0).value
+            val updates = viewModel.updates.collectAsState().value
             val filterInfo = object : FilterInfo {
                 override val model = viewModel.filterModel.collectAsState().value
                 override fun sortBy(sort: Sort) = viewModel.sortBy(sort)
@@ -24,7 +26,7 @@ class MainActivity : ComponentActivity() {
                 override fun showOnlyInstalledApps(onlyInstalled: Boolean) =
                     viewModel.showOnlyInstalledApps(onlyInstalled)
             }
-            Main(filterInfo)
+            Main(numUpdates, updates, filterInfo)
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index b24c33366..2f5a108c7 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -7,19 +7,42 @@ import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import org.fdroid.basic.ui.main.NUM_ITEMS
 import org.fdroid.basic.ui.main.Sort
 import org.fdroid.basic.ui.main.apps.AppNavigationItem
 import org.fdroid.basic.ui.main.apps.FilterModel
 import org.fdroid.basic.ui.main.apps.FilterPresenter
+import org.fdroid.basic.ui.main.updates.UpdatableApp
 
 class MainViewModel(app: Application) : AndroidViewModel(app) {
 
+    companion object {
+        val fakeUpdates = listOf(
+            UpdatableApp(
+                name = "App Name 123",
+                currentVersionName = "1.0.1",
+                updateVersionName = "1.1.0",
+                size = 123456789,
+                whatsNew = "Lots of changes in this version!\nThey are all awesome.\n" +
+                    "Only the best changes."
+            ),
+            UpdatableApp(
+                name = "App Name 456",
+                currentVersionName = "3.0.1",
+                updateVersionName = "3.1.0",
+                size = 9876543,
+            )
+        )
+    }
+
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
     val categories = listOf(
         app.getString(R.string.category_Time),
@@ -68,6 +91,27 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
             addedCategoriesFlow = addedCategories,
         )
     }
+    private val _updates = MutableStateFlow(fakeUpdates)
+    val updates = _updates.asStateFlow()
+    val numUpdates = _updates.map { it.size }
+
+    init {
+        viewModelScope.launch {
+            delay(5000)
+            _updates.update {
+                it.toMutableList().apply {
+                    val app = UpdatableApp(
+                        name = "App Name 789",
+                        currentVersionName = "4.0.1",
+                        updateVersionName = "4.3.0",
+                        size = 4561237,
+                        whatsNew = "This new version is super fast and aimed at fixing some bugs and enhancing your experience even more. So take the chance to update your app and always enjoy the best of Inter. In addition to the exciting new features in the latest version, we regularly release new versions to improve what you are already using on our app. To keep making your life simpler, keep your app up to date and take advantage of everything we prepare for you. "
+                    )
+                    add(app)
+                }
+            }
+        }
+    }
 
     fun sortBy(sort: Sort) {
         _sortBy.update { sort }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index a87074818..697563de8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -2,7 +2,6 @@ package org.fdroid.basic.ui.main
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Apps
 import androidx.compose.material.icons.filled.Update
@@ -30,6 +29,7 @@ import org.fdroid.basic.R
 import org.fdroid.basic.ui.main.apps.AppNavigationItem
 import org.fdroid.basic.ui.main.apps.FilterInfo
 import org.fdroid.basic.ui.main.apps.FilterModel
+import org.fdroid.basic.ui.main.updates.UpdatableApp
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 enum class AppDestinations(
@@ -41,7 +41,7 @@ enum class AppDestinations(
 }
 
 @Composable
-fun Main(filterInfo: FilterInfo) {
+fun Main(numUpdates: Int, updates: List<UpdatableApp>, filterInfo: FilterInfo) {
     var currentDestination by rememberSaveable { mutableStateOf(AppDestinations.APPS) }
     FDroidContent {
         val adaptiveInfo = currentWindowAdaptiveInfo()
@@ -63,9 +63,9 @@ fun Main(filterInfo: FilterInfo) {
                         icon = {
                             BadgedBox(
                                 badge = {
-                                    if (dest == AppDestinations.UPDATES) {
+                                    if (dest == AppDestinations.UPDATES && numUpdates > 0) {
                                         Badge {
-                                            Text(text = "13")
+                                            Text(text = numUpdates.toString())
                                         }
                                     }
                                 }
@@ -88,9 +88,8 @@ fun Main(filterInfo: FilterInfo) {
                 filterInfo = filterInfo,
                 modifier = Modifier,
             )
-            else Text(
-                text = "TODO",
-                modifier = Modifier.safeDrawingPadding(),
+            else Updates(
+                apps = updates,
             )
         }
     }
@@ -120,5 +119,5 @@ fun MainPreview() {
         override fun removeCategory(category: String) {}
         override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
     }
-    Main(filterInfo)
+    Main(2, emptyList(), filterInfo)
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Updates.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Updates.kt
new file mode 100644
index 000000000..2cfc4f072
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Updates.kt
@@ -0,0 +1,62 @@
+package org.fdroid.basic.ui.main
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewScreenSizes
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.ui.main.updates.UpdatableApp
+import org.fdroid.basic.ui.main.updates.UpdatableAppRow
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun Updates(apps: List<UpdatableApp>, modifier: Modifier = Modifier) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text("Updates") },
+                actions = {
+                    Button(onClick = {}, modifier = Modifier.padding(end = 16.dp)) {
+                        Text("Update all")
+                    }
+                },
+            )
+        },
+    ) { paddingValues ->
+        LazyColumn(modifier.padding(paddingValues)) {
+            items(apps, key = { it.name }) { app ->
+                UpdatableAppRow(app, Modifier.animateItem())
+            }
+        }
+    }
+}
+
+@Preview
+@PreviewScreenSizes
+@Composable
+fun UpdatesPreview() {
+    FDroidContent {
+        val app1 = UpdatableApp(
+            name = "App Update 123",
+            currentVersionName = "1.0.1",
+            updateVersionName = "1.1.0",
+            size = 123456789,
+        )
+        val app2 = UpdatableApp(
+            name = "App Update 456",
+            currentVersionName = "3.0.1",
+            updateVersionName = "3.1.0",
+            size = 9876543,
+        )
+        Updates(listOf(app1, app2))
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableApp.kt
new file mode 100644
index 000000000..c5a6d6784
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableApp.kt
@@ -0,0 +1,9 @@
+package org.fdroid.basic.ui.main.updates
+
+data class UpdatableApp(
+    val name: String,
+    val currentVersionName: String,
+    val updateVersionName: String,
+    val size: Long,
+    val whatsNew: String? = null,
+)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
new file mode 100644
index 000000000..5beddfb76
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
@@ -0,0 +1,86 @@
+package org.fdroid.basic.ui.main.updates
+
+import android.text.format.Formatter
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.filled.ArrowDropUp
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun UpdatableAppRow(app: UpdatableApp, modifier: Modifier = Modifier) {
+    var isExpanded by remember { mutableStateOf(false) }
+    Column {
+        ListItem(
+            leadingContent = {
+                Icon(
+                    Icons.Filled.Android,
+                    tint = MaterialTheme.colorScheme.secondary,
+                    contentDescription = null,
+                )
+            },
+            headlineContent = {
+                Text(app.name)
+            },
+            supportingContent = {
+                val size = app.size.let {
+                    Formatter.formatFileSize(LocalContext.current, it)
+                }
+                Text("${app.currentVersionName} → ${app.updateVersionName} • $size")
+            },
+            trailingContent = {
+                if (app.whatsNew != null) IconButton(onClick = { isExpanded = !isExpanded }) {
+                    if (isExpanded) {
+                        Icon(Icons.Default.ArrowDropUp, "TODO")
+                    } else {
+                        Icon(Icons.Default.ArrowDropDown, "TODO")
+                    }
+                }
+            },
+            modifier = modifier,
+        )
+        AnimatedVisibility(visible = isExpanded, modifier = Modifier.padding(8.dp)) {
+            Text(
+                text = app.whatsNew ?: "",
+                modifier = Modifier
+                    .background(MaterialTheme.colorScheme.surfaceVariant)
+                    .fillMaxWidth()
+                    .padding(8.dp)
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+fun UpdatableAppRowPreview() {
+    val app = UpdatableApp(
+        name = "App Update 123",
+        currentVersionName = "1.0.1",
+        updateVersionName = "1.1.0",
+        size = 123456789,
+        whatsNew = "This is new, all is new, nothing old.",
+    )
+    FDroidContent {
+        UpdatableAppRow(app)
+    }
+}

From 2faa2d018dd66ca41e08b8055fc644c332e9bf47 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 24 Apr 2025 12:19:25 -0300
Subject: [PATCH 008/180] small improvements after feedback

---
 .../java/org/fdroid/basic/MainViewModel.kt    |  2 +-
 .../java/org/fdroid/basic/ui/main/Apps.kt     |  6 +-
 .../java/org/fdroid/basic/ui/main/Main.kt     | 15 ++++
 .../basic/ui/main/apps/AppSearchInputField.kt | 14 ----
 .../fdroid/basic/ui/main/apps/AppsFilter.kt   | 72 +++++++++----------
 5 files changed, 50 insertions(+), 59 deletions(-)

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 2f5a108c7..0717f0544 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -77,7 +77,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
 
     private val _onlyInstalledApps = MutableStateFlow(false)
     val onlyInstalledApps = _onlyInstalledApps.asStateFlow<Boolean>()
-    private val _sortBy = MutableStateFlow<Sort>(Sort.NAME)
+    private val _sortBy = MutableStateFlow<Sort>(Sort.LATEST)
     val sortBy = _sortBy.asStateFlow<Sort>()
     private val _addedCategories = MutableStateFlow<List<String>>(emptyList())
     val addedCategories = _addedCategories.asStateFlow<List<String>>()
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
index 6fa7bd9f3..53a764bb8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
@@ -63,7 +63,7 @@ fun Apps(
                 Column(
                     modifier.fillMaxSize()
                 ) {
-                    var filterExpanded by rememberSaveable { mutableStateOf(false) }
+                    var filterExpanded by rememberSaveable { mutableStateOf(true) }
                     val addedRepos = remember { mutableStateListOf<String>() }
                     val showFilterBadge = addedRepos.isNotEmpty() ||
                         filterInfo.model.addedCategories.isNotEmpty() ||
@@ -95,9 +95,7 @@ fun Apps(
         detailPane = {
             AnimatedPane {
                 navigator.currentDestination?.contentKey?.let {
-                    AppDetails(
-                        appItem = it,
-                    )
+                    AppDetails(appItem = it)
                 } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
             }
         },
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index 697563de8..d256b3a8c 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -4,6 +4,7 @@ import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Apps
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Update
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
@@ -16,6 +17,7 @@ import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -51,6 +53,7 @@ fun Main(numUpdates: Int, updates: List<UpdatableApp>, filterInfo: FilterInfo) {
                 else -> NavigationSuiteType.NavigationRail
             }
         }
+        var menuExpanded by remember { mutableStateOf(false) }
         NavigationSuiteScaffold(
             modifier = Modifier.fillMaxSize(),
             layoutType = customNavSuiteType,
@@ -81,6 +84,18 @@ fun Main(numUpdates: Int, updates: List<UpdatableApp>, filterInfo: FilterInfo) {
                         onClick = { currentDestination = dest }
                     )
                 }
+                item(
+                    icon = {
+                        Icon(
+                            Icons.Default.MoreVert,
+                            contentDescription = null,
+                        )
+                        MainOverFlowMenu(menuExpanded) { menuExpanded = false }
+                    },
+                    label = { Text("More") },
+                    selected = false,
+                    onClick = { menuExpanded = true }
+                )
             }
         ) {
             if (currentDestination == AppDestinations.APPS) Apps(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
index 3cd638025..78db5ff7e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
@@ -7,7 +7,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Clear
 import androidx.compose.material.icons.filled.FilterList
-import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
@@ -20,14 +19,9 @@ import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import kotlinx.coroutines.launch
-import org.fdroid.basic.ui.main.MainOverFlowMenu
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -38,7 +32,6 @@ fun AppSearchInputField(
     showFilterBadge: Boolean
 ) {
     val scope = rememberCoroutineScope()
-    var menuExpanded by remember { mutableStateOf(false) }
     SearchBarDefaults.InputField(
         modifier = Modifier,
         searchBarState = searchBarState,
@@ -77,13 +70,6 @@ fun AppSearchInputField(
                         )
                     }
                 }
-                IconButton(onClick = { menuExpanded = true }) {
-                    Icon(
-                        Icons.Default.MoreVert,
-                        contentDescription = null,
-                    )
-                }
-                MainOverFlowMenu(menuExpanded) { menuExpanded = false }
             }
         }
     )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
index 01286ab79..8bc1c587c 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
@@ -54,42 +54,6 @@ fun ColumnScope.AppsFilter(
             var sortByMenuExpanded by remember { mutableStateOf(false) }
             var repoMenuExpanded by remember { mutableStateOf(false) }
             var categoryMenuExpanded by remember { mutableStateOf(false) }
-            filter.model.addedCategories.forEach { category ->
-                FilterChip(
-                    selected = true,
-                    trailingIcon = {
-                        Icon(
-                            Icons.Filled.Clear,
-                            null,
-                            modifier = Modifier.size(FilterChipDefaults.IconSize)
-                        )
-                    },
-                    label = {
-                        Text(category)
-                    },
-                    onClick = {
-                        filter.removeCategory(category)
-                    }
-                )
-            }
-            addedRepos.forEach { repo ->
-                FilterChip(
-                    selected = true,
-                    trailingIcon = {
-                        Icon(
-                            Icons.Filled.Clear,
-                            null,
-                            modifier = Modifier.size(FilterChipDefaults.IconSize)
-                        )
-                    },
-                    label = {
-                        Text(repo)
-                    },
-                    onClick = {
-                        addedRepos.remove(repo)
-                    }
-                )
-            }
             FilterChip(
                 selected = false,
                 leadingIcon = {
@@ -156,7 +120,7 @@ fun ColumnScope.AppsFilter(
                     Icon(
                         Icons.Filled.Add,
                         null,
-                        modifier = Modifier.size(FilterChipDefaults.IconSize)
+                        modifier = Modifier.size(FilterChipDefaults.IconSize),
                     )
                 },
                 label = {
@@ -182,9 +146,9 @@ fun ColumnScope.AppsFilter(
                 selected = false,
                 leadingIcon = {
                     Icon(
-                        Icons.Filled.Add,
-                        null,
-                        modifier = Modifier.size(FilterChipDefaults.IconSize)
+                        imageVector = Icons.Filled.Add,
+                        contentDescription = null,
+                        modifier = Modifier.size(FilterChipDefaults.IconSize),
                     )
                 },
                 label = {
@@ -211,6 +175,34 @@ fun ColumnScope.AppsFilter(
                 },
                 onClick = { repoMenuExpanded = !repoMenuExpanded },
             )
+            filter.model.addedCategories.forEach { category ->
+                FilterChip(
+                    selected = true,
+                    trailingIcon = {
+                        Icon(
+                            imageVector = Icons.Filled.Clear,
+                            contentDescription = null,
+                            modifier = Modifier.size(FilterChipDefaults.IconSize),
+                        )
+                    },
+                    label = { Text(category) },
+                    onClick = { filter.removeCategory(category) }
+                )
+            }
+            addedRepos.forEach { repo ->
+                FilterChip(
+                    selected = true,
+                    trailingIcon = {
+                        Icon(
+                            imageVector = Icons.Filled.Clear,
+                            contentDescription = null,
+                            modifier = Modifier.size(FilterChipDefaults.IconSize),
+                        )
+                    },
+                    label = { Text(repo) },
+                    onClick = { addedRepos.remove(repo) }
+                )
+            }
         }
     }
 }

From 318d972190dc9eb29262241bd9805517e7072291 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 24 Apr 2025 17:39:37 -0300
Subject: [PATCH 009/180] navigation

---
 basic/build.gradle.kts                        |   1 +
 .../java/org/fdroid/basic/MainActivity.kt     |  17 +-
 .../java/org/fdroid/basic/MainViewModel.kt    |  14 ++
 .../java/org/fdroid/basic/ui/main/About.kt    |  54 ++++++
 .../java/org/fdroid/basic/ui/main/Apps.kt     |  85 +++++----
 .../fdroid/basic/ui/main/BottomBarScreen.kt   | 130 +++++++++++++
 .../java/org/fdroid/basic/ui/main/Main.kt     | 168 ++++++-----------
 .../fdroid/basic/ui/main/MainOverflowMenu.kt  |  53 ++----
 .../org/fdroid/basic/ui/main/Repositories.kt  | 176 ++++++++++++++++++
 .../java/org/fdroid/basic/ui/main/Settings.kt |  54 ++++++
 .../fdroid/basic/ui/main/apps/AppCarousel.kt  |  96 ++++++++++
 .../org/fdroid/basic/ui/main/apps/AppList.kt  | 125 ++++++++++---
 .../basic/ui/main/apps/AppSearchInputField.kt |  20 +-
 .../fdroid/basic/ui/main/apps/AppsFilter.kt   |   3 +-
 .../fdroid/basic/ui/main/apps/AppsSearch.kt   |  53 +-----
 .../org/fdroid/basic/ui/main/apps/Discover.kt | 132 +++++++++++++
 .../basic/ui/main/updates/UpdatableAppRow.kt  |  10 +
 basic/src/main/res/values/strings-next.xml    |   4 +
 gradle/libs.versions.toml                     |   2 +
 19 files changed, 891 insertions(+), 306 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/About.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/Repositories.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/Settings.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index 519491ff6..efe32e649 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -54,6 +54,7 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.compose.material.icons.extended)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.material3.adaptive.layout)
diff --git a/basic/src/main/java/org/fdroid/basic/MainActivity.kt b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
index b0b9737e3..97e4d9c75 100644
--- a/basic/src/main/java/org/fdroid/basic/MainActivity.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
@@ -4,29 +4,14 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.collectAsState
-import androidx.lifecycle.viewmodel.compose.viewModel
 import org.fdroid.basic.ui.main.Main
-import org.fdroid.basic.ui.main.Sort
-import org.fdroid.basic.ui.main.apps.FilterInfo
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
-            val viewModel: MainViewModel = viewModel()
-            val numUpdates = viewModel.numUpdates.collectAsState(0).value
-            val updates = viewModel.updates.collectAsState().value
-            val filterInfo = object : FilterInfo {
-                override val model = viewModel.filterModel.collectAsState().value
-                override fun sortBy(sort: Sort) = viewModel.sortBy(sort)
-                override fun addCategory(category: String) = viewModel.addCategory(category)
-                override fun removeCategory(category: String) = viewModel.removeCategory(category)
-                override fun showOnlyInstalledApps(onlyInstalled: Boolean) =
-                    viewModel.showOnlyInstalledApps(onlyInstalled)
-            }
-            Main(numUpdates, updates, filterInfo)
+            Main()
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 0717f0544..f837e3857 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.fdroid.basic.ui.main.NUM_ITEMS
+import org.fdroid.basic.ui.main.Repository
 import org.fdroid.basic.ui.main.Sort
 import org.fdroid.basic.ui.main.apps.AppNavigationItem
 import org.fdroid.basic.ui.main.apps.FilterModel
@@ -94,6 +95,19 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
     private val _updates = MutableStateFlow(fakeUpdates)
     val updates = _updates.asStateFlow()
     val numUpdates = _updates.map { it.size }
+    private val _repos = MutableStateFlow(
+        listOf(
+            Repository(
+                address = "http://example.org",
+                timestamp = System.currentTimeMillis(),
+                lastUpdated = null,
+                weight = 2,
+                enabled = true,
+                name = "My first repository",
+            )
+        )
+    )
+    val repos = _repos.asStateFlow()
 
     init {
         viewModelScope.launch {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/About.kt b/basic/src/main/java/org/fdroid/basic/ui/main/About.kt
new file mode 100644
index 000000000..23773e7f5
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/About.kt
@@ -0,0 +1,54 @@
+package org.fdroid.basic.ui.main
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewScreenSizes
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun About(onBackClicked: () -> Unit) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                navigationIcon = {
+                    IconButton(onClick = onBackClicked) {
+                        Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
+                    }
+                },
+                title = {
+                    Text(stringResource(R.string.about_title_full))
+                },
+            )
+        },
+    ) { paddingValues ->
+        Text(
+            stringResource(R.string.about_title_full),
+            modifier = Modifier
+                .padding(paddingValues)
+                .padding(16.dp)
+        )
+    }
+}
+
+@Preview
+@PreviewScreenSizes
+@Composable
+fun AboutPreview() {
+    FDroidContent {
+        About {  }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
index 53a764bb8..5afbcd364 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
@@ -1,9 +1,9 @@
 package org.fdroid.basic.ui.main
 
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.AnimatedPane
@@ -12,23 +12,19 @@ import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Det
 import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.compose.ui.unit.dp
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
 import kotlinx.coroutines.launch
 import org.fdroid.basic.ui.main.apps.AppDetails
 import org.fdroid.basic.ui.main.apps.AppList
 import org.fdroid.basic.ui.main.apps.AppNavigationItem
-import org.fdroid.basic.ui.main.apps.AppsFilter
-import org.fdroid.basic.ui.main.apps.AppsSearch
+import org.fdroid.basic.ui.main.apps.Discover
 import org.fdroid.basic.ui.main.apps.FilterInfo
 import org.fdroid.basic.ui.main.apps.FilterModel
 import org.fdroid.fdroid.ui.theme.FDroidContent
@@ -41,11 +37,12 @@ enum class Sort {
 const val NUM_ITEMS = 42
 
 @Composable
-@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+@OptIn(ExperimentalMaterial3AdaptiveApi::class, ExperimentalMaterial3Api::class)
 fun Apps(
     apps: List<AppNavigationItem>,
     filterInfo: FilterInfo,
-    modifier: Modifier,
+    onMainNav: (String) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val navigator = rememberListDetailPaneScaffoldNavigator<AppNavigationItem>()
     val scope = rememberCoroutineScope()
@@ -55,39 +52,41 @@ fun Apps(
         }
     }
     val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
+    val listState = rememberLazyListState()
     ListDetailPaneScaffold(
         directive = navigator.scaffoldDirective,
         value = navigator.scaffoldValue,
+        modifier = modifier,
         listPane = {
             AnimatedPane {
-                Column(
-                    modifier.fillMaxSize()
-                ) {
-                    var filterExpanded by rememberSaveable { mutableStateOf(true) }
-                    val addedRepos = remember { mutableStateListOf<String>() }
-                    val showFilterBadge = addedRepos.isNotEmpty() ||
-                        filterInfo.model.addedCategories.isNotEmpty() ||
-                        filterInfo.model.onlyInstalledApps
-                    AppsSearch(
-                        showFilterBadge = showFilterBadge,
-                        toggleFilter = { filterExpanded = !filterExpanded },
-                    ) {
-                        scope.launch { navigator.navigateTo(Detail, it) }
+                val discoverNavController = rememberNavController()
+                NavHost(navController = discoverNavController, startDestination = "discover") {
+                    composable("discover") {
+                        Discover(
+                            apps = apps,
+                            onTitleTap = { discoverNavController.navigate("list") },
+                            onAppTap = {
+                                scope.launch { navigator.navigateTo(Detail, it) }
+                            },
+                            onMainNav = { onMainNav(it) },
+                            modifier = Modifier,
+                        )
                     }
-                    AppsFilter(
-                        filterExpanded = filterExpanded,
-                        filter = filterInfo,
-                        addedRepos = addedRepos,
-                    )
-                    AppList(
-                        apps = apps,
-                        currentItem = if (isDetailVisible) {
-                            navigator.currentDestination?.contentKey
-                        } else {
-                            null
-                        },
-                    ) {
-                        scope.launch { navigator.navigateTo(Detail, it) }
+                    composable("list") {
+                        AppList(
+                            listState = listState,
+                            apps = apps,
+                            filterInfo = filterInfo,
+                            currentItem = if (isDetailVisible) {
+                                navigator.currentDestination?.contentKey
+                            } else {
+                                null
+                            },
+                            onBackClicked = { discoverNavController.popBackStack() },
+                            modifier = Modifier,
+                        ) {
+                            scope.launch { navigator.navigateTo(Detail, it) }
+                        }
                     }
                 }
             }
@@ -108,9 +107,9 @@ fun Apps(
 fun AppsPreview() {
     FDroidContent {
         val apps = listOf(
-            AppNavigationItem("", "foo", "bar", false),
-            AppNavigationItem("", "foo", "bar", false),
-            AppNavigationItem("", "foo", "bar", false),
+            AppNavigationItem("1", "foo", "bar", false),
+            AppNavigationItem("2", "foo", "bar", false),
+            AppNavigationItem("3", "foo", "bar", false),
         )
         val filterInfo = object : FilterInfo {
             override val model = FilterModel(
@@ -127,6 +126,6 @@ fun AppsPreview() {
             override fun removeCategory(category: String) {}
             override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
         }
-        Apps(apps, filterInfo, Modifier)
+        Apps(apps, filterInfo, {})
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
new file mode 100644
index 000000000..8b27f22a3
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
@@ -0,0 +1,130 @@
+package org.fdroid.basic.ui.main
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Apps
+import androidx.compose.material.icons.filled.Explore
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
+import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewScreenSizes
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import androidx.window.core.layout.WindowWidthSizeClass
+import org.fdroid.basic.R
+import org.fdroid.basic.ui.main.apps.AppNavigationItem
+import org.fdroid.basic.ui.main.apps.FilterInfo
+import org.fdroid.basic.ui.main.apps.FilterModel
+import org.fdroid.basic.ui.main.updates.UpdatableApp
+
+enum class BottomNavDestinations(
+    @StringRes val label: Int,
+    val icon: ImageVector,
+) {
+    APPS(R.string.discover, Icons.Filled.Explore),
+    UPDATES(R.string.apps_my, Icons.Filled.Apps),
+}
+
+@Composable
+fun BottomBarScreen(
+    navController: NavHostController,
+    numUpdates: Int,
+    updates: List<UpdatableApp>,
+    filterInfo: FilterInfo
+) {
+    var currentDestination by rememberSaveable { mutableStateOf(BottomNavDestinations.APPS) }
+    val adaptiveInfo = currentWindowAdaptiveInfo()
+    val customNavSuiteType = with(adaptiveInfo) {
+        when (windowSizeClass.windowWidthSizeClass) {
+            WindowWidthSizeClass.COMPACT -> NavigationSuiteType.NavigationBar
+            else -> NavigationSuiteType.NavigationRail
+        }
+    }
+    NavigationSuiteScaffold(
+        modifier = Modifier.fillMaxSize(),
+        layoutType = customNavSuiteType,
+        navigationSuiteColors = NavigationSuiteDefaults.colors(
+            navigationBarContainerColor = Color.Transparent,
+        ),
+        navigationSuiteItems = {
+            BottomNavDestinations.entries.forEach { dest ->
+                item(
+                    icon = {
+                        BadgedBox(
+                            badge = {
+                                if (dest == BottomNavDestinations.UPDATES && numUpdates > 0) {
+                                    Badge {
+                                        Text(text = numUpdates.toString())
+                                    }
+                                }
+                            }
+                        ) {
+                            Icon(
+                                dest.icon,
+                                contentDescription = stringResource(dest.label)
+                            )
+                        }
+                    },
+                    label = { Text(stringResource(dest.label)) },
+                    selected = dest == currentDestination,
+                    onClick = { currentDestination = dest }
+                )
+            }
+        }
+    ) {
+        when (currentDestination) {
+            BottomNavDestinations.APPS -> Apps(
+                apps = filterInfo.model.apps,
+                filterInfo = filterInfo,
+                onMainNav = { navController.navigate(it) },
+                modifier = Modifier,
+            )
+            BottomNavDestinations.UPDATES -> Updates(
+                apps = updates,
+            )
+        }
+    }
+}
+
+@Preview
+@PreviewScreenSizes
+@Composable
+fun BottomBarPreview() {
+    val apps = listOf(
+        AppNavigationItem("", "foo", "bar", false),
+        AppNavigationItem("", "foo", "bar", false),
+        AppNavigationItem("", "foo", "bar", false),
+    )
+    val filterInfo = object : FilterInfo {
+        override val model = FilterModel(
+            isLoading = false,
+            apps = apps,
+            onlyInstalledApps = false,
+            sortBy = Sort.NAME,
+            allCategories = listOf("foo", "bar"),
+            addedCategories = emptyList(),
+        )
+
+        override fun sortBy(sort: Sort) {}
+        override fun addCategory(category: String) {}
+        override fun removeCategory(category: String) {}
+        override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
+    }
+    BottomBarScreen(rememberNavController(), 2, emptyList(), filterInfo)
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index d256b3a8c..ad9bfc929 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -1,138 +1,74 @@
 package org.fdroid.basic.ui.main
 
 import androidx.annotation.StringRes
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Apps
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.filled.Update
-import androidx.compose.material3.Badge
-import androidx.compose.material3.BadgedBox
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.Settings
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewScreenSizes
-import androidx.window.core.layout.WindowWidthSizeClass
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import org.fdroid.basic.MainViewModel
 import org.fdroid.basic.R
-import org.fdroid.basic.ui.main.apps.AppNavigationItem
+import org.fdroid.basic.ui.icons.PackageVariant
 import org.fdroid.basic.ui.main.apps.FilterInfo
-import org.fdroid.basic.ui.main.apps.FilterModel
-import org.fdroid.basic.ui.main.updates.UpdatableApp
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
-enum class AppDestinations(
+sealed class NavDestinations(
+    val id: String,
     @StringRes val label: Int,
     val icon: ImageVector,
 ) {
-    APPS(R.string.apps, Icons.Filled.Apps),
-    UPDATES(R.string.updates, Icons.Filled.Update),
+    object Main : NavDestinations("main", R.string.app_name, Icons.Default.Info)
+    object Repos : NavDestinations("repos", R.string.app_details_repositories, PackageVariant)
+    object Settings : NavDestinations("settings", R.string.menu_settings, Icons.Filled.Settings)
+    object About : NavDestinations("about", R.string.about, Icons.Filled.Info)
 }
 
+val topBarMenuItems = listOf(
+    NavDestinations.Repos,
+    NavDestinations.Settings,
+)
+
+val moreMenuItems = listOf(
+    NavDestinations.About,
+)
+
 @Composable
-fun Main(numUpdates: Int, updates: List<UpdatableApp>, filterInfo: FilterInfo) {
-    var currentDestination by rememberSaveable { mutableStateOf(AppDestinations.APPS) }
+fun Main(viewModel: MainViewModel = viewModel()) {
     FDroidContent {
-        val adaptiveInfo = currentWindowAdaptiveInfo()
-        val customNavSuiteType = with(adaptiveInfo) {
-            when (windowSizeClass.windowWidthSizeClass) {
-                WindowWidthSizeClass.COMPACT -> NavigationSuiteType.NavigationBar
-                else -> NavigationSuiteType.NavigationRail
-            }
-        }
-        var menuExpanded by remember { mutableStateOf(false) }
-        NavigationSuiteScaffold(
-            modifier = Modifier.fillMaxSize(),
-            layoutType = customNavSuiteType,
-            navigationSuiteColors = NavigationSuiteDefaults.colors(
-                navigationBarContainerColor = Color.Transparent,
-            ),
-            navigationSuiteItems = {
-                AppDestinations.entries.forEach { dest ->
-                    item(
-                        icon = {
-                            BadgedBox(
-                                badge = {
-                                    if (dest == AppDestinations.UPDATES && numUpdates > 0) {
-                                        Badge {
-                                            Text(text = numUpdates.toString())
-                                        }
-                                    }
-                                }
-                            ) {
-                                Icon(
-                                    dest.icon,
-                                    contentDescription = stringResource(dest.label)
-                                )
-                            }
-                        },
-                        label = { Text(stringResource(dest.label)) },
-                        selected = dest == currentDestination,
-                        onClick = { currentDestination = dest }
-                    )
+        val navController = rememberNavController()
+        NavHost(navController = navController, startDestination = NavDestinations.Main.id) {
+            composable(route = NavDestinations.Main.id) {
+                val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
+                val updates = viewModel.updates.collectAsStateWithLifecycle().value
+                val filterInfo = object : FilterInfo {
+                    override val model = viewModel.filterModel.collectAsStateWithLifecycle().value
+                    override fun sortBy(sort: Sort) = viewModel.sortBy(sort)
+                    override fun addCategory(category: String) = viewModel.addCategory(category)
+                    override fun removeCategory(category: String) =
+                        viewModel.removeCategory(category)
+
+                    override fun showOnlyInstalledApps(onlyInstalled: Boolean) =
+                        viewModel.showOnlyInstalledApps(onlyInstalled)
                 }
-                item(
-                    icon = {
-                        Icon(
-                            Icons.Default.MoreVert,
-                            contentDescription = null,
-                        )
-                        MainOverFlowMenu(menuExpanded) { menuExpanded = false }
-                    },
-                    label = { Text("More") },
-                    selected = false,
-                    onClick = { menuExpanded = true }
-                )
+                BottomBarScreen(navController, numUpdates, updates, filterInfo)
             }
-        ) {
-            if (currentDestination == AppDestinations.APPS) Apps(
-                apps = filterInfo.model.apps,
-                filterInfo = filterInfo,
-                modifier = Modifier,
-            )
-            else Updates(
-                apps = updates,
-            )
+            composable(route = NavDestinations.Repos.id) {
+                val repos = viewModel.repos.collectAsStateWithLifecycle().value
+                Repositories(repos, null) { navController.popBackStack() }
+            }
+            composable(route = NavDestinations.Settings.id) {
+                Settings { navController.popBackStack() }
+            }
+            composable(route = NavDestinations.About.id) {
+                About { navController.popBackStack() }
+            }
+            // Add more destinations similarly.
         }
+
     }
 }
-
-@Preview
-@PreviewScreenSizes
-@Composable
-fun MainPreview() {
-    val apps = listOf(
-        AppNavigationItem("", "foo", "bar", false),
-        AppNavigationItem("", "foo", "bar", false),
-        AppNavigationItem("", "foo", "bar", false),
-    )
-    val filterInfo = object : FilterInfo {
-        override val model = FilterModel(
-            isLoading = false,
-            apps = apps,
-            onlyInstalledApps = false,
-            sortBy = Sort.NAME,
-            allCategories = listOf("foo", "bar"),
-            addedCategories = emptyList(),
-        )
-
-        override fun sortBy(sort: Sort) {}
-        override fun addCategory(category: String) {}
-        override fun removeCategory(category: String) {}
-        override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
-    }
-    Main(2, emptyList(), filterInfo)
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt b/basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt
index ad24ba461..73c33e0a5 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt
@@ -1,51 +1,30 @@
 package org.fdroid.basic.ui.main
 
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Info
-import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import org.fdroid.basic.R
-import org.fdroid.basic.ui.icons.PackageVariant
 
 @Composable
-fun MainOverFlowMenu(menuExpanded: Boolean, onDismissRequest: () -> Unit) {
+fun MainOverFlowMenu(
+    menuExpanded: Boolean,
+    onItemClicked: (NavDestinations) -> Unit,
+    onDismissRequest: () -> Unit,
+) {
     DropdownMenu(
         expanded = menuExpanded,
-        onDismissRequest = onDismissRequest) {
-        DropdownMenuItem(
-            text = { Text(stringResource(R.string.app_details_repositories)) },
-            onClick = { },
-            leadingIcon = {
-                Icon(
-                    PackageVariant,
-                    contentDescription = null
-                )
-            }
-        )
-        DropdownMenuItem(
-            text = { Text(stringResource(R.string.menu_settings)) },
-            onClick = { },
-            leadingIcon = {
-                Icon(
-                    Icons.Filled.Settings,
-                    contentDescription = null
-                )
-            }
-        )
-        DropdownMenuItem(
-            text = { Text("About") },
-            onClick = { },
-            leadingIcon = {
-                Icon(
-                    Icons.Filled.Info,
-                    contentDescription = null
-                )
-            }
-        )
+        onDismissRequest = onDismissRequest
+    ) {
+        moreMenuItems.forEach { dest ->
+            DropdownMenuItem(
+                text = { Text(stringResource(dest.label)) },
+                onClick = { onItemClicked(dest) },
+                leadingIcon = {
+                    Icon(dest.icon, contentDescription = null)
+                }
+            )
+        }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Repositories.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Repositories.kt
new file mode 100644
index 000000000..5cfe118ca
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Repositories.kt
@@ -0,0 +1,176 @@
+package org.fdroid.basic.ui.main
+
+import android.os.Parcelable
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.layout.AnimatedPane
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Detail
+import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
+import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewScreenSizes
+import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
+import kotlinx.coroutines.launch
+import kotlinx.parcelize.Parcelize
+import org.fdroid.basic.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
+fun Repositories(
+    repositories: List<Repository>,
+    currentRepository: Repository?,
+    onBackClicked: () -> Unit,
+) {
+    val navigator = rememberListDetailPaneScaffoldNavigator<Repository>()
+    val scope = rememberCoroutineScope()
+    BackHandler(enabled = navigator.canNavigateBack()) {
+        scope.launch {
+            navigator.navigateBack()
+        }
+    }
+    val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
+    val listState = rememberLazyListState()
+    ListDetailPaneScaffold(
+        directive = navigator.scaffoldDirective,
+        value = navigator.scaffoldValue,
+        listPane = {
+            AnimatedPane {
+                Scaffold(
+                    topBar = {
+                        TopAppBar(
+                            navigationIcon = {
+                                IconButton(onClick = onBackClicked) {
+                                    Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
+                                }
+                            },
+                            title = {
+                                Text(stringResource(R.string.app_details_repositories))
+                            },
+                        )
+                    },
+                ) { paddingValues ->
+                    LazyColumn(
+                        contentPadding = PaddingValues(vertical = 8.dp),
+                        verticalArrangement = spacedBy(8.dp),
+                        modifier = Modifier
+                            .padding(paddingValues)
+                            .then(
+                                if (currentRepository == null) Modifier
+                                else Modifier.selectableGroup()
+                            ),
+                    ) {
+                        val localeList = LocaleListCompat.getDefault()
+                        val onItemClick: (Repository) -> Unit = {
+                            scope.launch { navigator.navigateTo(Detail, it) }
+                        }
+                        items(repositories) { repoItem ->
+                            val isSelected = currentRepository == repoItem
+                            val interactionModifier = if (currentRepository == null) {
+                                Modifier.clickable(
+                                    onClick = { onItemClick(repoItem) }
+                                )
+                            } else {
+                                Modifier.selectable(
+                                    selected = isSelected,
+                                    onClick = { onItemClick(repoItem) }
+                                )
+                            }
+                            ListItem(
+                                leadingContent = {
+                                    Icon(
+                                        Icons.Filled.Android,
+                                        tint = MaterialTheme.colorScheme.secondary,
+                                        contentDescription = null,
+                                    )
+                                },
+                                headlineContent = {
+                                    Text(repoItem.getName(localeList) ?: "Unknown repo")
+                                },
+                                supportingContent = {
+                                    Text(repoItem.address)
+                                },
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(horizontal = 8.dp)
+                                    .then(interactionModifier),
+                            )
+                        }
+                    }
+                }
+            }
+        },
+        detailPane = {
+            AnimatedPane {
+                navigator.currentDestination?.contentKey?.let {
+                    Column(verticalArrangement = spacedBy(16.dp)) {
+                        Text(it.getName(LocaleListCompat.getDefault()) ?: "Unknown repo")
+                        Text("This will basically be the repo details screen from latest client")
+                    }
+                } ?: Text(
+                    text = "No repository selected",
+                    modifier = Modifier.padding(16.dp),
+                )
+            }
+        },
+    )
+}
+
+@Preview
+@PreviewScreenSizes
+@Composable
+fun RepositoriesPreview() {
+    FDroidContent {
+        val repos = listOf(
+            Repository(
+                address = "http://example.org",
+                timestamp = System.currentTimeMillis(),
+                lastUpdated = null,
+                weight = 2,
+                enabled = true,
+                name = "My first repository",
+            )
+        )
+        Repositories(repos, repos[0]) { }
+    }
+}
+
+@Parcelize
+data class Repository(
+    val address: String,
+    val timestamp: Long,
+    val lastUpdated: Long?,
+    val weight: Int,
+    val enabled: Boolean,
+    private val name: String,
+) : Parcelable {
+    fun getName(localeList: LocaleListCompat): String? = name
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Settings.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Settings.kt
new file mode 100644
index 000000000..932a377a2
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Settings.kt
@@ -0,0 +1,54 @@
+package org.fdroid.basic.ui.main
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewScreenSizes
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun Settings(onBackClicked: () -> Unit) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                navigationIcon = {
+                    IconButton(onClick = onBackClicked) {
+                        Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
+                    }
+                },
+                title = {
+                    Text(stringResource(R.string.menu_settings))
+                },
+            )
+        },
+    ) { paddingValues ->
+        Text(
+            stringResource(R.string.menu_settings),
+            modifier = Modifier
+                .padding(paddingValues)
+                .padding(16.dp)
+        )
+    }
+}
+
+@Preview
+@PreviewScreenSizes
+@Composable
+fun SettingsPreview() {
+    FDroidContent {
+        Settings {  }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt
new file mode 100644
index 000000000..1f9dcda35
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt
@@ -0,0 +1,96 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
+import androidx.compose.material3.carousel.rememberCarouselState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AppCarousel(
+    title: String,
+    apps: List<AppNavigationItem>,
+    modifier: Modifier = Modifier,
+    onTitleTap: () -> Unit,
+    onAppTap: (AppNavigationItem) -> Unit,
+) {
+    val carouselState = rememberCarouselState { apps.size }
+    Column(modifier = modifier) {
+        Row(
+            verticalAlignment = CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable(onClick = onTitleTap)
+                .padding(horizontal = 16.dp, vertical = 8.dp),
+        ) {
+            Text(
+                text = title,
+                style = MaterialTheme.typography.headlineSmall,
+            )
+            Icon(
+                imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
+                contentDescription = null,
+            )
+        }
+        HorizontalUncontainedCarousel(
+            state = carouselState,
+            itemWidth = 64.dp,
+            itemSpacing = 8.dp,
+            contentPadding = PaddingValues(horizontal = 16.dp),
+        ) { index ->
+            AppBox(apps[index], onAppTap)
+        }
+    }
+}
+
+@Composable
+fun AppBox(app: AppNavigationItem, onAppTap: (AppNavigationItem) -> Unit) {
+    Column(
+        modifier = Modifier
+            .clip(MaterialTheme.shapes.medium)
+            .background(MaterialTheme.colorScheme.surfaceContainer)
+            .padding(8.dp)
+            .clickable { onAppTap(app) },
+    ) {
+        Icon(
+            Icons.Filled.Android,
+            tint = MaterialTheme.colorScheme.secondary,
+            contentDescription = null,
+            modifier = Modifier.size(64.dp),
+        )
+        Text(text = app.name, style = MaterialTheme.typography.bodySmall)
+    }
+}
+
+@Preview
+@Composable
+fun AppCarouselPreview() {
+    val apps = listOf(
+        AppNavigationItem("", "foo", "bar", true),
+        AppNavigationItem("", "foo", "bar", false),
+        AppNavigationItem("", "foo", "bar", false),
+    )
+    FDroidContent {
+        AppCarousel("Preview Apps", apps, onTitleTap = {}) {}
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
index 269623fe1..2e351a800 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
@@ -2,6 +2,7 @@ package org.fdroid.basic.ui.main.apps
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -10,47 +11,117 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.FilterList
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults.exitUntilCollapsedScrollBehavior
+import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
 
 @Composable
+@OptIn(ExperimentalMaterial3Api::class)
 fun AppList(
+    listState: LazyListState,
     apps: List<AppNavigationItem>,
+    filterInfo: FilterInfo,
     currentItem: AppNavigationItem?,
+    modifier: Modifier = Modifier,
+    onBackClicked: () -> Unit,
     onItemClick: (AppNavigationItem) -> Unit,
 ) {
-    LazyColumn(
-        contentPadding = PaddingValues(vertical = 8.dp),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-        modifier = Modifier.then(
-            if (currentItem == null) Modifier
-            else Modifier.selectableGroup()
-        ),
-    ) {
-        items(apps) { navItem ->
-            val isSelected = currentItem?.packageName == navItem.packageName
-            val interactionModifier = if (currentItem == null) {
-                Modifier.clickable(
-                    onClick = { onItemClick(navItem) }
-                )
-            } else {
-                Modifier.selectable(
-                    selected = isSelected,
-                    onClick = { onItemClick(navItem) }
-                )
+    val scrollBehavior = exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
+    var filterExpanded by rememberSaveable { mutableStateOf(true) }
+    val addedRepos = remember { mutableStateListOf<String>() }
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                        Text("New apps")
+                },
+                navigationIcon = {
+                    IconButton(onClick = onBackClicked) {
+                        Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
+                    }
+                },
+                actions = {
+                    IconButton(onClick = { filterExpanded = !filterExpanded }) {
+                        val showFilterBadge = addedRepos.isNotEmpty() ||
+                            filterInfo.model.addedCategories.isNotEmpty() ||
+                            filterInfo.model.onlyInstalledApps
+                        BadgedBox(badge = {
+                            if (showFilterBadge) Badge(containerColor = MaterialTheme.colorScheme.secondary)
+                        }) {
+                            Icon(
+                                Icons.Filled.FilterList,
+                                contentDescription = null,
+                            )
+                        }
+                    }
+                },
+                scrollBehavior = scrollBehavior,
+            )
+        },
+        modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+    ) { paddingValues ->
+        Column(modifier = Modifier.padding(paddingValues)) {
+            AppsFilter(
+                filterExpanded = filterExpanded,
+                filter = filterInfo,
+                addedRepos = addedRepos,
+            )
+            LazyColumn(
+                state = listState,
+                contentPadding = PaddingValues(vertical = 8.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+                modifier = Modifier.then(
+                        if (currentItem == null) Modifier
+                        else Modifier.selectableGroup()
+                    ),
+            ) {
+                items(apps) { navItem ->
+                    val isSelected = currentItem?.packageName == navItem.packageName
+                    val interactionModifier = if (currentItem == null) {
+                        Modifier.clickable(
+                            onClick = { onItemClick(navItem) }
+                        )
+                    } else {
+                        Modifier.selectable(
+                            selected = isSelected,
+                            onClick = { onItemClick(navItem) }
+                        )
+                    }
+                    val modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 8.dp)
+                        .then(interactionModifier)
+                    AppItem(navItem.name, navItem.summary, navItem.isNew, isSelected, modifier)
+                }
+                item {
+                    Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+                }
             }
-            val modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 8.dp)
-                .then(interactionModifier)
-            AppItem(navItem.name, navItem.summary, navItem.isNew, isSelected, modifier)
-        }
-        item {
-            Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
index 78db5ff7e..eaf97a4d9 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
@@ -1,19 +1,14 @@
 package org.fdroid.basic.ui.main.apps
 
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Clear
-import androidx.compose.material.icons.filled.FilterList
 import androidx.compose.material.icons.filled.Search
-import androidx.compose.material3.Badge
-import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
@@ -28,8 +23,6 @@ import kotlinx.coroutines.launch
 fun AppSearchInputField(
     searchBarState: SearchBarState,
     textFieldState: TextFieldState,
-    toggleFilter: () -> Unit,
-    showFilterBadge: Boolean
 ) {
     val scope = rememberCoroutineScope()
     SearchBarDefaults.InputField(
@@ -52,24 +45,13 @@ fun AppSearchInputField(
             }
         },
         trailingIcon = {
-            if (searchBarState.currentValue == SearchBarValue.Expanded) {
+            if (textFieldState.text.isNotEmpty()) {
                 IconButton(onClick = { textFieldState.setTextAndPlaceCursorAtEnd("") }) {
                     Icon(
                         Icons.Filled.Clear,
                         contentDescription = null,
                     )
                 }
-            } else Row {
-                IconButton(onClick = toggleFilter) {
-                    BadgedBox(badge = {
-                        if (showFilterBadge) Badge(containerColor = MaterialTheme.colorScheme.secondary)
-                    }) {
-                        Icon(
-                            Icons.Filled.FilterList,
-                            contentDescription = null,
-                        )
-                    }
-                }
             }
         }
     )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
index 8bc1c587c..7733af58a 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
@@ -44,10 +44,11 @@ fun ColumnScope.AppsFilter(
     filterExpanded: Boolean,
     filter: FilterInfo,
     addedRepos: MutableList<String>,
+    modifier: Modifier = Modifier,
 ) {
     AnimatedVisibility(filterExpanded) {
         FlowRow(
-            modifier = Modifier
+            modifier = modifier
                 .padding(horizontal = 16.dp),
             horizontalArrangement = spacedBy(16.dp),
         ) {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
index 5c7c84b32..d80f93b84 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
@@ -1,82 +1,41 @@
 package org.fdroid.basic.ui.main.apps
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.ExpandedDockedSearchBar
+import androidx.compose.material3.ExpandedFullScreenSearchBar
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.SearchBarDefaults
+import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.TopSearchBar
-import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.launch
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppsSearch(
-    showFilterBadge: Boolean,
-    toggleFilter: () -> Unit,
+    searchBarState: SearchBarState,
     onItemClick: (AppNavigationItem) -> Unit,
 ) {
     val textFieldState = rememberTextFieldState()
-    val scrollBehavior = SearchBarDefaults.enterAlwaysSearchBarScrollBehavior()
-    val searchBarState = rememberSearchBarState()
-    val scope = rememberCoroutineScope()
     val inputField = @Composable {
         AppSearchInputField(
             searchBarState = searchBarState,
             textFieldState = textFieldState,
-            toggleFilter = toggleFilter,
-            showFilterBadge = showFilterBadge,
         )
     }
     TopSearchBar(
-        modifier = Modifier,
         state = searchBarState,
-        scrollBehavior = scrollBehavior,
-        windowInsets = WindowInsets.systemBars,
+        windowInsets = WindowInsets(),
         inputField = inputField,
     )
-    ExpandedDockedSearchBar(
+    ExpandedFullScreenSearchBar(
         state = searchBarState,
         inputField = inputField,
     ) {
         Column(Modifier.verticalScroll(rememberScrollState())) {
-            repeat(4) { i ->
-                val navItem = AppNavigationItem(
-                    packageName = "$i",
-                    name = "App $i",
-                    summary = "Summary of the app",
-                    isNew = false,
-                )
-                AppItem(
-                    name = navItem.name,
-                    summary = navItem.summary,
-                    isNew = navItem.isNew,
-                    isSelected = false,
-                    modifier = Modifier
-                        .clickable {
-                            scope.launch {
-                                searchBarState.animateToCollapsed()
-                                onItemClick(navItem)
-                            }
-                        }
-                        .fillMaxWidth()
-                        .padding(
-                            horizontal = 16.dp,
-                            vertical = 4.dp
-                        )
-                )
-            }
+            // TODO
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt
new file mode 100644
index 000000000..7ef608cff
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt
@@ -0,0 +1,132 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.scrollable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults.enterAlwaysScrollBehavior
+import androidx.compose.material3.rememberSearchBarState
+import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+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
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.ui.main.MainOverFlowMenu
+import org.fdroid.basic.ui.main.topBarMenuItems
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun Discover(
+    apps: List<AppNavigationItem>,
+    modifier: Modifier = Modifier,
+    onTitleTap: () -> Unit,
+    onAppTap: (AppNavigationItem) -> Unit,
+    onMainNav: (String) -> Unit,
+) {
+    val searchBarState = rememberSearchBarState()
+    val scrollState = rememberScrollState()
+    val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text("F-Droid")
+                },
+                actions = {
+                    topBarMenuItems.forEach { dest ->
+                        IconButton(onClick = { onMainNav(dest.id) }) {
+                            Icon(
+                                imageVector = dest.icon,
+                                contentDescription = stringResource(dest.label),
+                            )
+                        }
+                    }
+                    var menuExpanded by remember { mutableStateOf(false) }
+                    IconButton(onClick = { menuExpanded = !menuExpanded }) {
+                        Icon(
+                            Icons.Default.MoreVert,
+                            contentDescription = null,
+                        )
+                    }
+                    MainOverFlowMenu(menuExpanded, {
+                        menuExpanded = false
+                        onMainNav(it.id)
+                    }) {
+                        menuExpanded = false
+                    }
+                },
+                scrollBehavior = scrollBehavior,
+            )
+        },
+        modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+    ) { paddingValues ->
+        Column(
+            Modifier
+                .scrollable(scrollState, Orientation.Vertical)
+                .padding(paddingValues)
+                .fillMaxSize()
+        ) {
+            AppsSearch(searchBarState, onAppTap)
+            AppCarousel(
+                title = "New apps",
+                apps = apps,
+                onTitleTap = onTitleTap,
+                onAppTap = onAppTap,
+            )
+            AppCarousel(
+                title = "Other apps",
+                apps = apps.filter { it.packageName.toInt() % 2 == 0 },
+                onTitleTap = onTitleTap,
+                onAppTap = onAppTap,
+                modifier = Modifier.padding(top = 8.dp),
+            )
+            Row(
+                verticalAlignment = CenterVertically,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clickable(onClick = onTitleTap)
+                    .padding(horizontal = 16.dp, vertical = 16.dp),
+            ) {
+                Text(
+                    text = "All apps",
+                    style = MaterialTheme.typography.headlineSmall,
+                )
+                Icon(
+                    imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
+                    contentDescription = null,
+                )
+            }
+            TextButton(
+                onClick = onTitleTap,
+                modifier = Modifier
+                    .align(End)
+                    .padding(16.dp),
+            ) {
+                Text("All apps")
+            }
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
index 5beddfb76..985cd47cd 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
@@ -13,6 +13,7 @@ import androidx.compose.material.icons.filled.ArrowDropUp
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -21,6 +22,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -29,6 +31,7 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 @Composable
 fun UpdatableAppRow(app: UpdatableApp, modifier: Modifier = Modifier) {
     var isExpanded by remember { mutableStateOf(false) }
+    val isSelected = false // TODO
     Column {
         ListItem(
             leadingContent = {
@@ -56,6 +59,13 @@ fun UpdatableAppRow(app: UpdatableApp, modifier: Modifier = Modifier) {
                     }
                 }
             },
+            colors = ListItemDefaults.colors(
+                containerColor = if (isSelected) {
+                    MaterialTheme.colorScheme.surfaceVariant
+                } else {
+                    Color.Transparent
+                }
+            ),
             modifier = modifier,
         )
         AnimatedVisibility(visible = isExpanded, modifier = Modifier.padding(8.dp)) {
diff --git a/basic/src/main/res/values/strings-next.xml b/basic/src/main/res/values/strings-next.xml
index c5faad631..121ed9945 100644
--- a/basic/src/main/res/values/strings-next.xml
+++ b/basic/src/main/res/values/strings-next.xml
@@ -3,4 +3,8 @@
 
     <string name="app_name">F-Droid Next</string>
 
+    <string name="about">About</string>
+    <string name="discover">Discover</string>
+    <string name="apps_my">My apps</string>
+
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1de62c88f..6d17d7cb3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -31,6 +31,7 @@ androidxVectordrawable = "1.2.0"
 androidxGridlayout = "1.1.0"
 androidxComposeBom = "2025.09.01"
 androidxActivityCompose = "1.11.0"
+androidxNavCompose = "2.9.1"
 accompanistDrawablepainter = "0.37.3"
 material = "1.13.0"
 
@@ -102,6 +103,7 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom-alpha",
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavCompose" }
 androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" }

From f5288a12d45b5141f965fd920495f0f46a0b1f33 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 6 May 2025 15:29:00 -0300
Subject: [PATCH 010/180] Show real app names and category images

---
 .../java/org/fdroid/basic/MainViewModel.kt    |   46 +-
 .../fdroid/basic/ui/main/CategoryCarousel.kt  |  120 +
 .../fdroid/basic/ui/main/apps/AppCarousel.kt  |   28 +-
 .../org/fdroid/basic/ui/main/apps/AppItem.kt  |    8 +
 .../fdroid/basic/ui/main/apps/AppsSearch.kt   |    2 +
 .../org/fdroid/basic/ui/main/apps/Discover.kt |   39 +-
 .../org/fdroid/basic/ui/main/apps/Names.kt    | 4302 +++++++++++++++++
 .../basic/ui/main/updates/UpdatableAppRow.kt  |    7 +
 .../res/drawable/category_connectivity.png    |    1 +
 .../res/drawable/category_development.png     |    1 +
 .../src/main/res/drawable/category_games.png  |    1 +
 .../main/res/drawable/category_graphics.png   |    1 +
 .../main/res/drawable/category_internet.png   |    1 +
 .../src/main/res/drawable/category_money.png  |    1 +
 .../main/res/drawable/category_navigation.png |    1 +
 .../main/res/drawable/category_reading.png    |    1 +
 .../drawable/category_science_education.png   |    1 +
 .../main/res/drawable/category_security.png   |    1 +
 .../src/main/res/drawable/category_system.png |    1 +
 .../main/res/drawable/category_theming.png    |    1 +
 .../main/res/drawable/category_writing.png    |    1 +
 21 files changed, 4505 insertions(+), 60 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/CategoryCarousel.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/Names.kt
 create mode 120000 basic/src/main/res/drawable/category_connectivity.png
 create mode 120000 basic/src/main/res/drawable/category_development.png
 create mode 120000 basic/src/main/res/drawable/category_games.png
 create mode 120000 basic/src/main/res/drawable/category_graphics.png
 create mode 120000 basic/src/main/res/drawable/category_internet.png
 create mode 120000 basic/src/main/res/drawable/category_money.png
 create mode 120000 basic/src/main/res/drawable/category_navigation.png
 create mode 120000 basic/src/main/res/drawable/category_reading.png
 create mode 120000 basic/src/main/res/drawable/category_science_education.png
 create mode 120000 basic/src/main/res/drawable/category_security.png
 create mode 120000 basic/src/main/res/drawable/category_system.png
 create mode 120000 basic/src/main/res/drawable/category_theming.png
 create mode 120000 basic/src/main/res/drawable/category_writing.png

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index f837e3857..d7cb8a040 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -21,6 +21,7 @@ import org.fdroid.basic.ui.main.Sort
 import org.fdroid.basic.ui.main.apps.AppNavigationItem
 import org.fdroid.basic.ui.main.apps.FilterModel
 import org.fdroid.basic.ui.main.apps.FilterPresenter
+import org.fdroid.basic.ui.main.apps.Names
 import org.fdroid.basic.ui.main.updates.UpdatableApp
 
 class MainViewModel(app: Application) : AndroidViewModel(app) {
@@ -28,7 +29,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
     companion object {
         val fakeUpdates = listOf(
             UpdatableApp(
-                name = "App Name 123",
+                name = Names.randomName,
                 currentVersionName = "1.0.1",
                 updateVersionName = "1.1.0",
                 size = 123456789,
@@ -36,7 +37,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
                     "Only the best changes."
             ),
             UpdatableApp(
-                name = "App Name 456",
+                name = Names.randomName,
                 currentVersionName = "3.0.1",
                 updateVersionName = "3.1.0",
                 size = 9876543,
@@ -46,29 +47,32 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
     val categories = listOf(
-        app.getString(R.string.category_Time),
-        app.getString(R.string.category_Games),
-        app.getString(R.string.category_Money),
-        app.getString(R.string.category_Reading),
-        app.getString(R.string.category_Theming),
-        app.getString(R.string.category_Connectivity),
-        app.getString(R.string.category_Internet),
-        app.getString(R.string.category_Navigation),
-        app.getString(R.string.category_Multimedia),
-        app.getString(R.string.category_Phone_SMS),
-        app.getString(R.string.category_Science_Education),
-        app.getString(R.string.category_Security),
-        app.getString(R.string.category_Sports_Health),
-        app.getString(R.string.category_System),
-        app.getString(R.string.category_Writing),
+        Pair(app.getString(R.string.category_Internet), R.drawable.category_internet),
+        Pair(app.getString(R.string.category_Games), R.drawable.category_games),
+        Pair(app.getString(R.string.category_Navigation), R.drawable.category_navigation),
+        Pair(app.getString(R.string.category_Multimedia), R.drawable.category_money),
+        Pair(app.getString(R.string.category_Security), R.drawable.category_security),
+        Pair(app.getString(R.string.category_Reading), R.drawable.category_reading),
+        Pair(app.getString(R.string.category_Time), R.drawable.category_theming),
+        Pair(app.getString(R.string.category_Money), R.drawable.category_money),
+        Pair(app.getString(R.string.category_Theming), R.drawable.category_theming),
+        Pair(app.getString(R.string.category_Connectivity), R.drawable.category_connectivity),
+        Pair(app.getString(R.string.category_Phone_SMS), R.drawable.category_system),
+        Pair(
+            app.getString(R.string.category_Science_Education),
+            R.drawable.category_science_education
+        ),
+        Pair(app.getString(R.string.category_Sports_Health), R.drawable.category_security),
+        Pair(app.getString(R.string.category_System), R.drawable.category_system),
+        Pair(app.getString(R.string.category_Writing), R.drawable.category_writing),
     )
 
     val initialApps = buildList {
         repeat(NUM_ITEMS) { i ->
-            val category = categories.getOrElse(i) { categories.random() }
+            val category = categories.getOrElse(i) { categories.random() }.first
             val navItem = AppNavigationItem(
                 packageName = "$i",
-                name = "App $i",
+                name = Names.randomName,
                 summary = "Summary of the app • $category",
                 isNew = i > NUM_ITEMS - 4,
             )
@@ -88,7 +92,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
             appsFlow = flow { emit(initialApps) },
             onlyInstalledAppsFlow = onlyInstalledApps,
             sortByFlow = sortBy,
-            allCategories = categories,
+            allCategories = categories.map { it.first },
             addedCategoriesFlow = addedCategories,
         )
     }
@@ -115,7 +119,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
             _updates.update {
                 it.toMutableList().apply {
                     val app = UpdatableApp(
-                        name = "App Name 789",
+                        name = Names.randomName,
                         currentVersionName = "4.0.1",
                         updateVersionName = "4.3.0",
                         size = 4561237,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/CategoryCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/CategoryCarousel.kt
new file mode 100644
index 000000000..3dee1ff96
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/CategoryCarousel.kt
@@ -0,0 +1,120 @@
+package org.fdroid.basic.ui.main
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
+import androidx.compose.material3.carousel.rememberCarouselState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import org.fdroid.basic.MainViewModel
+import org.fdroid.basic.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun CategoryCarousel(
+    onTitleTap: () -> Unit,
+    onCategoryTap: (String) -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: MainViewModel = viewModel(),
+) {
+    CategoryCarousel(viewModel.categories, modifier, onTitleTap, onCategoryTap)
+}
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun CategoryCarousel(
+    categories: List<Pair<String, Int>>,
+    modifier: Modifier = Modifier,
+    onTitleTap: () -> Unit,
+    onCategoryTap: (String) -> Unit,
+) {
+    val carouselState = rememberCarouselState { categories.size }
+    Column(modifier = modifier) {
+        Row(
+            verticalAlignment = CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable(onClick = onTitleTap)
+                .padding(horizontal = 16.dp, vertical = 8.dp),
+        ) {
+            Text(
+                text = "Categories",
+                style = MaterialTheme.typography.headlineSmall,
+            )
+            Icon(
+                imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
+                contentDescription = null,
+            )
+        }
+        HorizontalUncontainedCarousel(
+            state = carouselState,
+            itemWidth = 80.dp,
+            itemSpacing = 8.dp,
+            contentPadding = PaddingValues(horizontal = 16.dp),
+        ) { index ->
+            CategoryBox(categories[index], onCategoryTap)
+        }
+    }
+}
+
+@Composable
+fun CategoryBox(category: Pair<String, Int>, onCategoryTap: (String) -> Unit) {
+    Column(
+        verticalArrangement = spacedBy(8.dp),
+        modifier = Modifier
+            .padding(8.dp)
+            .clickable { onCategoryTap(category.first) },
+    ) {
+        Image(
+            painter = painterResource(category.second),
+            contentDescription = null,
+            contentScale = ContentScale.Fit,
+            modifier = Modifier
+                .clip(MaterialTheme.shapes.medium)
+                .size(76.dp),
+        )
+        Text(
+            text = category.first,
+            style = MaterialTheme.typography.bodySmall,
+            minLines = 2,
+            maxLines = 2,
+        )
+    }
+}
+
+@Preview
+@Composable
+fun CategoryCarouselPreview() {
+    val categories = listOf(
+        Pair(stringResource(R.string.category_Time), R.drawable.category_theming),
+        Pair(stringResource(R.string.category_Games), R.drawable.category_games),
+        Pair(stringResource(R.string.category_Money), R.drawable.category_money),
+        Pair(stringResource(R.string.category_Reading), R.drawable.category_reading),
+        Pair(stringResource(R.string.category_Theming), R.drawable.category_theming),
+        Pair(stringResource(R.string.category_Connectivity), R.drawable.category_connectivity),
+    )
+    FDroidContent {
+        CategoryCarousel(categories, onTitleTap = {}) {}
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt
index 1f9dcda35..c3dee33e3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt
@@ -2,6 +2,7 @@ package org.fdroid.basic.ui.main.apps
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -21,6 +22,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
@@ -54,7 +56,7 @@ fun AppCarousel(
         }
         HorizontalUncontainedCarousel(
             state = carouselState,
-            itemWidth = 64.dp,
+            itemWidth = 80.dp,
             itemSpacing = 8.dp,
             contentPadding = PaddingValues(horizontal = 16.dp),
         ) { index ->
@@ -66,9 +68,8 @@ fun AppCarousel(
 @Composable
 fun AppBox(app: AppNavigationItem, onAppTap: (AppNavigationItem) -> Unit) {
     Column(
+        verticalArrangement = spacedBy(8.dp),
         modifier = Modifier
-            .clip(MaterialTheme.shapes.medium)
-            .background(MaterialTheme.colorScheme.surfaceContainer)
             .padding(8.dp)
             .clickable { onAppTap(app) },
     ) {
@@ -76,9 +77,18 @@ fun AppBox(app: AppNavigationItem, onAppTap: (AppNavigationItem) -> Unit) {
             Icons.Filled.Android,
             tint = MaterialTheme.colorScheme.secondary,
             contentDescription = null,
-            modifier = Modifier.size(64.dp),
+            modifier = Modifier
+                .clip(MaterialTheme.shapes.medium)
+                .size(76.dp)
+                .background(Color.White)
+                .padding(8.dp),
+        )
+        Text(
+            text = app.name,
+            style = MaterialTheme.typography.bodySmall,
+            minLines = 2,
+            maxLines = 2,
         )
-        Text(text = app.name, style = MaterialTheme.typography.bodySmall)
     }
 }
 
@@ -86,9 +96,11 @@ fun AppBox(app: AppNavigationItem, onAppTap: (AppNavigationItem) -> Unit) {
 @Composable
 fun AppCarouselPreview() {
     val apps = listOf(
-        AppNavigationItem("", "foo", "bar", true),
-        AppNavigationItem("", "foo", "bar", false),
-        AppNavigationItem("", "foo", "bar", false),
+        AppNavigationItem("", Names.randomName, "bar", true),
+        AppNavigationItem("", Names.randomName, "bar", false),
+        AppNavigationItem("", Names.randomName, "bar", false),
+        AppNavigationItem("", Names.randomName, "bar", false),
+        AppNavigationItem("", Names.randomName, "bar", false),
     )
     FDroidContent {
         AppCarousel("Preview Apps", apps, onTitleTap = {}) {}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt
index 2973c48d1..8822419f5 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt
@@ -1,5 +1,7 @@
 package org.fdroid.basic.ui.main.apps
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Android
@@ -12,6 +14,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -40,6 +43,11 @@ fun AppItem(
                     Icons.Filled.Android,
                     tint = MaterialTheme.colorScheme.secondary,
                     contentDescription = null,
+                    modifier = Modifier
+                        .clip(MaterialTheme.shapes.medium)
+                        .size(48.dp)
+                        .background(Color.White)
+                        .padding(8.dp),
                 )
             }
         },
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
index d80f93b84..6a61ff166 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
@@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier
 fun AppsSearch(
     searchBarState: SearchBarState,
     onItemClick: (AppNavigationItem) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val textFieldState = rememberTextFieldState()
     val inputField = @Composable {
@@ -29,6 +30,7 @@ fun AppsSearch(
         state = searchBarState,
         windowInsets = WindowInsets(),
         inputField = inputField,
+        modifier = modifier,
     )
     ExpandedFullScreenSearchBar(
         state = searchBarState,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt
index 7ef608cff..ecfa4241c 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt
@@ -1,24 +1,18 @@
 package org.fdroid.basic.ui.main.apps
 
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults.enterAlwaysScrollBehavior
 import androidx.compose.material3.rememberSearchBarState
@@ -28,12 +22,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment.Companion.CenterVertically
 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
 import androidx.compose.ui.unit.dp
+import org.fdroid.basic.ui.main.CategoryCarousel
 import org.fdroid.basic.ui.main.MainOverFlowMenu
 import org.fdroid.basic.ui.main.topBarMenuItems
 
@@ -47,7 +41,6 @@ fun Discover(
     onMainNav: (String) -> Unit,
 ) {
     val searchBarState = rememberSearchBarState()
-    val scrollState = rememberScrollState()
     val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
     Scaffold(
         topBar = {
@@ -85,41 +78,25 @@ fun Discover(
     ) { paddingValues ->
         Column(
             Modifier
-                .scrollable(scrollState, Orientation.Vertical)
-                .padding(paddingValues)
                 .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(paddingValues)
         ) {
-            AppsSearch(searchBarState, onAppTap)
+            AppsSearch(searchBarState, onAppTap, modifier = Modifier.padding(top = 8.dp))
             AppCarousel(
                 title = "New apps",
                 apps = apps,
                 onTitleTap = onTitleTap,
                 onAppTap = onAppTap,
             )
+            CategoryCarousel(onTitleTap, {})
             AppCarousel(
                 title = "Other apps",
                 apps = apps.filter { it.packageName.toInt() % 2 == 0 },
                 onTitleTap = onTitleTap,
                 onAppTap = onAppTap,
-                modifier = Modifier.padding(top = 8.dp),
             )
-            Row(
-                verticalAlignment = CenterVertically,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .clickable(onClick = onTitleTap)
-                    .padding(horizontal = 16.dp, vertical = 16.dp),
-            ) {
-                Text(
-                    text = "All apps",
-                    style = MaterialTheme.typography.headlineSmall,
-                )
-                Icon(
-                    imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
-                    contentDescription = null,
-                )
-            }
-            TextButton(
+            FilledTonalButton(
                 onClick = onTitleTap,
                 modifier = Modifier
                     .align(End)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/Names.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/Names.kt
new file mode 100644
index 000000000..d0e73835f
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/Names.kt
@@ -0,0 +1,4302 @@
+package org.fdroid.basic.ui.main.apps
+
+object Names {
+
+    val randomName: String get() = names.random()
+    val names = listOf(
+        "Anstop",
+        "PipePipe",
+        "A2DP Volume",
+        "Com-Phone Story Maker",
+        "Lightning",
+        "BitAC - Bitcoin Address Checker",
+        "Text Launcher",
+        "Polaris",
+        "Chubby Click - Metronome",
+        "SUSI.AI",
+        "Moon Phase",
+        "Export Contacts",
+        "Import Contacts",
+        "DNG Processor",
+        "Rootless Pixel Launcher",
+        "AndroDNS",
+        "androidVNC",
+        "PrBoom For Android",
+        "FakeStandby",
+        "eBooks",
+        "ANONguard",
+        "Acrylic Paint",
+        "Immich",
+        "Crescent Cash",
+        "Forkyz",
+        "Forkyz Scanner",
+        "TubeAcad",
+        "Mobilizon",
+        "UntrackMe",
+        "UntrackMe Lite",
+        "OpenMultiMaps",
+        "TubeLab",
+        "Halma",
+        "HK Transport",
+        "Intra",
+        "Ladefuchs",
+        "LibreNews",
+        "BitBanana",
+        "mLauncher",
+        "Alibi",
+        "Locus",
+        "Olauncher",
+        "Olauncher Clutter Free",
+        "OpenConnect",
+        "Organic Maps: Hike, Bike, Drive Offline",
+        "Pachli",
+        "Prav",
+        "Stoic Reading",
+        "Stoic Reading",
+        "Seeneva: smart comic reader",
+        "Shosetsu",
+        "Inure App Manager (Trial)",
+        "Food-E",
+        "Vibe You",
+        "TICE – Secure GPS Location Sharing with Friends",
+        "Jargons Colombia",
+        "UpVPN - Serverless VPN",
+        "uNote",
+        "Voyager for Lemmy",
+        "Weather Overview",
+        "Baby Care Timer",
+        "Notify Lite",
+        "Simple ToDo",
+        "ShareToBrowser",
+        "Loud Bang",
+        "Mi Manga Nu",
+        "Lato",
+        "Arity",
+        "Asgardius S3 Manager",
+        "Asgardius S3 Music",
+        "CAdroid",
+        "DAVx⁵",
+        "Device Locator",
+        "GfxTablet",
+        "ICSx⁵",
+        "NoPhoneSpam",
+        "Kolab Client",
+        "NÖ Finderlein",
+        "AmSprung",
+        "A Whip",
+        "RxDroid",
+        "Grazer Linuxtage Schedule",
+        "Octal Sun Time",
+        "Cyrillic to Latin",
+        "Plug Off Airplane",
+        "jtx Board journals|notes|tasks",
+        "LibreOffice & OpenOffice document reader | ODF",
+        "تودویر",
+        "NASA Images",
+        "Rocket Guardian",
+        "Starun",
+        "X Server",
+        "Reddinator",
+        "Metrodroid",
+        "Funkwhale for Android",
+        "OMGSoundboard",
+        "Android Resources",
+        "USB Device Info",
+        "Apk Extractor",
+        "Notepad",
+        "Droid Dicom Viewer",
+        "MobileInpact",
+        "APKShare",
+        "DNSSetter",
+        "WiFiKeyShare",
+        "Better Internet Tiles",
+        "NanoLedger",
+        "FOSDEM Companion",
+        "Webthingify",
+        "NI",
+        "UCLL Student",
+        "VPN Hotspot",
+        "Random App",
+        "Shutdown",
+        "FTP Server (Free)",
+        "Manille",
+        "Hydra",
+        "Wi-Fi Privacy Police",
+        "Weather Forecast USA",
+        "YAAB",
+        "Ad-silence",
+        "Mint Task",
+        "Mint Calculator",
+        "Reader for Selfoss",
+        "NATO Alphabet Memorizer",
+        "Petals",
+        "Food Restrictions",
+        "Daily Pill — Medication Reminder",
+        "The Knights of Alentejo",
+        "Retro Breaker",
+        "BRouter",
+        "Ridmik Dictionary",
+        "SMS Filter",
+        "Overchan (fork)",
+        "fWallet",
+        "Gardine",
+        "Bodha Converter",
+        "HashPass",
+        "Port Knocker",
+        "Paseo",
+        "Location Share",
+        "Disable Battery Warnings",
+        "Flat Connectivity Icons",
+        "Heart Observe",
+        "MidniteSolar Classic Monitor",
+        "Kaku",
+        "Time Cop",
+        "Everyone's Timetable",
+        "Hangar",
+        "Lift",
+        "Peace of Mind+",
+        "Entrust IdentityGuard Unblocker",
+        "Delist",
+        "Virtuosity",
+        "French Calendar",
+        "Network Monitor",
+        "Poet Assistant",
+        "Scrum Chatter",
+        "Nounours and friends",
+        "deedum",
+        "Bites",
+        "Trolly",
+        "CineCat",
+        "MinCal Widget",
+        "Florae",
+        "NyaaPantsu",
+        "Calliope mini",
+        "Urecord",
+        "Cool Mic",
+        "BVD",
+        "Chaldea",
+        "Rainwave",
+        "#FFF Info",
+        "FreezeYou!",
+        "Guerrilla Mail",
+        "Ad-Free",
+        "Water Me - Plant Watering Reminder",
+        "AAT Another Activity Tracker",
+        "ApnSwitch",
+        "Vanilla Music",
+        "Headphone detector for Vanilla Music",
+        "Battery Circle",
+        "GSAK for Locus",
+        "TD",
+        "World Clock & Weather",
+        "LetterBox",
+        "Lawnchair",
+        "Drupal Editor",
+        "ETH & UZH canteens Zürich",
+        "Cowsay",
+        "MyHackerspace",
+        "Deine Rechte",
+        "TopoSuite",
+        "eyeCam",
+        "Calendar Color",
+        "Velocity Calculator",
+        "Bible Verse App",
+        "Anuto TD",
+        "OsciPrime",
+        "Bluemoon",
+        "ProtonVPN - Secure and Free VPN",
+        "HTTP Request Shortcuts",
+        "Status Bar Speedometer",
+        "Battery Level",
+        "Location Cache Map",
+        "Kanji draw",
+        "Spartathlon",
+        "Notely",
+        "Threema Libre",
+        "Markdown Widget",
+        "FluffyChat",
+        "Rocket.Chat",
+        "SimpleX Chat",
+        "PilferShush Jammer",
+        "FakeTraveler",
+        "UART Smartwatch",
+        "Fun Phone Puppet",
+        "HaveRadiosion",
+        "Image SMS",
+        "Notify2Jabber",
+        "Rick App",
+        "Retro Text Editor",
+        "YidKey KD",
+        "Overload",
+        "Valetudo Companion",
+        "Tarnhelm",
+        "News",
+        "AELF - Bible and day's reading",
+        "Material Flashlight",
+        "LocalMonero: buy XMR privately",
+        "Icicle for Freenet",
+        "Clima",
+        "Just Search",
+        "Voucher Vault",
+        "Retro Music",
+        "Graph 89",
+        "Dart Checker",
+        "Neural Network Simulator",
+        "Permissions",
+        "EVE Mining Calc",
+        "Nihonoari: Hiragana & Katakana",
+        "Share via HTTP",
+        "Graded - Grade tracker",
+        "ImapNotes2",
+        "koyu.space",
+        "Simple Weather",
+        "My Notes - Take notes anywhere",
+        "NoSurf for reddit",
+        "Port Authority",
+        "HomeBot",
+        "Root Verifier",
+        "Smart Edge",
+        "Fit Notifications",
+        "Flashlight",
+        "LibChecker",
+        "AcDisplay",
+        "Jelly Clock",
+        "Activity Manager",
+        "TasClock",
+        "Simple Scrobbler",
+        "Addi",
+        "AddisMapTransit",
+        "kboard",
+        "AdGuard Content Blocker",
+        "Ricochlime",
+        "Saber",
+        "Man Man",
+        "Launch App Ops",
+        "SAI",
+        "Thud",
+        "Deku SMS",
+        "Nock Nock",
+        "Burger Party",
+        "Cat Avatar Generator",
+        "Pixel Wheels",
+        "Solar Compass",
+        "AgoraDesk: buy BTC anonymously",
+        "Ahorcado",
+        "SimpleTextCrypt",
+        "Hail",
+        "ShareX",
+        "NoFb Event Scraper",
+        "Spark 360",
+        "MouseRemote",
+        "TouchDroid",
+        "Critical Velocity",
+        "Hourglass",
+        "JustChess",
+        "Just Craigslist",
+        "Just Notes",
+        "Ril Control",
+        "Ship Captain and Crew",
+        "Cooky",
+        "Wassword - Wonderful Password Generator",
+        "Papuh",
+        "BlueChat",
+        "LoopBoard",
+        "Matrix Calc",
+        "Asqare",
+        "Timeriffic",
+        "LeafPic Revived",
+        "Verbiste Android",
+        "Alovoa Lite",
+        "Alovoa",
+        "SatPredict",
+        "Post Writer",
+        "VTU CS Lab Manual",
+        "Unalix",
+        "Amaze",
+        "Amaze File Utilities",
+        "BookList",
+        "WallFlow",
+        "WallFlow Plus",
+        "ClearClipboard",
+        "KryptEY",
+        "TPT Helper",
+        "LinkHub",
+        "Harmony Music",
+        "Hypnotoad Live Wallpaper",
+        "Apollo",
+        "ADBKeyBoard",
+        "Geto",
+        "GPSTest",
+        "KeePassDroid",
+        "Launcher3",
+        "Music",
+        "Quake",
+        "ShellMS",
+        "TalkBack",
+        "To Do List",
+        "GameBoid",
+        "GBCoid",
+        "Nesoid",
+        "Working Time Alert",
+        "Androzic",
+        "Tram Hunter",
+        "la/u/ncher",
+        "Alarm Klock",
+        "QDict",
+        "PasteBin",
+        "Mahjongg Builder",
+        "Keikai Launcher",
+        "Power Ampache",
+        "Warpclock",
+        "Pixiv for Muzei 3",
+        "AnySoftKeyboard: SSH",
+        "Afrikaans for AnySoftKeyboard",
+        "Basque for AnySoftKeyboard",
+        "Brazilian Portuguese for AnySoftKeyboard",
+        "Catalan for AnySoftKeyboard",
+        "Danish for AnySoftKeyboard",
+        "Dutch for AnySoftKeyboard",
+        "AnySoftKeyboard: Esperanto",
+        "French for AnySoftKeyboard",
+        "AnySoftKeyboard: French",
+        "AnySoftKeyboard: Galician",
+        "AnySoftKeyboard: Georgian",
+        "German for AnySoftKeyboard",
+        "Greek for AnySoftKeyboard",
+        "Hebrew for AnySoftKeyboard",
+        "Hungarian for AnySoftKeyboard",
+        "AnySoftKeyboard: Icelandic",
+        "Indonesian for AnySoftKeyboard",
+        "Italian for AnySoftKeyboard",
+        "Latvian for AnySoftKeyboard",
+        "AnySoftKeyboard: Macedonian",
+        "AnySoftKeyboard: Malayalam",
+        "AnySoftKeyboard: NEO2",
+        "Norwegian for AnySoftKeyboard",
+        "AnySoftKeyboard: Polish",
+        "Turkish for AnySoftKeyboard",
+        "AnySoftKeyboard: Pali",
+        "AnySoftKeyboard: Persian",
+        "AnySoftKeyboard: Portuguese",
+        "Russian for AnySoftKeyboard",
+        "AnySoftKeyboard: Slovene",
+        "Spanish for AnySoftKeyboard",
+        "AnySoftKeyboard: Swedish",
+        "AnySoftKeyboard: Tatar",
+        "AnySoftKeyboard: Ukrainian",
+        "AnySoftKeyboard: Classic PC Theme",
+        "APK Explorer & Editor",
+        "Contact Diary",
+        "Zensuren",
+        "Missed Notifications Reminder",
+        "Sudoku Free",
+        "Contact Owner",
+        "neutriNote CE",
+        "Goodtime - Minimalist Pomodoro Timer",
+        "USB HID Terminal",
+        "Diceware Password Generator",
+        "Japanese Traditional Time",
+        "SafeDot",
+        "Pro Expense - Daily Finance Tracker",
+        "Seismo Wallpaper",
+        "Metronome",
+        "Vault",
+        "MuPDF mini",
+        "MuPDF viewer",
+        "NoLauncher",
+        "Réseau Discord Artivain",
+        "AnagramSolver",
+        "GymWen",
+        "Mebis (Unofficial)",
+        "QuickTiles",
+        "Timetable",
+        "Train Schedule",
+        "BBS",
+        "Better Wifi on/off",
+        "WonderDroid X",
+        "RPN",
+        "Barcode Scanner",
+        "atop",
+        "HIIT",
+        "TEdit ",
+        "Music Player Lite",
+        "Corona Stats",
+        "Aurora Store",
+        "Fall",
+        "krassesSpiel",
+        "World Scribe",
+        "AniHyou - AniList client",
+        "Delta Chat",
+        "Bagatur Chess Engine",
+        "BaldPhone",
+        "BoB",
+        "Coin Flip",
+        "Coin Flip Addon",
+        "DioLite",
+        "Aegis Authenticator",
+        "Offline Cook Book",
+        "ChineseTtsTflite",
+        "OpenLauncher",
+        "PxerStudio",
+        "Let Me Downgrade",
+        "MACsposed",
+        "Practice Suite",
+        "Change Detection",
+        "SDK Monitor",
+        "Clock",
+        "Simple Alarm Clock",
+        "BiglyBT, Torrent Downloader",
+        "Scarlet FDroid",
+        "Share to Pinboard",
+        "Cryptix",
+        "Hayago",
+        "Squircle CE - Code Editor",
+        "Remindly",
+        "TSViewer",
+        "Recurrence",
+        "blippex",
+        "Email Popup",
+        "Just Another Workout Timer",
+        "NS-USBloader",
+        "Money Tracker",
+        "Crates.io unofficial",
+        "Anagram Solver",
+        "Clock You",
+        "Connect You",
+        "Record You",
+        "Translate You",
+        "Trivia You",
+        "Wall You",
+        "BoardGameGeek",
+        "How far do you swim",
+        "Compass",
+        "Metronome",
+        "Shift",
+        "Piraten Karte",
+        "Contact Widget",
+        "Here GPS Location",
+        "PuppyFrame",
+        "Roaming Info",
+        "Simple Crypto Widget",
+        "Simple Ethereum Widget",
+        "Simple Litecoin Widget",
+        "URLazy",
+        "Performance Control",
+        "Instant Sound Effects",
+        "SoundBored",
+        "Color Clock",
+        "NFCMessageBoard",
+        "Deep Scratch",
+        "Just Sit",
+        "AirPush Detector",
+        "Just (Video) Player",
+        "Space Trader",
+        "Simple Bitcoin Wallet",
+        "falling for reddit",
+        "Photo Editor",
+        "Smart AutoClicker",
+        "CPU Spy",
+        "Mavinote",
+        "Quick Settings",
+        "Persian Calendar",
+        "OmniROM Changelog",
+        "Flowit",
+        "LaaNo",
+        "ToneDef",
+        "Mill",
+        "Call recorder for Android",
+        "Call recorder for Android",
+        "RustDesk",
+        "Simple Deadlines",
+        "PX:VW - converter",
+        "Rivia",
+        "Clip Stack",
+        "Extended emulator of МК 61/54",
+        "FFShare",
+        "Rethink: DNS + Firewall",
+        "Salat Times",
+        "Audio Notes",
+        "LRC Editor",
+        "Library",
+        " Just 24 Hours",
+        "Blazed Cloud",
+        "炒饭超Fun",
+        "ChemistryLab",
+        "Clock",
+        "Cheogram",
+        "Nekome",
+        "Pushie",
+        "Chess Clock",
+        "Simple Chess Clock",
+        "Koler",
+        "Tallyphant",
+        "Little Sir Echo",
+        "CityZen",
+        "Movian Remote",
+        "PlayMusic Widget (sample)",
+        "Easy Noise",
+        "SoundAura",
+        "MultiVNC",
+        "DeadPixel",
+        "FareBot",
+        "DeadHash",
+        "Inventory",
+        "WeeklyBudget",
+        "Peercoin Wallet",
+        "CoinTrend: Private Crypto Tracker",
+        "Torch",
+        "Fertility Test Analyzer App: Ovulation & Pregnancy",
+        "Color Namer",
+        "LabCoat",
+        "CommonsLab",
+        "arXiv mobile",
+        "Khan Academy viewer",
+        "InstaLate",
+        "Diconfinement",
+        "Controlloid",
+        "SmartCookieWeb",
+        "Beauty Clock",
+        "[ROOT] Night Light (KCAL)",
+        "Bible Notify",
+        "Go to Sleep",
+        "Candle",
+        "Stealth",
+        "SyncOrg",
+        "Countdown for DashClock",
+        "IITC Mobile",
+        "YubiClip XOR",
+        "LMS",
+        "Dungeon Crawl: Stone Soup for Android",
+        "Munch",
+        "SubHub",
+        "Vigilante",
+        "WifiAutOff",
+        "StoneAge",
+        "File Manager",
+        "FlashDim - Dim your flashlight",
+        "Pazzword - Password Evaluator",
+        "PINcredible - Secure PIN vault",
+        "PalmCalc",
+        "Bangumi",
+        "SshDaemon",
+        "psychphinder",
+        "TuCanMobile",
+        "Equipe RSS",
+        "TTS Util",
+        "Weather Radar",
+        "Mobile Pauker ++",
+        "Sound Recorder",
+        "Muspy for Android",
+        "Tinfoil for Facebook",
+        "NClientV2",
+        "OpenCalc",
+        "Darkness Map",
+        "Hammer [ALPHA]",
+        "BatteryBot",
+        "BatteryBot Pro",
+        "Databag",
+        "MH4U Database",
+        "Monster Hunter 3U Database",
+        "AdminControl",
+        "Cooper",
+        "Decred Address Scanner",
+        "Easter Eggs",
+        "Scrunch",
+        "Blood pressure monitor",
+        "Thumb-Key",
+        "Tempus Romanum",
+        "Knot",
+        "MotionEye Client for Android",
+        "Nomad - Hubzilla for Android ",
+        "PlanetCon",
+        "Caramelos",
+        "MorphClock",
+        "Bookland",
+        "Full colemak",
+        "OpenShift",
+        "Tessercube",
+        "Audio Recorder",
+        "Shaarlier",
+        "Wa-Tor",
+        "Open WiFi Cleaner",
+        "Chip8",
+        "Gelli",
+        "Frost",
+        "OpenAPK",
+        "MobileWebCam",
+        "Simple Explorer",
+        "Arcticons",
+        "Arcticons Day & Night",
+        "Arcticons Black",
+        "Arcticons Material You",
+        "OverFlow",
+        "Torch",
+        "Secrecy",
+        "OpenPods",
+        "SINE Isochronic Entrainer",
+        "Clock31",
+        "DozeOff",
+        " LibreSpeed",
+        "Gallery",
+        "NextDNS Manager",
+        "BART Runner",
+        "AsciiCam",
+        "Vector Pinball",
+        "CamTimer",
+        "Cards With Cats",
+        "Dodge",
+        "Kumquats",
+        "Egyptian Mouse Pounce ",
+        "Vector Camera",
+        "iFixit",
+        "Logcat Reader",
+        "ColorBlendr [Root]",
+        "USB-Dataloggerreader",
+        "drip. menstrual cycle and fertility tracking",
+        "RingyDingyDingy",
+        "DriSMo",
+        "Data Monitor",
+        "Tux Rider",
+        "Avare FOSS",
+        "DuckDuckGo Privacy Browser",
+        "Dashclock: Last Caller",
+        "Toggle Headset 2",
+        "Anonymous Messenger",
+        "Home Launcher",
+        "HeaterRC",
+        "Toe",
+        "BARIA",
+        "F2L",
+        "G2L",
+        "Marble One",
+        "Quoter",
+        "Transparent Widget",
+        "Fast N Fitness",
+        "Micopi+",
+        "TripleCamel",
+        "Diccionario Chileno",
+        "EHHelper",
+        "BmiCalc",
+        "Red Dot",
+        "Fire Strike Retro",
+        "PodListen",
+        "Candle",
+        "Keep Screen On",
+        "BootBoi",
+        "Theia Icon Theme",
+        "Shorey",
+        "Tron Wallet",
+        "Elfeed Mobile",
+        "Sayboard",
+        "Autostarts - Block apps from starting automaticall",
+        "Current Wallpaper",
+        "UUID 0xFD6F Scanner",
+        "PCAPdroid",
+        "Clean Status Bar",
+        "Deadlines",
+        "Its Dicey!",
+        "Simple Accounting",
+        "Simple Cleanup",
+        "TicTacToe Game",
+        "Dots & Squares",
+        "HexColorTime Wallpaper",
+        "Feeel - home workouts",
+        "Om",
+        "Parlera — word guessing game",
+        "Simply Solid",
+        "Battery Live",
+        "Storage & USB",
+        "Colorpicker",
+        "ImgurViewer",
+        "OS Monitor",
+        "AppAlarm Pro",
+        "Kinoko[Manga Reader]",
+        "Bangle.js Gadgetbridge",
+        "FileManagerSphere",
+        "EteSync Notes - End-to-end Encrypted Notes",
+        "EteSync - Secure Data Sync",
+        "Open Aviation Map",
+        "Euro konverter",
+        "Mileage",
+        "Eve-control",
+        "Eventyay Attendee App",
+        "Eventyay Organizer App",
+        "AutoAnswer",
+        "Evil Insult Generator",
+        "TTime",
+        "LCARS Wallpapers",
+        "Month Calendar Widget",
+        "Any Cut",
+        "QR & Barcode Scanner",
+        "Book Listing App",
+        "DeepL",
+        "Dozenal Clock",
+        "DozenCalc",
+        "ServeIt",
+        "Cardboard Museum",
+        "Librery",
+        "NextCompanion",
+        "DownloadFilesWeb",
+        "Kotlin Quiz",
+        "NASA APOD for Muzei",
+        "OpenPass",
+        "Poleidoscope",
+        "RegisCat",
+        "Analytical Translator",
+        "Siete y media",
+        "DékaDico",
+        "MiniDlnaOmatic",
+        "Freifunk Auto Connect",
+        "Trigger",
+        "Exif Thumbnail Adder",
+        "Eddy Malou",
+        "LogFox",
+        "Dokuwiki Android",
+        "Torchlight",
+        "Prestissimo",
+        "Diaguard: Diabetes Diary",
+        "Notepad",
+        "SecondScreen",
+        "Taskbar",
+        "FastHub-Libre",
+        "RGB Tool",
+        "Fedi Photo",
+        "FediPhoto-Lineage",
+        "Converter NOW: Unit Converter",
+        "MSnake",
+        "Launcher",
+        "Signal From Mars",
+        "Energize",
+        "Subz",
+        "Broccoli: The Green Recipe App",
+        "Front Camera",
+        "Flipper Mobile App",
+        "Githo",
+        "DetoxDroid: Digital Detoxing as Your New Default",
+        "DankChat",
+        "Snapdrop & PairDrop for Android",
+        "Librera Reader",
+        "Form-N-Fun",
+        "Suntimes Calendars",
+        "Suntimes",
+        "Acode editor - Android code editor",
+        "Gao&Blaze",
+        "AndrOBD GpsProvider",
+        "AndrOBD MQTTPublisher",
+        "AndrOBD SensorProvider",
+        "AndrOBD",
+        "StageFever",
+        "Hydrate",
+        "Brainf",
+        "EweSticker",
+        "FHCode",
+        "aFreeRDP",
+        "Anime Release Notifier",
+        "Monkeyboard Keystone Radio",
+        "FrostWire",
+        "Cuscon",
+        "Cache Cleaner",
+        "Periodic Table",
+        "Quran For My Android",
+        "K-9 Mail",
+        "Diolinux",
+        "Aurora",
+        "My Location Widget",
+        "Reservator",
+        "Fancy Places",
+        "Tap 'n' Turn",
+        "Covid19 Stats",
+        "ReLaunchX",
+        "gaika",
+        "Aeon's End",
+        "SimpleAppDowngrader [ROOT]",
+        "MHWorld Database",
+        "AVNC",
+        "arXiv eXplorer - Mobile App for arXiv.org",
+        "GCstar scanner",
+        "GCstar Viewer",
+        "QuickLyric",
+        "Geekttrss",
+        "MTG Familiar",
+        "TrebleShot",
+        "ActivityForceNewTask",
+        "Identiconizer!",
+        "OctoDroid",
+        "Your very own Sun!",
+        "Ghost Commander",
+        "MHGU Database",
+        "Aria2Android",
+        "Aria2App",
+        "DNS Hero",
+        "Zandy",
+        "Sudaku - Make your rules to solve sudoku",
+        "Taswast",
+        "Cricket's Alarm",
+        "Andlytics",
+        "QRCode & Barcode scanner",
+        "zbarcamdemo",
+        "Xtra",
+        "Noice: Natural calming noise",
+        "10-bit Clock Widget",
+        "Audio Recorder",
+        "Binaural Beats",
+        "Book Reader",
+        "Call Recorder",
+        "Darkness Immunity",
+        "Files",
+        "Hourly Reminder",
+        "Media Merger",
+        "SMS Gate",
+        "ToneGenerator.class",
+        "Torrent Client",
+        "Cache Cleaner",
+        "Syncthing-Fork",
+        "CEToolbox",
+        "BMI Calculator",
+        "Share my number",
+        "Dark Mode Live Wallpaper",
+        "Screenshot Tile (NoRoot)",
+        "WallpaperExport",
+        "Cythara",
+        "Hangman",
+        "AndTTT",
+        "dandelion*",
+        "Isotopes",
+        "Oinkoin",
+        "Notification Cron",
+        "ExprEval",
+        "Gotify",
+        "Botifier",
+        "Fiddle Assistant",
+        "croc",
+        "Quote Unquote",
+        "Greater Sudbury Transit",
+        "KurobaEx",
+        "Rsync Server",
+        "LibreRandonaut",
+        "LibreTube",
+        "Linwood Dev-Doctor",
+        "Unchained",
+        "aRevelation",
+        "Al-Azan - Prayer Times",
+        "GitHub",
+        "Instant Readme Demo",
+        "tagdrop",
+        "twitlatte - SNS client for Twitter and Mastodon",
+        "Android version",
+        "Coffee",
+        "Mute reminder",
+        "NFC Reader",
+        "Prepaid Balance",
+        "Stopwatch",
+        "Tabletop Tools",
+        "Hanuman Chalisa",
+        "Short URL Evaluator",
+        "IPCam Demo",
+        "ControlDLNA",
+        "RHVoice - a free and open source speech synthesize",
+        "OneTimePass",
+        "Hey! Meditation",
+        "PalmCalc 2019+",
+        "Android OBD-II Reader",
+        "Light Android Launcher",
+        "Stocks Widget",
+        "Calendar Notifications",
+        "RedPanal",
+        "T4 Launcher",
+        "GetBack GPS",
+        "CryptoTerminal",
+        "PayNoWay",
+        "Shadowsocks",
+        "V2ray Plugin",
+        "Shadowsocks",
+        "Coordinate Joker",
+        "Wirebug",
+        "Endless Sky",
+        "Smart Remote Control",
+        "SMS Import / Export",
+        "TTL Manager",
+        "Scoreboard",
+        "Nextcloud Yaga",
+        "1x1 clock",
+        "FillUp",
+        "Call Counter",
+        "Flashy Alarm",
+        "Virtual Host",
+        "QRStream",
+        "Dumbphone Assistant",
+        "SMS Scheduler",
+        "WorkoutLog",
+        "Minidoro",
+        "Apple Flinger",
+        "Dib2Calc",
+        "SDRemount",
+        "Sun Time",
+        "NiDeau",
+        "GitFox",
+        "Mobile Paper Wallet",
+        "SWJournal",
+        "GL TRON",
+        "BeepMe",
+        "Passy - cross-platform password manager",
+        "NightLight light",
+        "Pocket Gopher",
+        "Scribbler",
+        "WhatsDeleted",
+        "SilverDict",
+        "RSSAid",
+        "SD Scanner",
+        "Temp. monitor",
+        "Simple Reflected Light Meter",
+        "midistrum",
+        "Musify",
+        "STweaks",
+        "Guessaday",
+        "熊愛學臺語",
+        "Type and Speak",
+        "TalkBack (deprecated)",
+        "DiskUsage",
+        "UnifiedNlp (no GAPPS) (legacy)",
+        "TalkBack",
+        "Android Samba Client",
+        "Sky Map",
+        "Apps2Org",
+        "Apps Organizer",
+        "Eyes-Free Shell",
+        "Barcode Scanner",
+        "Ermete SMS",
+        "ChartDroid Core",
+        "DroidWall",
+        "eSpeak TTS",
+        "GogoDroid",
+        "GTalkSMS",
+        "Network Log",
+        "OpenWnn Legacy",
+        "注音倉頡輸入法",
+        "AusweisApp",
+        "Andor's Trail",
+        "GPSTether",
+        "Presentation",
+        "GraphHopper Maps",
+        "Gravity Force",
+        "ABCore",
+        "Green",
+        "Toronto Transit",
+        "Sound Toggle",
+        "Grocery manager",
+        "MobilePrint",
+        "Secure photo viewer",
+        "AppLocker",
+        "Remote Numpad",
+        "Hacker Live Wallpaper",
+        "Open Flood",
+        "Notify",
+        "PolyCal",
+        "Tinte Webcoms",
+        "free2pass",
+        "ReLaunch",
+        "Pulse Music",
+        "World Weather",
+        "Media Button Router",
+        "ListMaker",
+        "D00R",
+        "Headi - Your headache diary",
+        "openScale",
+        "openWorkout",
+        "Heb12 Bible",
+        "Multi Sms",
+        "Nextcloud Passwords",
+        "Bluez IME",
+        "BluezIME HID Enabler",
+        "RUTMath",
+        "Pomodoro",
+        "Hash Droid",
+        "HoloKenMod",
+        "HoloPlay",
+        "Easy-phone",
+        "Sophia keyboard",
+        "hwloc lstopo",
+        "FBReader TTS+ Plugin",
+        "Libre Camera",
+        "Android Explorer",
+        "Streak Alarm for Snapchat (Streak Reminder)",
+        "Footguy",
+        "Hide \"running in the background\" Notification",
+        "Resume Builder",
+        "ArkTap",
+        "Notable Plus",
+        "IceCondor",
+        "AnkiDroid",
+        "igo",
+        "OpenMoneyBox",
+        "PirateDice",
+        "Binaural Beats Therapy",
+        "Lyrics Grabbr",
+        "Improvement Roll",
+        "No meu Bairro!",
+        "Calculator-inator",
+        "IndiePass",
+        "Infomaniak kDrive",
+        "Infomaniak Mail",
+        "Infomaniak kMeet",
+        "Infomaniak kSync",
+        "OSRS Helper",
+        "Mongo Explorer",
+        "Linux Command Library",
+        "CallerID",
+        "FIND3 Scanner",
+        "MicDroid",
+        "Browser Intercept - Share URL",
+        "Ambient Weather DashClock Extension",
+        "Invoice Ninja",
+        "World Clock",
+        "AndroidCPG",
+        "Tri Rose",
+        "Quasseldroid",
+        "PlainApp: File & Web Access",
+        "SMS Ping",
+        "AndroidIDE",
+        "KPassNotes",
+        "Send to Computer",
+        "Vectorify da home!",
+        "Music Player GO",
+        "Xda Feed Reader",
+        "IYPS",
+        "Planetario",
+        "Car Cast",
+        "Motion Eye",
+        "Hearing Saver",
+        "Android SDK Search",
+        "Status",
+        "Auto Auto-Rotate",
+        "Drowser",
+        "Scrambled Exif",
+        "WaveUp",
+        "WaveUp Tasker Plugin",
+        "Smoke Reducer",
+        "Diccionario castellano",
+        "Beta Updater for WhatsApp",
+        "Minutes Checker for Virgin Mobile",
+        "mGerrit",
+        "920 Editor",
+        "Gears",
+        "Balance the Ball",
+        "PasswdSafe",
+        "JellyRevenge",
+        "Block6",
+        "Automation",
+        "Bacon  - Bluetooth Controller",
+        "Sushi - Personal Finance",
+        "Jerboa for Lemmy",
+        "Bucket - Overlay Manager",
+        "Lighthouse Power Management",
+        "Show Youtube Dislikes",
+        "Quake2",
+        "Chapel Hill Transit",
+        "Hacki for Hacker News",
+        "Share To Computer",
+        "Brethap",
+        "AnkiEditor",
+        "Unlauncher",
+        "JLyr Lyrics",
+        "Temaki",
+        "Chibe",
+        "Point & Hit",
+        "Red Moon",
+        "JfCupsPrintService",
+        "Juggling Lab",
+        "Fritter",
+        "KanaDrill",
+        "Cmus Remote",
+        "NiceFeed",
+        "ScreenInfo",
+        "JRPN 16c",
+        "Private DNS Quick Tile",
+        "OSS Tracker",
+        "Identify Dog Breeds",
+        "Identify Dog Breeds Pro",
+        "YARC",
+        "JumpGo",
+        "ArchWiki Viewer",
+        "Attendance Viewer",
+        "CaptivePortalLogin",
+        "Arso Vreme",
+        "PocketMaps",
+        "Seal",
+        "Apod Classic",
+        "Apod MD",
+        "HeartRateMonitor",
+        "LibreSudoku",
+        "Iconeration",
+        "GLXY",
+        "Go To Sleep",
+        "RaumBaller",
+        "Blacklist Blocker",
+        "Archlinux Forums",
+        "Holywarsoo",
+        "Vanilla Tag Editor",
+        "Cover Fetcher",
+        "Vanilla Lyrics Search",
+        "Vanilla Metadata Fetch",
+        "Catapult",
+        "idTech4A++",
+        "Sobriety",
+        "Money Logs",
+        "Nanji clock widget",
+        "NuSimi",
+        "Tusky",
+        "CPU Info",
+        "Notification Notes",
+        "EncPassChanger",
+        "Discuz Hub",
+        "Charmap",
+        "Sapio",
+        "VolumeLockr",
+        "Mindful Notifier",
+        "Paper",
+        "BeeCount",
+        "Stopwatch",
+        "Virus Attack",
+        "Hypezig",
+        "WECHANGE",
+        "Klock",
+        "HypnoTwister",
+        "OBS Blade",
+        "Superuser",
+        "XClipper - Smart Clipboard manager for Android",
+        "Pomodoro Tasks",
+        "Ohms Now!",
+        "WaterTracker",
+        "KeePassDX",
+        "Keyboard Switcher",
+        "kure Music Player",
+        "TAG Notepad",
+        "Trail Sense",
+        "MoClock",
+        "WalletCount",
+        "Silverfish",
+        "Lavabit Encrypted Proxy",
+        "Kanji draw",
+        "Destiny",
+        "TiltMazes",
+        "Fourth Tools",
+        "Kitchen Timer",
+        "Ubuntu Countdown Widget",
+        "Multitouch Test",
+        "LessPass",
+        "qBittorrent Client Pro",
+        "OpenMW",
+        "Libre Weather",
+        "QuickSnap",
+        "BLW - Bitcoin Lightning Wallet",
+        "LightPlan - Reminder & Planner",
+        "Simple MP (Simple Music Player)",
+        "Qwotable",
+        "Limbo x86 PC Emulator",
+        "Moonlight Game Streaming",
+        "RaspFinder",
+        "Changjie Input Method",
+        "Linux Counter Updater",
+        "Listen1",
+        "OpenStud for InfoStud",
+        "pyLauncher",
+        "Equate",
+        "Lliga Intermunicipal",
+        "Stately for NationStates",
+        "log28",
+        "1List - Simple Lists for TODO, Shopping, Movies...",
+        "Travis Jr.",
+        "Droid-ify",
+        "Reminders",
+        "oRing - Reminder",
+        "Limpazap",
+        "16-bit Clock Widget",
+        "Decimal Time Clock Widget",
+        "Unix Time Clock Widget",
+        "BiliYou",
+        "SauceNAO",
+        "TimeTable",
+        "Screen Notifications",
+        "Brailliac: Braille Keyboard",
+        "Vibrator",
+        "AiCamera",
+        "Turtl",
+        "Plain UPnP - UPnP / DLNA server and browser",
+        "M3U",
+        "Neo Backup",
+        "Der Die Das",
+        "Neo Store",
+        "Plant Sense",
+        "Agit",
+        "Orgro",
+        "Timed Shutdown [No Root]",
+        "Applications Info",
+        "Sudoku Generator",
+        "Alldebrid",
+        "Another notes app",
+        "MGit",
+        "Spell4Wiki",
+        "Website Monitor",
+        "CurrentWidget",
+        "RF Analyzer",
+        "HN",
+        "Hibi 「日々」",
+        "LifeCounter",
+        "Simply Pace",
+        "Simple Dilbert",
+        "RacketGhost",
+        "A Time Tracker",
+        "LG Touch LED",
+        "Little Music Player",
+        "Little File Explorer",
+        "Tiny Music Player",
+        "EBT New Note",
+        "Turbo Editor",
+        "Massive",
+        "MobileOrg",
+        "Dialer for Pebble",
+        "MaterialOS",
+        "Save Locally: Share2Storage",
+        "Vidya Music: Aersia VIP Player",
+        "Metric Time",
+        "ADB Manager",
+        "BoltOn",
+        "Outfield",
+        "DPixel",
+        "Loaned",
+        "Mattermost Beta",
+        "Miracast Shortcut",
+        "RoomMates",
+        "QueueToDo",
+        "Rubbish Calc",
+        "SandwichRoulette",
+        "Music",
+        "SimpleTextEditor",
+        "SimpMusic",
+        "The Squirrel's Maze 2D",
+        "WorkTimer",
+        "pOT-Droid",
+        "LifeDots - Diary in 8 dimensions",
+        "Eshotroid",
+        "Memetro",
+        "Conscrypt Provider",
+        "GPSLogger",
+        "Sheepy Horn",
+        "AnySoftKeyboard",
+        "AnySoftKeyboard: Finnish",
+        "blocker",
+        "Chiaki",
+        "Meteocool - Rain radar",
+        "ShowsRage",
+        "My Brain",
+        "Green Pass PDF Wallet",
+        "File Manager Pro",
+        "MidiSheetMusic",
+        "Padland",
+        "Text Torch",
+        "Tinfoil for Twitter",
+        "Destination Sol",
+        "Birday - Birthday Manager",
+        "Randomix - Decision Maker",
+        "Minimalistic Price Converter",
+        "Angel Player Live Wallpaper",
+        "Black★Rock Shooter: Animated Wallpaper",
+        "Flame Haze Shana Animated Wallpaper",
+        "Epoch Launcher",
+        "My Location",
+        "Noor-Ul-Huda نور الهدى",
+        "Permission Manager X",
+        "Dashchan",
+        "Mitzuli",
+        "DroidSat",
+        "microMathematics Plus",
+        "Enhanced Music Controller Lite",
+        "ProximitySensorFix",
+        "Hertz contact",
+        "Breathly",
+        "Bummerlzähler",
+        "Sokoban",
+        "MobiPerf",
+        "Fast Brightness Control Widget",
+        "QKSMS",
+        "Drinkable",
+        "Sequence Hunt",
+        "Money Manager Ex",
+        "Circo",
+        "Swiftnotes",
+        "TapUnlock",
+        "Mountie",
+        "Plumble",
+        "SELinuxModeChanger",
+        "Gasflow",
+        "Microchip",
+        "Hex Launcher",
+        "Audile",
+        "TTL Changer",
+        "TouchDetector",
+        "Comfort Reader",
+        "Lane's Lexicon",
+        "Sensors Sandbox",
+        "Metronome",
+        "Pitch Pipe",
+        "LexinProject",
+        "TextWarrior",
+        "Auto Off Bluetooth",
+        "Clean Timer",
+        "Disable Manager",
+        "S Tools+",
+        "MPDroid",
+        "nanoConverter",
+        "Cuppa - Tea Timer",
+        "Wine cellar",
+        "UML Class Editor",
+        "ChronoSnap",
+        "Color Picker",
+        "Dice Gainz",
+        "packlist",
+        "Get Off Your Phone",
+        "TIC-80",
+        "Galbijjim Searcher",
+        "Noiz2",
+        "Settings Database Provider",
+        "Calculator",
+        "NewsBlur",
+        "Open Manager",
+        "Nextcloud Dev",
+        "Nextcloud",
+        "Nextcloud Talk",
+        "Nextcloud Cookbook",
+        "NextGIS Mobile",
+        "Kernel Adiutor",
+        "Time Clock",
+        "PianOli",
+        "VlcFreemote",
+        "OneTwo",
+        "Nighthawk Wallet",
+        "Flashify",
+        "Lobsters App",
+        "Dagger: Dota 2 Stats",
+        "Chinese French Dictionary",
+        "Hosts Editor",
+        "Demo Musix",
+        "GuessThatPokemon",
+        "MyMood",
+        "OpenBooksDownloader",
+        "Task Manager",
+        "WikiAnime",
+        "Papanikolis Submarine",
+        "Split It Easy",
+        "Privacy Indicators",
+        "DoliDroid",
+        "StorageTrac",
+        "GymRoutines",
+        "Splitfit",
+        "App Tracker",
+        "Chord Reader",
+        "Japanese Name Converter",
+        "KeepScore",
+        "CatLog",
+        "Deep Links for LabCoat",
+        "Feeder",
+        "NoNonsense Notes",
+        "WaniDoku",
+        "The Kana Quiz",
+        "Note Crypt Pro",
+        "Noto",
+        "Budget",
+        "Null launcher",
+        "S2TDroid Pro",
+        "Number Guesser",
+        "Nunti",
+        "Ensichat",
+        "Syncthing",
+        "Move Certs!",
+        "Custom Uploader",
+        "Meditation",
+        "ADBungFu",
+        "apps_Packages Info - Updated ApplicationsInfos (² ",
+        "Chairlock",
+        "ClassyShark3xodus - Scan apps for warnings",
+        "jQuarks viewer",
+        "kDI Device Info system permission",
+        "NeoLinker",
+        "Fon",
+        "Insular",
+        "ForgetMeNot",
+        "Odysee",
+        "Olam",
+        "Holo Counter",
+        "Sutrans Plus",
+        "Cofi - Brew Timer",
+        "Notally | Minimalist Notes",
+        "Battery Notification",
+        "QuickWeather",
+        "Record Time Droid",
+        "Kung Foo Barracuda",
+        "OpenAthena™ for Android",
+        "OpenCamera Sensors",
+        "nds4droid",
+        "Open Ear",
+        "Spelling Wizard",
+        "Open Stable Diffusion",
+        "Orgzly",
+        "Orgzly Revived",
+        "MoneyWallet",
+        "AMPlayer",
+        "ScreenCam",
+        "SQLiteViewer",
+        "Trime",
+        "OpenOtago",
+        "Ellaism Wallet",
+        "WairToNow - Aviation Navigation",
+        "ownCloud",
+        "Packet Sender",
+        "NZ Tides",
+        "Secret Space Encryptor (SSE)",
+        "ParanoidWallpapers",
+        "Watomatic - Auto Reply For WhatsApp",
+        "PassCard",
+        "Yatoo",
+        "BackgroundRestrictor",
+        "Wormhole",
+        "Next Actualités informatiques",
+        "Flashlight Tiramisu",
+        "Twire",
+        "Pix-EzViewer",
+        "Visualizer",
+        "Constellations",
+        "ReGeX",
+        "Clock+",
+        "Hoplite Polytonic Greek Keyboard",
+        "EasySync",
+        "PSIAndroid",
+        "Dark theme",
+        "Unit Converter Ultimate",
+        "Nonocross",
+        "Punchline Bingo",
+        "SMS Forward",
+        "Wrong Pin Shutdown",
+        "Pi Locker",
+        "Voice Notify",
+        "PinDroid",
+        "TPB Proxy",
+        "Frost for Facebook",
+        "Stickeroid",
+        "Pixiv for Muzei",
+        "Pjuu",
+        "Planes Android",
+        "SAnd",
+        "Dicer",
+        "Nitter for Android",
+        "MatLog Libre",
+        "Todo Agenda for Android 4 - 7.0",
+        "PocketPlan",
+        "Podverse",
+        "VotAR",
+        "Mirror",
+        "NextcloudServices",
+        "Polipoid",
+        "Polite Droid",
+        "Simple Rss",
+        "Gugal",
+        "Attestation de déplacement",
+        "Vinyl Music Player",
+        "Nyan",
+        "HAMtrainer",
+        "AudioAnchor",
+        "Read4SpeechExperiments",
+        "Arduino Uno Communicator",
+        "Enhancement",
+        "Practice Hub",
+        "Birthday Buddy",
+        "My App List",
+        "URL to PDF Converter",
+        "Volume Control",
+        "PurpleDock",
+        "DebtCalc",
+        "Precio Luz",
+        "Pagan Music Sequencer",
+        "Quest Player",
+        "AudioMeter",
+        "Booky McBookface eReader",
+        "Computational Demonology",
+        "Doda The Exploda",
+        "Seafood Berserker!",
+        "LaunchTime Homescreen",
+        "PhoneFoneFun",
+        "Primary",
+        "FlashCards",
+        "Paperless Share",
+        "Passky",
+        "radio reddit",
+        "Radio Študent",
+        "Earth View for Muzei",
+        "Simple Material Notes",
+        "Tiny Travel Tracker",
+        "Adaptive Brightness Tile",
+        "Arch packages",
+        "AURdroid",
+        "Power Button Tile",
+        "DroidBeard",
+        "Simple Time Tracker",
+        "Readrops",
+        "Ghost Log",
+        "Calculate",
+        "Helsinki Timetables",
+        "Episodes",
+        "Twik",
+        "TV KILL",
+        "eSpeak",
+        "Driibo",
+        "ScriptManager",
+        "Materials Live Wallpaper",
+        "Text Fairy",
+        "Repay",
+        "Replica Island",
+        "RetroArch",
+        "LASKmobile",
+        "LASKmobile",
+        "Migraine Tracker",
+        "Catan Dice Game",
+        "Birthdroid",
+        "Ringdroid",
+        "Pixelesque",
+        "RMaps",
+        "Open Pros & Cons",
+        "ToberQuizz",
+        "arXiv Papers",
+        "Boxcars",
+        "PaddleTennis",
+        "Hydra Slayer",
+        "HyperRogue",
+        "SpotIt",
+        "Information about NCBS",
+        "Filester",
+        "Sound Manager",
+        "Look4Sat: Satellite tracker",
+        "Minimal",
+        "PhotoPhase",
+        "Rview",
+        "Unitto — calculator and unit converter",
+        "Screen Shift",
+        "Batch Uninstaller",
+        "Bop-MusicPlayer",
+        "Priority Alerts",
+        "Veterondo",
+        "Hex",
+        "Repeat Me",
+        "Track & Graph",
+        "Beacon Locator",
+        "MTA Fare Buster",
+        "Mobilne Bezpieczeństwo",
+        "Bushido Blocks",
+        "SanskritBasicsLetters",
+        "Memory",
+        "Markdownr",
+        "Clash of Balls",
+        "BetterUntis",
+        "Word of the day - Learn a new word every day",
+        "AOKP.co",
+        "Search Light",
+        "ScraperClub",
+        "SDCard StoryTeller",
+        "Slim Launcher - Fewer distractions, more life",
+        "Seafile",
+        "Tttris",
+        "KeepingTracks",
+        "Earth Live Wallpaper",
+        "Earth Live Wallpaper: Map Pack",
+        "Secure File Manager Beta",
+        "QR Scanner (PFA)",
+        "Torchlight (Privacy Friendly)",
+        "WREK Online",
+        "Smart Gadget",
+        "Sentien Launcher",
+        "An Light | Flashlight",
+        "Aster Launcher",
+        "DesktopLabel",
+        "Disabler",
+        "Baby Books",
+        "Baby Dots",
+        "Baby Phone",
+        "Beat Feet",
+        "Lexica",
+        "Mobile MSJ",
+        "Super Retro Mega Wars",
+        "Enthusiast Tea Timer",
+        "Pitcha",
+        "Unreal Tracker",
+        "Community compass",
+        "SpotiFlyer",
+        "SecDroid",
+        "BlackHole",
+        "Gore Companion",
+        "Shattered Pixel Dungeon",
+        "SDAI",
+        "Lyrically",
+        "Show Me Hills",
+        "DroidZebra",
+        "DOI to SciHub",
+        "WorldMap",
+        "INSTEAD",
+        "Ball2Box",
+        "Pocket Broomball",
+        "Yoke",
+        "GuitarFretboardTrainer",
+        "Simple Decred Widget",
+        "Simple App Launcher",
+        "Simple Calculator",
+        "Simple Calendar Pro",
+        "Simple Camera",
+        "Simple Clock",
+        "Simple Contacts Pro",
+        "Simple Dialer",
+        "Simple Draw Pro",
+        "Simple File Manager Pro",
+        "Simple Flashlight",
+        "Simple Keyboard",
+        "Simple Launcher",
+        "Simple Music Player",
+        "Simple Notes Pro",
+        "Simple SMS Messenger",
+        "Simple Thank You",
+        "Simple Voice Recorder",
+        "SimplyTranslate Mobile",
+        "NFCard",
+        "Sismics Reader",
+        "Battery Charge Limit",
+        "TIDY Text-to-Image Discovery",
+        "SleepTimer",
+        "Ohm Calc",
+        "Deckerino",
+        "BusyBox Installer",
+        "SmartPack-Kernel Manager",
+        "Kernel Profiler",
+        "Package Manager",
+        "Script Manager",
+        "Smart Flasher",
+        "Ham",
+        "Greentooth",
+        "Pretty Good Music Player",
+        "Pretty Good Music Player Launcher Mode",
+        "WADBS",
+        "Hot Death",
+        "Plutus - Investment Tracker",
+        "Amdroid",
+        "EDS Lite",
+        "Blue Mono Sound",
+        "Mounts2SD",
+        "Coin Collection",
+        "Carnet",
+        "FON Access",
+        "Rotation Manager",
+        "Clock Live Wallpaper",
+        "Standard Notes",
+        "TNEF Extractor",
+        "GreenStash",
+        "Myne: Ebook Downloader",
+        "Network Tools Library",
+        "Tsacdop - Podcast Player",
+        "Non Stop Balloons Shooter",
+        "Privacy Browser",
+        "Privacy Cell",
+        "Notesnook - Private notes app",
+        "XMouse",
+        "flickit",
+        "Strobe Light",
+        "Mastercom workbook",
+        "Styrkur",
+        "Subtracks",
+        "De-Bloater",
+        "sNotz",
+        "The Translator",
+        "KindMind",
+        "Super Productivity",
+        "ForceDoze",
+        "Léon – The URL Cleaner",
+        "QRAlarm",
+        "Every Locale",
+        "Swiss Chess Tournament",
+        "Lemuroid",
+        "Alt Launcher",
+        "Download Navi",
+        "Tailscale",
+        "Calculator Notification",
+        "Logcat",
+        "e-Passport Reader",
+        "HackDash",
+        "Open Link With...",
+        "Timesheet",
+        "RoboZZle Droid",
+        "Auto-Away",
+        "Androidomatic Keyer",
+        "Fish",
+        "Share to Clipboard",
+        "Terminal Emulator",
+        "Termux",
+        "Termux:API",
+        "Termux:Boot",
+        "Nix-on-Droid",
+        "Termux:Styling",
+        "Termux:Tasker",
+        "Termux:Widget",
+        "Termux:Float",
+        "Pattern HDPI Wallpapers",
+        "Tasky",
+        "ED_Tool",
+        "Evergreen Wishlist",
+        "Car Bus Interface",
+        "PixaPencil",
+        "FakeGapps",
+        "Yokatta",
+        "SUD💜KU",
+        "CBTAndroid",
+        "TimeLapse",
+        "OpenHub",
+        "ThreeDLite",
+        "URforms Database",
+        "UserHash",
+        "k3pler",
+        "Notification Analyser",
+        "Badreads",
+        "Gizmooi",
+        "Pong Time",
+        "OpenSound",
+        "PreviewMaker",
+        "Personal Log",
+        "Phase10Counter",
+        "Open FNDDS Viewer",
+        "crushr",
+        "Stripepaper",
+        "Balanduino",
+        "TkTon Wallet",
+        "Rage Maker",
+        "BirthDayDroid",
+        "DadosD",
+        "Cryptocam - encrypting camera app",
+        "SpMp",
+        "Month Calendar Widget",
+        "BatteryFu",
+        "GApps Browser",
+        "WebApps",
+        "Web Media Share",
+        "Open Note Scanner",
+        "Notepad",
+        "TimerDroid",
+        "KitchenOwl",
+        "Always On AMOLED",
+        "DBZ Battery Widget",
+        "Quick Draw Everywhere",
+        "More for GO",
+        "Magisk",
+        "Torrents-csv-android",
+        "SysLog",
+        "HoloKen",
+        "BookWorm",
+        "Shortyz",
+        "24game",
+        "Game of Life",
+        "Gomoku",
+        "Oware",
+        "Pentago",
+        "Ça reste ouvert",
+        "Adnihilation",
+        "Simple Clipboard Editor",
+        "Average data usage widget",
+        "isUserAMonkey & isUserAGoat [curiosity]",
+        "Custom Riddle Generator [small, no ads]",
+        "URLCheck",
+        "Safe Notes - Encrypted Notepad",
+        "Androsens 2",
+        "send2car",
+        "DbCleaner for Whatsapp",
+        "Particle Physics Simulator",
+        "Save to Nextcloud Bookmarks",
+        "Aggregator",
+        "Yahtzee",
+        "Tunerly",
+        "TunesViewer",
+        "Mightier Amp",
+        "TurtlePlayer",
+        "baresip",
+        "baresip+",
+        "Watt",
+        "Twidere X",
+        "App Locker",
+        "SealNote",
+        "xvii messenger for vk",
+        "Twisted Home Manager",
+        "Secur: Cross-platform 2FA client",
+        "Weechat-Android",
+        "2048",
+        "CineLog",
+        "NetInfo Widget",
+        "Flavordex Tasting Journal",
+        "Elementary: Periodic Table",
+        "DashNotifier",
+        "Unciv",
+        "Finamp",
+        "UnitsTool",
+        "Network Scanner",
+        "Truly Creative live wallpaper",
+        "AutoNotify",
+        "Password Hash",
+        "DontKillMyApp ✌️ Make apps work",
+        "Ichaival",
+        "pMetro",
+        "Search Based Launcher",
+        "Duorem",
+        "OASVN Pro",
+        "Heart rate",
+        "Can I Drive",
+        "Password Generator",
+        "Password Master",
+        "Vedroid Events",
+        "Bitcoinium Prime",
+        "Velas Wallet",
+        "Dir",
+        "minedmonero",
+        "Discreet Launcher",
+        "VES - Image and Photo Compare",
+        "SimpleRT",
+        "EnRecipes",
+        "Amethyst",
+        "Cams",
+        "Deep Rock Galactic Assistant",
+        "BeHe Pro",
+        "BeHe Keyboard",
+        "Vlille Checker",
+        "Daily Diary",
+        "WiFiKeyboard",
+        "Qz",
+        "SatStat",
+        "Voltage Drop Calculator",
+        "WiFiAnalyzer",
+        "Smart Card Emulator",
+        "Smart Card Reader",
+        "Geoperion",
+        "Vuze Remote",
+        "LocDemo",
+        "OpenWLANMap",
+        "OpenWLANMini",
+        "WiFi Widget",
+        "CIFS Documents Provider",
+        "Waistline",
+        "Mysplash",
+        "Remembeer",
+        "Pixel Dungeon",
+        "toodoo",
+        "SimpleMarkdown",
+        "GTFSOffline",
+        "ElloShare",
+        "Taipei Youbike Offline",
+        "DefCol",
+        "Private Lock",
+        "BookmarkOS",
+        "Ogame on Android",
+        "Habits",
+        "Simple Random Stock",
+        "LinConnect",
+        "Countdown Timer",
+        "Windscribe",
+        "Simpill",
+        "Wire • Secure Messenger",
+        "Bhagavad Gita",
+        "ZipXtract",
+        "TourCount",
+        "TransektCount",
+        "Shopping List",
+        "AwesomeWallpaper",
+        "CallerDetails",
+        "Democracy Droid",
+        "Devinettes",
+        "Fissure",
+        "Quran 16 Line - Quran Revision Helper",
+        "Quill",
+        "Atomize",
+        "xBrowserSync",
+        "Xabber",
+        "Xabber Classic",
+        "Port Knocker",
+        "Droid Draw",
+        "DataBackup",
+        "ChocoUI (XDA colors)",
+        "Liquid Wars OS",
+        "Mauth",
+        "Calculator",
+        "Minecraft Clock",
+        "To Do",
+        "Timidity AE",
+        "XRCB",
+        "Notification Dictionary",
+        "Simple Money Tracker",
+        "YacGuide",
+        "YacGuide Dev",
+        "DroidRec",
+        "YASFA",
+        "DO Swimmer",
+        "KeyPass",
+        "YubiClip",
+        "Yubico Authenticator",
+        "YubiTOTP",
+        "Pocket Talk",
+        "Pyroman: Jaws of Fire",
+        "WG Tunnel",
+        "Maniana",
+        "Hdhomerun Signal Meter",
+        "SMS Backup+",
+        "MediLog",
+        "开屏跳过",
+        "zSMTH",
+        "SuperImage",
+        "InnerTune",
+        "aagtl",
+        "AVIF Viewer",
+        "MetalabDoorWidget",
+        "TRIfA",
+        "ZANavi",
+        "BMI Calculator",
+        "Zorin Connect",
+        "Zulip",
+        "AppOpsX",
+        "Fairphone Checkup",
+        "Fairphone Clock Widget",
+        "Fairphone 2 Launcher",
+        "Fairphone 1 Launcher",
+        "My Contacts",
+        "Internet Radio",
+        "License",
+        "Buran",
+        "Mines3D",
+        "UK COVID-19 Venue Check-in",
+        "Sanity",
+        "Blackjack",
+        "Meme Creator",
+        "Squeez",
+        "Minesweeper",
+        "Smart Dock",
+        "APV PDF Viewer",
+        "PdDroid Party",
+        "Jami",
+        "SD Contacts",
+        "Limitless grid",
+        "Blurred Lines",
+        "NetSwitch",
+        "SnooperStopper",
+        "NorthDog Audio Compass",
+        "Chess Walk",
+        "Kaku",
+        "OpenCanteen",
+        "ALSA Mixer WebUI",
+        "Počasí v krajích",
+        "CTU Menza",
+        "Forecastie",
+        "WebTube",
+        "hJOP Driver",
+        "DPC",
+        "Czech Diacritic Keyboard",
+        "Better Schedule (Bakaláři)",
+        "Meshenger",
+        "Prepay Credit",
+        "Flexible Wallpaper",
+        "Compass",
+        "Dasher",
+        "BlackSCREENremote",
+        "Aalener Optik-Formelrechner",
+        "VergissNix",
+        "XOverrideHeadphoneJackDetection",
+        "YubNub Command Line",
+        "Anton Widget",
+        "Bewegungsmelder",
+        "Periodical",
+        "Flindex",
+        "sudokunst",
+        "Paperless Mobile",
+        "Easy Open Link",
+        "Mirakel-Dashclock",
+        "Mirakel",
+        "FP1-EPO-Autoupdate",
+        "Snapcast - multi-room audio in perfect sync",
+        "Railway station photos",
+        "DashClock: Sunrise",
+        "GC-Tools",
+        "FOSS Browser",
+        "FOSS Moodle",
+        "Quit Smoking",
+        "Blue Minimal",
+        "FOSS Weather",
+        "Screenshot Assistant",
+        "Score sheets",
+        "Library App VideLibri",
+        "Best-Before",
+        "LibreTranslator",
+        "Weather",
+        "Bibel-Kapitel-Losung",
+        "Binary Kitchen Doorlock",
+        "BitShares Wallet",
+        "VDR-Manager",
+        "Vespucci",
+        "OpenVPN for Android",
+        "PiGrid Companion",
+        "Child Resus Calc",
+        "HydroMemo",
+        "Barcode Buddy",
+        "LfDI BW",
+        "c3nav",
+        "card10 Companion",
+        "Chip Defense",
+        "Regex Crossword",
+        "meteroid",
+        "Zapp",
+        "Flux News",
+        "K-9 Mail DashClock Extension",
+        "Crypto Prices",
+        "Schule",
+        "Barcodegen",
+        "Voucher Calc",
+        "MensaPlan",
+        "Ning",
+        "FreeShisen",
+        "Headphone indicator",
+        "Was geht App?",
+        "LDAP Sync",
+        "AntennaPod",
+        "OpenWebWeaver",
+        "Congress Fahrplan",
+        "DEMOCRACY",
+        "OpenTracks",
+        "DetermApp",
+        "Slider",
+        "Muzei - Bing Image of the Day",
+        "PaperLaunch: Side launcher",
+        "Another-RSS",
+        "OpenWort",
+        "ReoTwé Twitter Client",
+        "Stop-o-Moto",
+        "TOTALOG",
+        "MicroPinner",
+        "Pizza Cost",
+        "TSCH_BYL",
+        "CALCVAC-VACLINE",
+        "Xearth",
+        "Birthday Countdown",
+        "FutharkBoard",
+        "GM Dice",
+        "RasPi Check",
+        "Unofficial Golem.de Reader",
+        "Keypad-Mapper 3",
+        "Fahrraddiebstahlwarnung",
+        "Word Value",
+        "ccgt",
+        "SpacePeng!",
+        "CMIS Browser",
+        "foodsharing",
+        "FragDenStaat",
+        "Hamburger ",
+        "Who Has My Stuff?",
+        "Freifunk-Karte",
+        "Forro Lyrics",
+        "Web Opac",
+        "App Bundle Reporter",
+        "BlitzMail",
+        "Transportr - Public Transit",
+        "DAPNET",
+        "GeoNotes",
+        "AndroFish",
+        "Really Basic Vocab",
+        "Studiportal",
+        "LnkShortener",
+        "Meeting Cost Clock",
+        "Dew Point",
+        "Digitales Klassenzimmer",
+        "Funktrainer",
+        "Contact Book",
+        "MapEver",
+        "IdiomReplaceX Browser App",
+        "aRevelation",
+        "GuessIron",
+        "Pedometer",
+        "/system/app mover",
+        "WiFi Automatic",
+        "NC Passwords",
+        "Break.Down.Timer",
+        "Everyday Tasks",
+        "ANOTHERpass",
+        "ParkenDD",
+        "NotificationLog",
+        "TU Darmstadt Moodle Wrapper",
+        "XMPP Admin",
+        "Voicesmith",
+        "A Photo Manager",
+        "CalEF (Calendar Entry Formatter)",
+        "Calendar ICS adapter",
+        "Camera Folder",
+        "Content Provider Helper",
+        "Show Articles in Map",
+        "Intent Intercept",
+        "Location Map Viewer",
+        "LLCrop (loss less)",
+        "ToGoZip ('==> Zip')",
+        "k4android",
+        "FeinstaubWidget",
+        "Imagepipe",
+        "Tiny Weather Forecast Germany",
+        "MoTAC",
+        "Hashr",
+        "Tricky Tripper",
+        "Camera Date Folders",
+        "Classical Music Scanner",
+        "Classical Music Tagger",
+        "Opus 1 Music Player",
+        "SAF Media Scanner",
+        "Unpopular Music Player",
+        "ANNO 1404 - Calculator",
+        "DictionaryForMIDs",
+        "Dogecoin Wallet",
+        "sesam",
+        "Nachtlager Downloader",
+        "pixelflood",
+        "Run Userinit",
+        "Cherry",
+        "Kimai TimeTracker",
+        "Ask me anything meaningful",
+        "Nextcloud News",
+        "Nextcloud Cookbook",
+        "Gcam Services Provider (Basic)",
+        "Balance",
+        "debDroid",
+        "SlideItLoud",
+        "SyncWifi",
+        "Throughput",
+        "Binary Eye",
+        "Decisions",
+        "Pie Launcher",
+        "Screen Time",
+        "Shader Editor",
+        "Wave Lines Live Wallpaper",
+        "FFUpdater",
+        "PrivacyBlur",
+        "Mooltifill",
+        "WikiAndPad",
+        "Contact Merger",
+        "Soundboard",
+        "MetaGer Search",
+        "DeuFeiTage",
+        "Nextcloud Cookbook",
+        "Kvaesitso",
+        "Metronome",
+        "Tuner",
+        "monocles browser",
+        "monocles chat",
+        "mail",
+        "monocles social",
+        "monocles translator",
+        "Mondstern Acrylic Icons",
+        "MOROway App",
+        "National Geographic for Muzei",
+        "TonUINO NFC Tools",
+        "Block Puzzle Stone Wars",
+        "WTF‽ (The MirOS Project)",
+        "User-controlled decryption operations",
+        "ArcheryStats",
+        "mTUO",
+        "ImapNotes3",
+        "Senior Launcher",
+        "p!n",
+        "FOSS Warn",
+        "BikeComputer",
+        "Find My Device (FMD)",
+        "ShiftCal",
+        "Droidentify",
+        "Drudgery",
+        "Geo Bookmark",
+        "List My Apps",
+        "Photo Bookmark",
+        "Pocket Bandit",
+        "Remote Keyboard",
+        "Sensor Readout",
+        "Text Fiction",
+        "BatteryCalibration",
+        "OpenUntis",
+        "Voice Audiobook Player",
+        "PC_DIMMER",
+        "piggybudget",
+        "BG2BangleJS",
+        "Exalted Dicer",
+        "Spickerrr 2.1",
+        "blabber.im",
+        "OneShot",
+        "Clementine Remote",
+        "Dynamic Night Light",
+        "trale",
+        "FTPClient",
+        "GameDealz",
+        "8-Bit Wonders",
+        "Activity Diary",
+        "QuickDic",
+        "Flashlight",
+        "Bierverkostung",
+        "Simple Contacts Pro SE",
+        "CovPass",
+        "CovPassCheck",
+        "PartyGames",
+        "Xposed Installer",
+        "Child Monitor",
+        "phyphox",
+        "Currencies: Exchange Rate Calculator",
+        "The Verge wallpapers for Muzei",
+        "Freebloks",
+        "Offi",
+        "Bitcoin Wallet",
+        "Bitcoin Wallet [testnet3]",
+        "Schlikk Calls",
+        "AirGuard - AirTag protection",
+        "Selfnet WIFI-Setup",
+        "Blockly for senseBox",
+        "Frog Password Generator",
+        "Feudal Tactics",
+        "Slight backup",
+        "Sigfood",
+        "Bluetooth LE Spam",
+        "SimpleStatsWidget",
+        "FingerList",
+        "Open Training",
+        "Tickmate",
+        "Trains Locations",
+        "DarkCroc Theme",
+        "Default Dark Theme",
+        "SchildiChat",
+        "GSMmap",
+        "SnoopSnitch",
+        "Falling Blocks",
+        "Dots'n'Boxes",
+        "Rule of Three",
+        "Critical Maps",
+        "F-Droid Build Status",
+        "OSM Dashboard for OpenTracks",
+        "OSM Dashboard Offline for OpenTracks",
+        "SudoQ",
+        "MIFARE Classic Tool",
+        "Activity Launcher",
+        "Activity Launcher fork",
+        "SecScanQR",
+        "FitoTrack",
+        "Flang",
+        "Easy Xkcd",
+        "taz",
+        "Minos",
+        "brainjogging",
+        "taz.app klassisch",
+        "LMd",
+        "Liedgutverzeichnis",
+        "ntodotxt",
+        "Simple Brick Games",
+        "Simple Search",
+        "Simple Solitaire Collection",
+        "TSVNC",
+        "OpenStop",
+        "HardWhere",
+        "iTLogger",
+        "Tuta Mail",
+        "Clipboard Beam",
+        "Portal Timer",
+        "OpenMensa",
+        "DeltaCamera",
+        "EnigmAndroid",
+        "Varengold activeTAN",
+        "Neo2 External Keyboard",
+        "Single-Feed",
+        "HABPanelViewer",
+        "aCalDAV",
+        "BonjourBrowser",
+        "Luftlinie",
+        "Street­Complete",
+        "SCEE",
+        "wger Workout Manager",
+        "Friendica",
+        "LDAP Sync",
+        "WiVeWa",
+        "Welefon",
+        "moreDays",
+        "YAACC",
+        "Mensa-Guthaben",
+        "ROT13 Translator",
+        "Aves Libre",
+        "Amarok",
+        "AuthPass - KeePass compatible Password Manager",
+        "Next Player",
+        "WordBook: Your Personal Dictionary",
+        "Lentil Translate",
+        "qBitController",
+        "Did I Take My Meds?",
+        "Open Chaos Chess",
+        "OpenBike",
+        "Noise Cancelling",
+        "Speaker",
+        "Burning-Series",
+        "Eat Poop You Cat",
+        "Moloko",
+        "LaMetric Notify+",
+        "You Have Mail",
+        "Photok",
+        "Linwood Butterfly",
+        "Linwood Butterfly",
+        "Linwood Flow",
+        " 1010! Klooni",
+        "Minesweeper - Antimine",
+        "Sharik - file sharing via WI-FI",
+        "LibrePass",
+        "Kotori",
+        "Password Store",
+        "Jiten Japanese Dictionary",
+        "Jiten Japanese Dictionary [Online]",
+        "Sokoban(g)",
+        "Android 2 Linux Notifications",
+        "FlorisBoard",
+        "RPNcalc",
+        "Interval Timer",
+        "AFWall+",
+        "Tehro: Tehran Metro",
+        "qBittorrent Manager",
+        "ParkenUlm",
+        "Lucia App",
+        "aSQLiteManager",
+        "oandbackup",
+        "My Leaf",
+        "Encrypt Text",
+        "Floating Image",
+        "Pijaret",
+        "personalDNSfilter",
+        "Clear List",
+        "Pulsar",
+        "Wattz",
+        "Expression Evaluator",
+        "Yet Another Call Blocker",
+        "BOINC",
+        "SafeSlinger Exchange for Security Developers",
+        "PocketSphinx Demo",
+        "MMSKeeper",
+        "OpenTimer",
+        "Flask",
+        "DroidAtomix",
+        "USA COVID-19 Tracker",
+        "Kõnele",
+        "Simple Loan Calculator",
+        "OCReader",
+        "QuiteSleep",
+        "Morse Trainer",
+        "CosyDVR",
+        "T16Fling",
+        "WD Notes",
+        "Workout Time!",
+        "Calendula",
+        "Passman",
+        "JioFi Battery Notifier",
+        "EZ Wifi Notification",
+        "MasterMindy",
+        "twitter2nitter",
+        "Paperless",
+        "HeartBeat",
+        "F-Droid Classic",
+        "CAPod - Companion for AirPods",
+        "DartsTrainer",
+        "EtchDroid USB writer",
+        "fb-client",
+        "JSlab",
+        "AnaCam",
+        "Angulo",
+        "BlackJack Trainer",
+        "Shopt",
+        "Momkin",
+        "SmsMatrix",
+        "Impeller",
+        "FairEmail",
+        "FineGeotag",
+        "NetGuard",
+        "SliderSynth",
+        "BeamControl for Smart Interface",
+        "GeoPaparazzi",
+        "SMASH — Smart Mobile App for Surveyor's Happiness",
+        "Meerkat Challenge",
+        "Tachiyomi",
+        "PlusMinusTimesDivide",
+        "Nani?",
+        "Digits",
+        "Echo",
+        "Yggdrasil",
+        "Polar Clock",
+        "pretixdroid",
+        "pretixPRINT",
+        "pretixSCAN",
+        "Lampshade",
+        "Coloring Book",
+        "12345 - Learn Counting",
+        "Bhagavad Gita",
+        "Learning Memory",
+        "Fruit Radar",
+        "GetMiTokens",
+        "NoAd Battery Calibrator [ROOT]",
+        "DSA Assistent",
+        "Screeps",
+        "OpenSyncedLists",
+        "Conversations",
+        "SIP Switch",
+        "CDLC Player",
+        "Eternity",
+        "Altcoin Prices",
+        "Brainstonz for Android",
+        "Colors Overflow",
+        "Complica4",
+        "Dice Overflow",
+        "Fish Rings for Android",
+        "Free Klondike",
+        "House of Cards",
+        "Hungarian Rings for Android",
+        "Ithaka Board Game",
+        "Kechi",
+        "No Thanks!",
+        "Politrics",
+        "Scribe4",
+        "Svarka Odds Calculator",
+        "Tri Peaks Solitaire for Android",
+        "Tuty Fruty Slot for Android",
+        "Vitosha Blackjack",
+        "VitoshaPokerOdds",
+        "VitoshaDM",
+        "WorkTime",
+        "StoryGame",
+        "HUD",
+        "Tournant",
+        "InitialVolume",
+        "AnLinux",
+        "Anemo",
+        "BLE Radar",
+        "Faenza ADW Theme",
+        "LinCal",
+        "SimpleReminder",
+        "WarmShowers",
+        "Flier",
+        "Peppy Flowers",
+        "Yin Yang",
+        "Vädret",
+        "Helsinki Testbed Viewer 2.0",
+        "RepWifi",
+        "opsu!",
+        "Seasonal Foods Calendar",
+        "Speedmeter",
+        "SpiritF",
+        "Helio",
+        "Libre Droid",
+        "Föhnix",
+        "NLWeer",
+        "Bliss Launcher",
+        "Xia Express",
+        "AndroidRun",
+        "Std Atmosphere",
+        "Bépo clavier externe",
+        "Tableau de bord Rolling",
+        "BwareArea",
+        "nitroxCalc",
+        "FreshRSS",
+        "Inflation Calculator",
+        "Paris Transport Traffic",
+        "CovidAt",
+        "Goguma",
+        "BikeSharingHub",
+        "Commons",
+        "wallabag",
+        "TousAntiCovid",
+        "Fedilab",
+        "OpenDNS Updater",
+        "Direct Dictaphone",
+        "BabyName",
+        "RiverFerry",
+        "SimpleProtocolPlayer NG",
+        "Flash Alert - Call and Message",
+        "IPCalc Android",
+        "Rights alert",
+        "ApkTrack",
+        "Eve-control",
+        "WhatExp",
+        "TaigIME",
+        "Drinks",
+        "Napply",
+        "Don du Sang",
+        "Goblim",
+        "PeerTube Live",
+        "Dinomail",
+        "KISS Launcher",
+        "DashClock Birthday Extension",
+        "Odeon",
+        "PasseGares",
+        "Souvenirs",
+        "Bide et Musique",
+        "Fujiten",
+        "Kingdomino Score",
+        "Onyx",
+        "Score Tarot",
+        "HexViewer",
+        "WikipOff",
+        "Sweet IPFS",
+        "PhotoBackup",
+        "Oburo.O",
+        "Preferences Manager",
+        "Secret Codes",
+        "Sleep Timer",
+        "Trouve ton campus",
+        "SynCarnet",
+        "Camera Color Picker",
+        "SimpleThermometer",
+        "KeepOn - Keep your screen on smartly!",
+        "PariDroid",
+        "Nextcloud SMS",
+        "OOS Firmware Extractor",
+        "Stanley",
+        "Ted",
+        "Focal",
+        "DragonGoApp",
+        "MouseApp",
+        "scrabble",
+        "Transports Bordeaux",
+        "Transports Rennes",
+        "Netcfg Widget",
+        "SkyTube Legacy",
+        "SkyTube",
+        "Hikar",
+        "OpenTrail",
+        "Pi-hole Droid",
+        "TestApp",
+        "Galnet Dictionary",
+        "SinGal Dictionary",
+        "Geddit",
+        "Floating Stickies",
+        "Passera",
+        "Dimmer",
+        "Kinolog",
+        "DSub",
+        "Sensor Server",
+        "Easy Weather",
+        "Memento",
+        "Piclice",
+        "campfire",
+        "ESBDirect",
+        "dawdle",
+        "usageDirect",
+        "Museum of a broken API",
+        "Tea Timer",
+        "NGA客户端开源版",
+        "Mealient",
+        "Scuttloid",
+        "Mach3Pendant",
+        "Step and Height Counter",
+        "CrocodileNote",
+        "Voice Mail Player",
+        "Skewy - anti eavesdropping",
+        "Dash Wallet",
+        "Groestlcoin Wallet",
+        "Groestlcoin Wallet TestNet",
+        "Behat Reporter",
+        "Local NLP Backend",
+        "words.hk 粵典",
+        "Calculator",
+        "Stratum 0 Widget",
+        "addy.io (formerly AnonAddy)",
+        "Enchanted Fortress",
+        "HSTempo",
+        "tTorrent search",
+        "plees-tracker",
+        "ADSdroid",
+        "UVC Camera / Usb Camera custom",
+        "myLock utilities",
+        "AmbitSync",
+        "DEfO ECH Apps",
+        "Ceno Browser: Share the Web",
+        "V2EX",
+        "NFSee - NFC Card Helper",
+        "Quicksy",
+        "清心天气",
+        "J 拼图",
+        "Status: Crypto Wallet, Messenger, Ethereum Browser",
+        "Element - Secure Messenger",
+        "\$HELL",
+        "Subtle News",
+        "Carts Bus Boarding",
+        "raag",
+        "Kandroid",
+        "Android Permissions",
+        "Torchie",
+        "aksharam",
+        "Shellshock Vulnerability Scan",
+        "Tanks of Freedom",
+        "Diode",
+        "Lock Pattern Generator",
+        "aShell",
+        "IzzyOnDroid",
+        "Remote Droid",
+        "8Vim Keyboard",
+        "Atomic",
+        "Kill Camera",
+        "My Wifi Passwords",
+        "SNotepad",
+        "ScreenStream",
+        "LaiCare",
+        "Checkey",
+        "Gilga",
+        "PixelKnot: Hidden Messages",
+        "Ripple: respond when panicking",
+        "Network Discovery",
+        "Thugaim",
+        "Bits & Bäume 2022 Schedule",
+        "Camp 2023",
+        "CLT 2023 Schedule",
+        "37C3 Schedule",
+        "Datenspuren 2023",
+        "DebConf Schedule",
+        "DiVOC Schedule",
+        "FOSDEM 2023 Schedule",
+        "FOSS4G 2023",
+        "GPN 2023",
+        "HOPE 2022",
+        "LibreOffice 2022 Schedule",
+        "MRMCD 2023 Schedule",
+        "PyConZA 2021",
+        "JEV 2022 Schedule",
+        "Night Screen",
+        "EinkBro",
+        "10,000 sentences",
+        "nusic",
+        "MergedWiFiNLP",
+        "SuperGenPass",
+        "robotfindskitten",
+        "24h Analog Clock",
+        "Units",
+        "cone",
+        "Hauk",
+        "Tower Collector",
+        "Every Door",
+        "Caffeine Tile",
+        "Mindustry",
+        "Pitch pipe",
+        "dahliaOS Calculator",
+        "Fabularium",
+        "Tensor",
+        "ente Authenticator",
+        "ente - encrypted photo storage",
+        "Mighty Knight",
+        "Always On Clock",
+        "Traintime PDA",
+        "CUPS Printing",
+        "Chiver",
+        "Yggdrasil",
+        "DanXi",
+        "DataStopwatch",
+        "Open Video Editor",
+        "Clipboard Cleaner",
+        "TimeR Machine",
+        "AAAAXY",
+        "aaaaa",
+        "Ching Machine",
+        "AlwaysOn | Always On Display",
+        "Battery Tool | Hibernate Unused Apps",
+        "Home App | For Philips Hue, Arduino & more",
+        "Pods Companion For AirPods",
+        "Power App | Simple Power Menu [Root only]",
+        "Slideshow Wallpaper",
+        "PDF Reader",
+        "Git Quick Reference",
+        "React",
+        "Folderlogs",
+        "Watermarking",
+        "Table Habit",
+        "PinPoi",
+        "MemeTastic",
+        "HashEasily",
+        "Materialistic",
+        "Hop'Edia",
+        "Installalogs",
+        "IsMyWebsiteUp",
+        "Copy SMS Code - OTP Helper",
+        "Minilens",
+        "Stringlate",
+        "Lona",
+        "Juvavum",
+        "Audio Share",
+        "Ninja",
+        "App Manager - Android package manager",
+        "Metro - A music player for Android",
+        "Captive Portal Controller",
+        "SetEdit - Settings Database Editor",
+        "UnApkm - Convert APKM to APKS",
+        "Everest",
+        "DNS man",
+        "Otobi Keyboard",
+        "FreePaint",
+        "GitTouch",
+        "JS-Dict",
+        "AeonDroid",
+        "eXch.",
+        "ScrollSocket",
+        "SyncPlayer",
+        "gpsdRelay",
+        "Quillpad",
+        "RandomFileMaker",
+        "Open FlashLight",
+        "SaveAsTxt",
+        "Key Mapper",
+        "Key Mapper GUI Keyboard",
+        "Silinote",
+        "Last Launcher",
+        "Night Mode",
+        "OCR",
+        "Open In WhatsApp",
+        "AppLock",
+        "Quick Calculation",
+        "FastLyrics",
+        "Cards Score Keeper",
+        "GPSd Forwarder",
+        "Nori",
+        "APN Settings",
+        "LibreTrivia",
+        "V2compose",
+        "Elements",
+        "BLE Peripheral Simulator",
+        "SerialPipe",
+        "Tri-Valley Buses",
+        "Wulkanowy",
+        "RCX - Rclone for Android",
+        "Dooz",
+        "freeDictionaryApp",
+        "Stroke Input Method (筆畫輸入法)",
+        "ADBio",
+        "AquaDroid",
+        "Symphony",
+        "Planet Rider",
+        "Taskkeeper",
+        "Cryptographic ID",
+        "Vibrato",
+        "ListenTogether",
+        "Marxist Tamil",
+        "Anecdote",
+        "ntfy - PUT/POST to your phone",
+        "Home Assistant",
+        "Who Here",
+        "Unstoppable Wallet",
+        "Pirate Solitaire",
+        "Prayer Book",
+        "Keep Alive",
+        "Anki Image Occlusion",
+        "kubenav",
+        "WhatsApp Web To Go - Mobile Client for WhatsApp We",
+        "LBRY F-Droid",
+        "LibreHealth Essential Care For Every Baby",
+        "LibreHealth Cost Of Care Explorer",
+        "Literal",
+        "HACS",
+        "Aruba Networks Login",
+        "Revolution IRC",
+        "Anchr for Android",
+        "PrivacyBreacher",
+        "Inner Breeze",
+        "AnXray",
+        "SagerNet",
+        "Brook Plugin - SagerNet",
+        "Hysteria Plugin - SagerNet",
+        "Mieru Plugin - SagerNet",
+        "NaïveProxy Plugin - SagerNet",
+        "Ping Tunnel Plugin - SagerNet",
+        "Trojan-Go Plugin - SagerNet",
+        "TUIC Plugin - SagerNet",
+        "NeuroLab",
+        "Oversec",
+        "PSLab Android App",
+        "Sideload Helper by Rebble",
+        "QuickShot: Share Screenshot",
+        "SimpleLogin | Anti-spam",
+        "MyHackerspace (New)",
+        "TimeLimit.io",
+        "Open TimeLimit",
+        "SMS Spammer",
+        "treehouses remote",
+        "VirtualXposed",
+        "Vertretungsplan.io - free substitution plan App",
+        "Defendo",
+        "K2",
+        "2 Player Battle",
+        "Trans",
+        "Turo",
+        "Conceal",
+        "Edifier RC10D1",
+        "Edifier RC10E",
+        "Edifier RC18A",
+        "Er ríkið opið?",
+        "JAWS",
+        "mpv-android",
+        "OMW",
+        "OMW Nightly",
+        "VCMI",
+        "Hue Widgets",
+        "Battle for Wesnoth",
+        "HostIsDown",
+        "EPUB3 Reader",
+        "Mercurygram",
+        "hippopotamos",
+        "Nextcloud Maps Geobookmarks",
+        "Ojo RTSP IP Camera viewer",
+        "HalfDot for Umami",
+        "Diab",
+        "Dudo",
+        "TriesteinBus",
+        "crond",
+        "RiMusic",
+        "Omni Notes",
+        "DashClock: Battery",
+        "GreenAddress.It",
+        "ePUBator",
+        "Greyscale",
+        "LinuxDayOSM",
+        "DualSim Reminder",
+        "Nextcloud Deck",
+        "Nextcloud Tables",
+        "Nextcloud Notes",
+        "BusTO",
+        "Chord Shift",
+        "MineSweeper",
+        "Lock Screen",
+        "PAFCalc",
+        "SlimSocial for Facebook",
+        "SlimSocial for Twitter",
+        "No-frills CPU Control CLASSIC",
+        "Mercury-SSH",
+        "ViMusic",
+        "Lyrics 2",
+        "The Italian Said",
+        "Aard 2",
+        "MoneyBalance",
+        "Terminal Emulator for Android",
+        "Droid Examiner",
+        "Musical Notes",
+        "Save For Offline",
+        "wX",
+        "Just Player",
+        "Just Player Plugin: Ampache",
+        "Just Player Plugin: Podcast",
+        "OpenWnn",
+        "Whale shark and sardines",
+        "UnicodePad",
+        "miniNoteViewer",
+        "Android USB Serial Monitor Lite",
+        "SyncMemories",
+        "OpenRedmine",
+        "Neko Project II for Android",
+        "aGrep",
+        "NDKmol",
+        "NFC Drivers License Reader",
+        "CPU Stats",
+        "DataStats",
+        "MaximaOnAndroid",
+        "Diary",
+        "MagiaDNI",
+        "JSettlers",
+        "Java installer",
+        "Timetable",
+        "Unexpected Keyboard",
+        "Jupiter Broadcasting",
+        "Chess",
+        "Yucata Envoy",
+        "Diktofon",
+        "Sithakuru",
+        "Simply Do",
+        "AN2Linux",
+        "DejaVu Fonts",
+        "Elpe Efpe",
+        "SidePanel",
+        "MultiPing",
+        "CryptoPass",
+        "Fun With Kanji",
+        "link eye",
+        "Ionic Notes",
+        "Taskwarrior",
+        "PhotoChiotte",
+        "Signature Spoofing Checker",
+        "andFHEM",
+        "LibreTasks",
+        "Fate Sheets",
+        "Phone Saver",
+        "Slideshow",
+        "TaiwanEbookSearcher",
+        "News Reader",
+        "aTox",
+        "CanZE",
+        "KFZ-Kennzeichen",
+        "LukeLauncher",
+        "Flash Deck",
+        "Medic Log",
+        "News Provider",
+        "Personal Stuff",
+        "Get ID",
+        "Volume Control",
+        "Rtl-sdr driver",
+        "Advanced Charging Controller (ACCA) ",
+        "EasyLight",
+        "music-cyclon",
+        "WoT Tank Quiz",
+        "Eylca",
+        "Bulkshare 2",
+        "GrowTracker",
+        "Gradr",
+        "Love Game",
+        "Read You",
+        "Canada Weather & Radar",
+        "Barinsta",
+        "Foreground",
+        "Fake Contacts",
+        "Easy Diary",
+        "ARChon Packager",
+        "Slide",
+        "LISTEN.moe",
+        "FallASleep - Device sleep timer",
+        "Catima — Loyalty Card Wallet",
+        "Raise To Answer",
+        "Share To InputStick",
+        "HDA URL",
+        "MBE Style",
+        "Knock on Ports",
+        "Toffeed",
+        "SimpleDo",
+        "Alarmio",
+        "BoogDroid",
+        "WhatsApp Twitch Stickers",
+        "CollinsDictionary",
+        "Car Report",
+        "Linkbox",
+        "Aodify",
+        "Clipeus",
+        "Duress",
+        "Red",
+        "Sentry",
+        "Silence",
+        "Vibe",
+        "Volta",
+        "Wasted",
+        "WyFy",
+        "DashClock: DashCricket",
+        "Open Golf",
+        "MoeMemos",
+        "FeedWatcher",
+        "FilmChecker",
+        "Party UP!",
+        "Superuser",
+        "AutoDark",
+        "Easy Watermark",
+        "NoWhatOpen",
+        "WATransmitter",
+        "AirMessage",
+        "Dawn for Reddit",
+        "timeto.me",
+        "RootlessJamesDSP",
+        "TripSit",
+        "Counter",
+        "PulseAudio Rtp Receiver",
+        "Fast Shopping",
+        "Writeily Pro",
+        "Coma Phone",
+        "MaterialFBook",
+        "Material Files",
+        "Select Text to Search",
+        "Untracker",
+        "WhereYouGo",
+        "Irregular Expressions",
+        "mpv remote",
+        "Miru",
+        "Speech Trainer",
+        "Sam Remote",
+        "Chalachithram",
+        "Semitone",
+        "Boilr",
+        "NSTools",
+        "Trekarta",
+        "Wehe",
+        "PerApp",
+        "Send Reduced",
+        "AutoDND",
+        "URLSanitizer",
+        "Unvcode",
+        "MIDICtrl",
+        "Matsuri",
+        "RoundR",
+        "SamLib Инфо",
+        "HgLauncher",
+        "Pedometer",
+        "Simon Tatham's Puzzles",
+        "TKCompanionApp",
+        "✉➡🌍 Acastus-Photon",
+        "Lithuanian Layouts - Ext. Keyboards",
+        "n-Puzzle",
+        "Save on Device",
+        "Bulgarian Phonetic Layout - Ext. Keyboards",
+        "Get Foreground Activity",
+        "IsPhoneEncrypted",
+        "Lock",
+        "ShoLi",
+        "Citybike Stations Vienna",
+        "Siteswap Generator",
+        "Puzzle Grid",
+        "Techahashi",
+        "Nekogram X",
+        "RvClock",
+        "Silectric",
+        "Netclip",
+        "ACV",
+        "OsmGpxUploader",
+        "Box Stacker",
+        "Rabbit Escape",
+        "Meritous",
+        "andLess",
+        "lWS",
+        "lWS QR",
+        "Open Markdown Notes (OMN)",
+        "AndBible: Bible Study",
+        "CKPool Watcher",
+        "Microphone",
+        "Bluetooth Viewer (LITE)",
+        "Pineapple Lock Screen (OSS)",
+        "OpenFixMap",
+        "MathDoku",
+        "TeaCup",
+        "droidVNC-NG",
+        "Speed of Sound",
+        "Joplin",
+        "Tonality",
+        "CycleStreets",
+        "Debatekeeper",
+        "ReGalAndroid",
+        "My Banq",
+        "Heriswap",
+        "Recursive Runner",
+        "Url forwarder",
+        "Device Connect",
+        "Trycorder",
+        "DebianDroid",
+        "e1547 - e621 browser",
+        "Muzei Ghibli",
+        "MoneyBuster",
+        "PhoneTrack",
+        "spaRSS",
+        "SMS Popup",
+        "μlogger",
+        "Learn Music Notes",
+        "Pilldroid",
+        "Flym",
+        "Giggity",
+        "GCompris",
+        "Abstract Art",
+        "AF Weather Widget",
+        "WPGen",
+        "AiCiA",
+        "nicoWnnG",
+        "dandelior*",
+        "Markor",
+        "Public IP",
+        "Anode",
+        "Lexic",
+        "I2P",
+        "Keep it up",
+        "BipolAlarm",
+        "Inbox Pager",
+        "DotDash Keyboard",
+        "IVPN - Secure VPN for Privacy",
+        "Apollo Trivia",
+        "NetCounter",
+        "Scrobble Droid",
+        "NWS Weather Alerts Widget",
+        "Comics Reader",
+        "ForRunners",
+        "Smarter Wi-Fi Manager",
+        "TrackerControl",
+        "VoIP.ms SMS",
+        "MoLe",
+        "KeePass NFC",
+        "WIFI_EAP_SIM_Conf",
+        "DashClock: Civilization V Quotes",
+        "DieDroid",
+        "Inetify",
+        "sg for SteamGifts",
+        "Spydroid",
+        "When Ze Bus",
+        "Compass",
+        "File Explorer",
+        "Sound Recorder",
+        "Minetest",
+        "MoasdaWiki App",
+        "VIMTouch",
+        "Mullvad VPN: privacy is a universal right",
+        "My Position",
+        "Blue Line Console",
+        "Blue Square Speedometer",
+        "PageTurner",
+        "Price Per Unit",
+        "NitroShare",
+        "Audinaut",
+        "Freedoom",
+        "DashClock Widget",
+        "Muzei",
+        "OpenArchive",
+        "OSChina",
+        "OsmAnd~",
+        "OsmAnd Contour lines",
+        "OSMTracker",
+        "Easy Dice",
+        "Summation",
+        "OSMfocus Reborn",
+        "Omnomagon",
+        "fooCam beta",
+        "Marine Compass",
+        "Chroma Doze",
+        "ykDroid",
+        "RadioDroid",
+        "Noteless",
+        "GIF Live Wallpaper",
+        "dreamDroid",
+        "Cigaló",
+        "Null Black Wallpaper",
+        "andRoc",
+        "Easy Repost and Downloader for Instagram",
+        "Thorium a PeerTube client",
+        "DuOTP",
+        "DeskCon",
+        "Forage",
+        "Battery Dog",
+        "Hotspot Login",
+        "Gort",
+        "Etheric Synthesizer",
+        "Halachic Prayer Times",
+        "Fulguris Web Browser",
+        "WebSearch",
+        "AndSys ~ Apps",
+        "Dib2Qm",
+        "Kid3",
+        "Open Camera",
+        "SolitaireCG",
+        "Subsonic",
+        "Wifi Remote Play",
+        "X11-Basic",
+        "AppList",
+        "Contacts",
+        "Contacts Import",
+        "StarGW Weight",
+        "Karma Firewall",
+        "STARGW FX",
+        "STK Addon Viewer",
+        "iTracing2",
+        "Syncthing Lite",
+        "PluckLock",
+        "Barnacle Wifi Tether",
+        "Taler Cashier",
+        "GNU Taler Point-of-Sale",
+        "Taler Wallet",
+        "HandyNotes",
+        "AndroSS",
+        "Andhrystone",
+        "Postcode",
+        "NoUSSD",
+        "Authorizer",
+        "USB Gadget Tool",
+        "萊姆輸入法",
+        "YtAlarm",
+        "Shelter",
+        "KouChat",
+        "Zade's wallpaper",
+        "Corporate Addressbook",
+        "EVMap - EV chargers",
+        "QuickMSG",
+        "WiGLE WiFi Wardriving FOSS",
+        "Quizz'n World Capitals",
+        "Timer +X",
+        "EngineDataLogger-Dashboard",
+        "Salasana",
+        "UpgradeAll",
+        "Router Keygen YoloSec",
+        "Misbothering SMS Receiver",
+        "Locker",
+        "Session F-Droid",
+        "Mysterium Dark — Next Gen VPN",
+        "UBIC Wallet",
+        "Launch on Boot",
+        "Frex",
+        "Pepper&Carrot Reader",
+        "Ministocks",
+        "DroidShows",
+        "SleepyWifi",
+        "eduVPN",
+        "36C3 Wifi Setup",
+        "Brony Live Wallpaper",
+        "RainTime",
+        "Weather Widget",
+        "Fintunes",
+        "Simpletask",
+        "Simpletask Nextcloud",
+        "Simpletask (WebDAV)",
+        "Kandroid (fork)",
+        "BookWyrm",
+        "TodoTree",
+        "Simple C25K",
+        "Glider for Hacker News",
+        "NoteBuddy",
+        "Exercise Reminders",
+        "InventoryGUI Mobile",
+        "Gadgetbridge",
+        "TpmsMonitor",
+        "BlitzTypeKeyboard",
+        "Based Cooking",
+        "WiFi Warning",
+        "Foxy Droid",
+        "Overchan",
+        "ObjViewer",
+        "TriPeaks",
+        "T-UI",
+        "Quick Dice Roller",
+        "SSTV Encoder ",
+        "Giant Stopwatch",
+        "OPMT",
+        "Xournal++",
+        "Webmon",
+        "Permissions Manager",
+        "OpenContacts",
+        "OpenBeautyFacts",
+        "OpenFoodFacts",
+        "OrbitalLiveWallpaper",
+        "AdAway",
+        "Adblock Plus",
+        "ADW.Launcher",
+        "AFH Downloader",
+        "Tux Math",
+        "Flight Mode",
+        "Akvo RSR Up",
+        "Always On Display Toggle",
+        "OUI Lookup and Database",
+        "Scanner For Zotero",
+        "MATHTools",
+        "Syncopoli",
+        "Son of Hunky Punk",
+        "3D Model Viewer",
+        "Battery Widget",
+        "Wi-Fi Widget",
+        "ArchNews",
+        "AndroidPN Client",
+        "Permission Friendly Apps",
+        "Coloring for Kids",
+        "Tux Memory",
+        "Puzzle",
+        "Slow It!",
+        "AndStatus",
+        "2048 Open Fun Game",
+        "Todo Agenda",
+        "AnotherMonitor",
+        "Effects Pro",
+        "Ardroid",
+        "Rocks 'n' Diamonds",
+        "Block'Buster",
+        "Monly",
+        "Inventum",
+        "Good Weather",
+        "Derandom",
+        "AsteroidOS Sync",
+        "rust-keylock-android",
+        "Character Recognition",
+        "aTalk",
+        "Casio G-Shock Smart Sync",
+        "Remote Video Camera",
+        "MyOwnNotes",
+        "Snow",
+        "Fake Dawn",
+        "Buddha Quotes",
+        "LG",
+        "BasketBuild Downloader",
+        "MrWhite",
+        "Bomber",
+        "Droidgain",
+        "Simple Sudoku Game",
+        "Berlin-Vegan",
+        "Bibledit",
+        "Bienvenido a Internet",
+        "Accordion",
+        "Buses",
+        "Crossword",
+        "Currency",
+        "Diary",
+        "Editor",
+        "Gridle",
+        "Gurgle",
+        "Melodeon",
+        "Notes",
+        "Print",
+        "Oscilloscope",
+        "Shorty",
+        "Signal Generator",
+        "WordleSolver",
+        "Specie",
+        "Tuner",
+        "gophercle",
+        "launch",
+        "Seshat",
+        "Birthday Adapter",
+        "WiFiScanner",
+        "Mirror Mirror",
+        "Haircomb",
+        "Blitzortung Lightning Monitor",
+        "Blockinger",
+        "BobBall",
+        "BombusMod",
+        "BluePass",
+        "SoundWaves",
+        "Open Explorer Beta",
+        "Briar",
+        "Box, Box!",
+        "BlueGps",
+        "UsbGps4Droid",
+        "BTC Map",
+        "c-beam",
+        "Squawker",
+        "Mygeo",
+        "Calyx VPN",
+        "Pocket Paint",
+        "BinderFuzzy - Pentest Android Services",
+        "StartFlagExploit",
+        "Say My Texts",
+        "ToDo List Widget",
+        "Tacere",
+        "CameraFileCopy",
+        "Fwknop2",
+        "Rotation Lock + Landscape",
+        "Donate your voice: CV Project",
+        "ElegiLegi",
+        "ConnectBot",
+        "Mytronome",
+        "Cool Reader",
+        "Cool Reader",
+        "Cosmic IDE",
+        "NOVA Video Player",
+        "Mars Live Wallpaper",
+        "Wi-Fi Matic",
+        "sbautologin",
+        "mOTP",
+        "Cryptomator",
+        "Cuberite",
+        "Great Freedom",
+        "CyanogenMod Installer",
+        "WhereAreTheEyes",
+        "OkcAgent",
+        "Heading Calculator",
+        "DecSync CC",
+        "Flym DecSync",
+        "spaRSS DecSync",
+        "Trireme for Deluge",
+        "CCDroid",
+        "LogMeIn",
+        "Word Power Made Easy",
+        "Dungeon Crawl Stone Soup",
+        "Add to calendar",
+        "Ruslin",
+        "Disroot app",
+        "Rumble",
+        "DIYgenomics",
+        "Mule on Android",
+        "OpenTasks",
+        "Dialer2",
+        "Docspell Share",
+        "LibreOffice Viewer",
+        "Dolphin Emulator",
+        "Domodroid",
+        "Timer",
+        "Battery Widget",
+        "/d/gapps",
+        "DroidTR IME",
+        "Termbin",
+        "DroidUPnP",
+        "Markers",
+        "OpenBoard",
+        "Hall Monitor",
+        "dynalogin",
+        "CalorieScope ",
+        "Compass Keyboard",
+        "Petronius",
+        "Debian Kit",
+        "Web2PDF",
+        "SimpleEmail",
+        "SQRL Login",
+        "Easy Ear Trainer for Chord Progressions",
+        "EasyRPG Player",
+        "Debitum",
+        "Drawterm",
+        "Flip a coin",
+        "Where am I?",
+        "CrossWords",
+        "Android XMRig Miner",
+        "Shaman",
+        "INSTEAD",
+        "UniPatcher",
+        "Encointer Wallet",
+        "EP Mobile",
+        "MorbidMeter",
+        "Tremotesf",
+        "Piano",
+        "ESUP-NFC-TAG-DROID",
+        "Exodus",
+        "Balance",
+        "eLiquid Calculator",
+        "Masterwork Tools: Pathfinder Open Reference",
+        "Rosary",
+        "IITC-CE Mobile",
+        "FasterGPS",
+        "Fcitx5 for Android",
+        "Fcitx5 for Android (Anthy Plugin)",
+        "Fcitx5 for Android (Chewing Plugin)",
+        "Fcitx5 for Android (Clipboard Filter Plugin)",
+        "Fcitx5 for Android (Hangul Plugin)",
+        "Fcitx5 for Android (Jyutping Plugin)",
+        "Fcitx5 for Android (RIME Plugin)",
+        "Fcitx5 for Android (Sayura Plugin)",
+        "Fcitx5 for Android (Unikey Plugin)",
+        "F-Droid Basic",
+        "F-Droid",
+        "F-Droid Privileged Extension",
+        "F-Droid Privileged Extension OTA",
+        "F-Droid Nearby",
+        "FreeOTP",
+        "Déjà Vu - A local RF based back end for the µg Pro",
+        "LocalGsmNlpBackend",
+        "Symphony",
+        "LocalWifiNlpBackend",
+        "FLARE",
+        "Clover",
+        "Inventory",
+        "Flyve MDM Agent",
+        "Forkgram",
+        "Badge Magic",
+        "Fossify Calendar",
+        "Fossify File Manager",
+        "Fossify Gallery",
+        "Fossify Phone",
+        "Tiny Tiny RSS",
+        "FreedomBox",
+        "freeminer",
+        "Freenet mobile",
+        "EasyRSS",
+        "FrOSCon",
+        "Vernet - Network Analyzer",
+        "SimpleSSHD",
+        "M.A.L.P.",
+        "Odyssey Music Player",
+        "Network Tester",
+        "G-Droid",
+        "CalDAV Sync Adapter",
+        "FBReader Calibre connector",
+        "FBReader TTS plugin",
+        "FBReader",
+        "Libre Ipsum",
+        "GSMLocationNlpBackend",
+        "Guileless Bopomofo Keyboard",
+        "AnimeOne",
+        "Hexiano",
+        "OSMBugs ",
+        "GLPI Agent",
+        "Glucosio",
+        "Gmote",
+        "Emacs",
+        "Godot Editor 3",
+        "Godot Editor 4",
+        "Exceer",
+        "Wiki Unblocked",
+        "Colour Clock",
+        "Concentric Clock",
+        "Ansible Sempahore Client",
+        "Chord Reader",
+        "floccus bookmark sync",
+        "ONScripter",
+        "Sumatora",
+        "Gravity Defied",
+        "ChessWatch",
+        "Xmp Mod Player",
+        "TuxGuitar",
+        "Tricorder",
+        "AnySoftKeyboard: Czech",
+        "AnySoftKeyboard: Lithuanian",
+        "Georgian Fonts Installer",
+        "HIIT Timer",
+        "The Light",
+        "The Life",
+        "RingCode",
+        "ChordReader 2",
+        "Nuntius",
+        "LeafPic",
+        "SexyTopo",
+        "Tella",
+        "Mather",
+        "IETF 113",
+        "openmentoring-mobile",
+        "Calculate!",
+        "Face Slim",
+        "Libero Vocab",
+        "Yivi",
+        "Tibetan Pad",
+        "Tibetan Keyboard",
+        "Loop Habit Tracker",
+        "Point.im",
+        "Daedalus",
+        "DNS66",
+        "Episodes",
+        "ShoppingList",
+        "Shop With Mom",
+        "Jellyfin for Android TV",
+        "Jellyfin - your media in your hands!",
+        "Dalvik Explorer",
+        "Penroser",
+        "Frozen Bubble",
+        "NXT Remote Control",
+        "Bats! HIIT",
+        "Make Some Noise",
+        "Jitsi Meet",
+        "Notification Plus",
+        "Mastodon",
+        "Moshidon",
+        "OpenRecipes",
+        "Forecast widgets",
+        "CameraAlign",
+        "ShellsMP",
+        "WiFi Walkie Talkie",
+        "aLogcat",
+        "DroidLife",
+        "httpmon",
+        "XScreenSaver",
+        "Kakugo",
+        "DoF Calculator",
+        "HeatCalc",
+        "ND Filter",
+        "BetterCounter",
+        "KDE Connect",
+        "KTrip",
+        "Ministro",
+        "Keyoxide",
+        "Kiwix",
+        "Spider",
+        "Kotatsu",
+        "Kontalk Messenger",
+        "Kolab Notes",
+        "KOReader",
+        "NetworkMapper",
+        "Krita",
+        "HA Bluetooth Proxy",
+        "Kwaak3",
+        "Fortunes",
+        "Tap the black tiles",
+        "NC Bookmark Viewer",
+        "PGPAuth",
+        "AnyMemo",
+        "FreeOTP+",
+        "P2Play",
+        "Libreflix",
+        "Impress Remote",
+        "lichess",
+        "AJShA Android Java Shell App",
+        "BLExplorer",
+        "ΞtheRemotΞ",
+        "FAST App Search Tool",
+        "FASTer App Search Tool",
+        "Gobandroid",
+        "gobandroid ai gnugo",
+        "IPFSDroid",
+        "Material Tea Timer",
+        "PassAndroid",
+        "Satoshi Proof",
+        "Survival Manual",
+        "Vaporizer Control Crafty",
+        "glmark2",
+        "Linphone - open source SIP client",
+        "Li-Ri",
+        "LocalSend",
+        "Moving Polygons",
+        "FreeCell4",
+        "LBalance",
+        "PySolFC",
+        "Lumicall",
+        "Puma",
+        "Unicode Map",
+        "Learn reading (in french)",
+        "WiFi ACE",
+        "GLImageViewer",
+        "Twidere",
+        "Twidere Extension: TwitLonger",
+        "MaterialOS",
+        "2050",
+        "ProgressBars",
+        "过早客",
+        "LeMondeRssReader",
+        "Soft Sound",
+        "Senreta Vortaro",
+        "ZephyrLogger",
+        "MusicBrainz",
+        "Auto Airplane Mode",
+        "GitNex for Forgejo and Gitea",
+        "Night Mode Enabler",
+        "UnifiedNlp (GAPPS)",
+        "Apple UnifiedNlp Backend",
+        "MozillaNlpBackend",
+        "NominatimNlpBackend",
+        "Midori",
+        "Insigno",
+        "Fira Font",
+        "Open Sudoku",
+        "Ultrasonic",
+        "AppBak",
+        "Page Plus Balance",
+        "ProjectLaogai ",
+        "Teapod",
+        "Moss",
+        "Mozc for Android",
+        "Fennec F-Droid",
+        "DAAP",
+        "Mustard {MOD}",
+        "Mupen64Plus AE",
+        "Picard Barcode Scanner",
+        "MPD",
+        "Mustard",
+        "FixMyStreet",
+        "MythDroid",
+        "MobileSWC",
+        "build.prop Editor",
+        "Navit",
+        "NetTTS",
+        "NDEF Tools for Android",
+        "Klaxon",
+        "Hamfisted",
+        "Cryptfs Password",
+        "WWWJDIC for Android",
+        "CuprumPDF",
+        "OpenTopoMap Viewer",
+        "NoiseCapture",
+        "Movie DB",
+        "NTPSync",
+        "Shitter",
+        "Icon Request for Numix",
+        "Wrong PIN Shutdown",
+        "Daily Dozen",
+        "OpenManga",
+        "OCS-NG Agent",
+        "ODK Collect",
+        "1toX",
+        "Ogre Sample Browser",
+        "Product Open Data",
+        "PipePanic",
+        "Sugarizer",
+        "OnionShare",
+        "OpenGApps Downloader",
+        "Shiurim",
+        "OpenGPX",
+        "openHAB",
+        "openHAB Beta",
+        "OI About",
+        "OI File Manager",
+        "OI Flashlight",
+        "OI Notepad",
+        "OI Safe",
+        "OI Shopping list",
+        "OONI Probe",
+        "Open Pet Food Facts",
+        "OpenTTD",
+        "Open Map",
+        "TAC Database Client",
+        "Presence Publisher",
+        "Outline",
+        "Auxio",
+        "Tinc App",
+        "MedicLog",
+        "Pareu de Parar-me",
+        "PasswordMaker Pro",
+        "Text Edit",
+        "Remote for VLC",
+        "DroidFish",
+        "Pekka Kana 2",
+        "JaMuz",
+        "Gauguin",
+        "Cow's Revenge",
+        "TowerJumper",
+        "Piwigo",
+        "PixelDroid",
+        "Free Mobile Netstat",
+        "Hacker's Keyboard",
+        "Tinc",
+        "Tiny Tiny Feed",
+        "POuL BITS",
+        "PPSSPP",
+        "primitive ftpd",
+        "Dealing Sheet",
+        "Privacy Helper",
+        "Safe Space",
+        "MAXS Main",
+        "MAXS Module AlarmSet",
+        "MAXS Module Bluetooth",
+        "MAXS Module BluetoothAdmin",
+        "MAXS Module Clipboard",
+        "MAXS Module ContactsRead",
+        "MAXS Module FileRead",
+        "MAXS Module FileWrite",
+        "MAXS Module LocationFine",
+        "MAXS Module Misc",
+        "MAXS Module NFC",
+        "MAXS Module Notification",
+        "MAXS Module PhonestateRead",
+        "MAXS Module Ringermode",
+        "MAXS Module Shell",
+        "MAXS Module SmsNotify",
+        "MAXS Module SmsRead",
+        "MAXS Module SmsSend",
+        "MAXS Module SmsWrite",
+        "MAXS Module WifiAccess",
+        "MAXS Module WifiChange",
+        "MAXS Transport XMPP",
+        "Voodoo OTA RootKeeper",
+        "Voodoo Screen Test Patterns",
+        "Voodoo CarrierIQ Detector",
+        "Blink Comparison",
+        "LibreTorrent",
+        "LibreTrack",
+        "OpenComicVine",
+        "Lesser Pad",
+        "Smoke",
+        "SmokeStack",
+        "i2pd",
+        "pyLoad",
+        "Tabulae",
+        "四次元",
+        "Quillnote",
+        "RedReader",
+        "Libre Memory Game",
+        "Simple Counter",
+        "anDOF",
+        "Radar App",
+        "Recent Contacts Widget",
+        "OpenMapKit",
+        "Revengate",
+        "RunnerUp",
+        "SafePrice",
+        "InTheClear",
+        "Sage",
+        "SaidIt",
+        "Falling Blocks",
+        "Canta",
+        "Live Burger Wallpaper",
+        "SatDump",
+        "SavaPage Print Service",
+        "Etherwake",
+        "Jeden Tag ein Set",
+        "KIBA",
+        "NewPipe",
+        "NewPipe Legacy",
+        "Nextcloud Bookmarks",
+        "Stethox",
+        "SVG redirect",
+        "Terminightor",
+        "Scid on the go",
+        "Trollslate",
+        "Blokish",
+        "Chinese Checkers",
+        "RPN",
+        "ScummVM",
+        "SeaMapDroid",
+        "2048 (Privacy Friendly)",
+        "Pedometer (PFA)",
+        "Backup (Privacy Friendly)",
+        "Boardgame Clock (Privacy Friendly)",
+        "Circuit Training (PFA)",
+        "Checkers (Privacy Friendly)",
+        "Dicer (Privacy Friendly)",
+        "Finance Manager (PFA)",
+        "Food-Tracker (PFA)",
+        "Interval Timer (Privacy Friendly)",
+        "Ludo (Privacy Friendly)",
+        "Memo Game (Privacy Friendly)",
+        "Minesweeper (Privacy Friendly)",
+        "Notes (PFA)",
+        "Pain Diary (PFA)",
+        "Password Generator (PFA)",
+        "Pausing Healthily (Privacy Friendly)",
+        "PIN Mnemonic (Privacy Friendly)",
+        "Reckoning Skills (Privacy Friendly)",
+        "Ruler",
+        "Sketching (PFA)",
+        "Solitaire (Privacy Friendly)",
+        "Sudoku (Privacy Friendly)",
+        "Tape Measure (Privacy Friendly)",
+        "Todo List (PFA)",
+        "Dice Game (Privacy Friendly)",
+        "BF Interpreter",
+        "TTL Editor",
+        "Sensorkraken",
+        "Sensors2OSC",
+        "Sensors2Pd",
+        "ServDroid",
+        "Serval Mesh",
+        "Haltestellenanzeige (Display Monitor)",
+        "Ocelot",
+        "Shortcuts for Calendar/Contacts",
+        "SickStache",
+        "Simlar - secure calls",
+        "Sipdroid",
+        "Outline Keeper",
+        "Warmongr",
+        "IntentRadio",
+        "Indic Keyboard",
+        "Silence",
+        "Snikket",
+        "Traductor Softcatalà",
+        "ForPDA",
+        "Calculator++",
+        "TinyKeePass",
+        "SparkleShare",
+        "Stingle Photos",
+        "AG Store",
+        "Pollywog",
+        "strongSwan VPN Client",
+        "unofficial Stud.IP-app",
+        "Dicio assistant",
+        "Tridenta",
+        "Subsurface",
+        "Sudowars",
+        "Calendar Import-Export",
+        "OpenKeychain: Easy PGP",
+        "Offline Calendar",
+        "TermBot",
+        "Document Viewer",
+        "Document Viewer Font Pack",
+        "Gear Shift",
+        "SuperTuxKart",
+        "Notifications for Facebook",
+        "Messenger bypasser",
+        "Starke Verben",
+        "Synergy",
+        "Card Game Scores",
+        "SyncOnWifi",
+        "Osram Remote",
+        "AtmosphereLogger",
+        "Multipicture Wallpaper",
+        "Tasks.org: Open-source To-Do Lists & Reminders",
+        "Mnemododo",
+        "Telegram FOSS",
+        "Planisphere",
+        "Geological Time Scale",
+        "Qonvert",
+        "Syphon",
+        "mTPMS",
+        "APG",
+        "YouTube Stream",
+        "Your local weather",
+        "Stork IM",
+        "Tileless Map",
+        "Tint Browser",
+        "Tint Browser Adblock Addon",
+        "boQwI'",
+        "Presentation Timer",
+        "Taps Of Fire",
+        "Tomdroid",
+        "TorServices (alpha)",
+        "My Expenses",
+        "OCR (Tesseract)",
+        "Send With FTP",
+        "Traccar Client",
+        "RoadEagle",
+        "Transdroid",
+        "Transdrone",
+        "Transdroid Torrent Search",
+        "Tryton",
+        "TTRSS-Reader",
+        "TunesRemote+",
+        "Tux Paint",
+        "TVHGuide",
+        "COVID-19 italian monitoring",
+        "E numbers",
+        "NextPush",
+        "NoProvider2Push",
+        "UP-Example",
+        "Prism",
+        "Isolmoa",
+        "UDP Bus",
+        "RedScreenActivity",
+        "VLC",
+        "SwpieView",
+        "JKU App",
+        "Narau",
+        "Wifi Fixer",
+        "WallETH",
+        "SplitBills",
+        "GetFlow",
+        "SIP Caller",
+        "CommonsLab",
+        "Wikipedia",
+        "Wiktionary",
+        "windvolt Germany",
+        "ObscuraCam: The Privacy Camera",
+        "TimeLapseCam",
+        "ArityCalc",
+        "Audio Spectrum Analyzer",
+        "hEARtest",
+        "FREE Browser",
+        "DumpSeeker",
+        "Smart EggTimer",
+        "GPS Cockpit",
+        "gptAssist",
+        "huggingAssist",
+        "LavSeeker",
+        "Bubble",
+        "omWeather",
+        "solXpect",
+        "Gas Prices",
+        "RadarWeather",
+        "GoldenEye",
+        "AndIodine",
+        "XBMC Remote",
+        "Kodi",
+        "Kore",
+        "XCSoar",
+        "Ameixa",
+        "Ameixa Monochrome",
+        "Turtl",
+        "Xposed Downloader",
+        "Escapepod - Podcast Player",
+        "Trackbook - Movement Recorder",
+        "Transistor - Simple Radio App",
+        "Yaaic",
+        "Yabause",
+        "dvd",
+        "yaxim",
+        "Bodhi Timer",
+        "Android Tipitaka",
+        "MemoPad",
+        "Gloomy Dungeons 3D - Hardcore",
+        "Gloomy Dungeons 2",
+        "Check Network",
+        "SDB Viewer",
+        "Track Work Time",
+        "Migraine Log",
+        "Spotube",
+        "Fruity Game",
+        "InviZible Pro: increase your security, protect you",
+        "Actualizador ODNS",
+        "Seguime",
+        "Recover VOIP settings from H300s",
+        "Peanut Encryption",
+        "Fast Draw",
+        "DialogMusicPlayer",
+        "Earmouse",
+        "OneTimeAlarm",
+        "ShoppingList",
+        "Endoscope",
+        "Progress Tracker",
+        "Network",
+        "Thermometer Extended",
+        "NFC Key",
+        "NFC Tag maker",
+        "GeoKrety Logger",
+        "Poland can into Space",
+        "Kwik (ant.spl)",
+        "Kwik (eur.rus)",
+        "Kwik (pan.arg)",
+        "Kwik (sah.jap)",
+        "Kwik (usa.can)",
+        "Kwik (zar.aus)",
+        "Kwik EFIS",
+        "Phonograph Plus",
+        "posidon launcher",
+        "News",
+        "Brightness Widget",
+        "SerialTest",
+        "Shopping List (Privacy Friendly)",
+        "Open BART",
+        "SelfPrivacy",
+        "Fluffyboard",
+        "L9Droid",
+        "LineageOS updater shortcut",
+        "Wikimedia Commons for Muzei",
+        "OpenVegeMap",
+        "PaperCraft",
+        "Search to browser",
+        "Protect Baby Monitor",
+        "Baby Sleep Sounds",
+        "Budget Watch",
+        "Loyalty Card Keychain",
+        "Gift Card Guard",
+        "Rental Calc",
+        "Video Transcoder",
+        "MyMusicQoE",
+        "Free Fall",
+        "Titan Companion",
+        "Moscow Wi-Fi autologin",
+        "Tip Calculator",
+        "Quickly quit",
+        "Concurseiro",
+        "SimpleAdvancedMetronome",
+        "Palette-Cycle",
+        "Lunar Launcher",
+        "Epistolaire",
+        "Play Music Exporter",
+        "Remuco",
+        "Tether companion",
+        "Simple Keyboard",
+        "DSC Auto Rename",
+        "Retro Stack",
+        "FonBot",
+        "FiSSH",
+        "Radio Romania",
+        "pttdroid",
+        "BendyStraw",
+        "mucke - Music Player",
+        "Flashy",
+        "Morse",
+        "To Don't",
+        "Vacation Days",
+        "LiveWallpaperIt - Muzei plugin for Reddit",
+        "TinyBit Launcher",
+        "Pixel Artist",
+        "Ltt.rs",
+        "aLogcat ROOT",
+        "TimePlanner",
+        "DPI Tunnel",
+        "DPI Tunnel v2",
+        "Snooder 21",
+        "Open in browser",
+        "Send to SD card",
+        "Weather notification",
+        "Weather Skin: Bigger Text",
+        "Weather Skin: Black",
+        "Weather Skin: Black Text Plus",
+        "Weather Skin: White",
+        "Weather Skin: White Text Plus",
+        "Wi-Fi Reminders",
+        "Emerald Dialer",
+        "Emerald Launcher",
+        "FS Assistant",
+        "Patolli",
+        "RE:INSTEAD",
+        "OpenFool",
+        "AFReplacer",
+        "Achie",
+        "BusyBox",
+        "WeatherLog",
+        "WebSDR client",
+        "Silent Night",
+        "EasySSHFS",
+        "Core",
+        "J2ME Loader",
+        "Updater for Spotify",
+        "Bluetooth terminal",
+        "Finder",
+        "Paranoid Sms Blocker",
+        "Image Toolbox (Resizer)",
+        "Notey",
+        "Paper Wallet",
+        "Handy Reading",
+        "TorrServe",
+        "Guess",
+        "RtkGps",
+        "CamCov",
+        "ColorSniffer",
+        "Easer",
+        "Easer (beta)",
+        "FLock",
+        "SaverTuner",
+        "Birthday Calendar",
+        "Planning Poker",
+        "Pomfshare",
+        "Pixel Filter",
+        "NFC Reader",
+        "Valv",
+        "Crazyflie Client",
+        "Geometri Destroyer",
+        "Retroboy",
+        "FindMyPhone",
+        "Copy to Clipboard",
+        "Bitmask",
+        "Riseup VPN",
+        "Mumla",
+        "Manyverse",
+        "RKFRead",
+        "Riksdagskollen",
+        "Gerberoid",
+        "Dot-Race",
+        "Drum On!",
+        "Candy Memory",
+        "9P",
+        "WhereRing",
+        "Search searx",
+        "Meditation Assistant",
+        "liteshort",
+        "Did I?",
+        "Tarock Palčka",
+        "adbWireless",
+        "Nheengaré",
+        "Simple Reboot",
+        "Les Pas - Photo Album for Nextcloud",
+        "Setter - A multi-purpose search app for Android",
+        "Pixiv Func",
+        "Sithakuru",
+        "Frozen Bubble LevelEditor plus",
+        "Logcat to UDP",
+        "VX ConnectBot",
+        "Warpinator for Android (unofficial)",
+        "Openreads",
+        "Sonorox",
+        "Service Menu",
+        "SicMu Player",
+        "Battery level",
+        "Power Button",
+        "Krautschlüssel",
+        "LayTray",
+        "Xenia",
+        "Hrm",
+        "WebRadio",
+        "Dotty",
+        "flutterhole",
+        "USB Mountr",
+        "YaShlang",
+        "Husky",
+        "Manglish",
+        "/r/Android App store",
+        "Puff",
+        "SuperFreezZ App stopper",
+        "SuperUStats Usage stats viewer",
+        "DroidFS",
+        "PDF Converter",
+        "AIProute",
+        "now8: public transport",
+        "Clock Screensaver",
+        "Twister",
+        "Offline Puzzle Solver",
+        "APKMirror",
+        "Scoop",
+        "Pendulums",
+        "Wifi Camera",
+        "SMS to URL Forwarder",
+        "Platypush",
+        "Plexus",
+        "UserLAnd",
+        "Metronome",
+        "Teleposter",
+        "SyncTool",
+        "LTE Cleaner",
+        "IPFS Lite",
+        "Thor - IPFS Lite",
+        "WebCall",
+        "WebRTCCheck",
+        "Bad Pixel Detector",
+        "DailybRead",
+        "DisasterRadio",
+        "painlessMesh",
+        "Phoenix",
+        "Treble Info",
+        "Simple IRC",
+        "Wifi QR Code Creator",
+        "mythmote",
+        "Food Scale Droid",
+        "WateryDroid",
+        "Youtube Video Listing App (By The Creative Team)",
+        "Always On AMOLED Plugin",
+        "FfF Profile picture generator",
+        "Tiddloid",
+        "拷贝漫画",
+        "open2share",
+        "Toadua",
+        "Simple sms remote",
+        "Obsqr",
+        "Slide",
+        "Talalarmo",
+        "SLW Traffic Meter Widget",
+        "SLW Cpu Widget",
+        "FreeDcam",
+        "tower",
+        "Chiki Chiki Tube",
+        "Light Controller",
+        "VirtualSoftKeys",
+        "AirUnlock",
+        "Custom Search",
+        "uaTranslit",
+        "Lightning Address to Invoice",
+        "Gallery for PhotoPrism",
+        "Mitch",
+        "Try LBRY",
+        "Kanji Dojo",
+        "Barcode Box 2",
+        "Mandelbrot Maps",
+        "eduroamCAT",
+        "Intent Intercept",
+        "Auth Token",
+        "Grabagram",
+        "Catverbs",
+        "PReVo",
+        "Flashback",
+        "Just A Damn Compass",
+        "Screens",
+        "Monochromatic",
+        "Calendar Trigger",
+        "SecondsClock",
+        "OpenVK Legacy",
+        "Weather Forecast",
+        "CrimeTalk",
+        "Squeezer",
+        "InfiniList",
+        "Photographer's Notebook",
+        "Orion Viewer - Pdf & Djvu",
+        "yaft",
+        "Rehearsal Assistant",
+        "agram",
+        "IMCKTG",
+        "Dongsa",
+        "MarkdownView Demo",
+        "Camera Roll",
+        "CIDR Calculator",
+        "GigaGet",
+        "Extirpater",
+        "Mull",
+        "IR Remote",
+        "Hypatia",
+        "GMaps WV",
+        "MotionLock",
+        "US Travel Converter",
+        "Audiometry Made Easy",
+        "Valentin's PowerTools #002 - Passwords to remember",
+        "DSU Sideloader",
+        "Kaleidoscope",
+        "VocableTrainer",
+        "Geometric Weather",
+        "Smart Receipts",
+        "Delta Icon Pack",
+        "WiseRadar",
+        "Etar - OpenSource Calendar",
+        "Taponium",
+        "RoMote",
+        "Open Bitcoin Wallet",
+        "tldr man-pages",
+        "Init.d Light",
+        "All In Gold",
+        "Bullseye",
+        "Robot36 - SSTV Image Decoder",
+        "Aniki",
+        "Bimba",
+        "Friend Alert",
+        "Quinb: 4 players reaction game",
+        "Xeonjia: Ice Adventures",
+        "Zoysii - Logic game",
+        "Firefly III Mobile",
+        "PluckLockEx",
+        "SaveTo.Downloader",
+        "SaveTo…",
+        "LibreBible",
+        "Doodle: Live Wallpapers",
+        "Grocy: Self-hosted Grocery Management",
+        "Газета VEGETARIAN",
+        "Flashlight Widget",
+        "Logical Defence",
+        "Alarm Clock",
+        "Gloomy Dungeons",
+        "Zen",
+    )
+
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
index 985cd47cd..d79bb51f7 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Android
 import androidx.compose.material.icons.filled.ArrowDropDown
@@ -22,6 +23,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
@@ -39,6 +41,11 @@ fun UpdatableAppRow(app: UpdatableApp, modifier: Modifier = Modifier) {
                     Icons.Filled.Android,
                     tint = MaterialTheme.colorScheme.secondary,
                     contentDescription = null,
+                    modifier = Modifier
+                        .clip(MaterialTheme.shapes.medium)
+                        .size(48.dp)
+                        .background(Color.White)
+                        .padding(8.dp),
                 )
             },
             headlineContent = {
diff --git a/basic/src/main/res/drawable/category_connectivity.png b/basic/src/main/res/drawable/category_connectivity.png
new file mode 120000
index 000000000..f9bf4859b
--- /dev/null
+++ b/basic/src/main/res/drawable/category_connectivity.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_connectivity.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_development.png b/basic/src/main/res/drawable/category_development.png
new file mode 120000
index 000000000..9877c43db
--- /dev/null
+++ b/basic/src/main/res/drawable/category_development.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_development.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_games.png b/basic/src/main/res/drawable/category_games.png
new file mode 120000
index 000000000..d6c6a5e97
--- /dev/null
+++ b/basic/src/main/res/drawable/category_games.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_games.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_graphics.png b/basic/src/main/res/drawable/category_graphics.png
new file mode 120000
index 000000000..9c06c883e
--- /dev/null
+++ b/basic/src/main/res/drawable/category_graphics.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_graphics.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_internet.png b/basic/src/main/res/drawable/category_internet.png
new file mode 120000
index 000000000..7aa90b227
--- /dev/null
+++ b/basic/src/main/res/drawable/category_internet.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_internet.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_money.png b/basic/src/main/res/drawable/category_money.png
new file mode 120000
index 000000000..66940a8df
--- /dev/null
+++ b/basic/src/main/res/drawable/category_money.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_money.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_navigation.png b/basic/src/main/res/drawable/category_navigation.png
new file mode 120000
index 000000000..6a0ed59d2
--- /dev/null
+++ b/basic/src/main/res/drawable/category_navigation.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_navigation.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_reading.png b/basic/src/main/res/drawable/category_reading.png
new file mode 120000
index 000000000..054ebf935
--- /dev/null
+++ b/basic/src/main/res/drawable/category_reading.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_reading.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_science_education.png b/basic/src/main/res/drawable/category_science_education.png
new file mode 120000
index 000000000..2384b51de
--- /dev/null
+++ b/basic/src/main/res/drawable/category_science_education.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_science_education.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_security.png b/basic/src/main/res/drawable/category_security.png
new file mode 120000
index 000000000..eed4a3cc0
--- /dev/null
+++ b/basic/src/main/res/drawable/category_security.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_security.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_system.png b/basic/src/main/res/drawable/category_system.png
new file mode 120000
index 000000000..23784d432
--- /dev/null
+++ b/basic/src/main/res/drawable/category_system.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_system.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_theming.png b/basic/src/main/res/drawable/category_theming.png
new file mode 120000
index 000000000..d79a9166a
--- /dev/null
+++ b/basic/src/main/res/drawable/category_theming.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_theming.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_writing.png b/basic/src/main/res/drawable/category_writing.png
new file mode 120000
index 000000000..912639a30
--- /dev/null
+++ b/basic/src/main/res/drawable/category_writing.png
@@ -0,0 +1 @@
+../../../../../app//src/main/res/drawable/category_writing.png
\ No newline at end of file

From 333929fdfe48ce768368acd1c6416734119e7d06 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 7 May 2025 10:07:59 -0300
Subject: [PATCH 011/180] Show installed apps and updates in My apps

also use list/detail scaffold
---
 .../java/org/fdroid/basic/MainViewModel.kt    | 86 +++++++++++-----
 .../fdroid/basic/ui/main/BottomBarScreen.kt   | 37 ++++---
 .../java/org/fdroid/basic/ui/main/Main.kt     | 15 ++-
 .../java/org/fdroid/basic/ui/main/Updates.kt  | 62 ------------
 .../basic/ui/main/apps/AppNavigationItem.kt   | 12 ---
 .../fdroid/basic/ui/main/apps/InstalledApp.kt | 16 +++
 .../basic/ui/main/apps/InstalledAppRow.kt     | 75 ++++++++++++++
 .../fdroid/basic/ui/main/apps/MyAppsList.kt   | 91 +++++++++++++++++
 .../basic/ui/main/apps/MyAppsScaffold.kt      | 97 +++++++++++++++++++
 .../fdroid/basic/ui/main/apps/UpdatableApp.kt | 14 +++
 .../main/{updates => apps}/UpdatableAppRow.kt | 45 ++++++---
 .../ui/main/{apps => details}/AppDetails.kt   | 14 ++-
 .../ui/main/{apps => discover}/AppCarousel.kt |  2 +-
 .../ui/main/discover/AppNavigationItem.kt     | 13 +++
 .../{apps => discover}/AppSearchInputField.kt |  2 +-
 .../ui/main/{apps => discover}/AppsFilter.kt  |  3 +-
 .../ui/main/{apps => discover}/AppsSearch.kt  |  2 +-
 .../main/{ => discover}/CategoryCarousel.kt   |  2 +-
 .../ui/main/{apps => discover}/Discover.kt    |  8 +-
 .../{Apps.kt => discover/DiscoverScaffold.kt} | 31 +++---
 .../{apps => discover}/FilterPresenter.kt     |  3 +-
 .../basic/ui/main/{apps => discover}/Names.kt |  2 +-
 .../basic/ui/main/{apps => lists}/AppItem.kt  |  2 +-
 .../basic/ui/main/{apps => lists}/AppList.kt  |  8 +-
 .../basic/ui/main/updates/UpdatableApp.kt     |  9 --
 25 files changed, 474 insertions(+), 177 deletions(-)
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/Updates.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt
 rename basic/src/main/java/org/fdroid/basic/ui/main/{updates => apps}/UpdatableAppRow.kt (73%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => details}/AppDetails.kt (75%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => discover}/AppCarousel.kt (98%)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => discover}/AppSearchInputField.kt (98%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => discover}/AppsFilter.kt (99%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => discover}/AppsSearch.kt (96%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{ => discover}/CategoryCarousel.kt (99%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => discover}/Discover.kt (95%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{Apps.kt => discover/DiscoverScaffold.kt} (85%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => discover}/FilterPresenter.kt (95%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => discover}/Names.kt (99%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => lists}/AppItem.kt (98%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{apps => lists}/AppList.kt (95%)
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableApp.kt

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index d7cb8a040..03d038481 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -15,33 +15,36 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.fdroid.basic.ui.main.NUM_ITEMS
 import org.fdroid.basic.ui.main.Repository
-import org.fdroid.basic.ui.main.Sort
-import org.fdroid.basic.ui.main.apps.AppNavigationItem
-import org.fdroid.basic.ui.main.apps.FilterModel
-import org.fdroid.basic.ui.main.apps.FilterPresenter
-import org.fdroid.basic.ui.main.apps.Names
-import org.fdroid.basic.ui.main.updates.UpdatableApp
+import org.fdroid.basic.ui.main.apps.InstalledApp
+import org.fdroid.basic.ui.main.apps.MinimalApp
+import org.fdroid.basic.ui.main.apps.UpdatableApp
+import org.fdroid.basic.ui.main.discover.AppNavigationItem
+import org.fdroid.basic.ui.main.discover.FilterModel
+import org.fdroid.basic.ui.main.discover.FilterPresenter
+import org.fdroid.basic.ui.main.discover.NUM_ITEMS
+import org.fdroid.basic.ui.main.discover.Names
+import org.fdroid.basic.ui.main.discover.Sort
 
 class MainViewModel(app: Application) : AndroidViewModel(app) {
 
     companion object {
-        val fakeUpdates = listOf(
-            UpdatableApp(
+        val installedApps = listOf(
+            InstalledApp(
+                packageName = "1000",
                 name = Names.randomName,
-                currentVersionName = "1.0.1",
-                updateVersionName = "1.1.0",
-                size = 123456789,
-                whatsNew = "Lots of changes in this version!\nThey are all awesome.\n" +
-                    "Only the best changes."
+                versionName = "1.0.1",
             ),
-            UpdatableApp(
+            InstalledApp(
+                packageName = "1001",
                 name = Names.randomName,
-                currentVersionName = "3.0.1",
-                updateVersionName = "3.1.0",
-                size = 9876543,
-            )
+                versionName = "0.1",
+            ),
+            InstalledApp(
+                packageName = "1002",
+                name = Names.randomName,
+                versionName = "3.0.1",
+            ),
         )
     }
 
@@ -96,9 +99,14 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
             addedCategoriesFlow = addedCategories,
         )
     }
-    private val _updates = MutableStateFlow(fakeUpdates)
+    private val _updates = MutableStateFlow<List<UpdatableApp>>(emptyList())
     val updates = _updates.asStateFlow()
+    private val _installed = MutableStateFlow<List<InstalledApp>>(installedApps)
+    val installed = _installed.asStateFlow()
     val numUpdates = _updates.map { it.size }
+    private val _appDetails = MutableStateFlow<AppNavigationItem?>(null)
+    val appDetails = _appDetails.asStateFlow()
+
     private val _repos = MutableStateFlow(
         listOf(
             Repository(
@@ -115,22 +123,48 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
 
     init {
         viewModelScope.launch {
-            delay(5000)
+            delay(10_000)
             _updates.update {
-                it.toMutableList().apply {
-                    val app = UpdatableApp(
+                listOf(
+                    UpdatableApp(
+                        packageName = "2000",
+                        name = Names.randomName,
+                        currentVersionName = "1.0.1",
+                        updateVersionName = "1.1.0",
+                        size = 123456789,
+                        whatsNew = "Lots of changes in this version!\nThey are all awesome.\n" +
+                            "Only the best changes."
+                    ),
+                    UpdatableApp(
+                        packageName = "2001",
+                        name = Names.randomName,
+                        currentVersionName = "3.0.1",
+                        updateVersionName = "3.1.0",
+                        size = 9876543,
+                    ),
+                    UpdatableApp(
+                        packageName = "2002",
                         name = Names.randomName,
                         currentVersionName = "4.0.1",
                         updateVersionName = "4.3.0",
                         size = 4561237,
                         whatsNew = "This new version is super fast and aimed at fixing some bugs and enhancing your experience even more. So take the chance to update your app and always enjoy the best of Inter. In addition to the exciting new features in the latest version, we regularly release new versions to improve what you are already using on our app. To keep making your life simpler, keep your app up to date and take advantage of everything we prepare for you. "
-                    )
-                    add(app)
-                }
+                    ),
+                )
             }
         }
     }
 
+    fun setAppDetails(app: MinimalApp) {
+        _appDetails.value = null
+        val newApp = filterModel.value.apps.find { it.packageName == app.packageName }
+            ?: (updates.value.find { it.packageName == app.packageName }
+                ?: installed.value.find { it.packageName == app.packageName })?.let {
+                AppNavigationItem(it.packageName, it.name ?: "Unknown app", "Summary", false)
+            }
+        _appDetails.value = newApp
+    }
+
     fun sortBy(sort: Sort) {
         _sortBy.update { sort }
     }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
index 8b27f22a3..70ea34d4e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
@@ -24,14 +24,17 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
 import androidx.window.core.layout.WindowWidthSizeClass
 import org.fdroid.basic.R
-import org.fdroid.basic.ui.main.apps.AppNavigationItem
-import org.fdroid.basic.ui.main.apps.FilterInfo
-import org.fdroid.basic.ui.main.apps.FilterModel
-import org.fdroid.basic.ui.main.updates.UpdatableApp
+import org.fdroid.basic.ui.main.apps.InstalledApp
+import org.fdroid.basic.ui.main.apps.MinimalApp
+import org.fdroid.basic.ui.main.apps.MyAppsScaffold
+import org.fdroid.basic.ui.main.apps.UpdatableApp
+import org.fdroid.basic.ui.main.discover.AppNavigationItem
+import org.fdroid.basic.ui.main.discover.DiscoverScaffold
+import org.fdroid.basic.ui.main.discover.FilterInfo
+import org.fdroid.basic.ui.main.discover.FilterModel
+import org.fdroid.basic.ui.main.discover.Sort
 
 enum class BottomNavDestinations(
     @StringRes val label: Int,
@@ -43,10 +46,13 @@ enum class BottomNavDestinations(
 
 @Composable
 fun BottomBarScreen(
-    navController: NavHostController,
+    onMainNav: (String) -> Unit,
     numUpdates: Int,
     updates: List<UpdatableApp>,
-    filterInfo: FilterInfo
+    installed: List<InstalledApp>,
+    filterInfo: FilterInfo,
+    currentItem: MinimalApp?,
+    onSelectAppItem: (MinimalApp) -> Unit,
 ) {
     var currentDestination by rememberSaveable { mutableStateOf(BottomNavDestinations.APPS) }
     val adaptiveInfo = currentWindowAdaptiveInfo()
@@ -89,14 +95,19 @@ fun BottomBarScreen(
         }
     ) {
         when (currentDestination) {
-            BottomNavDestinations.APPS -> Apps(
+            BottomNavDestinations.APPS -> DiscoverScaffold(
                 apps = filterInfo.model.apps,
                 filterInfo = filterInfo,
-                onMainNav = { navController.navigate(it) },
+                onMainNav = onMainNav,
+                currentItem = currentItem,
+                onSelectAppItem = onSelectAppItem,
                 modifier = Modifier,
             )
-            BottomNavDestinations.UPDATES -> Updates(
-                apps = updates,
+            BottomNavDestinations.UPDATES -> MyAppsScaffold(
+                updatableApps = updates,
+                installedApps = installed,
+                currentItem = currentItem,
+                onSelectAppItem = onSelectAppItem,
             )
         }
     }
@@ -126,5 +137,5 @@ fun BottomBarPreview() {
         override fun removeCategory(category: String) {}
         override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
     }
-    BottomBarScreen(rememberNavController(), 2, emptyList(), filterInfo)
+    BottomBarScreen({ }, 2, emptyList(), emptyList(), filterInfo, null, {})
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index ad9bfc929..09ea56ce6 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -14,7 +14,8 @@ import androidx.navigation.compose.rememberNavController
 import org.fdroid.basic.MainViewModel
 import org.fdroid.basic.R
 import org.fdroid.basic.ui.icons.PackageVariant
-import org.fdroid.basic.ui.main.apps.FilterInfo
+import org.fdroid.basic.ui.main.discover.FilterInfo
+import org.fdroid.basic.ui.main.discover.Sort
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 sealed class NavDestinations(
@@ -45,6 +46,7 @@ fun Main(viewModel: MainViewModel = viewModel()) {
             composable(route = NavDestinations.Main.id) {
                 val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
                 val updates = viewModel.updates.collectAsStateWithLifecycle().value
+                val installed = viewModel.installed.collectAsStateWithLifecycle().value
                 val filterInfo = object : FilterInfo {
                     override val model = viewModel.filterModel.collectAsStateWithLifecycle().value
                     override fun sortBy(sort: Sort) = viewModel.sortBy(sort)
@@ -55,7 +57,16 @@ fun Main(viewModel: MainViewModel = viewModel()) {
                     override fun showOnlyInstalledApps(onlyInstalled: Boolean) =
                         viewModel.showOnlyInstalledApps(onlyInstalled)
                 }
-                BottomBarScreen(navController, numUpdates, updates, filterInfo)
+                val currentItem = viewModel.appDetails.collectAsStateWithLifecycle().value
+                BottomBarScreen(
+                    onMainNav = { navController.navigate(it) },
+                    numUpdates = numUpdates,
+                    updates = updates,
+                    installed = installed,
+                    filterInfo = filterInfo,
+                    currentItem = currentItem,
+                    onSelectAppItem = viewModel::setAppDetails,
+                )
             }
             composable(route = NavDestinations.Repos.id) {
                 val repos = viewModel.repos.collectAsStateWithLifecycle().value
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Updates.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Updates.kt
deleted file mode 100644
index 2cfc4f072..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Updates.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.fdroid.basic.ui.main
-
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Button
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewScreenSizes
-import androidx.compose.ui.unit.dp
-import org.fdroid.basic.ui.main.updates.UpdatableApp
-import org.fdroid.basic.ui.main.updates.UpdatableAppRow
-import org.fdroid.fdroid.ui.theme.FDroidContent
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun Updates(apps: List<UpdatableApp>, modifier: Modifier = Modifier) {
-    Scaffold(
-        topBar = {
-            TopAppBar(
-                title = { Text("Updates") },
-                actions = {
-                    Button(onClick = {}, modifier = Modifier.padding(end = 16.dp)) {
-                        Text("Update all")
-                    }
-                },
-            )
-        },
-    ) { paddingValues ->
-        LazyColumn(modifier.padding(paddingValues)) {
-            items(apps, key = { it.name }) { app ->
-                UpdatableAppRow(app, Modifier.animateItem())
-            }
-        }
-    }
-}
-
-@Preview
-@PreviewScreenSizes
-@Composable
-fun UpdatesPreview() {
-    FDroidContent {
-        val app1 = UpdatableApp(
-            name = "App Update 123",
-            currentVersionName = "1.0.1",
-            updateVersionName = "1.1.0",
-            size = 123456789,
-        )
-        val app2 = UpdatableApp(
-            name = "App Update 456",
-            currentVersionName = "3.0.1",
-            updateVersionName = "3.1.0",
-            size = 9876543,
-        )
-        Updates(listOf(app1, app2))
-    }
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt
deleted file mode 100644
index 0ce464ae0..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppNavigationItem.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.fdroid.basic.ui.main.apps
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-class AppNavigationItem(
-    val packageName: String,
-    val name: String,
-    val summary: String,
-    val isNew: Boolean,
-): Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
new file mode 100644
index 000000000..dc3ab1e37
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
@@ -0,0 +1,16 @@
+package org.fdroid.basic.ui.main.apps
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+interface MinimalApp {
+    val packageName: String
+    val name: String?
+}
+
+@Parcelize
+data class InstalledApp(
+    override val packageName: String,
+    override val name: String,
+    val versionName: String,
+) : MinimalApp, Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
new file mode 100644
index 000000000..3a11695e3
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
@@ -0,0 +1,75 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.ui.main.discover.Names
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun InstalledAppRow(
+    app: InstalledApp,
+    isSelected: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    Column {
+        ListItem(
+            leadingContent = {
+                Icon(
+                    Icons.Filled.Android,
+                    tint = MaterialTheme.colorScheme.secondary,
+                    contentDescription = null,
+                    modifier = Modifier
+                        .clip(MaterialTheme.shapes.medium)
+                        .size(48.dp)
+                        .background(Color.White)
+                        .padding(8.dp),
+                )
+            },
+            headlineContent = {
+                Text(app.name)
+            },
+            supportingContent = {
+                Text(app.versionName)
+            },
+            colors = ListItemDefaults.colors(
+                containerColor = if (isSelected) {
+                    MaterialTheme.colorScheme.surfaceVariant
+                } else {
+                    Color.Transparent
+                }
+            ),
+            modifier = modifier,
+        )
+    }
+}
+
+@Preview
+@Composable
+fun InstalledAppRowPreview() {
+    val app = InstalledApp(
+        packageName = "",
+        name = Names.randomName,
+        versionName = "1.0.1",
+    )
+    FDroidContent {
+        Column {
+            InstalledAppRow(app, false)
+            InstalledAppRow(app, true)
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
new file mode 100644
index 000000000..63583c116
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
@@ -0,0 +1,91 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun MyAppsList(
+    updatableApps: List<UpdatableApp>,
+    installedApps: List<InstalledApp>,
+    currentItem: MinimalApp?,
+    onItemClick: (MinimalApp) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text(if (updatableApps.isEmpty()) "My apps" else "Updates") },
+                actions = {
+                    if (updatableApps.isNotEmpty()) Button(
+                        onClick = {},
+                        modifier = Modifier.padding(end = 16.dp),
+                    ) {
+                        Text("Update all")
+                    }
+                },
+            )
+        },
+        modifier = modifier,
+    ) { paddingValues ->
+        LazyColumn(
+            modifier
+                .padding(paddingValues)
+                .then(
+                    if (currentItem == null) Modifier
+                    else Modifier.selectableGroup()
+                ),
+        ) {
+            items(updatableApps, key = { it.packageName }, contentType = { "A" }) { app ->
+                val isSelected = app.packageName == currentItem?.packageName
+                val interactionModifier = if (currentItem == null) {
+                    Modifier.clickable(
+                        onClick = { onItemClick(app) }
+                    )
+                } else {
+                    Modifier.selectable(
+                        selected = isSelected,
+                        onClick = { onItemClick(app) }
+                    )
+                }
+                val modifier = Modifier
+                    .animateItem()
+                    .then(interactionModifier)
+                UpdatableAppRow(app, isSelected, modifier)
+            }
+            if (updatableApps.isNotEmpty()) item(contentType = { "D" }) {
+                TopAppBar(title = { Text("My apps") }, windowInsets = WindowInsets())
+            }
+            items(installedApps, key = { it.packageName }, contentType = { "B" }) { app ->
+                val isSelected = app.packageName == currentItem?.packageName
+                val interactionModifier = if (currentItem == null) {
+                    Modifier.clickable(
+                        onClick = { onItemClick(app) }
+                    )
+                } else {
+                    Modifier.selectable(
+                        selected = isSelected,
+                        onClick = { onItemClick(app) }
+                    )
+                }
+                val modifier = Modifier
+                    .animateItem()
+                    .then(interactionModifier)
+                InstalledAppRow(app, isSelected, modifier)
+            }
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
new file mode 100644
index 000000000..7d5493324
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
@@ -0,0 +1,97 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.layout.AnimatedPane
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Detail
+import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
+import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewScreenSizes
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
+import org.fdroid.basic.ui.main.details.AppDetails
+import org.fdroid.basic.ui.main.discover.Names
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
+@Composable
+fun MyAppsScaffold(
+    updatableApps: List<UpdatableApp>,
+    installedApps: List<InstalledApp>,
+    currentItem: MinimalApp?,
+    onSelectAppItem: (MinimalApp) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val navigator = rememberListDetailPaneScaffoldNavigator<MinimalApp>()
+    val scope = rememberCoroutineScope()
+    BackHandler(enabled = navigator.canNavigateBack()) {
+        scope.launch {
+            navigator.navigateBack()
+        }
+    }
+    val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
+    ListDetailPaneScaffold(
+        directive = navigator.scaffoldDirective,
+        value = navigator.scaffoldValue,
+        modifier = modifier,
+        listPane = {
+            AnimatedPane {
+                MyAppsList(
+                    updatableApps = updatableApps,
+                    installedApps = installedApps,
+                    currentItem = if (isDetailVisible) currentItem else null,
+                    onItemClick = {
+                        onSelectAppItem(it)
+                        scope.launch { navigator.navigateTo(Detail, it) }
+                    }
+                )
+            }
+        },
+        detailPane = {
+            AnimatedPane {
+                navigator.currentDestination?.contentKey?.let {
+                    AppDetails(it)
+                } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
+            }
+        },
+    )
+}
+
+@Preview
+@PreviewScreenSizes
+@Composable
+fun MyAppsScaffoldPreview() {
+    FDroidContent {
+        val app1 = UpdatableApp(
+            packageName = "",
+            name = Names.randomName,
+            currentVersionName = "1.0.1",
+            updateVersionName = "1.1.0",
+            size = 123456789,
+        )
+        val app2 = UpdatableApp(
+            packageName = "",
+            name = Names.randomName,
+            currentVersionName = "3.0.1",
+            updateVersionName = "3.1.0",
+            size = 9876543,
+        )
+        val installedApp1 = InstalledApp("", Names.randomName, "3.0.1")
+        val installedApp2 = InstalledApp("", Names.randomName, "1.0")
+        val installedApp3 = InstalledApp("", Names.randomName, "0.1")
+        MyAppsScaffold(
+            updatableApps = listOf(app1, app2),
+            installedApps = listOf(installedApp1, installedApp2, installedApp3),
+            currentItem = null,
+            onSelectAppItem = {},
+        )
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt
new file mode 100644
index 000000000..15a3b6032
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt
@@ -0,0 +1,14 @@
+package org.fdroid.basic.ui.main.apps
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class UpdatableApp(
+    override val packageName: String,
+    override val name: String,
+    val currentVersionName: String,
+    val updateVersionName: String,
+    val size: Long,
+    val whatsNew: String? = null,
+): MinimalApp, Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
similarity index 73%
rename from basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
index d79bb51f7..12cada3f1 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableAppRow.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.updates
+package org.fdroid.basic.ui.main.apps
 
 import android.text.format.Formatter
 import androidx.compose.animation.AnimatedVisibility
@@ -11,6 +11,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Android
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.ArrowDropUp
+import androidx.compose.material.icons.filled.NewReleases
+import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
@@ -31,22 +33,33 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
-fun UpdatableAppRow(app: UpdatableApp, modifier: Modifier = Modifier) {
+fun UpdatableAppRow(
+    app: UpdatableApp,
+    isSelected: Boolean,
+    modifier: Modifier = Modifier
+) {
     var isExpanded by remember { mutableStateOf(false) }
-    val isSelected = false // TODO
     Column {
         ListItem(
             leadingContent = {
-                Icon(
-                    Icons.Filled.Android,
-                    tint = MaterialTheme.colorScheme.secondary,
-                    contentDescription = null,
-                    modifier = Modifier
-                        .clip(MaterialTheme.shapes.medium)
-                        .size(48.dp)
-                        .background(Color.White)
-                        .padding(8.dp),
-                )
+                BadgedBox(badge = {
+                    Icon(
+                        imageVector = Icons.Filled.NewReleases,
+                        tint = MaterialTheme.colorScheme.error,
+                        contentDescription = null, modifier = Modifier.size(24.dp),
+                    )
+                }) {
+                    Icon(
+                        Icons.Filled.Android,
+                        tint = MaterialTheme.colorScheme.secondary,
+                        contentDescription = null,
+                        modifier = Modifier
+                            .clip(MaterialTheme.shapes.medium)
+                            .size(48.dp)
+                            .background(Color.White)
+                            .padding(8.dp),
+                    )
+                }
             },
             headlineContent = {
                 Text(app.name)
@@ -91,6 +104,7 @@ fun UpdatableAppRow(app: UpdatableApp, modifier: Modifier = Modifier) {
 @Composable
 fun UpdatableAppRowPreview() {
     val app = UpdatableApp(
+        packageName = "",
         name = "App Update 123",
         currentVersionName = "1.0.1",
         updateVersionName = "1.1.0",
@@ -98,6 +112,9 @@ fun UpdatableAppRowPreview() {
         whatsNew = "This is new, all is new, nothing old.",
     )
     FDroidContent {
-        UpdatableAppRow(app)
+        Column {
+            UpdatableAppRow(app, false)
+            UpdatableAppRow(app, true)
+        }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
similarity index 75%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
index 690dba9ff..e04854eea 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppDetails.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.details
 
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Android
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -15,14 +16,17 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.basic.ui.main.apps.MinimalApp
+import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 fun AppDetails(
-    appItem: AppNavigationItem,
+    appItem: MinimalApp?,
     modifier: Modifier = Modifier,
 ) {
-    Row(
+    if (appItem == null) CircularProgressIndicator()
+    else Row(
         modifier = modifier
             .safeDrawingPadding()
             .padding(16.dp),
@@ -35,8 +39,8 @@ fun AppDetails(
             modifier = Modifier.size(48.dp),
         )
         Column {
-            Text(appItem.name, style = MaterialTheme.typography.headlineMedium)
-            Text(appItem.summary, style = MaterialTheme.typography.bodyMedium)
+            Text(appItem.name ?: "Unknown app", style = MaterialTheme.typography.headlineMedium)
+            Text("Summary foo bar", style = MaterialTheme.typography.bodyMedium)
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
index c3dee33e3..3f2b652db 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.discover
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
new file mode 100644
index 000000000..09958bf2d
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
@@ -0,0 +1,13 @@
+package org.fdroid.basic.ui.main.discover
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import org.fdroid.basic.ui.main.apps.MinimalApp
+
+@Parcelize
+class AppNavigationItem(
+    override val packageName: String,
+    override val name: String,
+    val summary: String,
+    val isNew: Boolean,
+): MinimalApp, Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppSearchInputField.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/discover/AppSearchInputField.kt
index eaf97a4d9..e6add1e46 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppSearchInputField.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppSearchInputField.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.discover
 
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsFilter.kt
similarity index 99%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsFilter.kt
index 7733af58a..a21e75fad 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsFilter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsFilter.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.discover
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Arrangement.spacedBy
@@ -28,7 +28,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import org.fdroid.basic.R
-import org.fdroid.basic.ui.main.Sort
 
 interface FilterInfo {
     val model: FilterModel
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
similarity index 96%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
index 6a61ff166..294915d8d 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppsSearch.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.discover
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/CategoryCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
similarity index 99%
rename from basic/src/main/java/org/fdroid/basic/ui/main/CategoryCarousel.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
index 3dee1ff96..f1922a667 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/CategoryCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main
+package org.fdroid.basic.ui.main.discover
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
index ecfa4241c..865784fa7 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/Discover.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.discover
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -27,7 +27,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.ui.main.CategoryCarousel
 import org.fdroid.basic.ui.main.MainOverFlowMenu
 import org.fdroid.basic.ui.main.topBarMenuItems
 
@@ -84,14 +83,13 @@ fun Discover(
         ) {
             AppsSearch(searchBarState, onAppTap, modifier = Modifier.padding(top = 8.dp))
             AppCarousel(
-                title = "New apps",
+                title = "New",
                 apps = apps,
                 onTitleTap = onTitleTap,
                 onAppTap = onAppTap,
             )
-            CategoryCarousel(onTitleTap, {})
             AppCarousel(
-                title = "Other apps",
+                title = "Recently updated",
                 apps = apps.filter { it.packageName.toInt() % 2 == 0 },
                 onTitleTap = onTitleTap,
                 onAppTap = onAppTap,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
similarity index 85%
rename from basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
index 5afbcd364..f08961208 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Apps.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main
+package org.fdroid.basic.ui.main.discover
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.padding
@@ -21,12 +21,9 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import kotlinx.coroutines.launch
-import org.fdroid.basic.ui.main.apps.AppDetails
-import org.fdroid.basic.ui.main.apps.AppList
-import org.fdroid.basic.ui.main.apps.AppNavigationItem
-import org.fdroid.basic.ui.main.apps.Discover
-import org.fdroid.basic.ui.main.apps.FilterInfo
-import org.fdroid.basic.ui.main.apps.FilterModel
+import org.fdroid.basic.ui.main.apps.MinimalApp
+import org.fdroid.basic.ui.main.details.AppDetails
+import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 enum class Sort {
@@ -38,13 +35,15 @@ const val NUM_ITEMS = 42
 
 @Composable
 @OptIn(ExperimentalMaterial3AdaptiveApi::class, ExperimentalMaterial3Api::class)
-fun Apps(
+fun DiscoverScaffold(
     apps: List<AppNavigationItem>,
     filterInfo: FilterInfo,
     onMainNav: (String) -> Unit,
+    onSelectAppItem: (MinimalApp) -> Unit,
+    currentItem: MinimalApp?,
     modifier: Modifier = Modifier,
 ) {
-    val navigator = rememberListDetailPaneScaffoldNavigator<AppNavigationItem>()
+    val navigator = rememberListDetailPaneScaffoldNavigator<MinimalApp>()
     val scope = rememberCoroutineScope()
     BackHandler(enabled = navigator.canNavigateBack()) {
         scope.launch {
@@ -66,6 +65,7 @@ fun Apps(
                             apps = apps,
                             onTitleTap = { discoverNavController.navigate("list") },
                             onAppTap = {
+                                onSelectAppItem(it)
                                 scope.launch { navigator.navigateTo(Detail, it) }
                             },
                             onMainNav = { onMainNav(it) },
@@ -77,14 +77,11 @@ fun Apps(
                             listState = listState,
                             apps = apps,
                             filterInfo = filterInfo,
-                            currentItem = if (isDetailVisible) {
-                                navigator.currentDestination?.contentKey
-                            } else {
-                                null
-                            },
+                            currentItem = if (isDetailVisible) currentItem else null,
                             onBackClicked = { discoverNavController.popBackStack() },
                             modifier = Modifier,
                         ) {
+                            onSelectAppItem(it)
                             scope.launch { navigator.navigateTo(Detail, it) }
                         }
                     }
@@ -94,7 +91,7 @@ fun Apps(
         detailPane = {
             AnimatedPane {
                 navigator.currentDestination?.contentKey?.let {
-                    AppDetails(appItem = it)
+                    AppDetails(it)
                 } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
             }
         },
@@ -104,7 +101,7 @@ fun Apps(
 @Preview
 @PreviewScreenSizes
 @Composable
-fun AppsPreview() {
+fun DiscoverScaffoldPreview() {
     FDroidContent {
         val apps = listOf(
             AppNavigationItem("1", "foo", "bar", false),
@@ -126,6 +123,6 @@ fun AppsPreview() {
             override fun removeCategory(category: String) {}
             override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
         }
-        Apps(apps, filterInfo, {})
+        DiscoverScaffold(apps, filterInfo, {}, {}, null)
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/FilterPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/FilterPresenter.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
index 67af918df..667a68286 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/FilterPresenter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
@@ -1,10 +1,9 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.discover
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
-import org.fdroid.basic.ui.main.Sort
 
 @Composable
 fun FilterPresenter(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/Names.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Names.kt
similarity index 99%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/Names.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/discover/Names.kt
index d0e73835f..46b4d7bb3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/Names.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Names.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.discover
 
 object Names {
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
index 8822419f5..b7f127ec7 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppItem.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.lists
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.padding
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
index 2e351a800..fa05ea0c8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.basic.ui.main.lists
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -39,6 +39,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
+import org.fdroid.basic.ui.main.apps.MinimalApp
+import org.fdroid.basic.ui.main.discover.AppNavigationItem
+import org.fdroid.basic.ui.main.discover.AppsFilter
+import org.fdroid.basic.ui.main.discover.FilterInfo
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -46,7 +50,7 @@ fun AppList(
     listState: LazyListState,
     apps: List<AppNavigationItem>,
     filterInfo: FilterInfo,
-    currentItem: AppNavigationItem?,
+    currentItem: MinimalApp?,
     modifier: Modifier = Modifier,
     onBackClicked: () -> Unit,
     onItemClick: (AppNavigationItem) -> Unit,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableApp.kt
deleted file mode 100644
index c5a6d6784..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/updates/UpdatableApp.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.fdroid.basic.ui.main.updates
-
-data class UpdatableApp(
-    val name: String,
-    val currentVersionName: String,
-    val updateVersionName: String,
-    val size: Long,
-    val whatsNew: String? = null,
-)

From ce29eece09c15187dd5063063f56723a95013cd1 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 19 May 2025 15:10:59 -0300
Subject: [PATCH 012/180] Add Hilt

---
 basic/build.gradle.kts                        |  6 ++
 basic/src/main/AndroidManifest.xml            |  1 +
 basic/src/main/java/org/fdroid/basic/App.kt   |  7 ++
 .../java/org/fdroid/basic/MainActivity.kt     |  2 +
 .../java/org/fdroid/basic/MainViewModel.kt    | 66 +++++--------------
 .../fdroid/basic/manager/AppDetailsManager.kt | 17 +++++
 .../org/fdroid/basic/manager/MyAppsManager.kt | 60 +++++++++++++++++
 .../java/org/fdroid/basic/ui/main/Main.kt     |  4 +-
 .../ui/main/discover/CategoryCarousel.kt      |  4 +-
 build.gradle                                  |  1 +
 gradle/libs.versions.toml                     |  7 ++
 11 files changed, 123 insertions(+), 52 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/App.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/manager/AppDetailsManager.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index efe32e649..df519a543 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -1,5 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
+    alias(libs.plugins.android.ksp)
+    alias(libs.plugins.android.hilt)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.jetbrains.kotlin.parcelize)
     alias(libs.plugins.jetbrains.compose.compiler)
@@ -62,6 +64,10 @@ dependencies {
     implementation(libs.androidx.compose.material3.adaptive.navigation.suite.android)
     implementation(libs.molecule.runtime)
 
+    implementation(libs.hilt.android)
+    implementation(libs.androidx.hilt.navigation.compose)
+    ksp(libs.hilt.android.compiler)
+
     debugImplementation(libs.androidx.compose.ui.tooling.preview)
 
     testImplementation(libs.junit)
diff --git a/basic/src/main/AndroidManifest.xml b/basic/src/main/AndroidManifest.xml
index dde1136bb..93c98cbdd 100644
--- a/basic/src/main/AndroidManifest.xml
+++ b/basic/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/basic/src/main/java/org/fdroid/basic/App.kt b/basic/src/main/java/org/fdroid/basic/App.kt
new file mode 100644
index 000000000..5ed6d5986
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/App.kt
@@ -0,0 +1,7 @@
+package org.fdroid.basic
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class App : Application()
diff --git a/basic/src/main/java/org/fdroid/basic/MainActivity.kt b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
index 97e4d9c75..262dedd88 100644
--- a/basic/src/main/java/org/fdroid/basic/MainActivity.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
@@ -4,8 +4,10 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import dagger.hilt.android.AndroidEntryPoint
 import org.fdroid.basic.ui.main.Main
 
+@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 03d038481..a2c4b2424 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -2,31 +2,38 @@ package org.fdroid.basic
 
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
+import org.fdroid.basic.manager.AppDetailsManager
+import org.fdroid.basic.manager.MyAppsManager
 import org.fdroid.basic.ui.main.Repository
 import org.fdroid.basic.ui.main.apps.InstalledApp
 import org.fdroid.basic.ui.main.apps.MinimalApp
-import org.fdroid.basic.ui.main.apps.UpdatableApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.basic.ui.main.discover.FilterModel
 import org.fdroid.basic.ui.main.discover.FilterPresenter
 import org.fdroid.basic.ui.main.discover.NUM_ITEMS
 import org.fdroid.basic.ui.main.discover.Names
 import org.fdroid.basic.ui.main.discover.Sort
+import javax.inject.Inject
 
-class MainViewModel(app: Application) : AndroidViewModel(app) {
+@HiltViewModel
+class MainViewModel @Inject constructor(
+    app: Application,
+    private val savedStateHandle: SavedStateHandle,
+    private val myAppsManager: MyAppsManager,
+    private val appDetailsManager: AppDetailsManager,
+) : AndroidViewModel(app) {
 
     companion object {
         val installedApps = listOf(
@@ -99,13 +106,10 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
             addedCategoriesFlow = addedCategories,
         )
     }
-    private val _updates = MutableStateFlow<List<UpdatableApp>>(emptyList())
-    val updates = _updates.asStateFlow()
-    private val _installed = MutableStateFlow<List<InstalledApp>>(installedApps)
-    val installed = _installed.asStateFlow()
-    val numUpdates = _updates.map { it.size }
-    private val _appDetails = MutableStateFlow<AppNavigationItem?>(null)
-    val appDetails = _appDetails.asStateFlow()
+    val updates = myAppsManager.updates
+    val installed = myAppsManager.installed
+    val numUpdates = myAppsManager.numUpdates
+    val appDetails = appDetailsManager.appDetails
 
     private val _repos = MutableStateFlow(
         listOf(
@@ -121,48 +125,14 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
     )
     val repos = _repos.asStateFlow()
 
-    init {
-        viewModelScope.launch {
-            delay(10_000)
-            _updates.update {
-                listOf(
-                    UpdatableApp(
-                        packageName = "2000",
-                        name = Names.randomName,
-                        currentVersionName = "1.0.1",
-                        updateVersionName = "1.1.0",
-                        size = 123456789,
-                        whatsNew = "Lots of changes in this version!\nThey are all awesome.\n" +
-                            "Only the best changes."
-                    ),
-                    UpdatableApp(
-                        packageName = "2001",
-                        name = Names.randomName,
-                        currentVersionName = "3.0.1",
-                        updateVersionName = "3.1.0",
-                        size = 9876543,
-                    ),
-                    UpdatableApp(
-                        packageName = "2002",
-                        name = Names.randomName,
-                        currentVersionName = "4.0.1",
-                        updateVersionName = "4.3.0",
-                        size = 4561237,
-                        whatsNew = "This new version is super fast and aimed at fixing some bugs and enhancing your experience even more. So take the chance to update your app and always enjoy the best of Inter. In addition to the exciting new features in the latest version, we regularly release new versions to improve what you are already using on our app. To keep making your life simpler, keep your app up to date and take advantage of everything we prepare for you. "
-                    ),
-                )
-            }
-        }
-    }
-
     fun setAppDetails(app: MinimalApp) {
-        _appDetails.value = null
+        appDetailsManager.setAppDetails(null)
         val newApp = filterModel.value.apps.find { it.packageName == app.packageName }
             ?: (updates.value.find { it.packageName == app.packageName }
                 ?: installed.value.find { it.packageName == app.packageName })?.let {
                 AppNavigationItem(it.packageName, it.name ?: "Unknown app", "Summary", false)
             }
-        _appDetails.value = newApp
+        appDetailsManager.setAppDetails(newApp)
     }
 
     fun sortBy(sort: Sort) {
diff --git a/basic/src/main/java/org/fdroid/basic/manager/AppDetailsManager.kt b/basic/src/main/java/org/fdroid/basic/manager/AppDetailsManager.kt
new file mode 100644
index 000000000..56df2c3ff
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/manager/AppDetailsManager.kt
@@ -0,0 +1,17 @@
+package org.fdroid.basic.manager
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import org.fdroid.basic.ui.main.discover.AppNavigationItem
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppDetailsManager @Inject constructor() {
+    private val _appDetails = MutableStateFlow<AppNavigationItem?>(null)
+    val appDetails = _appDetails.asStateFlow()
+
+    fun setAppDetails(app: AppNavigationItem?) {
+        _appDetails.value = app
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
new file mode 100644
index 000000000..185692a31
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
@@ -0,0 +1,60 @@
+package org.fdroid.basic.manager
+
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import org.fdroid.basic.MainViewModel.Companion.installedApps
+import org.fdroid.basic.ui.main.apps.InstalledApp
+import org.fdroid.basic.ui.main.apps.UpdatableApp
+import org.fdroid.basic.ui.main.discover.Names
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MyAppsManager @Inject constructor() {
+
+    private val _updates = MutableStateFlow<List<UpdatableApp>>(emptyList())
+    val updates = _updates.asStateFlow()
+    private val _installed = MutableStateFlow<List<InstalledApp>>(installedApps)
+    val installed = _installed.asStateFlow()
+    val numUpdates = _updates.map { it.size }
+
+    init {
+        GlobalScope.launch {
+            delay(10_000)
+            _updates.update {
+                listOf(
+                    UpdatableApp(
+                        packageName = "2000",
+                        name = Names.randomName,
+                        currentVersionName = "1.0.1",
+                        updateVersionName = "1.1.0",
+                        size = 123456789,
+                        whatsNew = "Lots of changes in this version!\nThey are all awesome.\n" +
+                            "Only the best changes."
+                    ),
+                    UpdatableApp(
+                        packageName = "2001",
+                        name = Names.randomName,
+                        currentVersionName = "3.0.1",
+                        updateVersionName = "3.1.0",
+                        size = 9876543,
+                    ),
+                    UpdatableApp(
+                        packageName = "2002",
+                        name = Names.randomName,
+                        currentVersionName = "4.0.1",
+                        updateVersionName = "4.3.0",
+                        size = 4561237,
+                        whatsNew = "This new version is super fast and aimed at fixing some bugs and enhancing your experience even more. So take the chance to update your app and always enjoy the best of Inter. In addition to the exciting new features in the latest version, we regularly release new versions to improve what you are already using on our app. To keep making your life simpler, keep your app up to date and take advantage of everything we prepare for you. "
+                    ),
+                )
+            }
+        }
+    }
+
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index 09ea56ce6..aab8fa704 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -6,8 +6,8 @@ import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -39,7 +39,7 @@ val moreMenuItems = listOf(
 )
 
 @Composable
-fun Main(viewModel: MainViewModel = viewModel()) {
+fun Main(viewModel: MainViewModel = hiltViewModel()) {
     FDroidContent {
         val navController = rememberNavController()
         NavHost(navController = navController, startDestination = NavDestinations.Main.id) {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
index f1922a667..fa5ba1f1e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.hilt.navigation.compose.hiltViewModel
 import org.fdroid.basic.MainViewModel
 import org.fdroid.basic.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
@@ -36,7 +36,7 @@ fun CategoryCarousel(
     onTitleTap: () -> Unit,
     onCategoryTap: (String) -> Unit,
     modifier: Modifier = Modifier,
-    viewModel: MainViewModel = viewModel(),
+    viewModel: MainViewModel = hiltViewModel(),
 ) {
     CategoryCarousel(viewModel.categories, modifier, onTitleTap, onCategoryTap)
 }
diff --git a/build.gradle b/build.gradle
index 8a9f49847..38cbe29c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,7 @@ plugins {
     alias libs.plugins.android.application apply false
     alias libs.plugins.android.library apply false
     alias libs.plugins.android.ksp apply false
+    alias libs.plugins.android.hilt apply false
     alias libs.plugins.jetbrains.kotlin.android apply false
     alias libs.plugins.jetbrains.kotlin.multiplatform apply false
     alias libs.plugins.jetbrains.kotlin.plugin.serialization apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6d17d7cb3..f2f9f7e1e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,6 +3,8 @@ compileSdk = "36"
 kotlin = "2.2.21"
 androidGradlePlugin = "8.11.1" # 8.12.0 pulls in aapt2 which has issue on buildserver
 androidKspPlugin = "2.2.21-2.0.4" # first version needs to match kotlin version
+hilt = "2.56.2"
+hiltNavigationCompose = "1.2.0"
 dokka = "2.1.0"
 mavenPublish = "0.34.0"
 jlleitschuhKtlint = "13.1.0"
@@ -110,6 +112,7 @@ androidx-compose-material3-adaptive = { module = "androidx.compose.material3.ada
 androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation" }
 androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout" }
 androidx-compose-material3-adaptive-navigation-suite-android = { module = "androidx.compose.material3:material3-adaptive-navigation-suite-android" }
+androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
 
 androidx-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
@@ -123,6 +126,9 @@ glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref =
 glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glideCompose" }
 glide-annotations = { module = "com.github.bumptech.glide:annotations", version.ref = "glide" }
 
+hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
+hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
+
 molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
 guardianproject-netcipher = { module = "info.guardianproject.netcipher:netcipher", version.ref = "guardianprojectNetcipher" }
 guardianproject-panic = { module = "info.guardianproject.panic:panic", version.ref = "guardianprojectPanic" }
@@ -181,6 +187,7 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-ksp = { id = "com.google.devtools.ksp", version.ref = "androidKspPlugin" }
+android-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 jetbrains-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 jetbrains-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

From 3559e7d4d50700d6d3937d000cfbac3d853c7022 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 19 May 2025 17:48:41 -0300
Subject: [PATCH 013/180] Manager based item selection

also split up repository UI code further
---
 .../java/org/fdroid/basic/MainViewModel.kt    |  17 +--
 .../fdroid/basic/manager/RepositoryManager.kt |  41 ++++++
 .../java/org/fdroid/basic/ui/main/Main.kt     |  14 +-
 .../basic/ui/main/apps/InstalledAppRow.kt     |   2 +-
 .../basic/ui/main/apps/MyAppsScaffold.kt      |   2 +-
 .../basic/ui/main/apps/UpdatableAppRow.kt     |   2 +-
 .../ui/main/discover/DiscoverScaffold.kt      |   5 +-
 .../org/fdroid/basic/ui/main/lists/AppList.kt |   3 -
 .../ui/main/repositories/RepositoriesList.kt  |  57 ++++++++
 .../RepositoriesScaffold.kt}                  | 131 ++++++++----------
 .../ui/main/repositories/RepositoryItem.kt    |  49 +++++++
 11 files changed, 225 insertions(+), 98 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/manager/RepositoryManager.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesList.kt
 rename basic/src/main/java/org/fdroid/basic/ui/main/{Repositories.kt => repositories/RepositoriesScaffold.kt} (54%)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index a2c4b2424..f2450586a 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -16,7 +16,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.update
 import org.fdroid.basic.manager.AppDetailsManager
 import org.fdroid.basic.manager.MyAppsManager
-import org.fdroid.basic.ui.main.Repository
+import org.fdroid.basic.manager.RepositoryManager
 import org.fdroid.basic.ui.main.apps.InstalledApp
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
@@ -33,6 +33,7 @@ class MainViewModel @Inject constructor(
     private val savedStateHandle: SavedStateHandle,
     private val myAppsManager: MyAppsManager,
     private val appDetailsManager: AppDetailsManager,
+    val repositoryManager: RepositoryManager,
 ) : AndroidViewModel(app) {
 
     companion object {
@@ -111,22 +112,8 @@ class MainViewModel @Inject constructor(
     val numUpdates = myAppsManager.numUpdates
     val appDetails = appDetailsManager.appDetails
 
-    private val _repos = MutableStateFlow(
-        listOf(
-            Repository(
-                address = "http://example.org",
-                timestamp = System.currentTimeMillis(),
-                lastUpdated = null,
-                weight = 2,
-                enabled = true,
-                name = "My first repository",
-            )
-        )
-    )
-    val repos = _repos.asStateFlow()
 
     fun setAppDetails(app: MinimalApp) {
-        appDetailsManager.setAppDetails(null)
         val newApp = filterModel.value.apps.find { it.packageName == app.packageName }
             ?: (updates.value.find { it.packageName == app.packageName }
                 ?: installed.value.find { it.packageName == app.packageName })?.let {
diff --git a/basic/src/main/java/org/fdroid/basic/manager/RepositoryManager.kt b/basic/src/main/java/org/fdroid/basic/manager/RepositoryManager.kt
new file mode 100644
index 000000000..6bc4118f6
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/manager/RepositoryManager.kt
@@ -0,0 +1,41 @@
+package org.fdroid.basic.manager
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import org.fdroid.basic.ui.main.repositories.Repository
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RepositoryManager @Inject constructor() {
+
+    private val _repos = MutableStateFlow(
+        listOf(
+            Repository(
+                address = "http://example.org",
+                timestamp = System.currentTimeMillis(),
+                lastUpdated = null,
+                weight = 1,
+                enabled = true,
+                name = "My first repository",
+            ),
+            Repository(
+                address = "http://example.com",
+                timestamp = System.currentTimeMillis(),
+                lastUpdated = null,
+                weight = 2,
+                enabled = true,
+                name = "My second repository",
+            ),
+        )
+    )
+    val repos = _repos.asStateFlow()
+
+    private val _visibleRepository = MutableStateFlow<Repository?>(null)
+    val visibleRepository = _visibleRepository.asStateFlow()
+
+    fun setVisibleRepository(repository: Repository?) {
+        _visibleRepository.value = repository
+    }
+
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index aab8fa704..abc33eb13 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -16,6 +16,7 @@ import org.fdroid.basic.R
 import org.fdroid.basic.ui.icons.PackageVariant
 import org.fdroid.basic.ui.main.discover.FilterInfo
 import org.fdroid.basic.ui.main.discover.Sort
+import org.fdroid.basic.ui.main.repositories.RepositoriesScaffold
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 sealed class NavDestinations(
@@ -69,8 +70,17 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                 )
             }
             composable(route = NavDestinations.Repos.id) {
-                val repos = viewModel.repos.collectAsStateWithLifecycle().value
-                Repositories(repos, null) { navController.popBackStack() }
+                val repositoryManager = viewModel.repositoryManager
+                val repos = repositoryManager.repos.collectAsStateWithLifecycle().value
+                val visibleRepository =
+                    repositoryManager.visibleRepository.collectAsStateWithLifecycle().value
+                RepositoriesScaffold(
+                    repositories = repos,
+                    currentRepository = visibleRepository,
+                    onRepositorySelected = repositoryManager::setVisibleRepository,
+                ) {
+                    navController.popBackStack()
+                }
             }
             composable(route = NavDestinations.Settings.id) {
                 Settings { navController.popBackStack() }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
index 3a11695e3..513e1b2d0 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
@@ -26,7 +26,7 @@ fun InstalledAppRow(
     isSelected: Boolean,
     modifier: Modifier = Modifier,
 ) {
-    Column {
+    Column(modifier = modifier) {
         ListItem(
             leadingContent = {
                 Icon(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
index 7d5493324..4663ec863 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
@@ -57,7 +57,7 @@ fun MyAppsScaffold(
         },
         detailPane = {
             AnimatedPane {
-                navigator.currentDestination?.contentKey?.let {
+                currentItem?.let {
                     AppDetails(it)
                 } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
             }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
index 12cada3f1..f4bf43137 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
@@ -39,7 +39,7 @@ fun UpdatableAppRow(
     modifier: Modifier = Modifier
 ) {
     var isExpanded by remember { mutableStateOf(false) }
-    Column {
+    Column(modifier = modifier) {
         ListItem(
             leadingContent = {
                 BadgedBox(badge = {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
index f08961208..6420674a9 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
@@ -2,7 +2,6 @@ package org.fdroid.basic.ui.main.discover
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
@@ -51,7 +50,6 @@ fun DiscoverScaffold(
         }
     }
     val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
-    val listState = rememberLazyListState()
     ListDetailPaneScaffold(
         directive = navigator.scaffoldDirective,
         value = navigator.scaffoldValue,
@@ -74,7 +72,6 @@ fun DiscoverScaffold(
                     }
                     composable("list") {
                         AppList(
-                            listState = listState,
                             apps = apps,
                             filterInfo = filterInfo,
                             currentItem = if (isDetailVisible) currentItem else null,
@@ -90,7 +87,7 @@ fun DiscoverScaffold(
         },
         detailPane = {
             AnimatedPane {
-                navigator.currentDestination?.contentKey?.let {
+                currentItem?.let {
                     AppDetails(it)
                 } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
             }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
index fa05ea0c8..657448587 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
@@ -47,7 +46,6 @@ import org.fdroid.basic.ui.main.discover.FilterInfo
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppList(
-    listState: LazyListState,
     apps: List<AppNavigationItem>,
     filterInfo: FilterInfo,
     currentItem: MinimalApp?,
@@ -96,7 +94,6 @@ fun AppList(
                 addedRepos = addedRepos,
             )
             LazyColumn(
-                state = listState,
                 contentPadding = PaddingValues(vertical = 8.dp),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
                 modifier = Modifier.then(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesList.kt
new file mode 100644
index 000000000..097cc9c92
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesList.kt
@@ -0,0 +1,57 @@
+package org.fdroid.basic.ui.main.repositories
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
+fun RepositoriesList(
+    repositories: List<Repository>,
+    currentRepository: Repository?,
+    onRepositorySelected: (Repository) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    LazyColumn(
+        contentPadding = PaddingValues(vertical = 8.dp),
+        verticalArrangement = spacedBy(8.dp),
+        modifier = modifier.then(
+            if (currentRepository == null) Modifier
+            else Modifier.selectableGroup()
+        ),
+    ) {
+        val localeList = LocaleListCompat.getDefault()
+        items(repositories) { repoItem ->
+            val isSelected = currentRepository == repoItem
+            val interactionModifier = if (currentRepository == null) {
+                Modifier.clickable(
+                    onClick = { onRepositorySelected(repoItem) }
+                )
+            } else {
+                Modifier.selectable(
+                    selected = isSelected,
+                    onClick = { onRepositorySelected(repoItem) }
+                )
+            }
+            RepositoryItem(
+                repoItem = repoItem,
+                isSelected = isSelected,
+                localeList = localeList,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .then(interactionModifier),
+            )
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Repositories.kt b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt
similarity index 54%
rename from basic/src/main/java/org/fdroid/basic/ui/main/Repositories.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt
index 5cfe118ca..cadf2954b 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Repositories.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt
@@ -1,36 +1,35 @@
-package org.fdroid.basic.ui.main
+package org.fdroid.basic.ui.main.repositories
 
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
 import android.os.Parcelable
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.selection.selectable
-import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Android
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItem
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.VerticalDragHandle
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.AnimatedPane
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Detail
 import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
+import androidx.compose.material3.adaptive.layout.defaultDragHandleSemantics
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -45,9 +44,10 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
-fun Repositories(
+fun RepositoriesScaffold(
     repositories: List<Repository>,
     currentRepository: Repository?,
+    onRepositorySelected: (Repository) -> Unit,
     onBackClicked: () -> Unit,
 ) {
     val navigator = rememberListDetailPaneScaffoldNavigator<Repository>()
@@ -58,7 +58,6 @@ fun Repositories(
         }
     }
     val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
-    val listState = rememberLazyListState()
     ListDetailPaneScaffold(
         directive = navigator.scaffoldDirective,
         value = navigator.scaffoldValue,
@@ -78,88 +77,78 @@ fun Repositories(
                         )
                     },
                 ) { paddingValues ->
-                    LazyColumn(
-                        contentPadding = PaddingValues(vertical = 8.dp),
-                        verticalArrangement = spacedBy(8.dp),
-                        modifier = Modifier
-                            .padding(paddingValues)
-                            .then(
-                                if (currentRepository == null) Modifier
-                                else Modifier.selectableGroup()
-                            ),
-                    ) {
-                        val localeList = LocaleListCompat.getDefault()
-                        val onItemClick: (Repository) -> Unit = {
+                    RepositoriesList(
+                        repositories = repositories,
+                        currentRepository = if (isDetailVisible) currentRepository else null,
+                        onRepositorySelected = {
+                            onRepositorySelected(it)
                             scope.launch { navigator.navigateTo(Detail, it) }
-                        }
-                        items(repositories) { repoItem ->
-                            val isSelected = currentRepository == repoItem
-                            val interactionModifier = if (currentRepository == null) {
-                                Modifier.clickable(
-                                    onClick = { onItemClick(repoItem) }
-                                )
-                            } else {
-                                Modifier.selectable(
-                                    selected = isSelected,
-                                    onClick = { onItemClick(repoItem) }
-                                )
-                            }
-                            ListItem(
-                                leadingContent = {
-                                    Icon(
-                                        Icons.Filled.Android,
-                                        tint = MaterialTheme.colorScheme.secondary,
-                                        contentDescription = null,
-                                    )
-                                },
-                                headlineContent = {
-                                    Text(repoItem.getName(localeList) ?: "Unknown repo")
-                                },
-                                supportingContent = {
-                                    Text(repoItem.address)
-                                },
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(horizontal = 8.dp)
-                                    .then(interactionModifier),
-                            )
-                        }
-                    }
+                        },
+                        modifier = Modifier
+                            .padding(paddingValues),
+                    )
                 }
             }
         },
         detailPane = {
             AnimatedPane {
-                navigator.currentDestination?.contentKey?.let {
-                    Column(verticalArrangement = spacedBy(16.dp)) {
+                Column(
+                    verticalArrangement = spacedBy(16.dp),
+                    modifier = Modifier
+                        .background(MaterialTheme.colorScheme.background)
+                        .safeDrawingPadding(),
+                ) {
+                    currentRepository?.let {
                         Text(it.getName(LocaleListCompat.getDefault()) ?: "Unknown repo")
                         Text("This will basically be the repo details screen from latest client")
-                    }
-                } ?: Text(
-                    text = "No repository selected",
-                    modifier = Modifier.padding(16.dp),
-                )
+                    } ?: Text(text = "No repository selected")
+                }
             }
         },
+        paneExpansionDragHandle = { state ->
+            val interactionSource = remember { MutableInteractionSource() }
+            VerticalDragHandle(
+                modifier =
+                    Modifier.paneExpansionDraggable(
+                        state,
+                        LocalMinimumInteractiveComponentSize.current,
+                        interactionSource,
+                        state.defaultDragHandleSemantics(),
+                    ),
+                interactionSource = interactionSource
+            )
+        },
+        modifier = Modifier.background(MaterialTheme.colorScheme.background),
     )
 }
 
-@Preview
+@Preview(
+    showBackground = true,
+    uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
+)
 @PreviewScreenSizes
 @Composable
-fun RepositoriesPreview() {
+fun RepositoriesScaffoldPreview() {
     FDroidContent {
         val repos = listOf(
             Repository(
                 address = "http://example.org",
                 timestamp = System.currentTimeMillis(),
                 lastUpdated = null,
-                weight = 2,
+                weight = 1,
                 enabled = true,
                 name = "My first repository",
-            )
+            ),
+            Repository(
+                address = "http://example.com",
+                timestamp = System.currentTimeMillis(),
+                lastUpdated = null,
+                weight = 2,
+                enabled = true,
+                name = "My second repository",
+            ),
         )
-        Repositories(repos, repos[0]) { }
+        RepositoriesScaffold(repos, repos[0], {}) { }
     }
 }
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt
new file mode 100644
index 000000000..10d15faed
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt
@@ -0,0 +1,49 @@
+package org.fdroid.basic.ui.main.repositories
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.core.os.LocaleListCompat
+
+@Composable
+fun RepositoryItem(
+    repoItem: Repository,
+    isSelected: Boolean,
+    localeList: LocaleListCompat,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        leadingContent = {
+            Icon(
+                Icons.Filled.Android,
+                tint = MaterialTheme.colorScheme.secondary,
+                contentDescription = null,
+            )
+        },
+        headlineContent = {
+            Text(repoItem.getName(localeList) ?: "Unknown repo")
+        },
+        supportingContent = {
+            Text(repoItem.address)
+        },
+        trailingContent = {
+            Switch(true, onCheckedChange = null)
+        },
+        colors = ListItemDefaults.colors(
+            containerColor = if (isSelected) {
+                MaterialTheme.colorScheme.surfaceVariant
+            } else {
+                Color.Transparent
+            }
+        ),
+        modifier = modifier,
+    )
+}

From 5d30885f9c94a3334a06df216f510d5792f6bade Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 20 May 2025 17:15:56 -0300
Subject: [PATCH 014/180] Add filter chip for sorting to my apps

---
 .../java/org/fdroid/basic/MainViewModel.kt    |  23 +---
 .../org/fdroid/basic/manager/MyAppsManager.kt |  78 +++++++++++++-
 .../fdroid/basic/ui/main/BottomBarScreen.kt   |   6 +-
 .../java/org/fdroid/basic/ui/main/Main.kt     |   2 +
 .../fdroid/basic/ui/main/apps/MyAppsList.kt   | 101 +++++++++++++++++-
 .../basic/ui/main/apps/MyAppsScaffold.kt      |  14 ++-
 6 files changed, 192 insertions(+), 32 deletions(-)

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index f2450586a..45799f712 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -17,7 +17,6 @@ import kotlinx.coroutines.flow.update
 import org.fdroid.basic.manager.AppDetailsManager
 import org.fdroid.basic.manager.MyAppsManager
 import org.fdroid.basic.manager.RepositoryManager
-import org.fdroid.basic.ui.main.apps.InstalledApp
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.basic.ui.main.discover.FilterModel
@@ -31,31 +30,11 @@ import javax.inject.Inject
 class MainViewModel @Inject constructor(
     app: Application,
     private val savedStateHandle: SavedStateHandle,
-    private val myAppsManager: MyAppsManager,
+    val myAppsManager: MyAppsManager,
     private val appDetailsManager: AppDetailsManager,
     val repositoryManager: RepositoryManager,
 ) : AndroidViewModel(app) {
 
-    companion object {
-        val installedApps = listOf(
-            InstalledApp(
-                packageName = "1000",
-                name = Names.randomName,
-                versionName = "1.0.1",
-            ),
-            InstalledApp(
-                packageName = "1001",
-                name = Names.randomName,
-                versionName = "0.1",
-            ),
-            InstalledApp(
-                packageName = "1002",
-                name = Names.randomName,
-                versionName = "3.0.1",
-            ),
-        )
-    }
-
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
     val categories = listOf(
         Pair(app.getString(R.string.category_Internet), R.drawable.category_internet),
diff --git a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
index 185692a31..7f741e48d 100644
--- a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
+++ b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
@@ -7,10 +7,11 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.fdroid.basic.MainViewModel.Companion.installedApps
 import org.fdroid.basic.ui.main.apps.InstalledApp
 import org.fdroid.basic.ui.main.apps.UpdatableApp
 import org.fdroid.basic.ui.main.discover.Names
+import org.fdroid.basic.ui.main.discover.Sort
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -22,10 +23,52 @@ class MyAppsManager @Inject constructor() {
     private val _installed = MutableStateFlow<List<InstalledApp>>(installedApps)
     val installed = _installed.asStateFlow()
     val numUpdates = _updates.map { it.size }
+    private val _sortBy = MutableStateFlow<Sort>(Sort.NAME)
+    val sortBy = _sortBy.asStateFlow()
+
+    companion object {
+        val installedApps = listOf(
+            InstalledApp(
+                packageName = "1000",
+                name = Names.randomName,
+                versionName = "1.0.1",
+            ),
+            InstalledApp(
+                packageName = "1001",
+                name = Names.randomName,
+                versionName = "0.1",
+            ),
+            InstalledApp(
+                packageName = "1002",
+                name = Names.randomName,
+                versionName = "3.0.1",
+            ),
+            InstalledApp(
+                packageName = "1003",
+                name = Names.randomName,
+                versionName = "0.2.1",
+            ),
+            InstalledApp(
+                packageName = "1004",
+                name = Names.randomName,
+                versionName = "0.0.1",
+            ),
+            InstalledApp(
+                packageName = "1005",
+                name = Names.randomName,
+                versionName = "1.1.1",
+            ),
+            InstalledApp(
+                packageName = "1006",
+                name = Names.randomName,
+                versionName = "2.0.1",
+            ),
+        ).sortedBy { it.name.lowercase(Locale.getDefault()) }
+    }
 
     init {
         GlobalScope.launch {
-            delay(10_000)
+            delay(5_000)
             _updates.update {
                 listOf(
                     UpdatableApp(
@@ -52,9 +95,38 @@ class MyAppsManager @Inject constructor() {
                         size = 4561237,
                         whatsNew = "This new version is super fast and aimed at fixing some bugs and enhancing your experience even more. So take the chance to update your app and always enjoy the best of Inter. In addition to the exciting new features in the latest version, we regularly release new versions to improve what you are already using on our app. To keep making your life simpler, keep your app up to date and take advantage of everything we prepare for you. "
                     ),
-                )
+                    UpdatableApp(
+                        packageName = "2003",
+                        name = Names.randomName,
+                        currentVersionName = "3.0.1",
+                        updateVersionName = "3.1.0",
+                        size = 9876543,
+                    ),
+                ).sortedBy { it.name.lowercase(Locale.getDefault()) }
             }
         }
     }
 
+    fun sortBy(sort: Sort) {
+        when (sort) {
+            Sort.NAME -> {
+                _updates.update {
+                    it.sortedBy { it.name.lowercase(Locale.getDefault()) }
+                }
+                _installed.update {
+                    it.sortedBy { it.name.lowercase(Locale.getDefault()) }
+                }
+            }
+            Sort.LATEST -> {
+                _updates.update {
+                    it.sortedBy { it.packageName }
+                }
+                _installed.update {
+                    it.sortedBy { it.packageName }
+                }
+            }
+        }
+        _sortBy.value = sort
+    }
+
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
index 70ea34d4e..ab7f1b923 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
@@ -53,6 +53,8 @@ fun BottomBarScreen(
     filterInfo: FilterInfo,
     currentItem: MinimalApp?,
     onSelectAppItem: (MinimalApp) -> Unit,
+    sortBy: Sort,
+    onSortChanged: (Sort) -> Unit,
 ) {
     var currentDestination by rememberSaveable { mutableStateOf(BottomNavDestinations.APPS) }
     val adaptiveInfo = currentWindowAdaptiveInfo()
@@ -108,6 +110,8 @@ fun BottomBarScreen(
                 installedApps = installed,
                 currentItem = currentItem,
                 onSelectAppItem = onSelectAppItem,
+                sortBy = sortBy,
+                onSortChanged = onSortChanged,
             )
         }
     }
@@ -137,5 +141,5 @@ fun BottomBarPreview() {
         override fun removeCategory(category: String) {}
         override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
     }
-    BottomBarScreen({ }, 2, emptyList(), emptyList(), filterInfo, null, {})
+    BottomBarScreen({ }, 2, emptyList(), emptyList(), filterInfo, null, {}, Sort.NAME, {})
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index abc33eb13..b71743b16 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -67,6 +67,8 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                     filterInfo = filterInfo,
                     currentItem = currentItem,
                     onSelectAppItem = viewModel::setAppDetails,
+                    sortBy = viewModel.myAppsManager.sortBy.collectAsStateWithLifecycle().value,
+                    onSortChanged = viewModel.myAppsManager::sortBy,
                 )
             }
             composable(route = NavDestinations.Repos.id) {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
index 63583c116..db2e5ab87 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
@@ -1,20 +1,41 @@
 package org.fdroid.basic.ui.main.apps
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AccessTime
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.filled.SortByAlpha
 import androidx.compose.material3.Button
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.FilterChipDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults.enterAlwaysScrollBehavior
+import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import org.fdroid.basic.R
+import org.fdroid.basic.ui.main.discover.Sort
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -23,12 +44,70 @@ fun MyAppsList(
     installedApps: List<InstalledApp>,
     currentItem: MinimalApp?,
     onItemClick: (MinimalApp) -> Unit,
+    sortBy: Sort,
+    onSortChanged: (Sort) -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(if (updatableApps.isEmpty()) "My apps" else "Updates") },
+                title = {
+                    var sortByMenuExpanded by remember { mutableStateOf(false) }
+                    Column {
+                        Text("My apps")
+                        FilterChip(
+                            selected = false,
+                            leadingIcon = {
+                                val vector = when (sortBy) {
+                                    Sort.NAME -> Icons.Filled.SortByAlpha
+                                    Sort.LATEST -> Icons.Filled.AccessTime
+                                }
+                                Icon(
+                                    vector,
+                                    null,
+                                    modifier = Modifier.size(FilterChipDefaults.IconSize)
+                                )
+                            },
+                            trailingIcon = {
+                                Icon(Icons.Filled.ArrowDropDown, null)
+                            },
+                            label = {
+                                val s = when (sortBy) {
+                                    Sort.NAME -> "Sort by name"
+                                    Sort.LATEST -> "Sort by latest"
+                                }
+                                Text(s)
+                                DropdownMenu(
+                                    expanded = sortByMenuExpanded,
+                                    onDismissRequest = { sortByMenuExpanded = false },
+                                ) {
+                                    DropdownMenuItem(
+                                        text = { Text("Sort by name") },
+                                        leadingIcon = {
+                                            Icon(Icons.Filled.SortByAlpha, null)
+                                        },
+                                        onClick = {
+                                            onSortChanged(Sort.NAME)
+                                            sortByMenuExpanded = false
+                                        },
+                                    )
+                                    DropdownMenuItem(
+                                        text = { Text("Sort by latest") },
+                                        leadingIcon = {
+                                            Icon(Icons.Filled.AccessTime, null)
+                                        },
+                                        onClick = {
+                                            onSortChanged(Sort.LATEST)
+                                            sortByMenuExpanded = false
+                                        },
+                                    )
+                                }
+                            },
+                            onClick = { sortByMenuExpanded = !sortByMenuExpanded },
+                        )
+                    }
+                },
                 actions = {
                     if (updatableApps.isNotEmpty()) Button(
                         onClick = {},
@@ -37,9 +116,10 @@ fun MyAppsList(
                         Text("Update all")
                     }
                 },
+                scrollBehavior = scrollBehavior,
             )
         },
-        modifier = modifier,
+        modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         LazyColumn(
             modifier
@@ -49,6 +129,13 @@ fun MyAppsList(
                     else Modifier.selectableGroup()
                 ),
         ) {
+            if (updatableApps.isNotEmpty()) item(key = "A", contentType = "header") {
+                Text(
+                    text = stringResource(R.string.updates),
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier.padding(horizontal = 16.dp),
+                )
+            }
             items(updatableApps, key = { it.packageName }, contentType = { "A" }) { app ->
                 val isSelected = app.packageName == currentItem?.packageName
                 val interactionModifier = if (currentItem == null) {
@@ -66,8 +153,12 @@ fun MyAppsList(
                     .then(interactionModifier)
                 UpdatableAppRow(app, isSelected, modifier)
             }
-            if (updatableApps.isNotEmpty()) item(contentType = { "D" }) {
-                TopAppBar(title = { Text("My apps") }, windowInsets = WindowInsets())
+            if (updatableApps.isNotEmpty()) item(key = "B", contentType = "header") {
+                Text(
+                    text = stringResource(R.string.installed_apps__activity_title),
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier.padding(horizontal = 16.dp),
+                )
             }
             items(installedApps, key = { it.packageName }, contentType = { "B" }) { app ->
                 val isSelected = app.packageName == currentItem?.packageName
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
index 4663ec863..410294e8b 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
@@ -11,7 +11,11 @@ import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Det
 import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
@@ -19,6 +23,7 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import org.fdroid.basic.ui.main.details.AppDetails
 import org.fdroid.basic.ui.main.discover.Names
+import org.fdroid.basic.ui.main.discover.Sort
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
@@ -28,6 +33,8 @@ fun MyAppsScaffold(
     installedApps: List<InstalledApp>,
     currentItem: MinimalApp?,
     onSelectAppItem: (MinimalApp) -> Unit,
+    sortBy: Sort,
+    onSortChanged: (Sort) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val navigator = rememberListDetailPaneScaffoldNavigator<MinimalApp>()
@@ -51,7 +58,9 @@ fun MyAppsScaffold(
                     onItemClick = {
                         onSelectAppItem(it)
                         scope.launch { navigator.navigateTo(Detail, it) }
-                    }
+                    },
+                    sortBy = sortBy,
+                    onSortChanged = onSortChanged,
                 )
             }
         },
@@ -87,11 +96,14 @@ fun MyAppsScaffoldPreview() {
         val installedApp1 = InstalledApp("", Names.randomName, "3.0.1")
         val installedApp2 = InstalledApp("", Names.randomName, "1.0")
         val installedApp3 = InstalledApp("", Names.randomName, "0.1")
+        var sortBy by remember { mutableStateOf<Sort>(Sort.NAME) }
         MyAppsScaffold(
             updatableApps = listOf(app1, app2),
             installedApps = listOf(installedApp1, installedApp2, installedApp3),
             currentItem = null,
             onSelectAppItem = {},
+            sortBy = sortBy,
+            onSortChanged = { sortBy = it },
         )
     }
 }

From 490df42ea24e82f593bd74ebc8b6d55971629372 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 21 May 2025 14:29:54 -0300
Subject: [PATCH 015/180] Flesh out About page a bit more

---
 basic/build.gradle.kts                        |   1 +
 basic/src/main/AndroidManifest.xml            |   3 +-
 .../java/org/fdroid/basic/MainViewModel.kt    |  30 ++--
 .../java/org/fdroid/basic/ui/main/About.kt    |  89 ++++++++-
 .../ui/main/discover/CategoryCarousel.kt      |  12 +-
 .../drawable-v24/ic_launcher_foreground.xml   |  30 ----
 .../res/drawable/category_connectivity.png    |   1 -
 .../res/drawable/category_development.png     |   1 -
 .../src/main/res/drawable/category_games.png  |   1 -
 .../main/res/drawable/category_graphics.png   |   1 -
 .../main/res/drawable/category_internet.png   |   1 -
 .../src/main/res/drawable/category_money.png  |   1 -
 .../main/res/drawable/category_navigation.png |   1 -
 .../main/res/drawable/category_reading.png    |   1 -
 .../drawable/category_science_education.png   |   1 -
 .../main/res/drawable/category_security.png   |   1 -
 .../src/main/res/drawable/category_system.png |   1 -
 .../main/res/drawable/category_theming.png    |   1 -
 .../main/res/drawable/category_writing.png    |   1 -
 basic/src/main/res/drawable/ic_launcher.png   | Bin 0 -> 10858 bytes
 .../res/drawable/ic_launcher_background.xml   | 170 ------------------
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   6 -
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   6 -
 23 files changed, 104 insertions(+), 256 deletions(-)
 delete mode 100644 basic/src/main/res/drawable-v24/ic_launcher_foreground.xml
 delete mode 120000 basic/src/main/res/drawable/category_connectivity.png
 delete mode 120000 basic/src/main/res/drawable/category_development.png
 delete mode 120000 basic/src/main/res/drawable/category_games.png
 delete mode 120000 basic/src/main/res/drawable/category_graphics.png
 delete mode 120000 basic/src/main/res/drawable/category_internet.png
 delete mode 120000 basic/src/main/res/drawable/category_money.png
 delete mode 120000 basic/src/main/res/drawable/category_navigation.png
 delete mode 120000 basic/src/main/res/drawable/category_reading.png
 delete mode 120000 basic/src/main/res/drawable/category_science_education.png
 delete mode 120000 basic/src/main/res/drawable/category_security.png
 delete mode 120000 basic/src/main/res/drawable/category_system.png
 delete mode 120000 basic/src/main/res/drawable/category_theming.png
 delete mode 120000 basic/src/main/res/drawable/category_writing.png
 create mode 100644 basic/src/main/res/drawable/ic_launcher.png
 delete mode 100644 basic/src/main/res/drawable/ic_launcher_background.xml
 delete mode 100644 basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 delete mode 100644 basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index df519a543..958e96496 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -39,6 +39,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
     packaging {
         resources {
diff --git a/basic/src/main/AndroidManifest.xml b/basic/src/main/AndroidManifest.xml
index 93c98cbdd..c58d5cca5 100644
--- a/basic/src/main/AndroidManifest.xml
+++ b/basic/src/main/AndroidManifest.xml
@@ -4,9 +4,8 @@
     <application
         android:name=".App"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Fdroidclient">
         <activity
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 45799f712..e8b0168a1 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -37,24 +37,24 @@ class MainViewModel @Inject constructor(
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
     val categories = listOf(
-        Pair(app.getString(R.string.category_Internet), R.drawable.category_internet),
-        Pair(app.getString(R.string.category_Games), R.drawable.category_games),
-        Pair(app.getString(R.string.category_Navigation), R.drawable.category_navigation),
-        Pair(app.getString(R.string.category_Multimedia), R.drawable.category_money),
-        Pair(app.getString(R.string.category_Security), R.drawable.category_security),
-        Pair(app.getString(R.string.category_Reading), R.drawable.category_reading),
-        Pair(app.getString(R.string.category_Time), R.drawable.category_theming),
-        Pair(app.getString(R.string.category_Money), R.drawable.category_money),
-        Pair(app.getString(R.string.category_Theming), R.drawable.category_theming),
-        Pair(app.getString(R.string.category_Connectivity), R.drawable.category_connectivity),
-        Pair(app.getString(R.string.category_Phone_SMS), R.drawable.category_system),
+        Pair(app.getString(R.string.category_Internet), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Games), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Navigation), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Multimedia), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Security), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Reading), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Time), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Money), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Theming), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Connectivity), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Phone_SMS), R.drawable.ic_launcher),
         Pair(
             app.getString(R.string.category_Science_Education),
-            R.drawable.category_science_education
+            R.drawable.ic_launcher
         ),
-        Pair(app.getString(R.string.category_Sports_Health), R.drawable.category_security),
-        Pair(app.getString(R.string.category_System), R.drawable.category_system),
-        Pair(app.getString(R.string.category_Writing), R.drawable.category_writing),
+        Pair(app.getString(R.string.category_Sports_Health), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_System), R.drawable.ic_launcher),
+        Pair(app.getString(R.string.category_Writing), R.drawable.ic_launcher),
     )
 
     val initialApps = buildList {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/About.kt b/basic/src/main/java/org/fdroid/basic/ui/main/About.kt
index 23773e7f5..5b03e7890 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/About.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/About.kt
@@ -1,20 +1,37 @@
 package org.fdroid.basic.ui.main
 
+import android.content.res.Configuration
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.compose.ui.unit.dp
+import org.fdroid.basic.BuildConfig.VERSION_NAME
 import org.fdroid.basic.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
@@ -35,20 +52,76 @@ fun About(onBackClicked: () -> Unit) {
             )
         },
     ) { paddingValues ->
-        Text(
-            stringResource(R.string.about_title_full),
+        val scrollableState = rememberScrollState()
+        Column(
             modifier = Modifier
-                .padding(paddingValues)
-                .padding(16.dp)
+                .padding(horizontal = 16.dp)
+                .padding(top = paddingValues.calculateTopPadding())
+                .verticalScroll(scrollableState)
+        ) {
+            AboutHeader(modifier = Modifier.padding(top = 32.dp))
+            Text(
+                text = "F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. This app makes it easy to browse, install, and keep track of updates on your device.",
+                style = MaterialTheme.typography.bodyLarge,
+                modifier = Modifier.padding(top = 24.dp),
+            )
+            Column(modifier = Modifier.padding(top = 24.dp, bottom = 16.dp)) {
+                val uriHandler = LocalUriHandler.current
+                Text(
+                    text = "Links",
+                    fontWeight = FontWeight.Bold,
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+                Text(
+                    text = "Homepage",
+                    style = MaterialTheme.typography.bodyLarge,
+                    color = MaterialTheme.colorScheme.secondary,
+                    modifier = Modifier
+                        .padding(top = 4.dp)
+                        .clickable { uriHandler.openUri("https://f-droid.org") }
+                )
+                Text(
+                    text = "Gitlab",
+                    style = MaterialTheme.typography.bodyLarge,
+                    color = MaterialTheme.colorScheme.secondary,
+                    modifier = Modifier
+                        .padding(top = 4.dp)
+                        .clickable { uriHandler.openUri("https://gitlab.com/fdroid") }
+                )
+            }
+            Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+        }
+    }
+}
+
+@Composable
+fun AboutHeader(modifier: Modifier = Modifier) {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier.fillMaxWidth()
+    ) {
+        Image(
+            painter = painterResource(id = R.drawable.ic_launcher),
+            contentDescription = null, // decorative element
+        )
+        Text(
+            text = "${stringResource(R.string.about_version)} $VERSION_NAME",
+            style = MaterialTheme.typography.bodyLarge,
+            modifier = Modifier
+                .padding(top = 16.dp)
+                .alpha(0.75f)
         )
     }
 }
 
-@Preview
-@PreviewScreenSizes
+@Preview(showBackground = true)
 @Composable
 fun AboutPreview() {
     FDroidContent {
-        About {  }
+        About {}
     }
 }
+
+@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun AboutPreviewDark() = AboutPreview()
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
index fa5ba1f1e..ce3b41f0f 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
@@ -107,12 +107,12 @@ fun CategoryBox(category: Pair<String, Int>, onCategoryTap: (String) -> Unit) {
 @Composable
 fun CategoryCarouselPreview() {
     val categories = listOf(
-        Pair(stringResource(R.string.category_Time), R.drawable.category_theming),
-        Pair(stringResource(R.string.category_Games), R.drawable.category_games),
-        Pair(stringResource(R.string.category_Money), R.drawable.category_money),
-        Pair(stringResource(R.string.category_Reading), R.drawable.category_reading),
-        Pair(stringResource(R.string.category_Theming), R.drawable.category_theming),
-        Pair(stringResource(R.string.category_Connectivity), R.drawable.category_connectivity),
+        Pair(stringResource(R.string.category_Time), R.drawable.ic_launcher),
+        Pair(stringResource(R.string.category_Games), R.drawable.ic_launcher),
+        Pair(stringResource(R.string.category_Money), R.drawable.ic_launcher),
+        Pair(stringResource(R.string.category_Reading), R.drawable.ic_launcher),
+        Pair(stringResource(R.string.category_Theming), R.drawable.ic_launcher),
+        Pair(stringResource(R.string.category_Connectivity), R.drawable.ic_launcher),
     )
     FDroidContent {
         CategoryCarousel(categories, onTitleTap = {}) {}
diff --git a/basic/src/main/res/drawable-v24/ic_launcher_foreground.xml b/basic/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 7706ab9e6..000000000
--- a/basic/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
diff --git a/basic/src/main/res/drawable/category_connectivity.png b/basic/src/main/res/drawable/category_connectivity.png
deleted file mode 120000
index f9bf4859b..000000000
--- a/basic/src/main/res/drawable/category_connectivity.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_connectivity.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_development.png b/basic/src/main/res/drawable/category_development.png
deleted file mode 120000
index 9877c43db..000000000
--- a/basic/src/main/res/drawable/category_development.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_development.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_games.png b/basic/src/main/res/drawable/category_games.png
deleted file mode 120000
index d6c6a5e97..000000000
--- a/basic/src/main/res/drawable/category_games.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_games.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_graphics.png b/basic/src/main/res/drawable/category_graphics.png
deleted file mode 120000
index 9c06c883e..000000000
--- a/basic/src/main/res/drawable/category_graphics.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_graphics.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_internet.png b/basic/src/main/res/drawable/category_internet.png
deleted file mode 120000
index 7aa90b227..000000000
--- a/basic/src/main/res/drawable/category_internet.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_internet.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_money.png b/basic/src/main/res/drawable/category_money.png
deleted file mode 120000
index 66940a8df..000000000
--- a/basic/src/main/res/drawable/category_money.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_money.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_navigation.png b/basic/src/main/res/drawable/category_navigation.png
deleted file mode 120000
index 6a0ed59d2..000000000
--- a/basic/src/main/res/drawable/category_navigation.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_navigation.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_reading.png b/basic/src/main/res/drawable/category_reading.png
deleted file mode 120000
index 054ebf935..000000000
--- a/basic/src/main/res/drawable/category_reading.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_reading.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_science_education.png b/basic/src/main/res/drawable/category_science_education.png
deleted file mode 120000
index 2384b51de..000000000
--- a/basic/src/main/res/drawable/category_science_education.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_science_education.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_security.png b/basic/src/main/res/drawable/category_security.png
deleted file mode 120000
index eed4a3cc0..000000000
--- a/basic/src/main/res/drawable/category_security.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_security.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_system.png b/basic/src/main/res/drawable/category_system.png
deleted file mode 120000
index 23784d432..000000000
--- a/basic/src/main/res/drawable/category_system.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_system.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_theming.png b/basic/src/main/res/drawable/category_theming.png
deleted file mode 120000
index d79a9166a..000000000
--- a/basic/src/main/res/drawable/category_theming.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_theming.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/category_writing.png b/basic/src/main/res/drawable/category_writing.png
deleted file mode 120000
index 912639a30..000000000
--- a/basic/src/main/res/drawable/category_writing.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../app//src/main/res/drawable/category_writing.png
\ No newline at end of file
diff --git a/basic/src/main/res/drawable/ic_launcher.png b/basic/src/main/res/drawable/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..6107595cf86aff526de92931a9aebe5172d6b419
GIT binary patch
literal 10858
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
agGoHuHCwxL%pd+C1(aW_%U8;ph5kRWr7s!)

literal 0
HcmV?d00001

diff --git a/basic/src/main/res/drawable/ic_launcher_background.xml b/basic/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9cb..000000000
--- a/basic/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index b3e26b4c6..000000000
--- a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
diff --git a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index b3e26b4c6..000000000
--- a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

From 05e511325a87e461b4a0cd3c66b3c6d23be028db Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 26 May 2025 11:55:39 -0300
Subject: [PATCH 016/180] Improve app lists

---
 .../java/org/fdroid/basic/MainViewModel.kt    | 23 +++++++----
 .../fdroid/basic/ui/main/BottomBarScreen.kt   | 30 +++++++++++---
 .../java/org/fdroid/basic/ui/main/Main.kt     | 11 +++--
 .../fdroid/basic/ui/main/apps/MyAppsList.kt   |  4 +-
 .../fdroid/basic/ui/main/discover/Discover.kt | 15 +++----
 .../ui/main/discover/DiscoverScaffold.kt      | 23 +++++++++--
 .../basic/ui/main/discover/FilterPresenter.kt | 12 +++---
 .../org/fdroid/basic/ui/main/lists/AppList.kt | 41 +++++++++++--------
 .../ui/main/{discover => lists}/AppsFilter.kt | 28 ++++---------
 9 files changed, 110 insertions(+), 77 deletions(-)
 rename basic/src/main/java/org/fdroid/basic/ui/main/{discover => lists}/AppsFilter.kt (88%)

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index e8b0168a1..8b76a11fd 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -24,12 +24,13 @@ import org.fdroid.basic.ui.main.discover.FilterPresenter
 import org.fdroid.basic.ui.main.discover.NUM_ITEMS
 import org.fdroid.basic.ui.main.discover.Names
 import org.fdroid.basic.ui.main.discover.Sort
+import org.fdroid.basic.ui.main.lists.AppList
 import javax.inject.Inject
 
 @HiltViewModel
 class MainViewModel @Inject constructor(
     app: Application,
-    private val savedStateHandle: SavedStateHandle,
+    savedStateHandle: SavedStateHandle,
     val myAppsManager: MyAppsManager,
     private val appDetailsManager: AppDetailsManager,
     val repositoryManager: RepositoryManager,
@@ -70,8 +71,10 @@ class MainViewModel @Inject constructor(
         }
     }
 
-    private val _onlyInstalledApps = MutableStateFlow(false)
-    val onlyInstalledApps = _onlyInstalledApps.asStateFlow<Boolean>()
+    private val _currentList = MutableStateFlow<AppList>(AppList.New)
+    val currentList = _currentList.asStateFlow()
+    private val _showFilters = savedStateHandle.getMutableStateFlow("showFilters", true)
+    val showFilters = _showFilters.asStateFlow()
     private val _sortBy = MutableStateFlow<Sort>(Sort.LATEST)
     val sortBy = _sortBy.asStateFlow<Sort>()
     private val _addedCategories = MutableStateFlow<List<String>>(emptyList())
@@ -79,8 +82,8 @@ class MainViewModel @Inject constructor(
 
     val filterModel: StateFlow<FilterModel> = scope.launchMolecule(mode = ContextClock) {
         FilterPresenter(
+            areFiltersShownFlow = showFilters,
             appsFlow = flow { emit(initialApps) },
-            onlyInstalledAppsFlow = onlyInstalledApps,
             sortByFlow = sortBy,
             allCategories = categories.map { it.first },
             addedCategoriesFlow = addedCategories,
@@ -91,6 +94,9 @@ class MainViewModel @Inject constructor(
     val numUpdates = myAppsManager.numUpdates
     val appDetails = appDetailsManager.appDetails
 
+    fun setAppList(appList: AppList) {
+        _currentList.value = appList
+    }
 
     fun setAppDetails(app: MinimalApp) {
         val newApp = filterModel.value.apps.find { it.packageName == app.packageName }
@@ -101,6 +107,10 @@ class MainViewModel @Inject constructor(
         appDetailsManager.setAppDetails(newApp)
     }
 
+    fun toggleListFilterVisibility() {
+        _showFilters.update { !it }
+    }
+
     fun sortBy(sort: Sort) {
         _sortBy.update { sort }
     }
@@ -120,9 +130,4 @@ class MainViewModel @Inject constructor(
             }
         }
     }
-
-    fun showOnlyInstalledApps(onlyInstalled: Boolean) {
-        _onlyInstalledApps.update { onlyInstalled }
-    }
-
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
index ab7f1b923..f5ad9e162 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
@@ -32,9 +32,10 @@ import org.fdroid.basic.ui.main.apps.MyAppsScaffold
 import org.fdroid.basic.ui.main.apps.UpdatableApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.basic.ui.main.discover.DiscoverScaffold
-import org.fdroid.basic.ui.main.discover.FilterInfo
 import org.fdroid.basic.ui.main.discover.FilterModel
 import org.fdroid.basic.ui.main.discover.Sort
+import org.fdroid.basic.ui.main.lists.AppList
+import org.fdroid.basic.ui.main.lists.FilterInfo
 
 enum class BottomNavDestinations(
     @StringRes val label: Int,
@@ -50,11 +51,13 @@ fun BottomBarScreen(
     numUpdates: Int,
     updates: List<UpdatableApp>,
     installed: List<InstalledApp>,
+    appList: AppList,
     filterInfo: FilterInfo,
     currentItem: MinimalApp?,
     onSelectAppItem: (MinimalApp) -> Unit,
     sortBy: Sort,
     onSortChanged: (Sort) -> Unit,
+    onAppListChanged: (AppList) -> Unit,
 ) {
     var currentDestination by rememberSaveable { mutableStateOf(BottomNavDestinations.APPS) }
     val adaptiveInfo = currentWindowAdaptiveInfo()
@@ -98,11 +101,13 @@ fun BottomBarScreen(
     ) {
         when (currentDestination) {
             BottomNavDestinations.APPS -> DiscoverScaffold(
+                appList = appList,
                 apps = filterInfo.model.apps,
                 filterInfo = filterInfo,
                 onMainNav = onMainNav,
                 currentItem = currentItem,
                 onSelectAppItem = onSelectAppItem,
+                onAppListChanged = onAppListChanged,
                 modifier = Modifier,
             )
             BottomNavDestinations.UPDATES -> MyAppsScaffold(
@@ -126,20 +131,35 @@ fun BottomBarPreview() {
         AppNavigationItem("", "foo", "bar", false),
         AppNavigationItem("", "foo", "bar", false),
     )
+    var filterExpanded by rememberSaveable { mutableStateOf(true) }
     val filterInfo = object : FilterInfo {
         override val model = FilterModel(
             isLoading = false,
+            areFiltersShown = filterExpanded,
             apps = apps,
-            onlyInstalledApps = false,
             sortBy = Sort.NAME,
             allCategories = listOf("foo", "bar"),
             addedCategories = emptyList(),
         )
 
+        override fun toggleFilterVisibility() {}
         override fun sortBy(sort: Sort) {}
         override fun addCategory(category: String) {}
-        override fun removeCategory(category: String) {}
-        override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
+        override fun removeCategory(category: String) {
+            filterExpanded = !filterExpanded
+        }
     }
-    BottomBarScreen({ }, 2, emptyList(), emptyList(), filterInfo, null, {}, Sort.NAME, {})
+    BottomBarScreen(
+        onMainNav = { },
+        numUpdates = 2,
+        updates = emptyList(),
+        installed = emptyList(),
+        appList = AppList.New,
+        filterInfo = filterInfo,
+        currentItem = null,
+        onSelectAppItem = {},
+        sortBy = Sort.NAME,
+        onSortChanged = {},
+        onAppListChanged = {},
+    )
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index b71743b16..a213fe29a 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -14,8 +14,8 @@ import androidx.navigation.compose.rememberNavController
 import org.fdroid.basic.MainViewModel
 import org.fdroid.basic.R
 import org.fdroid.basic.ui.icons.PackageVariant
-import org.fdroid.basic.ui.main.discover.FilterInfo
 import org.fdroid.basic.ui.main.discover.Sort
+import org.fdroid.basic.ui.main.lists.FilterInfo
 import org.fdroid.basic.ui.main.repositories.RepositoriesScaffold
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
@@ -50,13 +50,14 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                 val installed = viewModel.installed.collectAsStateWithLifecycle().value
                 val filterInfo = object : FilterInfo {
                     override val model = viewModel.filterModel.collectAsStateWithLifecycle().value
+                    override fun toggleFilterVisibility() {
+                        viewModel.toggleListFilterVisibility()
+                    }
+
                     override fun sortBy(sort: Sort) = viewModel.sortBy(sort)
                     override fun addCategory(category: String) = viewModel.addCategory(category)
                     override fun removeCategory(category: String) =
                         viewModel.removeCategory(category)
-
-                    override fun showOnlyInstalledApps(onlyInstalled: Boolean) =
-                        viewModel.showOnlyInstalledApps(onlyInstalled)
                 }
                 val currentItem = viewModel.appDetails.collectAsStateWithLifecycle().value
                 BottomBarScreen(
@@ -64,6 +65,8 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                     numUpdates = numUpdates,
                     updates = updates,
                     installed = installed,
+                    onAppListChanged = viewModel::setAppList,
+                    appList = viewModel.currentList.collectAsStateWithLifecycle().value,
                     filterInfo = filterInfo,
                     currentItem = currentItem,
                     onSelectAppItem = viewModel::setAppDetails,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
index db2e5ab87..5be721956 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
@@ -133,7 +133,7 @@ fun MyAppsList(
                 Text(
                     text = stringResource(R.string.updates),
                     style = MaterialTheme.typography.titleMedium,
-                    modifier = Modifier.padding(horizontal = 16.dp),
+                    modifier = Modifier.padding(16.dp),
                 )
             }
             items(updatableApps, key = { it.packageName }, contentType = { "A" }) { app ->
@@ -157,7 +157,7 @@ fun MyAppsList(
                 Text(
                     text = stringResource(R.string.installed_apps__activity_title),
                     style = MaterialTheme.typography.titleMedium,
-                    modifier = Modifier.padding(horizontal = 16.dp),
+                    modifier = Modifier.padding(16.dp),
                 )
             }
             items(installedApps, key = { it.packageName }, contentType = { "B" }) { app ->
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
index 865784fa7..86b499087 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import org.fdroid.basic.ui.main.MainOverFlowMenu
+import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.basic.ui.main.topBarMenuItems
 
 @Composable
@@ -35,7 +36,7 @@ import org.fdroid.basic.ui.main.topBarMenuItems
 fun Discover(
     apps: List<AppNavigationItem>,
     modifier: Modifier = Modifier,
-    onTitleTap: () -> Unit,
+    onTitleTap: (AppList) -> Unit,
     onAppTap: (AppNavigationItem) -> Unit,
     onMainNav: (String) -> Unit,
 ) {
@@ -83,24 +84,24 @@ fun Discover(
         ) {
             AppsSearch(searchBarState, onAppTap, modifier = Modifier.padding(top = 8.dp))
             AppCarousel(
-                title = "New",
+                title = AppList.New.title,
                 apps = apps,
-                onTitleTap = onTitleTap,
+                onTitleTap = { onTitleTap(AppList.New) },
                 onAppTap = onAppTap,
             )
             AppCarousel(
-                title = "Recently updated",
+                title = AppList.RecentlyUpdated.title,
                 apps = apps.filter { it.packageName.toInt() % 2 == 0 },
-                onTitleTap = onTitleTap,
+                onTitleTap = { onTitleTap(AppList.RecentlyUpdated) },
                 onAppTap = onAppTap,
             )
             FilledTonalButton(
-                onClick = onTitleTap,
+                onClick = { onTitleTap(AppList.All) },
                 modifier = Modifier
                     .align(End)
                     .padding(16.dp),
             ) {
-                Text("All apps")
+                Text(AppList.All.title)
             }
         }
     }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
index 6420674a9..7c1468791 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
@@ -11,7 +11,11 @@ import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Det
 import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
@@ -23,6 +27,7 @@ import kotlinx.coroutines.launch
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.details.AppDetails
 import org.fdroid.basic.ui.main.lists.AppList
+import org.fdroid.basic.ui.main.lists.FilterInfo
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 enum class Sort {
@@ -35,10 +40,12 @@ const val NUM_ITEMS = 42
 @Composable
 @OptIn(ExperimentalMaterial3AdaptiveApi::class, ExperimentalMaterial3Api::class)
 fun DiscoverScaffold(
+    appList: AppList,
     apps: List<AppNavigationItem>,
     filterInfo: FilterInfo,
     onMainNav: (String) -> Unit,
     onSelectAppItem: (MinimalApp) -> Unit,
+    onAppListChanged: (AppList) -> Unit,
     currentItem: MinimalApp?,
     modifier: Modifier = Modifier,
 ) {
@@ -61,7 +68,10 @@ fun DiscoverScaffold(
                     composable("discover") {
                         Discover(
                             apps = apps,
-                            onTitleTap = { discoverNavController.navigate("list") },
+                            onTitleTap = {
+                                onAppListChanged(it)
+                                discoverNavController.navigate("list")
+                            },
                             onAppTap = {
                                 onSelectAppItem(it)
                                 scope.launch { navigator.navigateTo(Detail, it) }
@@ -72,6 +82,7 @@ fun DiscoverScaffold(
                     }
                     composable("list") {
                         AppList(
+                            appList = appList,
                             apps = apps,
                             filterInfo = filterInfo,
                             currentItem = if (isDetailVisible) currentItem else null,
@@ -105,21 +116,25 @@ fun DiscoverScaffoldPreview() {
             AppNavigationItem("2", "foo", "bar", false),
             AppNavigationItem("3", "foo", "bar", false),
         )
+        var filterExpanded by rememberSaveable { mutableStateOf(true) }
         val filterInfo = object : FilterInfo {
             override val model = FilterModel(
                 isLoading = false,
+                areFiltersShown = filterExpanded,
                 apps = apps,
-                onlyInstalledApps = false,
                 sortBy = Sort.NAME,
                 allCategories = listOf("foo", "bar"),
                 addedCategories = emptyList(),
             )
 
+            override fun toggleFilterVisibility() {
+                filterExpanded = !filterExpanded
+            }
+
             override fun sortBy(sort: Sort) {}
             override fun addCategory(category: String) {}
             override fun removeCategory(category: String) {}
-            override fun showOnlyInstalledApps(onlyInstalled: Boolean) {}
         }
-        DiscoverScaffold(apps, filterInfo, {}, {}, null)
+        DiscoverScaffold(AppList.New, apps, filterInfo, {}, {}, {}, null)
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
index 667a68286..dfd1d8f7b 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
@@ -4,34 +4,32 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
+import java.util.Locale
 
 @Composable
 fun FilterPresenter(
+    areFiltersShownFlow: StateFlow<Boolean>,
     appsFlow: Flow<List<AppNavigationItem>>,
-    onlyInstalledAppsFlow: StateFlow<Boolean>,
     sortByFlow: StateFlow<Sort>,
     allCategories: List<String>,
     addedCategoriesFlow: StateFlow<List<String>>,
 ): FilterModel {
     val apps = appsFlow.collectAsState(null).value
-    val onlyInstalledApps = onlyInstalledAppsFlow.collectAsState().value
     val sortBy = sortByFlow.collectAsState().value
     val addedCategories = addedCategoriesFlow.collectAsState().value
 
     val newApps = apps?.filter { app ->
-        if (onlyInstalledApps) app.packageName.toInt() % 2 > 0 else true
-    }?.filter { app ->
         addedCategories.isEmpty() || addedCategories.any { app.summary.contains(it) }
     } ?: emptyList()
 
     return FilterModel(
         isLoading = apps == null,
+        areFiltersShown = areFiltersShownFlow.collectAsState().value,
         apps = if (sortBy == Sort.NAME) {
-            newApps.sortedBy { it.packageName.toInt() }
+            newApps.sortedBy { it.name.lowercase(Locale.getDefault()) }
         } else {
             newApps.sortedByDescending { it.packageName.toInt() }
         },
-        onlyInstalledApps = onlyInstalledApps,
         sortBy = sortBy,
         allCategories = allCategories,
         addedCategories = addedCategories,
@@ -40,8 +38,8 @@ fun FilterPresenter(
 
 data class FilterModel(
     val isLoading: Boolean,
+    val areFiltersShown: Boolean,
     val apps: List<AppNavigationItem>,
-    val onlyInstalledApps: Boolean,
     val sortBy: Sort,
     val allCategories: List<String>,
     val addedCategories: List<String>,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
index 657448587..2ea542eae 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
@@ -1,5 +1,6 @@
 package org.fdroid.basic.ui.main.lists
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -26,26 +27,28 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarDefaults.exitUntilCollapsedScrollBehavior
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
-import org.fdroid.basic.ui.main.discover.AppsFilter
-import org.fdroid.basic.ui.main.discover.FilterInfo
+
+sealed class AppList(val title: String) {
+    data object New : AppList("New apps")
+    data object RecentlyUpdated : AppList("Recently updated")
+    data object All : AppList("All apps")
+}
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppList(
+    appList: AppList,
     apps: List<AppNavigationItem>,
     filterInfo: FilterInfo,
     currentItem: MinimalApp?,
@@ -54,13 +57,12 @@ fun AppList(
     onItemClick: (AppNavigationItem) -> Unit,
 ) {
     val scrollBehavior = exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
-    var filterExpanded by rememberSaveable { mutableStateOf(true) }
     val addedRepos = remember { mutableStateListOf<String>() }
     Scaffold(
         topBar = {
             TopAppBar(
                 title = {
-                        Text("New apps")
+                    Text(appList.title)
                 },
                 navigationIcon = {
                     IconButton(onClick = onBackClicked) {
@@ -68,10 +70,9 @@ fun AppList(
                     }
                 },
                 actions = {
-                    IconButton(onClick = { filterExpanded = !filterExpanded }) {
+                    IconButton(onClick = { filterInfo.toggleFilterVisibility() }) {
                         val showFilterBadge = addedRepos.isNotEmpty() ||
-                            filterInfo.model.addedCategories.isNotEmpty() ||
-                            filterInfo.model.onlyInstalledApps
+                            filterInfo.model.addedCategories.isNotEmpty()
                         BadgedBox(badge = {
                             if (showFilterBadge) Badge(containerColor = MaterialTheme.colorScheme.secondary)
                         }) {
@@ -87,21 +88,24 @@ fun AppList(
         },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
-        Column(modifier = Modifier.padding(paddingValues)) {
+        Column(
+            modifier = Modifier
+                .padding(paddingValues),
+        ) {
             AppsFilter(
-                filterExpanded = filterExpanded,
                 filter = filterInfo,
                 addedRepos = addedRepos,
+                modifier = Modifier.background(TopAppBarDefaults.topAppBarColors().containerColor),
             )
             LazyColumn(
                 contentPadding = PaddingValues(vertical = 8.dp),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
                 modifier = Modifier.then(
-                        if (currentItem == null) Modifier
-                        else Modifier.selectableGroup()
-                    ),
+                    if (currentItem == null) Modifier
+                    else Modifier.selectableGroup()
+                ),
             ) {
-                items(apps) { navItem ->
+                items(apps, key = { it.packageName }, contentType = { "A" }) { navItem ->
                     val isSelected = currentItem?.packageName == navItem.packageName
                     val interactionModifier = if (currentItem == null) {
                         Modifier.clickable(
@@ -115,11 +119,12 @@ fun AppList(
                     }
                     val modifier = Modifier
                         .fillMaxWidth()
+                        .animateItem()
                         .padding(horizontal = 8.dp)
                         .then(interactionModifier)
                     AppItem(navItem.name, navItem.summary, navItem.isNew, isSelected, modifier)
                 }
-                item {
+                item(contentType = "S") {
                     Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
                 }
             }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsFilter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
similarity index 88%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsFilter.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
index a21e75fad..2ff705922 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsFilter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
@@ -1,9 +1,10 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.basic.ui.main.lists
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
@@ -11,7 +12,6 @@ import androidx.compose.material.icons.filled.AccessTime
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.Clear
-import androidx.compose.material.icons.filled.Done
 import androidx.compose.material.icons.filled.SortByAlpha
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -25,29 +25,29 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.R
+import org.fdroid.basic.ui.main.discover.FilterModel
+import org.fdroid.basic.ui.main.discover.Sort
 
 interface FilterInfo {
     val model: FilterModel
 
+    fun toggleFilterVisibility()
     fun sortBy(sort: Sort)
     fun addCategory(category: String)
     fun removeCategory(category: String)
-    fun showOnlyInstalledApps(onlyInstalled: Boolean)
 }
 
 @Composable
 fun ColumnScope.AppsFilter(
-    filterExpanded: Boolean,
     filter: FilterInfo,
     addedRepos: MutableList<String>,
     modifier: Modifier = Modifier,
 ) {
-    AnimatedVisibility(filterExpanded) {
+    AnimatedVisibility(filter.model.areFiltersShown) {
         FlowRow(
             modifier = modifier
+                .fillMaxWidth()
                 .padding(horizontal = 16.dp),
             horizontalArrangement = spacedBy(16.dp),
         ) {
@@ -100,20 +100,6 @@ fun ColumnScope.AppsFilter(
                 },
                 onClick = { sortByMenuExpanded = !sortByMenuExpanded },
             )
-            FilterChip(
-                selected = filter.model.onlyInstalledApps,
-                leadingIcon = if (filter.model.onlyInstalledApps) {
-                    {
-                        Icon(
-                            imageVector = Icons.Filled.Done,
-                            contentDescription = null,
-                            modifier = Modifier.size(FilterChipDefaults.IconSize),
-                        )
-                    }
-                } else null,
-                label = { Text(stringResource(R.string.app_installed)) },
-                onClick = { filter.showOnlyInstalledApps(!filter.model.onlyInstalledApps) },
-            )
             FilterChip(
                 selected = false,
                 leadingIcon = {

From ebee6c48c55e815f489a0dc1d87c5628f24751d4 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 26 May 2025 17:32:55 -0300
Subject: [PATCH 017/180] App details screen

---
 basic/build.gradle.kts                        |   4 +
 basic/src/main/AndroidManifest.xml            |   3 +
 basic/src/main/java/org/fdroid/IndexFile.kt   |  10 +
 .../main/java/org/fdroid/basic/ui/Utils.kt    |  12 +
 .../basic/ui/main/details/AppDetails.kt       | 241 ++++++++++++++++--
 .../org/fdroid/basic/ui/main/details/IApp.kt  | 168 ++++++++++++
 .../fdroid/basic/ui/main/details/License.kt   |  86 +++++++
 gradle/libs.versions.toml                     |   3 +
 8 files changed, 510 insertions(+), 17 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/IndexFile.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/Utils.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/License.kt

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index 958e96496..e43eb1b4d 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -49,6 +49,8 @@ android {
 }
 
 dependencies {
+    implementation(project(":libs:index"))
+    implementation(project(":libs:database"))
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -64,6 +66,8 @@ dependencies {
     implementation(libs.androidx.compose.material3.adaptive.navigation)
     implementation(libs.androidx.compose.material3.adaptive.navigation.suite.android)
     implementation(libs.molecule.runtime)
+    implementation(libs.coil.compose)
+    implementation(libs.coil.network.okhttp)
 
     implementation(libs.hilt.android)
     implementation(libs.androidx.hilt.navigation.compose)
diff --git a/basic/src/main/AndroidManifest.xml b/basic/src/main/AndroidManifest.xml
index c58d5cca5..5956f2a95 100644
--- a/basic/src/main/AndroidManifest.xml
+++ b/basic/src/main/AndroidManifest.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
     <application
         android:name=".App"
         android:allowBackup="true"
diff --git a/basic/src/main/java/org/fdroid/IndexFile.kt b/basic/src/main/java/org/fdroid/IndexFile.kt
new file mode 100644
index 000000000..84b646754
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/IndexFile.kt
@@ -0,0 +1,10 @@
+package org.fdroid
+
+public interface IndexFile {
+    public val name: String
+    public val sha256: String?
+    public val size: Long?
+    public val ipfsCidV1: String?
+
+    public fun serialize(): String
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Utils.kt b/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
new file mode 100644
index 000000000..9ecdde674
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
@@ -0,0 +1,12 @@
+package org.fdroid.basic.ui
+
+import android.text.format.DateUtils
+
+fun Long.asRelativeTimeString(): String {
+    return DateUtils.getRelativeTimeSpanString(
+        this,
+        System.currentTimeMillis(),
+        DateUtils.MINUTE_IN_MILLIS,
+        DateUtils.FORMAT_ABBREV_ALL
+    ).toString()
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
index e04854eea..7e97b5b13 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
@@ -2,45 +2,252 @@ package org.fdroid.basic.ui.main.details
 
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Android
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material3.Button
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
+import androidx.compose.material3.carousel.rememberCarouselState
+import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter.Companion.tint
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import org.fdroid.basic.R
+import org.fdroid.basic.ui.asRelativeTimeString
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun AppDetails(
     appItem: MinimalApp?,
     modifier: Modifier = Modifier,
 ) {
+    val topAppBarState = rememberTopAppBarState()
+    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(topAppBarState)
     if (appItem == null) CircularProgressIndicator()
-    else Row(
-        modifier = modifier
-            .safeDrawingPadding()
-            .padding(16.dp),
-        horizontalArrangement = spacedBy(8.dp),
-    ) {
-        Icon(
-            Icons.Filled.Android,
-            tint = MaterialTheme.colorScheme.secondary,
-            contentDescription = null,
-            modifier = Modifier.size(48.dp),
-        )
-        Column {
-            Text(appItem.name ?: "Unknown app", style = MaterialTheme.typography.headlineMedium)
-            Text("Summary foo bar", style = MaterialTheme.typography.bodyMedium)
+    else Scaffold(
+        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        topBar = {
+            TopAppBar(
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = Color.Transparent,
+                ),
+                title = {
+                    if (topAppBarState.overlappedFraction == 1f) {
+                        Text(appItem.name ?: "unknown app")
+                    }
+                },
+                navigationIcon = {
+                    IconButton(onClick = { /* do something */ }) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = "Localized description"
+                        )
+                    }
+                },
+                actions = {
+                    IconButton(onClick = { /* do something */ }) {
+                        Icon(
+                            imageVector = Icons.Filled.Share,
+                            contentDescription = "Localized description"
+                        )
+                    }
+                    IconButton(onClick = { /* do something */ }) {
+                        Icon(
+                            imageVector = Icons.Filled.MoreVert,
+                            contentDescription = "Localized description"
+                        )
+                    }
+                },
+                scrollBehavior = scrollBehavior,
+            )
+        },
+    ) { innerPadding ->
+        val item = newPipe
+        Column(
+            modifier = modifier
+                .verticalScroll(rememberScrollState())
+                .fillMaxWidth(),
+        ) {
+            item.featureGraphic?.let { featureGraphic ->
+                AsyncImage(
+                    model = featureGraphic.name,
+                    contentDescription = "",
+                    contentScale = ContentScale.FillWidth,
+                    onError = {
+                        // TODO Spacer(modifier = Modifier.padding(innerPadding))
+                    },
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .heightIn(max = 196.dp)
+                        .padding(bottom = 8.dp),
+                    error = rememberVectorPainter(Icons.Default.Error),
+                )
+            } ?: Spacer(modifier = Modifier.padding(innerPadding))
+            Row(
+                modifier = Modifier
+                    .padding(horizontal = 16.dp),
+                horizontalArrangement = spacedBy(8.dp),
+            ) {
+                item.icon?.let { icon ->
+                    AsyncImage(
+                        model = icon.name,
+                        contentDescription = "",
+                        placeholder = rememberVectorPainter(Icons.Default.Image),
+                        error = rememberVectorPainter(Icons.Default.Error),
+                        modifier = Modifier.size(64.dp),
+                    )
+                }
+                Column {
+                    Text(
+                        item.app.name ?: "Unknown app",
+                        style = MaterialTheme.typography.headlineMediumEmphasized
+                    )
+                    item.app.metadata.authorName?.let { authorName ->
+                        Text(
+                            text = "By $authorName",
+                            style = MaterialTheme.typography.bodyMedium,
+                        )
+                    }
+                    val lastUpdated = item.app.metadata.lastUpdated.asRelativeTimeString()
+                    Text(
+                        text = "Last updated: $lastUpdated (11.91 MB)",
+                        style = MaterialTheme.typography.bodyMedium,
+                    )
+                }
+            }
+            item.app.summary?.let { summary ->
+                Text(
+                    text = summary,
+                    style = MaterialTheme.typography.bodyLargeEmphasized,
+                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                )
+            }
+            Row(
+                horizontalArrangement = spacedBy(8.dp),
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Button(onClick = {}, modifier = Modifier.weight(1f)) {
+                    Text("Install")
+                }
+            }
+            item.whatsNew?.let { whatsNew ->
+                ElevatedCard(
+                    colors = CardDefaults.elevatedCardColors(
+                        containerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+                    ),
+                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                ) {
+                    Text(
+                        text = "What's new",
+                        style = MaterialTheme.typography.titleMediumEmphasized,
+                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                    )
+                    Text(
+                        text = whatsNew,
+                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                    )
+                }
+            }
+            item.description?.let { description ->
+                Text(
+                    text = description,
+                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                )
+            }
+            val carouselState = rememberCarouselState { item.phoneScreenshots.size }
+            HorizontalUncontainedCarousel(
+                state = carouselState,
+                itemWidth = 135.dp,
+                itemSpacing = 0.dp,
+                contentPadding = PaddingValues(horizontal = 16.dp),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(240.dp)
+                    .padding(vertical = 8.dp)
+            ) { index ->
+                AsyncImage(
+                    model = item.phoneScreenshots[index].name,
+                    contentDescription = "",
+                    placeholder = rememberVectorPainter(Icons.Default.Image),
+                    error = rememberVectorPainter(Icons.Default.Error),
+                    modifier = Modifier.widthIn(min = 135.dp)
+                )
+            }
+            // Anti-Features
+            Text(
+                text = stringResource(R.string.antifeatures),
+                style = MaterialTheme.typography.titleMediumEmphasized,
+                modifier = Modifier.padding(horizontal = 16.dp),
+            )
+            item.antiFeatures?.forEach { antiFeature ->
+                ListItem(
+                    leadingContent = {
+                        antiFeature.icon?.let { icon ->
+                            AsyncImage(
+                                model = icon.name,
+                                contentDescription = "",
+                                colorFilter = tint(MaterialTheme.colorScheme.onBackground),
+                                error = rememberVectorPainter(Icons.Filled.Error),
+                                modifier = Modifier.size(48.dp),
+                            )
+                        }
+                    },
+                    headlineContent = {
+                        Text(
+                            text = antiFeature.name,
+                            style = MaterialTheme.typography.bodyMediumEmphasized,
+                        )
+                    },
+                    supportingContent = {
+                        antiFeature.reason?.let {
+                            Text(
+                                text = antiFeature.reason,
+                                style = MaterialTheme.typography.labelMedium,
+                            )
+                        }
+                    },
+                    colors = ListItemDefaults.colors(containerColor = Color.Transparent),
+                )
+            }
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
new file mode 100644
index 000000000..24278bdea
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
@@ -0,0 +1,168 @@
+package org.fdroid.basic.ui.main.details
+
+import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
+import androidx.core.os.LocaleListCompat
+import org.fdroid.basic.ui.main.apps.MinimalApp
+import org.fdroid.database.AppMetadata
+import org.fdroid.database.AppVersion
+import org.fdroid.index.v2.FileV2
+import java.util.concurrent.TimeUnit
+import kotlin.random.Random
+
+data class AppDetailsItem(
+    val app: IApp,
+    val whatsNew: String? = null,
+    val versions: List<AppVersion>? = null,
+    val installedVersion: AppVersion? = null,
+    val suggestedVersion: AppVersion? = null,
+    val antiFeatures: List<AntiFeature>? = null,
+) {
+    private val localeList = LocaleListCompat.getDefault()
+    val description: String? get() = app.getDescription(localeList)
+    val icon: FileV2? get() = app.getIcon(localeList)
+    val video: String? get() = app.getVideo(localeList)
+    val featureGraphic: FileV2? get() = app.getFeatureGraphic(localeList)
+    val phoneScreenshots: List<FileV2> get() = app.getPhoneScreenshots(localeList)
+    val installedVersionCode: Long? get() = installedVersion?.manifest?.versionCode
+    val installedVersionName: String? get() = installedVersion?.manifest?.versionName
+}
+
+data class AntiFeature(
+    val id: String,
+    val icon: FileV2?,
+    val name: String,
+    val reason: String? = null,
+)
+
+interface IApp : MinimalApp {
+    val repoId: Long
+    override val packageName: String
+    override val name: String?
+    val summary: String?
+    val metadata: AppMetadata
+
+    fun getDescription(localeList: LocaleListCompat): String?
+    fun getVideo(localeList: LocaleListCompat): String?
+    fun getIcon(localeList: LocaleListCompat): FileV2?
+    fun getFeatureGraphic(localeList: LocaleListCompat): FileV2?
+    fun getPromoGraphic(localeList: LocaleListCompat): FileV2?
+    fun getTvBanner(localeList: LocaleListCompat): FileV2?
+    fun getPhoneScreenshots(localeList: LocaleListCompat): List<FileV2>
+    fun getSevenInchScreenshots(localeList: LocaleListCompat): List<FileV2>
+    fun getTenInchScreenshots(localeList: LocaleListCompat): List<FileV2>
+    fun getTvScreenshots(localeList: LocaleListCompat): List<FileV2>
+    fun getWearScreenshots(localeList: LocaleListCompat): List<FileV2>
+}
+
+private val long_min = TimeUnit.DAYS.toMillis(1)
+private val long_max = TimeUnit.DAYS.toMillis(365 * 3)
+
+data class TestApp(
+    override val repoId: Long = -1,
+    override val packageName: String,
+    override val name: String?,
+    override val summary: String?,
+    val description: String? = null,
+    val icon: FileV2? = null,
+    val featureGraphic: FileV2? = null,
+    val phoneScreenshots: List<FileV2> = emptyList(),
+    override val metadata: AppMetadata = AppMetadata(
+        repoId = repoId,
+        packageName = packageName,
+        added = System.currentTimeMillis() - Random.nextLong(),
+        lastUpdated = System.currentTimeMillis() - Random.nextLong(long_min, long_max),
+        isCompatible = true,
+    )
+) : IApp {
+    override fun getIcon(localeList: LocaleListCompat): FileV2? = icon
+    override fun getDescription(localeList: LocaleListCompat): String? = description
+    override fun getFeatureGraphic(localeList: LocaleListCompat): FileV2? = featureGraphic
+    override fun getPhoneScreenshots(localeList: LocaleListCompat): List<FileV2> = phoneScreenshots
+
+    override fun getVideo(localeList: LocaleListCompat): String? = null
+    override fun getPromoGraphic(localeList: LocaleListCompat): FileV2? = null
+    override fun getTvBanner(localeList: LocaleListCompat): FileV2? = null
+
+    override fun getSevenInchScreenshots(localeList: LocaleListCompat): List<FileV2> = emptyList()
+    override fun getTenInchScreenshots(localeList: LocaleListCompat): List<FileV2> = emptyList()
+    override fun getTvScreenshots(localeList: LocaleListCompat): List<FileV2> = emptyList()
+    override fun getWearScreenshots(localeList: LocaleListCompat): List<FileV2> = emptyList()
+}
+
+val newPipeApp = TestApp(
+    packageName = "org.schabi.newpipe",
+    name = "NewPipe",
+    summary = "Lightweight YouTube frontend",
+    description = "NewPipe does not use any Google framework libraries, or the YouTube API. " +
+        "It only parses the website in order to gain the information it needs. " +
+        "Therefore this app can be used on devices without Google Services installed. " +
+        "Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.\n\n" +
+        LoremIpsum(256).values.joinToString(" "),
+    metadata = AppMetadata(
+        repoId = 1,
+        packageName = "org.schabi.newpipe",
+        added = 1441756800000,
+        lastUpdated = 1747214796000,
+        webSite = "https://newpipe.net",
+        changelog = "https://github.com/TeamNewPipe/NewPipe/releases",
+        license = "GPL-3.0-or-later",
+        sourceCode = "https://github.com/TeamNewPipe/NewPipe",
+        issueTracker = "https://github.com/TeamNewPipe/NewPipe/issues",
+        translation = "https://hosted.weblate.org/projects/newpipe/",
+        preferredSigner = "cb84069bd68116bafae5ee4ee5b08a567aa6d898404e7cb12f9e756df5cf5cab",
+        video = null,
+        authorName = "Team NewPipe",
+        authorEmail = "team@newpipe.net",
+        authorWebSite = null,
+        authorPhone = null,
+        donate = listOf("https://newpipe.net/donate"),
+        liberapayID = null,
+        liberapay = "TeamNewPipe",
+        openCollective = null,
+        bitcoin = null,
+        litecoin = null,
+        flattrID = null,
+        categories = listOf("Internet", "Multimedia"),
+        isCompatible = true,
+    ),
+    icon = FileV2(name = "https://f-droid.org/repo/org.schabi.newpipe/en-US/icon_OHy4y1W-fJCNhHHOBCM9V_cxZNJJgbcNkB-x7UDTY9Q=.png"),
+    featureGraphic = FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/featureGraphic_aeQS-fmo5GZhNiioPTtd8Sjgb53Mvvg6LOV2ww-irYA=.png"),
+    phoneScreenshots = listOf(
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/00.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/01.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/02.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/03.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/04.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/05.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/06.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/07.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/08.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_01.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_02.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_03.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_04.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_05.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_06.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_07.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_08.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_09.png"),
+        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_10.png"),
+    ),
+)
+
+val newPipe = AppDetailsItem(
+    app = newPipeApp,
+    antiFeatures = listOf(
+        AntiFeature(
+            id = "NonFreeNet",
+            icon = FileV2("https://f-droid.org/repo/icons/ic_antifeature_nonfreenet.png"),
+            name = "This app promotes or depends entirely on a non-free network service",
+            reason = "Depends on Youtube for videos.",
+        )
+    ),
+    whatsNew = "This release fixes YouTube only providing a 360p stream.\n\n" +
+        "Note that the solution employed in this version is likely temporary, " +
+        "and in the long run the SABR video protocol needs to be implemented, " +
+        "but TeamNewPipe members are currently busy so any help would be greatly appreciated! " +
+        "https://github.com/TeamNewPipe/NewPipe/issues/12248",
+)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/License.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/License.kt
new file mode 100644
index 000000000..1c6932657
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/License.kt
@@ -0,0 +1,86 @@
+package org.fdroid.basic.ui.main.details
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathFillType
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.StrokeJoin
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+
+public val License: ImageVector
+    get() {
+        if (_License != null) {
+            return _License!!
+        }
+        _License = ImageVector.Builder(
+            name = "License",
+            defaultWidth = 24.dp,
+            defaultHeight = 24.dp,
+            viewportWidth = 960f,
+            viewportHeight = 960f
+        ).apply {
+            path(
+                fill = SolidColor(Color.Black),
+                fillAlpha = 1.0f,
+                stroke = null,
+                strokeAlpha = 1.0f,
+                strokeLineWidth = 1.0f,
+                strokeLineCap = StrokeCap.Butt,
+                strokeLineJoin = StrokeJoin.Miter,
+                strokeLineMiter = 1.0f,
+                pathFillType = PathFillType.NonZero
+            ) {
+                moveTo(480f, 520f)
+                quadToRelative(-50f, 0f, -85f, -35f)
+                reflectiveQuadToRelative(-35f, -85f)
+                reflectiveQuadToRelative(35f, -85f)
+                reflectiveQuadToRelative(85f, -35f)
+                reflectiveQuadToRelative(85f, 35f)
+                reflectiveQuadToRelative(35f, 85f)
+                reflectiveQuadToRelative(-35f, 85f)
+                reflectiveQuadToRelative(-85f, 35f)
+                moveToRelative(0f, 320f)
+                lineTo(293f, 902f)
+                quadToRelative(-20f, 7f, -36.5f, -5f)
+                reflectiveQuadTo(240f, 865f)
+                verticalLineToRelative(-254f)
+                quadToRelative(-38f, -42f, -59f, -96f)
+                reflectiveQuadToRelative(-21f, -115f)
+                quadToRelative(0f, -134f, 93f, -227f)
+                reflectiveQuadToRelative(227f, -93f)
+                reflectiveQuadToRelative(227f, 93f)
+                reflectiveQuadToRelative(93f, 227f)
+                quadToRelative(0f, 61f, -21f, 115f)
+                reflectiveQuadToRelative(-59f, 96f)
+                verticalLineToRelative(254f)
+                quadToRelative(0f, 20f, -16.5f, 32f)
+                reflectiveQuadTo(667f, 902f)
+                close()
+                moveToRelative(0f, -200f)
+                quadToRelative(100f, 0f, 170f, -70f)
+                reflectiveQuadToRelative(70f, -170f)
+                reflectiveQuadToRelative(-70f, -170f)
+                reflectiveQuadToRelative(-170f, -70f)
+                reflectiveQuadToRelative(-170f, 70f)
+                reflectiveQuadToRelative(-70f, 170f)
+                reflectiveQuadToRelative(70f, 170f)
+                reflectiveQuadToRelative(170f, 70f)
+                moveTo(320f, 801f)
+                lineToRelative(160f, -41f)
+                lineToRelative(160f, 41f)
+                verticalLineToRelative(-124f)
+                quadToRelative(-35f, 20f, -75.5f, 31.5f)
+                reflectiveQuadTo(480f, 720f)
+                reflectiveQuadToRelative(-84.5f, -11.5f)
+                reflectiveQuadTo(320f, 677f)
+                close()
+                moveToRelative(160f, -62f)
+            }
+        }.build()
+        return _License!!
+    }
+
+private var _License: ImageVector? = null
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f2f9f7e1e..4f2f5409b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,6 +17,7 @@ okhttp = "4.12.0"
 room = "2.8.3"
 glide = "5.0.5"
 glideCompose = "1.0.0-beta08"
+coilCompose = "3.3.0"
 molecule = "2.2.0"
 
 androidxCoreKtx = "1.17.0"
@@ -125,6 +126,8 @@ glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" }
 glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glideCompose" }
 glide-annotations = { module = "com.github.bumptech.glide:annotations", version.ref = "glide" }
+coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" }
+coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coilCompose" }
 
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }

From 834101c64be78e19841234bf851d460d705b79e0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 29 May 2025 14:37:56 -0300
Subject: [PATCH 018/180] use real repo icons for apps everywhere

---
 .../java/org/fdroid/basic/MainViewModel.kt    |  18 +-
 .../org/fdroid/basic/manager/MyAppsManager.kt |  13 +-
 .../main/java/org/fdroid/basic/ui/Icons.kt    | 572 ++++++++++++++++++
 .../basic/ui/{main/discover => }/Names.kt     |   2 +-
 .../fdroid/basic/ui/main/BottomBarScreen.kt   |   6 +-
 .../fdroid/basic/ui/main/apps/InstalledApp.kt |   2 +
 .../basic/ui/main/apps/InstalledAppRow.kt     |  11 +-
 .../basic/ui/main/apps/MyAppsScaffold.kt      |   9 +-
 .../fdroid/basic/ui/main/apps/UpdatableApp.kt |   1 +
 .../basic/ui/main/apps/UpdatableAppRow.kt     |   9 +-
 .../basic/ui/main/details/AppDetails.kt       |   2 +
 .../org/fdroid/basic/ui/main/details/IApp.kt  |   6 +-
 .../basic/ui/main/discover/AppCarousel.kt     |  25 +-
 .../ui/main/discover/AppNavigationItem.kt     |   1 +
 .../ui/main/discover/DiscoverScaffold.kt      |   6 +-
 .../org/fdroid/basic/ui/main/lists/AppItem.kt |  16 +-
 .../org/fdroid/basic/ui/main/lists/AppList.kt |   9 +-
 17 files changed, 677 insertions(+), 31 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/Icons.kt
 rename basic/src/main/java/org/fdroid/basic/ui/{main/discover => }/Names.kt (99%)

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 8b76a11fd..d7754a9ec 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -17,12 +17,13 @@ import kotlinx.coroutines.flow.update
 import org.fdroid.basic.manager.AppDetailsManager
 import org.fdroid.basic.manager.MyAppsManager
 import org.fdroid.basic.manager.RepositoryManager
+import org.fdroid.basic.ui.Icons
+import org.fdroid.basic.ui.Names
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.basic.ui.main.discover.FilterModel
 import org.fdroid.basic.ui.main.discover.FilterPresenter
 import org.fdroid.basic.ui.main.discover.NUM_ITEMS
-import org.fdroid.basic.ui.main.discover.Names
 import org.fdroid.basic.ui.main.discover.Sort
 import org.fdroid.basic.ui.main.lists.AppList
 import javax.inject.Inject
@@ -63,6 +64,13 @@ class MainViewModel @Inject constructor(
             val category = categories.getOrElse(i) { categories.random() }.first
             val navItem = AppNavigationItem(
                 packageName = "$i",
+                icon = when (i) {
+                    0 -> "https://f-droid.org/repo/icons/org.wikimedia.commons.wikimedia.1.png"
+                    1 -> "https://f-droid.org/repo/org.videolan.vlc/en-US/icon_yAfSvPRJukZzMMfUzvbYqwaD1XmHXNtiPBtuPVHW-6s=.png"
+                    2 -> "https://f-droid.org/repo/net.thunderbird.android/en-US/icon_llBuXRxsJFITCCuDze-ENOPa1J_HFZLudN5K3gU-xiU=.png"
+                    3 -> "https://f-droid.org/repo/org.schabi.newpipe/en-US/icon_OHy4y1W-fJCNhHHOBCM9V_cxZNJJgbcNkB-x7UDTY9Q=.png"
+                    else -> Icons.randomIcon
+                },
                 name = Names.randomName,
                 summary = "Summary of the app • $category",
                 isNew = i > NUM_ITEMS - 4,
@@ -102,7 +110,13 @@ class MainViewModel @Inject constructor(
         val newApp = filterModel.value.apps.find { it.packageName == app.packageName }
             ?: (updates.value.find { it.packageName == app.packageName }
                 ?: installed.value.find { it.packageName == app.packageName })?.let {
-                AppNavigationItem(it.packageName, it.name ?: "Unknown app", "Summary", false)
+                AppNavigationItem(
+                    packageName = it.packageName,
+                    name = it.name ?: "Unknown app",
+                    icon = it.icon,
+                    summary = "Summary",
+                    isNew = false
+                )
             }
         appDetailsManager.setAppDetails(newApp)
     }
diff --git a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
index 7f741e48d..93a7264b9 100644
--- a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
+++ b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
@@ -7,9 +7,10 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import org.fdroid.basic.ui.Icons
+import org.fdroid.basic.ui.Names
 import org.fdroid.basic.ui.main.apps.InstalledApp
 import org.fdroid.basic.ui.main.apps.UpdatableApp
-import org.fdroid.basic.ui.main.discover.Names
 import org.fdroid.basic.ui.main.discover.Sort
 import java.util.Locale
 import javax.inject.Inject
@@ -31,36 +32,43 @@ class MyAppsManager @Inject constructor() {
             InstalledApp(
                 packageName = "1000",
                 name = Names.randomName,
+                icon = Icons.randomIcon,
                 versionName = "1.0.1",
             ),
             InstalledApp(
                 packageName = "1001",
                 name = Names.randomName,
+                icon = Icons.randomIcon,
                 versionName = "0.1",
             ),
             InstalledApp(
                 packageName = "1002",
                 name = Names.randomName,
+                icon = Icons.randomIcon,
                 versionName = "3.0.1",
             ),
             InstalledApp(
                 packageName = "1003",
                 name = Names.randomName,
+                icon = Icons.randomIcon,
                 versionName = "0.2.1",
             ),
             InstalledApp(
                 packageName = "1004",
                 name = Names.randomName,
+                icon = Icons.randomIcon,
                 versionName = "0.0.1",
             ),
             InstalledApp(
                 packageName = "1005",
                 name = Names.randomName,
+                icon = Icons.randomIcon,
                 versionName = "1.1.1",
             ),
             InstalledApp(
                 packageName = "1006",
                 name = Names.randomName,
+                icon = Icons.randomIcon,
                 versionName = "2.0.1",
             ),
         ).sortedBy { it.name.lowercase(Locale.getDefault()) }
@@ -74,6 +82,7 @@ class MyAppsManager @Inject constructor() {
                     UpdatableApp(
                         packageName = "2000",
                         name = Names.randomName,
+                        icon = Icons.randomIcon,
                         currentVersionName = "1.0.1",
                         updateVersionName = "1.1.0",
                         size = 123456789,
@@ -83,6 +92,7 @@ class MyAppsManager @Inject constructor() {
                     UpdatableApp(
                         packageName = "2001",
                         name = Names.randomName,
+                        icon = Icons.randomIcon,
                         currentVersionName = "3.0.1",
                         updateVersionName = "3.1.0",
                         size = 9876543,
@@ -98,6 +108,7 @@ class MyAppsManager @Inject constructor() {
                     UpdatableApp(
                         packageName = "2003",
                         name = Names.randomName,
+                        icon = Icons.randomIcon,
                         currentVersionName = "3.0.1",
                         updateVersionName = "3.1.0",
                         size = 9876543,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Icons.kt b/basic/src/main/java/org/fdroid/basic/ui/Icons.kt
new file mode 100644
index 000000000..0172cb0ed
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/Icons.kt
@@ -0,0 +1,572 @@
+package org.fdroid.basic.ui
+
+object Icons {
+
+    val randomIcon: String get() {
+        val url = "https://f-droid.org/repo${icons.random()}"
+        // workaround for low resolution F-Droid images
+        return if (url.startsWith("https://f-droid.org/repo/icons/")) {
+            url.replace("https://f-droid.org/repo/icons/", "https://f-droid.org/repo/icons-640/")
+        } else {
+            url
+        }
+    }
+
+    val icons = listOf(
+        "/org.mian.gitnex/en-US/icon_EFgjn4gHRyqqXYqpnqHKUCSQXnd_FYoonxHcgHAZ5MM=.png",
+        "/icons/org.michaelevans.nightmodeenabler.1.png",
+        "/icons/org.microg.nlp.20187.png",
+        "/icons/org.microg.nlp.backend.apple.20043.png",
+        "/icons/org.microg.nlp.backend.nominatim.20042.png",
+        "/org.midorinext.android/en-US/icon_kZSJKKmAKJcrPxhKc-_9v_47I2lFzAnzOUzykKr6iIE=.png",
+        "/org.mindshub.insigno/en-US/icon_7fHy1gcVADMUln5Gm-6Wa37Oo84DLMlNe0-E95MEPtc=.png",
+        "/icons/org.mmk2410.cyngn.theme.fira.1.png",
+        "/org.moire.opensudoku/en-US/icon_bsqk6CwD3zJMF59UMK0v4STUwLUbabQG2iWXX2ZF6ds=.png",
+        "/org.moire.ultrasonic/en-US/icon_n8q1j9UmN_uZnoMyUaZnthdHNjsMfej1Rw8RgQadTOI=.png",
+        "/icons/org.moparisthebest.appbak.2.png",
+        "/icons/org.moparisthebest.pageplus.8.png",
+        "/icons/org.mosad.seil0.projectlaogai.6000.png",
+        "/org.mosad.teapod/en-US/icon_Wl8y-j3hY10RDMOT5pB_krgDEGdpzVUaBeTCX9sxEZ0=.png",
+        "/icons/org.mosspaper.6.png",
+        "/icons/org.mozc.android.inputmethod.japanese.6028153.png",
+        "/icons/org.mumod.android.168.png",
+        "/icons/org.mupen64plusae.v3.alpha.246.png",
+        "/org.musicbrainz.picard.barcodescanner/en-US/icon_Tl2aDd5KG1Um3leOs6B7HJjh3Zp871Zejf4aiSlQKYs=.png",
+        "/icons/org.musicpd.73.png",
+        "/icons/org.mustard.android.150.png",
+        "/icons/org.mysociety.FixMyStreet.39.png",
+        "/icons/org.mythdroid.63.png",
+        "/icons/org.n52.sosmobileclient.12.png",
+        "/icons/org.nathan.jf.build.prop.editor.4.png",
+        "/org.navitproject.navit/en-US/icon_t_B5zAoIfBrdggxqEbQGby-9umill0AwcPKhTftgLMg=.png",
+        "/icons/org.ncrmnt.nettts.3.png",
+        "/icons/org.ndeftools.boilerplate.3.png",
+        "/icons/org.nerdcircus.android.klaxon.27.png",
+        "/org.nhcham.hamfisted/en-US/icon_lPNeJeUutxq4rOuVeL2lJ3ReTTKvR1u-TbIKJbn6FUo=.png",
+        "/icons/org.nick.cryptfs.passwdmanager.1260.png",
+        "/icons/org.nick.wwwjdic.2370.png",
+        "/icons/org.ninthfloor.copperpdf.5.png",
+        "/org.nitri.opentopo/en-US/icon_dS97YMa6ybea-zBC9xt-tvfinvcPUAncx2HUmXvdk-Q=.png",
+        "/org.noise_planet.noisecapture/en-US/icon_OdhPdETkaa0-uA_xBZXYEATi80Ce9xhBC6BiTbVdX_Q=.png",
+        "/org.notabug.lifeuser.moviedb/en-US/icon_eunZ1NUNBbRUE1N-8J6ecZ3UGpUYzaL_iA8IWdgFHfs=.png",
+        "/icons/org.ntpsync.12.png",
+        "/org.nuclearfog.twidda/en-US/icon_Rbpfog3-aKuGprlwLY6jjM6sStGxOwP2Wqev3uDnwck=.png",
+        "/icons/org.numixproject.iconsubmit.1.png",
+        "/org.nuntius35.wrongpinshutdown/en-US/icon_vHkJzA2f01BgPUhVKZQRDtykJcHCl0quayxknpKhBpA=.png",
+        "/icons/org.nv95.openmanga.51331.png",
+        "/icons/org.ocsinventoryng.android.agent.24.png",
+        "/icons/org.odk.collect.android.1023.png",
+        "/icons/org.og8.a1tox.1.png",
+        "/icons/org.okfn.pod.13.png",
+        "/icons/org.olpc_france.sugarizer.17000.png",
+        "/org.onionshare.android.fdroid/en-US/icon_70KfzrV3wIfrF_Ki-wNUcEvmMggzX_TLp6mqqQMC-lI=.png",
+        "/icons/org.opengappsdownloader.12.png",
+        "/icons/org.opengemara.shiurim.4.png",
+        "/icons/org.opengpx.192.png",
+        "/org.openhab.habdroid/en-US/icon_MbJ4aGShNFnfKlhvFAVK16j1qoM_JBPo0xjNuwSsP_g=.png",
+        "/org.openhab.habdroid.beta/en-US/icon_MbJ4aGShNFnfKlhvFAVK16j1qoM_JBPo0xjNuwSsP_g=.png",
+        "/icons/org.openintents.about.8.png",
+        "/icons/org.openintents.filemanager.40.png",
+        "/icons/org.openintents.flashlight.10015.png",
+        "/icons/org.openintents.notepad.10084.png",
+        "/icons/org.openintents.safe.30.png",
+        "/icons/org.openintents.shopping.100221.png",
+        "/org.openttd.fdroid/en-US/icon_ymrS616qpAn2i33fU14so-yR6oBfVl87tgmI5wtA5gA=.png",
+        "/icons/org.osmocom.tacdatabaseclient.1.png",
+        "/org.ostrya.presencepublisher/en-US/icon_nSKxAlLAD-o4d62aQcn-c3WnMk9CrRPUYEiv8TI9WtM=.png",
+        "/org.oxycblt.auxio/en-US/icon_jdRok4xNvWOD-mGXxk051-Y1DqArTANlpnrn5cmCk9k=.png",
+        "/org.pacien.tincapp/en-US/icon_y4WBHAwFCDYJwJHIQDLaDKUviLlMCQ7pV1Soca-NKhM=.png",
+        "/org.pareudepararme.pareu_de_pararme_map/en-US/icon_eIVMjJ6uX6N7AhAnt0qXvD7KQtdC6jzXvaESRBckrtw=.png",
+        "/icons/org.passwordmaker.android.11.png",
+        "/icons/org.paulmach.textedit.15.png",
+        "/icons/org.peterbaldwin.client.android.vlcremote.58.png",
+        "/org.pgnapps.pk2/en-US/icon_FByroU6m8XaSFxXZNi_nsb2vRi0fTrhf1G0GlKe4_4g=.png",
+        "/org.piepmeyer.gauguin/en-US/icon_Pp0IthYj4RE6O_3BQcd_ApZWV8iNei9l_LspIKJIoak=.png",
+        "/org.piwigo.android/en-US/icon_oJO6Zpp4v2TBVS6BPWw76DfDTUECAFVnRWXzSOBVVi8=.png",
+        "/org.pixeldroid.app/en-US/icon_0fVnr5IwyZsIR2qOnAM_0mrPAtWa5UgOPlHlOA0locw=.png",
+        "/icons/org.pixmob.freemobile.netstat.63.png",
+        "/icons/org.pocketworkstation.pckeyboard.1041001.png",
+        "/icons/org.poirsouille.tinc_gui.15.png",
+        "/icons/org.poopeeland.tinytinyfeed.24.png",
+        "/org.poul.bits.android/en-US/icon_jjQ-5YrrcZkBRLaUUPr1L8wH4S8984OVNwrtch60MGY=.png",
+        "/icons/org.ppsspp.ppsspp.11103.png",
+        "/org.primftpd/en-US/icon_1OgKmaQ-xwDUi_MyHyhcwmXKVRJOhbCjTkSaU3a2S-k=.png",
+        "/org.principate.matthew.dealing_sheet/en-US/icon_aGybJoDXpzPRWI4bglKMDawJG4V7PREk3ywIGtu1c2w=.png",
+        "/org.privacyhelper/en-US/icon_edTwvy92ACwEeTekGnyHyqrbLYC5CUt_mdXawXPWrrQ=.png",
+        "/org.privacymatters.safespace/en-US/icon_PE26zYSBlKPklqpmkuQdvBI0veNcd7WxFYKOP3b3Os8=.png",
+        "/icons/org.projectvoodoo.otarootkeeper.10.png",
+        "/icons/org.projectvoodoo.screentestpatterns.11.png",
+        "/icons/org.projectvoodoo.simplecarrieriqdetector.16.png",
+        "/org.proninyaroslav.blink_comparison/en-US/icon_YKBmFzZFOxejk81uJ8HdA2KnMBgGsBF4Nd8WBDjrF6s=.png",
+        "/org.proninyaroslav.libretorrent/en-US/icon_dPU2aB1n6sbQiEF2K88eVegKSG2gT4D8W3LUenntoCQ=.png",
+        "/org.proninyaroslav.opencomicvine/en-US/icon_vMjZCYH05R_qzEmhUzSiq-l8-BegKJYYlKqrmH1LuAM=.png",
+        "/icons/org.pulpdust.lesserpad.42.png",
+        "/org.purple.smoke/en-US/icon_df-D2zJ1SdpIJ0eMUkiBQYvRQZkeRgp3fXI9LpS6ERY=.png",
+        "/org.purple.smokestack/en-US/icon_YZf8y44Wnd6ro8GeQD5Mhde0C0oWj9pyYyzWdGIDEkg=.png",
+        "/org.purplei2p.i2pd/en-US/icon_s8LzOD_2B2FH6LSuaQfSFbLiiF-Hams5GCRkChgpWeo=.png",
+        "/icons/org.pyload.android.client.21.png",
+        "/icons/org.pyneo.maps.10010.png",
+        "/icons/org.qii.weiciyuan.25.png",
+        "/org.qosp.notes/en-US/icon_e0aR--5sHsUBUwSmwHvgKJpmA8DBXQYltHVwBiBwg40=.png",
+        "/org.quantumbadger.redreader/en-US/icon_eI9VPkT0LK1Y9Uw3AfEoMXYcnFFGgiLeUSGONrclQ_Q=.png",
+        "/org.quentin_bettoum.librememorygame/en-US/icon_wz0PzyUmK3iZv72NHyzQGxhVJO_b3H3xVxqIb9XgDyQ=.png",
+        "/icons/org.quovadit.apps.andof.21.png",
+        "/org.radar.app/en-US/icon_ho-tDJr8jkTUNFIlp3RxSxrM6sOgS1N7xBqj_H9bc6g=.png",
+        "/icons/org.recentwidget.6.png",
+        "/icons/org.redcross.openmapkit.23.png",
+        "/org.revengate.revengate/en-US/icon_CruDJivFsI1rehfykeQz_f6xP4wjEgzaKW6uTaLxYB8=.png",
+        "/org.runnerup.free/en-US/icon_kN3i52l3-KVxE-yMinNc6g8JQTsMQeRFjWA2fW3M1uE=.png",
+        "/icons/org.safecoin.safeprice.1.png",
+        "/icons/org.safermobile.intheclear.1.png",
+        "/icons/org.sagemath.droid.8.png",
+        "/icons/org.saiditnet.redreader.87.png",
+        "/org.sajeg.fallingblocks/en-US/icon_mrzO0eqK8wNo5D_jBeWYvIaII-QqYrxMH85L7j_OLhg=.png",
+        "/org.samo_lego.canta/en-US/icon_Le6UT5Ar_Guj_DTgy5cT_Y9pKR9WdkPN3FCYwKtiq84=.png",
+        "/icons/org.sasehash.burgerwp.122.png",
+        "/org.satdump.SatDump/en-US/icon_wRxam0hxvU7_T7ZU4WWY2OKcE3H_HBSPY1TCYpNzyco=.png",
+        "/icons/org.savapage.android.print.1.png",
+        "/icons/org.schabi.etherwake.3.png",
+        "/icons/org.schabi.jedentageinset.30.png",
+        "/icons/org.schabi.kiba.2.png",
+        "/org.schabi.newpipe/en-US/icon_OHy4y1W-fJCNhHHOBCM9V_cxZNJJgbcNkB-x7UDTY9Q=.png",
+        "/icons/org.schabi.newpipelegacy.120.png",
+        "/org.schabi.nxbookmarks/en-US/icon_Iaz_MHkpacJKSeJn-qXdKNm1TCo693M96MDf6__K-Wk=.png",
+        "/icons/org.schabi.stethox.2.png",
+        "/icons/org.schabi.svgredirect.1.png",
+        "/icons/org.schabi.terminightor.12.png",
+        "/icons/org.scid.android.55.png",
+        "/org.scotthamilton.trollslate/en-US/icon_69XzV_OxWA15TsSztNzybIrgzbfGjADgEfUWWgWkUHo=.png",
+        "/icons/org.scoutant.blokish.22.png",
+        "/icons/org.scoutant.cc.1.png",
+        "/icons/org.scummvm.scummvm.6.png",
+        "/icons/org.seamapdroid.32.png",
+        "/org.secuso.privacyfriendly2048/en-US/icon__EtkwPp725lQQYnzjkzDUiOqD2X5nnY1CiZSIYN9TVU=.png",
+        "/org.secuso.privacyfriendlyactivitytracker/en-US/icon_ZNYfUCGDhxZXrvJKw1gCPAtSr9OBTiyYpuzJz3Z6otI=.png",
+        "/org.secuso.privacyfriendlybackup/en-US/icon_1mFluy26WuCj3h2577MVTiMRVz1X_fhv8JDOzeQ8jms=.png",
+        "/org.secuso.privacyfriendlyboardgameclock/en-US/icon_85kgnYhCkoI8M9KHgmITVp0DBkgsYUQtfcTS4PFQpMI=.png",
+        "/org.secuso.privacyfriendlycircuittraining/en-US/icon_LMNXB8N38b4etgSAyIvu85YPSTlj_f5lrwzWirnn1mo=.png",
+        "/org.secuso.privacyfriendlydicer/en-US/icon_si6lBVbpTWi7-Skao29BKAay4d1RvmynmiHj27XnfN4=.png",
+        "/org.secuso.privacyfriendlyfinancemanager/en-US/icon_8l8ArpmWWeXATWp6_iCOOLbPGaHRwl_Ftz9bIxLKZWA=.png",
+        "/org.secuso.privacyfriendlyfoodtracker/en-US/icon_Y9YeMADds1HM1kaY9XPpPjQaHo_fIIoTdOoCabIpRTY=.png",
+        "/org.secuso.privacyfriendlyintervaltimer/en-US/icon_2ObHBYqG7uKblJ82emTKmnhyAn6aAKHBwhXo50jHo94=.png",
+        "/org.secuso.privacyfriendlyludo/en-US/icon_DZst6xmtt-VLyQO18rwuhvxU74PFijCI_sQ03zAjSjg=.png",
+        "/org.secuso.privacyfriendlymemory/en-US/icon_gDvQsQ2aVYwaLf5RRQjp58Uu9jddoZ5o9uujFdK2kxE=.png",
+        "/org.secuso.privacyfriendlyminesweeper/en-US/icon_jIalmOtqbC87iVjx8tVJRSj7x6IFbX7ztThFtEfgWtk=.png",
+        "/org.secuso.privacyfriendlynotes/en-US/icon_g7vncjz9GT3SusxSxaAoB0jKcQuT2b2M6JldwE5v8mY=.png",
+        "/org.secuso.privacyfriendlypaindiary/en-US/icon_qm9CNXzW2hXQBsJYab5ZaaZMFdAv9BmwtU8jVxm4gag=.png",
+        "/org.secuso.privacyfriendlypasswordgenerator/en-US/icon_JlKkSB1sa7J7SmAI44lSMEecSlIB0X2TFlyZdDSZkzg=.png",
+        "/org.secuso.privacyfriendlypausinghealthily/en-US/icon_n5P5tbx3Tbo5rHZ7PesdIJsCi9zLSzAb8wWaRWaHOXg=.png",
+        "/org.secuso.privacyfriendlypin/en-US/icon_dDxJ0-8NgBBCEI41sRT9FfWKdhj8N3oT6DSi2M_uBN0=.png",
+        "/org.secuso.privacyfriendlyrecknoningskills/en-US/icon_biDKy0cVkrA6ylSthJKrtrKKM15UXHiQ1ACvDnMuhlE=.png",
+        "/icons/org.secuso.privacyfriendlyruler.3.png",
+        "/org.secuso.privacyfriendlysketching/en-US/icon_jssyjt-vLtlrgFx-SlE1gtZBK4bgU2EGprPJ14OxJiA=.png",
+        "/org.secuso.privacyfriendlysolitaire/en-US/icon_uQoi8ZlLu7r8O1i6XuLC7u3ma-_PeW6PwcktLWhbn2A=.png",
+        "/org.secuso.privacyfriendlysudoku/en-US/icon_oWx09GXf5s9FvhdDzVWZseAKTf-e7f-sn0MS7J-H4Ug=.png",
+        "/org.secuso.privacyfriendlytapemeasure/en-US/icon_RZ97oIy6nfyTclzuOQjIN4vkJxFEkON-IPLmSRYxkEo=.png",
+        "/org.secuso.privacyfriendlytodolist/en-US/icon_muCAiEnC-seBQpNk-apzYHYW9pgIECNn46gYuorR2ZM=.png",
+        "/org.secuso.privacyfriendlyyahtzeedicer/en-US/icon_FJba_abIkbvk7WTqDKLrgak4UWtcNHKsG8JUwB_qJ84=.png",
+        "/icons/org.segin.bfinterpreter.9.png",
+        "/icons/org.segin.ttleditor.19.png",
+        "/org.sensorkraken/en-US/icon_6y_M-7WiwspkLKUiZF4Tn2Op7gXt7UMrl8kW26p7N7c=.png",
+        "/org.sensors2.osc/en-US/icon_WX26DXa6dd22B7bO3XoTXwEBV7VY9KIBw7HOhMJS-Ws=.png",
+        "/org.sensors2.pd/en-US/icon_ojebh1OXB8-hS-Tm6Ogv2rWIMSZvxJmcRm_Zu3-dPDw=.png",
+        "/icons/org.servDroid.web.1000300.png",
+        "/icons/org.servalproject.2371.png",
+        "/org.sge.haltestellenanzeige/en-US/icon_dc8pRwxBBUijqVPp0l4MsAHiN4VVTinq5BU5mkuBDjE=.png",
+        "/org.shirakumo.ocelot/en-US/icon_lv-eZxwo4zxB7w_tk5gQrZUiGkQBpqQVVKyXLwg5Bcw=.png",
+        "/icons/org.shortcuts.2.png",
+        "/icons/org.sickstache.43.png",
+        "/org.simlar/en-US/icon_63ytugLFwg3DfPkXdjAPLsky5zmWzBxVu12oNUDVlag=.png",
+        "/org.sirekanyan.outline/en-US/icon_hoykFBZXZ41mHn1wliA9Id0NXIjqIJckPA6iGa0CUMc=.png",
+        "/org.sirekanyan.warmongr/en-US/icon_subDorrw5YUZqmV9pQzXa_gkxVF4ftt1v8dvXicq_r0=.png",
+        "/icons/org.smblott.intentradio.21.png",
+        "/org.smssecure.smssecure/en-US/icon_-oSFodWAvrEIq_o_0fs8IVHbVDbzfWAeJhAT_6oZ6zA=.png",
+        "/icons/org.softcatala.traductor.39.png",
+        "/icons/org.softeg.slartus.forpdaplus.678.png",
+        "/icons/org.sorz.lab.tinykeepass.14.png",
+        "/icons/org.sparkleshare.android.1.png",
+        "/org.stingle.photos/en-US/icon_o5hnpF5dc8w-wI9RotZmpXfYM9YNZfDYbmW3PxBnvQg=.png",
+        "/icons/org.strawberryforum.argentum.3.png",
+        "/icons/org.strawberryforum.pollywog.2.png",
+        "/org.strongswan.android/en-US/icon_-z1nByYuxaNTKXtj8zgWexwX5uSRPfc4eChKZA9WSVU=.png",
+        "/org.studip.unofficial_app/en-US/icon_QPTYaOjNzuooSmrbBOKPoLbPUmE3Mxr-CtZSA9uN_9I=.png",
+        "/org.stypox.dicio/en-US/icon_T01bGmCQCqqiZnutxO3xn-klGaJmoX_bp0PpNk-d_RM=.png",
+        "/org.stypox.tridenta/en-US/icon_rQ2-S0bsL8BZclD6fmdqTQw4_308SMKHy6Ec_O0ElAI=.png",
+        "/icons/org.subsurface.8.png",
+        "/icons/org.sudowars.2.png",
+        "/org.sufficientlysecure.keychain/en-US/icon_7CVWLf-lztDVEl2HY_TnF0d98nwq__xr05Yu8lLZoV4=.png",
+        "/icons/org.sufficientlysecure.localcalendar.10.png",
+        "/icons/org.sufficientlysecure.termbot.10905217.png",
+        "/icons/org.sufficientlysecure.viewer.2827.png",
+        "/icons/org.sufficientlysecure.viewer.fontpack.2300.png",
+        "/icons/org.sugr.gearshift.88.png",
+        "/icons/org.surrel.facebooknotifications.13.png",
+        "/icons/org.surrel.messengerbypasser.2.png",
+        "/icons/org.synergy.2.png",
+        "/icons/org.systemcall.scores.2.png",
+        "/icons/org.t2.synconwifi.3.png",
+        "/org.talkingpanda.osram_remote/en-US/icon_0humjzaEE0brFeRs89e3N3bm_YmYFOP5chl_pkReQ4k=.png",
+        "/icons/org.tamanegi.atmosphere.9.png",
+        "/icons/org.tamanegi.wallpaper.multipicture.dnt.48.png",
+        "/org.tasks/en-US/icon_YftLJ2dGZxgevP1f0n9c9X9HZKYmyz06c370Udel8Tk=.png",
+        "/icons/org.tbrk.mnemododo.23.png",
+        "/org.telegram.messenger/en-US/icon_yf3k2arrpvOWv5oUZ3p1Eri1ThBaYEhH0lEWqjiyFO4=.png",
+        "/org.tengel.planisphere/en-US/icon_9Ilzys_XhHiXB1AkvEf4l8XXhglFndfZIuDrlEfI3Bo=.png",
+        "/org.tengel.timescale/en-US/icon_CjYNl5NZP4MP_nIml9ZkY0KyTBo_L1Q4Tlz8J8ud2ZY=.png",
+        "/org.tessoft.qonvert/en-US/icon_FwaLwlZgpBHWG7SrttK5-UgwPyAFErb7jHG9LgB4500=.png",
+        "/org.tether.tether/en-US/icon_8JBV0Zc57RF45NeIOsjRkf2ui7ZKklBgG3Ue30aMj_s=.png",
+        "/icons/org.thecongers.mtpms.4.png",
+        "/icons/org.thialfihar.android.apg.11199.png",
+        "/icons/org.thiolliere.youtubestream.3.png",
+        "/icons/org.tigase.messenger.phone.pro.90.png",
+        "/icons/org.tilelessmap.app.4.png",
+        "/icons/org.tint.10.png",
+        "/icons/org.tint.adblock.3.png",
+        "/icons/org.tmurakam.presentationtimer.3.png",
+        "/icons/org.tof.17.png",
+        "/icons/org.tomdroid.14.png",
+        "/org.torproject.torservices/en-US/icon_NTqDkUSRsPZf24fX_eEmLwJ79JTaOUF6zg24wpCglj8=.png",
+        "/org.totschnig.myexpenses/en-US/icon_zWawBtP0U6S03MdPDF6m-Zh9Tbt6MmuSM-w68Ug-58o=.png",
+        "/icons/org.totschnig.sendwithftp.10.png",
+        "/org.traffxml.roadeagle/en-US/icon_PnzF4fDLMt1nogtfj_Y1P2R5TCbiPVZxw1znF-2V4Lo=.png",
+        "/icons/org.transdroid.lite.239.png",
+        "/icons/org.tryton.client.6.png",
+        "/icons/org.tunesremote.253.png",
+        "/icons/org.tvheadend.tvhguide.21.png",
+        "/org.twistedappdeveloper.statocovid19italia/en-US/icon_sDi92MRcvDEI0gGRidLh-DPaZxl26P396Y1qXikEroo=.png",
+        "/icons/org.uaraven.e.16.png",
+        "/org.unifiedpush.distributor.nextpush/en-US/icon_0n89cTApPXFOx2mP_c447S2kjcSYnyy_A8qZe0BQWhA=.png",
+        "/icons/org.us.andriod.4.png",
+        "/icons/org.valos.isolmoa.2.png",
+        "/org.vi_server.androidudpbus/en-US/icon_iTWudSqf3cQTjU3byy47yXnZ2R4_MN9Z7iayz9bhWo4=.png",
+        "/icons/org.vi_server.red_screen.2.png",
+        "/org.videolan.vlc/en-US/icon_yAfSvPRJukZzMMfUzvbYqwaD1XmHXNtiPBtuPVHW-6s=.png",
+        "/icons/org.voidptr.swpieview.15.png",
+        "/icons/org.vono.narau.6.png",
+        "/icons/org.wahtod.wififixer.1165.png",
+        "/icons/org.weilbach.splitbills.22.png",
+        "/org.wentura.getflow/en-US/icon_3fBq70zaUDwNhW6kMUp7xWKPjRl2Kg6WTa_O-WYB3DQ=.png",
+        "/icons/org.whitequark.sipcaller.1.png",
+        "/icons/org.wikimedia.commons.wikimedia.1.png",
+        "/org.wikipedia/en-US/icon_5SFC_iUU0JlFAg2ABkkUprx0FZE65k9xWEBEt6i8VOU=.png",
+        "/icons/org.wiktionary.1.png",
+        "/org.woheller69.TimeLapseCam/en-US/icon_riipT3bsfS8vKFDKhrgTDTEtkOILua-sig0Fp9J02bA=.png",
+        "/org.woheller69.arity/en-US/icon_gMHvE2YJt_aAZ0GSqTNZj1CttAGxHWIC1SGqOAjbvmc=.png",
+        "/org.woheller69.audio_analyzer_for_android/en-US/icon_69h0hh9-RSrBkOK1H9avcrClGYxS-jXwwEYX_umaAsg=.png",
+        "/org.woheller69.audiometry/en-US/icon_GNCuSdLBqwEzqKqbFFA7V07B5K4c6dm-lv7Wt9-wUeo=.png",
+        "/org.woheller69.browser/en-US/icon_APRdxKz4agebNIDq8VYaZeylyACvbq1yk0IRDL1-ziw=.png",
+        "/org.woheller69.dumpseeker/en-US/icon_LCe4lpWXVWsCVPyJ8ToaMkKwXrYUGZo7jGlcLaTGskc=.png",
+        "/org.woheller69.eggtimer/en-US/icon_--_cKNCtw9Dl2-kv8iAoG2iqmgPEny3tf2uAUfq8M3c=.png",
+        "/org.woheller69.gpscockpit/en-US/icon_ALj88xlFpbeVbsnBSx953lcWsRd5OBSy-F-YvwVcu58=.png",
+        "/org.woheller69.gptassist/en-US/icon_K3SmX4z6CrgPDrCUtL_XECtz-g8Oo8xkVZhqeUkeEQM=.png",
+        "/org.woheller69.hugassist/en-US/icon_XiohgFiEg50jmpJfFnFHNeXd-hoVedy_ICEhlDOcPew=.png",
+        "/org.woheller69.lavatories/en-US/icon_Ivd-E0kQp51JAAR2ldnvcDqlhOA8D50kun4q1qC3-g8=.png",
+        "/org.woheller69.level/en-US/icon_qdaodZGMhv0yefCJPnfxpKoIR9zwO8iO_jasafDMBXM=.png",
+        "/org.woheller69.omweather/en-US/icon_E3rAVMKaoXV3S6EdjZbr8Ah3yVuGV4teI7GOx4SRxl4=.png",
+        "/org.woheller69.solxpect/en-US/icon_AEie4rFo-7kCxa6d7pg7iTz33NKFfaYg9L7Nl8JqN-s=.png",
+        "/org.woheller69.spritpreise/en-US/icon_b-CXsG_A_mrbNXO3cWAMnjLeat7ak9zqp-eIfv4O4qY=.png",
+        "/org.woheller69.weather/en-US/icon_0HGIX6c4w38A-r1z-Fnix1SPqQ7b4hN0j614YKJga7s=.png",
+        "/icons/org.wroot.android.goldeneye.1.png",
+        "/icons/org.xapek.andiodine.6.png",
+        "/icons/org.xbmc.android.remote.1009.png",
+        "/org.xbmc.kore/en-US/icon_yHTeBW4jt4FZGjqI-4yUMsn7sdJniQRXICkoM3qGFXA=.png",
+        "/icons/org.xcsoar.162.png",
+        "/org.xphnx.ameixa/en-US/icon_CQLCGleZNBzDPRNp1ADs121TecVHFmUbe-Au-4qXF08=.png",
+        "/icons/org.xphnx.ameixamonochrome.4100.png",
+        "/icons/org.xphnx.iconsubmit.9.png",
+        "/icons/org.xposeddownloader.12.png",
+        "/org.y20k.escapepod/en-US/icon_xK1u54mnPFLYtmXZHy_WpIrcn0GKWco0XxicFSjDu0U=.png",
+        "/org.y20k.trackbook/en-US/icon_f6AHUlGQuywiZCtyEb_HWQ_QgqstO17v5l3X4gkHTV0=.png",
+        "/org.y20k.transistor/en-US/icon_XnM_HqswaEhC6q8FE0MZj_v9uWdubb9cv_3kbE4T25M=.png",
+        "/icons/org.yaaic.13.png",
+        "/icons/org.yabause.android.1.png",
+        "/org.yausername.dvd/en-US/icon_5_ZYnb12dZebI7p8dgLN15vaqPNuWkKtNd1ct9zF4Xc=.png",
+        "/icons/org.yaxim.androidclient.53.png",
+        "/icons/org.yuttadhammo.tipitaka.59.png",
+        "/icons/org.zakky.memopad.3.png",
+        "/icons/org.zamedev.gloomydungeons1hardcore.opensource.1807020000.png",
+        "/icons/org.zamedev.gloomydungeons2.opensource.1602221800.png",
+        "/icons/org.zephyrsoft.checknetwork.5.png",
+        "/org.zephyrsoft.sdbviewer/en-US/icon_TzJ8NMdZCjvEiKZMVa-LcMAYS--01q693CcAHJsiU9M=.png",
+        "/org.zephyrsoft.trackworktime/en-US/icon_RhdooqTkZmgVE7y9XYPJ4J2LdF-J0oEsEZ9IAZ9K8GQ=.png",
+        "/oss.krtirtho.spotube/en-US/icon_NoulGcYaWOAMoUDo5jVCaPiSQztIr-9GbQEyE3Mu2Ro=.png",
+        "/page.codeberg.marshreaper.fruitygame/en-US/icon_Co1D6xWLCepsgPDGDmjCiQVctCUVILrUg9IP2bvFb8A=.png",
+        "/pan.alexander.tordnscrypt.stable/en-US/icon_de8pORbxQtizOAeyqadO017HBVe3r3LnAYr7XlT5D-s=.png",
+        "/pc.javier.actualizadoropendns/en-US/icon_soaT2WQO3A3ISsmaW_iRgHIvxnGGuXXzTejcJSazmUY=.png",
+        "/pc.javier.seguime/en-US/icon_GxcGCqaSFdVKYdyqy9XJSTITpxXmBvgJUlyguF7KLqs=.png",
+        "/pcmagas.vodafone_fu_h300s/en-US/icon_Dwcy3ucAejdLzo4FZoi9X0EGv3GBN-qKWVuk5iT1F_Q=.png",
+        "/icons/peanutencryption.peanutencryption.4.png",
+        "/phone.vishnu.dialogmusicplayer/en-US/icon_kkSAAI7ch6xixEOv1FNRm3DSUqBPDKnsXzyXOinbCIc=.png",
+        "/icons/pk.contender.earmouse.30.png",
+        "/pl.ascendit.onetimealarm/en-US/icon_DNW3hpAiYOrONr8KTwxPSbPweuipnIGcTZ7pgLlSwaY=.png",
+        "/pl.edu.pjwstk.s999844.shoppinglist/en-US/icon_VvhYJgKrC6jZRc-HCh7kepFtxgFqOuVeWLvLa85IUlw=.png",
+        "/icons/pl.hypeapp.endoscope.5.png",
+        "/icons/pl.kuben.progressapp.8.png",
+        "/icons/pl.narfsoftware.thermometer.29.png",
+        "/icons/pl.net.szafraniec.NFCKey.24.png",
+        "/icons/pl.net.szafraniec.NFCTagmaker.23.png",
+        "/icons/pl.nkg.geokrety.47.png",
+        "/icons/pl.sanszo.pcis.2.png",
+        "/player.efis.data.ant.spl/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
+        "/player.efis.data.eur.rus/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
+        "/player.efis.data.pan.arg/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
+        "/player.efis.data.sah.jap/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
+        "/player.efis.data.usa.can/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
+        "/player.efis.data.zar.aus/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
+        "/player.efis.pfd/en-US/icon_e0F0p5ehhoYamO8DBo_YgFby-CaPv2z3pvjbVaXJ92w=.png",
+        "/player.phonograph.plus/en-US/icon_ncl9cm4Mr4U0edpzvu_8H--zCPmHTHhroPKmj3ABwA4=.png",
+        "/posidon.launcher/en-US/icon_9quSno5bEyYxaSjfiVAhqNhzOB2eFp_93tUftzq_DvE=.png",
+        "/icons/press.condense.www.18.png",
+        "/icons/priv.twoerner.brightnesswidget.7.png",
+        "/priv.wh201906.serialtest/en-US/icon_iyx3srfqep5gfJ3RkBMqClPCKaywkhf-qeViFlq1KWs=.png",
+        "/icons/pro.dbro.bart.11.png",
+        "/pro.kherel.selfprivacy/en-US/icon_KqV8lYNuMMaJAAUrk8cnGSeuE-7m0fwgrQiiM8fLCqM=.png",
+        "/pro.oblivioncoding.fluffy_board/en-US/icon__says5HSPCdUhTP2i2HBBs6__4_CNNEPo8pIkY-34CE=.png",
+        "/icons/pro.oneredpixel.l9droid.4.png",
+        "/pro.rudloff.lineageos_updater_shortcut/en-US/icon_1fFeLEI5fDNAhNRha6oVFDifNMbwFNGynF09aqLDhy4=.png",
+        "/pro.rudloff.muzei.commons/en-US/icon_thAGRiF5zJ7WnMYzq8utEzg9Qy-oTadk9TlDAQhns7Q=.png",
+        "/pro.rudloff.openvegemap/en-US/icon_ouU525xbUpBNmikHWHZID7IlNwF61o-BFd8MebA7lVA=.png",
+        "/icons/pro.rudloff.papercraft.2.png",
+        "/pro.rudloff.search_to_browser/en-US/icon_CV0GdYMSKeobnLWydiKODiza14HurG_b3vGGWKcWBbk=.png",
+        "/icons/protect.babymonitor.3.png",
+        "/icons/protect.babysleepsounds.15.png",
+        "/icons/protect.budgetwatch.29.png",
+        "/protect.card_locker/en-US/icon_O8PYOX9-Kshl8NYoqJs4JLPqQNDQECeVsbYen01Bcso=.png",
+        "/icons/protect.gift_card_guard.6.png",
+        "/icons/protect.rentalcalc.6.png",
+        "/protect.videoeditor/en-US/icon_tXO43YnYtOc6a6fq5cXrOSdyH0J0H-gTBUN1SSpWNMQ=.png",
+        "/icons/pt.ipleiria.mymusicqoe.12.png",
+        "/icons/pt.isec.tp.am.4.png",
+        "/icons/pt.joaomneto.titancompanion.67.png",
+        "/icons/pw.thedrhax.mosmetro.77.png",
+        "/icons/quickly.quit.7.png",
+        "/icons/raele.concurseiro.1.png",
+        "/icons/raffarti.simpleadvancedmetronome.2.png",
+        "/rasel.lunar.launcher/en-US/icon_Cl7GhsnEgPHJBS9Sb8g8CHC9u6K8LL5uJ8PLWXCtGFk=.png",
+        "/re.indigo.epistolaire/en-US/icon_bNoF8LYjcQsfyOOrDIMjjDq42IgO2ZABzc72WHL2eP4=.png",
+        "/icons/re.jcg.playmusicexporter.110.png",
+        "/icons/remuco.client.android.1.png",
+        "/icons/rino.org.tethercompanion.2.png",
+        "/rkr.simplekeyboard.inputmethod/en-US/icon_T5pp0k_s8W4dOKUnC7tidpw27SzS0186ruJ782IwcPc=.png",
+        "/icons/ro.ciubex.dscautorename.103.png",
+        "/ro.hume.cosmin.retrostack/en-US/icon_S10IYv5dT34sGelvD0PVh2Jeycb2T8jxnG7nUEUmww4=.png",
+        "/ro.radioromaniaactualitati.podcasts/en-US/icon_B3bfursDI8_7dCn-Ns00WNO7PSCJkyF9MpIgE21tXMw=.png",
+        "/icons/ro.ui.pttdroid.5.png",
+        "/rocks.mm_dev.BendyStraw/en-US/icon_bT7aA98uz_5LmgcdUvcXW8136dc57ZMUV2J8-lOr2Jw=.png",
+        "/rocks.mucke/en-US/icon_fBslLOCIT8IlqNAry8i_amW-Ze8gAUFf8TWGhhI4F0A=.png",
+        "/rocks.poopjournal.flashy/en-US/icon_7aJTA0zPg6Ky_2u6MyMygQ6-_-njnIkWmdtE8UMgHZE=.png",
+        "/rocks.poopjournal.todont/en-US/icon_tmmZ0IcmHScWU3xCVVsLldkcq_1vPp6p0SuSGqsyGEA=.png",
+        "/rocks.poopjournal.vacationdays/en-US/icon_liF7CZ4SLT5y6gMBrx9WSvQOa61AT7IDwLTIlEKEvNQ=.png",
+        "/rocks.tbog.livewallpaperit/en-US/icon_lX5Y_qC10u1s6Ahmt0JQ44-bX7NBMjg54gpIDGvpwrA=.png",
+        "/rocks.tbog.tblauncher/en-US/icon_BdwL31sD_dI5SryWmB-wi8Znh5nJbjHImIy7DE06o08=.png",
+        "/icons/rodrigodavy.com.github.pixelartist.4.png",
+        "/rs.ltt.android/en-US/icon_Z_RsaXt3HHZzoTMzGelLteXy8K_Mej2CRUCuDtSbwf4=.png",
+        "/icons/rs.pedjaapps.alogcatroot.app.20140922.png",
+        "/ru.aleshin.timeplanner/en-US/icon_v2rLqxxbVIMbyGhzX7WatwBprSEAeHc_OIsCBzP8TM0=.png",
+        "/ru.evgeniy.dpitunnel/en-US/icon_d5-PnxU_nkt7Rlu6zdHav6bjjYeHmjKz9R9Fp_9frWs=.png",
+        "/ru.evgeniy.dpitunnelcli/en-US/icon_EPi620MBaJ1K9r6d4FH9qUR_Ia3NwXarMNlKaDJJsss=.png",
+        "/icons/ru.exlmoto.snood21.3.png",
+        "/icons/ru.gelin.android.browser.open.8.png",
+        "/icons/ru.gelin.android.sendtosd.41.png",
+        "/icons/ru.gelin.android.weather.notification.60.png",
+        "/icons/ru.gelin.android.weather.notification.skin.biggertext.18.png",
+        "/icons/ru.gelin.android.weather.notification.skin.blacktext.18.png",
+        "/icons/ru.gelin.android.weather.notification.skin.blacktextplus.18.png",
+        "/icons/ru.gelin.android.weather.notification.skin.whitetext.18.png",
+        "/icons/ru.gelin.android.weather.notification.skin.whitetextplus.18.png",
+        "/icons/ru.glesik.wifireminders.1340.png",
+        "/icons/ru.henridellal.dialer.15.png",
+        "/icons/ru.henridellal.emerald.43.png",
+        "/icons/ru.henridellal.fsassist.5.png",
+        "/icons/ru.henridellal.patolli.2.png",
+        "/icons/ru.hugeping.reinstead.7.png",
+        "/icons/ru.hyst329.openfool.30.png",
+        "/icons/ru.ifproject.android.afr.14.png",
+        "/ru.ikkui.achie/en-US/icon_gcqikwwx81QCZtQK8vb1dxqD-AVPtiX6Xzk1zoSbWSc=.png",
+        "/icons/ru.moscow.tuzlukov.sergey.weatherlog.3.png",
+        "/ru.natsuru.websdr/en-US/icon_m9jGEc6rsXzPQst0a5Rx8uf_dL-0I54VMOHCYJ2DZg8=.png",
+        "/icons/ru.neverdark.silentnight.8.png",
+        "/ru.nsu.bobrofon.easysshfs/en-US/icon_kq1Pf3Pki_NY4H4eu2bOC4cHKTzQtAj4xGFtEA3QEqU=.png",
+        "/icons/ru.o2genum.coregame.3.png",
+        "/ru.playsoftware.j2meloader/en-US/icon_VBtFNFUO_uu2EMB_OWeXxZz-2YLvrJy5ckTyDGS8FzA=.png",
+        "/ru.sash0k.bluetooth_terminal/en-US/icon_65cv-qFnip_FEXomLF4Oz9LllmQX_rzRFI-Gq9yuJpE=.png",
+        "/ru.seva.finder/en-US/icon_pNl-Jc-Eu0ycOM1aZr6ayzKmdFUi3UYGRfn-OLePpWM=.png",
+        "/icons/ru.subprogram.paranoidsmsblocker.6.png",
+        "/ru.tech.imageresizershrinker/en-US/icon_4pqg53lbewU2xudArqoc_0jFIIdDl9Gmce6Ec6LXQ6Y=.png",
+        "/icons/ru.ttyh.neko259.notey.6.png",
+        "/icons/ru.valle.btc.260.png",
+        "/ru.yanus171.feedexfork/en-US/icon_gZUP1wHq66VuzccM-dA4F_m3EBSYZCFmzskbmrf15ao=.png",
+        "/ru.yourok.torrserve/en-US/icon_U0kfrQasC_UXU_rCfT3EEAo8jN4n_zHwbF72XO1C3cE=.png",
+        "/icons/ru.zxalexis.ugaday.15.png",
+        "/icons/ru0xdc.rtkgps.1.png",
+        "/icons/ryey.camcov.9.png",
+        "/icons/ryey.colorsniffer.5.png",
+        "/icons/ryey.easer.128.png",
+        "/icons/ryey.flock.8.png",
+        "/s1m.savertuner/en-US/icon_GSE6KthrO2cL8VGLKZ3YHC4O68LJt07DsGFk71nyHgo=.png",
+        "/icons/saschpe.contactevents.160179.png",
+        "/icons/saschpe.poker.170127.png",
+        "/icons/science.itaintrocket.pomfshare.3.png",
+        "/icons/screen.dimmer.pixelfilter.24.png",
+        "/icons/se.anyro.nfc_reader.15.png",
+        "/se.arctosoft.vault/en-US/icon_O-U3JRoNgZ4gL272ZdZJ---yZfQ32Lwn4ZoOxhl_Lz0=.png",
+        "/icons/se.danielj.geometridestroyer.2.png",
+        "/icons/se.embargo.retroboy.44.png",
+        "/icons/se.erikofsweden.findmyphone.13.png",
+        "/icons/se.johanhil.clipboard.2.png",
+        "/se.lublin.mumla/en-US/icon_TxKqlJbEjKCNiQjiDMsn8eCAHhULl3PFRA66uJ1DgnA=.png",
+        "/icons/se.norenh.rkfread.4.png",
+        "/icons/se.traffar.dot_race.4.png",
+        "/icons/se.tube42.drum.android.34.png",
+        "/icons/se.tube42.kidsmem.android.17.png",
+        "/icons/se.tube42.p9.android.11.png",
+        "/icons/seanfoy.wherering.99.png",
+        "/icons/search.searx.2.png",
+        "/sh.ftp.rocketninelabs.meditationassistant.opensource/en-US/icon_Q4W1bwqqvfns4pz1lvtszKuYqBC4BewcHdu5SqfaobE=.png",
+        "/sh.ikl.liteshort/en-US/icon_mQPvN8duq1wtOg5-zqhG4ybBglJ7HAVAF4_TaRecsxU=.png",
+        "/icons/si.modrajagoda.didi.1.png",
+        "/si.palcka.tarok/en-US/icon_gM8-nW79C-Mj8YfxesrE92Ssrv7SBZXQDTXADR-ZlDE=.png",
+        "/icons/siir.es.adbWireless.12.png",
+        "/simbio.se.nheengare/en-US/icon_IQq2A3LXhptZrhCHvoJBKFsrvt7ipOWYMOzhLLdghfg=.png",
+        "/site.leos.apps.lespas/en-US/icon_gqN3X7rJ2uGFNx-UqHpgpPUREQFmOnpIFAs7UZ9Yq04=.png",
+        "/site.leos.setter/en-US/icon__3FXP1CM3G4DB-4Pop3Si6k3KXs4g6tEgBAhq6QLa8g=.png",
+        "/sithakuru.sinhala.keyboard/en-US/icon_ndvPk26fyUi0MZDYDczwAksLoWt2wED8zvz7A1gg3BU=.png",
+        "/icons/sk.halmi.fbeditplus.13.png",
+        "/icons/sk.madzik.android.logcatudp.5.png",
+        "/icons/sk.vx.connectbot.30.png",
+        "/slowscript.warpinator/en-US/icon_qQAphVhOW0ygYnP4F_rZSO1B3XrrKsUMNAVoKrALnkg=.png",
+        "/software.mdev.bookstracker/en-US/icon_Dcan1mwK_h5oLOey3VD6W39KRruYK838rKYVV_RvE_Y=.png",
+        "/icons/sonoroxadc.garethmurfin.co.uk.4.png",
+        "/icons/sony.hidden.servicemenu.2.png",
+        "/souch.smp/en-US/icon_blS_BHptxEOYX2kZQB0mh-BCS0LML0Nx92HhLA4ZCTw=.png",
+        "/icons/souch.smsbypass.9.png",
+        "/icons/space.bm835.pb.2.png",
+        "/icons/space.kraut.schluessel.3.png",
+        "/icons/space.neothefox.laytray.10.png",
+        "/space.rocketnine.xenia/en-US/icon_iB6mMI7zT8Z3_07guTf8252-lZoNvqm7KNQCMstP-Ug=.png",
+        "/icons/st.wow.git.hrm.3.png",
+        "/starcom.snd/en-US/icon_rEQq5teFqHNbcL7PM9PB6yB4jTRLUX58bOxWzHlN4Ds=.png",
+        "/icons/steele.gerry.dotty.2.png",
+        "/icons/sterrenburg.github.flutterhole.641.png",
+        "/icons/streetwalrus.usbmountr.8.png",
+        "/su.sadrobot.yashlang/en-US/icon_2J4-LzC3BDXgoE8svgWwVvQnbiIgoC7-Ntj4pz5LVME=.png",
+        "/su.xash.husky/en-US/icon__8Cvub58cJLcRFEuTxGYqAB0xJh5UDEHVn19hJiHERU=.png",
+        "/icons/subins2000.manglish.7.png",
+        "/icons/subreddit.android.appstore.9200.png",
+        "/icons/sun.bob.leela.2.png",
+        "/icons/superfreeze.tool.android.1000.png",
+        "/icons/superustats.tool.android.12.png",
+        "/sushi.hardcore.droidfs/en-US/icon_6N05in6K4NA2BFj5YcninogjocC2UFhHa3u0FmUuB2I=.png",
+        "/icons/systems.byteswap.aiproute.1.png",
+        "/systems.now8.app/en-US/icon_l9yA_loM7DbfLhW6rdr2jFQTn1MTbDqPDq-d0wdWm5E=.png",
+        "/systems.sieber.fsclock/en-US/icon_Kv7VY4CM1jrXAKhsqF80pXZ2zTrshs_qWFer6dZFNPs=.png",
+        "/icons/szelok.app.twister.1.png",
+        "/t20kdc.offlinepuzzlesolver/en-US/icon_ICB4PsFIfcUSTuGEX8w7x7iKjld_QAutBYALvENZhIA=.png",
+        "/icons/taco.apkmirror.11.png",
+        "/taco.scoop/en-US/icon_nzoWyX4GIu-sRf6VEuiwr1wmxCJIiv_5U-ea8SK7CmI=.png",
+        "/icons/team.swing.pendulums.4.png",
+        "/icons/teaonly.droideye.12.png",
+        "/tech.bogomolov.incomingsmsgateway/en-US/icon_4zKtRhP3AJT6NI6eqA_iK6jYPLKtAix4znG9hLnGrJs=.png",
+        "/tech.platypush.platypush/en-US/icon_yxImraRM6cv5VAIIGImTFkyF7EFlM6T7spXIj2RGaCU=.png",
+        "/icons/tech.ula.7438725.png",
+        "/tech.waelk.radioactive.metronome/en-US/icon_FsiNQ4o0RBTTIqZ2u_ec-ZV_W2C16c5Jr8KYOS17m5U=.png",
+        "/icons/telegra.ph.18.png",
+        "/icons/theakki.synctool.100.png",
+        "/theredspy15.ltecleanerfoss/en-US/icon_JiGGIl8oic65fOBtg69mQvtzAWwjaFcTOIf1yLuvAKg=.png",
+        "/threads.server/en-US/icon_mapvuLLVytxl_Xu5BKNoixGrO4iCSBGo7YiCLLzYst4=.png",
+        "/threads.thor/en-US/icon_h529wR-N5X9khCqHqY3bSG-AQel7uSZNzBmL9YUQ0ws=.png",
+        "/timur.webcall.callee/en-US/icon_ibxAPC5TqyL3RFWM6SwH9ScQ7ynVIcl2rBsepiUD7wE=.png",
+        "/timur.webrtc.check/en-US/icon_nqVT_xFrjp8tpTCiRvjM3vZUUM4i-BP5ND0u5es-fNM=.png",
+        "/icons/tk.al54.dev.badpixels.4.png",
+        "/icons/tk.elevenk.dailybread.5.png",
+        "/tk.giesecke.disaster_radio/en-US/icon_S0Ue3R1hm43S3zdRqugj4UajW3UW_dqbisqbJRDg9uE=.png",
+        "/icons/tk.giesecke.painlessmesh.14.png",
+        "/icons/tk.giesecke.phoenix.3.png",
+        "/tk.hack5.treblecheck/en-US/icon_xGJi_cbbDsCLPe4tRV2rD2oOCL3t0Ak12Z8D2WChkRM=.png",
+        "/icons/tk.jordynsmediagroup.simpleirc.fdroid.19.png",
+        "/icons/tk.superl2.xwifi.3.png",
+        "/icons/tkj.android.homecontrol.mythmote.3014.png",
+        "/icons/tmendes.com.analyticalbalancedroid.3.png",
+        "/tmendes.com.waterydroid/en-US/icon_c-aUiGov7NIsjpx8Jb2evkLS9TPbpoH_X4S40d4wi0M=.png",
+        "/tn.creativeteam.newyoutubelistingapp/en-US/icon_JU-xUr3BpL97EdDssij796cdThwA2A5mfXXaRJKuWd0=.png",
+        "/icons/tomer.com.alwaysonamoledplugin.3.png",
+        "/icons/tool.fff.profilepicturegenerator.17.png",
+        "/top.donmor.tiddloid/en-US/icon_gN5QC6EGpv1ClyDuv4iIaurP8hv1ME5FJ1WKJbXgg-w=.png",
+        "/town.robin.toadua/en-US/icon_Fby3LR7ssfdyE7wqCKyP0HK76ZdPHN6XD-MhMwvwl2k=.png",
+        "/icons/trikita.obsqr.16.png",
+        "/icons/trikita.slide.4.png",
+        "/icons/trikita.talalarmo.19.png",
+        "/icons/tritop.android.SLWTrafficMeterWidget.2.png",
+        "/icons/tritop.androidSLWCpuWidget.6.png",
+        "/troop.com.freedcam/en-US/icon_lQfkt8nwjdbqCGAYArqGNHzE10B0BllmKDNMZrxVu9Y=.png",
+        "/truewatcher.tower/en-US/icon_71IS-OznC8AdEJtKqSLCNrpk3AqhpdVZ7XX55zoYQCw=.png",
+        "/tube.chikichiki.sako/en-US/icon_34jeIlmHVdJTOYk6CK4RaUXJ4NTWwyoRsCFfrYpAsvw=.png",
+        "/icons/tv.piratemedia.lightcontroler.161.png",
+        "/icons/tw.com.daxia.virtualsoftkeys.10.png",
+        "/icons/tw.qtlin.mac.airunlocker.1.png",
+        "/icons/tyagi.shubham.customsearch.1.png",
+        "/ua.bossly.tools.translit/en-US/icon_Z6_Fp0IO6kRy2G62fCHjsUMRsuz9iQlXedglUrn0oRI=.png",
+        "/ua.com.radiokot.lnaddr2invoice/en-US/icon_E8f0ItDFeKIKF5NdNl9VCqEzaonb8g2REw7i9G8sAD4=.png",
+        "/ua.com.radiokot.photoprism/en-US/icon_W_5TnleHSiMH-MyytjFp3GcUAbzrps9k-6bgbWwryW8=.png",
+        "/ua.syt0r.kanji.fdroid/en-US/icon_WOSc49VcLgMELOmUR06ULIlzfKwH2sOslgW-JZ7UgoI=.png",
+        "/icons/uk.ac.cam.cl.dtg.android.barcodebox.4.png",
+        "/icons/uk.ac.ed.inf.mandelbrotmaps.2.png",
+        "/icons/uk.ac.swansea.eduroamcat.59.png",
+        "/icons/uk.co.ashtonbrsc.android.intentintercept.224.png",
+        "/icons/uk.co.bitethebullet.android.token.6.png",
+        "/uk.co.busydoingnothing.anagrams/en-US/icon_Q7bOEPl-HXkXJuhAIKtwTCbkV19AA9lCsANrzfp_C_M=.png",
+        "/icons/uk.co.busydoingnothing.catverbs.5.png",
+        "/icons/uk.co.danieljarvis.android.flashback.16.png",
+        "/icons/uk.co.jarofgreen.JustADamnCompass.2.png",
+        "/icons/uk.co.keepawayfromfire.screens.8.png",
+        "/uk.co.richyhbm.monochromatic/en-US/icon_4CQcSo8ZaBqMku-lZDgkALKa2f4C3obIl5SkgwJG13Y=.png",
+        "/icons/uk.co.yahoo.p1rpp.calendartrigger.8.png",
+        "/uk.co.yahoo.p1rpp.secondsclock/en-US/icon_P6l-ExK2htLLffu0bW4H36jDxdOwBsBqQMhHmfAGArk=.png",
+        "/uk.openvk.android.legacy/en-US/icon_0u5-xTfu181pFkvmkqz_qJJzvtbgwu3v9zBoXjhj1AU=.png",
+        "/uk.org.boddie.android.weatherforecast/en-US/icon_3Q4g4RjCgQCr9AaLImtJ-wW5leAAhFDDqRao2cBDUHM=.png",
+        "/icons/uk.org.crimetalk.3.png",
+        "/uk.org.ngo.squeezer/en-US/icon_aV_5RzYdJ8B3aNOFEkDGCgT2rySswXrmsjrCl-Bc_ek=.png",
+        "/icons/unisiegen.photographers.activity.11.png",
+        "/icons/urbanstew.RehearsalAssistant.26.png",
+        "/icons/us.achromaticmetaphor.agram.21.png",
+        "/icons/us.achromaticmetaphor.imcktg.12.png",
+        "/icons/us.bravender.android.dongsa.8.png",
+        "/icons/us.feras.mdv.demo.2.png",
+        "/icons/us.koller.cameraroll.36.png",
+        "/icons/us.lindanrandy.cidrcalculator.125.png",
+        "/icons/us.shandian.giga.8.png",
+        "/us.spotco.ir_remote/en-US/icon_YTFyFmRDXZA-QmXW5Ztuau27oW_k1gX4VDI1Ayjsf1o=.png",
+        "/us.spotco.malwarescanner/en-US/icon_CwoXahI8sykVdZhPCngZXFau7kqvs2UPdnN8pp8pkmk=.png",
+        "/us.spotco.maps/en-US/icon_J86ytM4svDAKfKcRdXEhBjgd9VVtuUdM9GqEARTNseA=.png",
+        "/uscartools.USTravelConverter/en-US/icon_jXEOPMpTXJW05TyNrLuqVPnEeG4fMxSfU9aKOrl2S4k=.png",
+        "/icons/ut.ewh.audiometrytest.14.png",
+        "/v4lpt.vpt.pwg/en-US/icon_zNhsX0Hxb2T_cdJMt42yWcAB2O0IhzLxXWLYm5IDluI=.png",
+        "/vegabobo.dsusideloader/en-US/icon_rJljVEuF2qXiKxKffaI3tPPOdx1pbI3MDWQAr2eEL8M=.png",
+        "/icons/vnd.blueararat.kaleidoscope6.21.png",
+        "/icons/wb.receiptspro.82.png",
+        "/website.leifs.delta.foss/en-US/icon_TIvE5SwAV7-DtiN6GSUekYW2AKQS6K7lvtqwNqvsdsE=.png",
+        "/icons/wiseguys.radar.12.png",
+        "/ws.xsoh.etar/en-US/icon_MV5P0hb85YWVJIfobFH46J3yDwLvde2IRXbFLfH133s=.png",
+        "/wsdfhjxc.taponium/en-US/icon_JpvdnanU1Ero9sh9zAk5zs_4TVlbzsACAiuuXoScC3k=.png",
+        "/wtf.nbd.obw/en-US/icon_4rGInMh-wTaGNTghffm0ME4voG8o2miEmzeN0p_5AN4=.png",
+        "/wtf.technodisaster.tldr/en-US/icon_ZCJI1-QvZOV5cwB-eC7YMbe8PdMKMOWFoJ-eX_T9H-I=.png",
+        "/icons/x1125io.initdlight.2.png",
+        "/x653.all_in_gold/en-US/icon_0Zb7ymS3RKTpeGpzp5BwMf8dSYwP72raEfqSnKtBNfQ=.png",
+        "/x653.bullseye/en-US/icon_TcCEiqkjAtuAa98rx88GTO6cYzL2k14VK9HQzM2Tbu8=.png",
+        "/xdsopl.robot36/en-US/icon_xMvFGWXViBKRkGWHtzJGjA42fUyci7QijuziV0-LTrI=.png",
+        "/xyz.apiote.bimba.czwek/en-US/icon_FDJ5OEjVG8QC2w1VqOh8oryRHRpqC3B4Ddmk3n-elGM=.png",
+        "/xyz.crucitti.friendalert/en-US/icon_-d01wWj8k202nIbtgepr6qrA3AImbsVUD0j6XMhaeg8=.png",
+        "/xyz.deepdaikon.quinb/en-US/icon_PI7HCSDkOiTInZY8Q7nTJZvTvZU3tb5mrPdBtu4y3c4=.png",
+        "/xyz.deepdaikon.xeonjia/en-US/icon_1bqqbKPRcCv_2pm6z8W2kKzjDnmSBDCiDNEY5krl_og=.png",
+        "/xyz.deepdaikon.zoysii/en-US/icon_Q0smhUDLZZW0E-4TQqHLiGZnhH23LsXkX8OR859beQA=.png",
+        "/icons/xyz.iridiumion.plucklockex.4.png",
+        "/xyz.zedler.patrick.doodle/en-US/icon_3fyxhfUcYbfcC1TSiXFYxqp_6lMGkjjNdLyRUkZ3FaE=.png",
+        "/xyz.zedler.patrick.grocy/en-US/icon_GAoo5LLMVaGqL5SyqnJP5MwL0C8_G7MsoWGipBgFCBw=.png",
+        "/icons/ymakei.vegetarian_journal.1.png",
+        "/icons/z4pp3r.flashlightwidget.1.png",
+        "/icons/za.co.lukestonehm.logicaldefence.22.png",
+        "/icons/za.co.neilson.alarm.4.png",
+        "/icons/zame.GloomyDungeons.opensource.game.1807020000.png",
+        "/icons/zen.meditation.android.1644109.png",
+    )
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Names.kt b/basic/src/main/java/org/fdroid/basic/ui/Names.kt
similarity index 99%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/Names.kt
rename to basic/src/main/java/org/fdroid/basic/ui/Names.kt
index 46b4d7bb3..8252113a6 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Names.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/Names.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.basic.ui
 
 object Names {
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
index f5ad9e162..15bcc0e29 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
@@ -127,9 +127,9 @@ fun BottomBarScreen(
 @Composable
 fun BottomBarPreview() {
     val apps = listOf(
-        AppNavigationItem("", "foo", "bar", false),
-        AppNavigationItem("", "foo", "bar", false),
-        AppNavigationItem("", "foo", "bar", false),
+        AppNavigationItem("", "foo", null, "bar", false),
+        AppNavigationItem("", "foo", null, "bar", false),
+        AppNavigationItem("", "foo", null, "bar", false),
     )
     var filterExpanded by rememberSaveable { mutableStateOf(true) }
     val filterInfo = object : FilterInfo {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
index dc3ab1e37..10b0fce51 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
@@ -6,11 +6,13 @@ import kotlinx.parcelize.Parcelize
 interface MinimalApp {
     val packageName: String
     val name: String?
+    val icon: String?
 }
 
 @Parcelize
 data class InstalledApp(
     override val packageName: String,
+    override val icon: String? = null,
     override val name: String,
     val versionName: String,
 ) : MinimalApp, Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
index 513e1b2d0..4e4cf100a 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
@@ -17,7 +17,8 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.ui.main.discover.Names
+import coil3.compose.AsyncImage
+import org.fdroid.basic.ui.Names
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
@@ -29,7 +30,13 @@ fun InstalledAppRow(
     Column(modifier = modifier) {
         ListItem(
             leadingContent = {
-                Icon(
+                app.icon?.let {
+                    AsyncImage(
+                        model = app.icon,
+                        contentDescription = null,
+                        modifier = Modifier.size(48.dp),
+                    )
+                } ?: Icon(
                     Icons.Filled.Android,
                     tint = MaterialTheme.colorScheme.secondary,
                     contentDescription = null,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
index 410294e8b..0577d750b 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
@@ -21,8 +21,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
+import org.fdroid.basic.ui.Icons
+import org.fdroid.basic.ui.Names
 import org.fdroid.basic.ui.main.details.AppDetails
-import org.fdroid.basic.ui.main.discover.Names
 import org.fdroid.basic.ui.main.discover.Sort
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
@@ -93,9 +94,9 @@ fun MyAppsScaffoldPreview() {
             updateVersionName = "3.1.0",
             size = 9876543,
         )
-        val installedApp1 = InstalledApp("", Names.randomName, "3.0.1")
-        val installedApp2 = InstalledApp("", Names.randomName, "1.0")
-        val installedApp3 = InstalledApp("", Names.randomName, "0.1")
+        val installedApp1 = InstalledApp("", Names.randomName, Icons.randomIcon, "3.0.1")
+        val installedApp2 = InstalledApp("", Names.randomName, Icons.randomIcon, "1.0")
+        val installedApp3 = InstalledApp("", Names.randomName, Icons.randomIcon, "0.1")
         var sortBy by remember { mutableStateOf<Sort>(Sort.NAME) }
         MyAppsScaffold(
             updatableApps = listOf(app1, app2),
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt
index 15a3b6032..0cb7d1b6a 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt
@@ -10,5 +10,6 @@ data class UpdatableApp(
     val currentVersionName: String,
     val updateVersionName: String,
     val size: Long,
+    override val icon: String? = null,
     val whatsNew: String? = null,
 ): MinimalApp, Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
index f4bf43137..2e97b109e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
@@ -49,7 +50,13 @@ fun UpdatableAppRow(
                         contentDescription = null, modifier = Modifier.size(24.dp),
                     )
                 }) {
-                    Icon(
+                    app.icon?.let {
+                        AsyncImage(
+                            model = app.icon,
+                            contentDescription = null,
+                            modifier = Modifier.size(48.dp),
+                        )
+                    } ?: Icon(
                         Icons.Filled.Android,
                         tint = MaterialTheme.colorScheme.secondary,
                         contentDescription = null,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
index 7e97b5b13..3b7d90d05 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
@@ -49,6 +49,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import org.fdroid.basic.R
+import org.fdroid.basic.ui.Names.names
 import org.fdroid.basic.ui.asRelativeTimeString
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
@@ -204,6 +205,7 @@ fun AppDetails(
                     .height(240.dp)
                     .padding(vertical = 8.dp)
             ) { index ->
+                names
                 AsyncImage(
                     model = item.phoneScreenshots[index].name,
                     contentDescription = "",
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
index 24278bdea..e5203bcd8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
@@ -63,7 +63,7 @@ data class TestApp(
     override val name: String?,
     override val summary: String?,
     val description: String? = null,
-    val icon: FileV2? = null,
+    override val icon: String? = null,
     val featureGraphic: FileV2? = null,
     val phoneScreenshots: List<FileV2> = emptyList(),
     override val metadata: AppMetadata = AppMetadata(
@@ -74,7 +74,7 @@ data class TestApp(
         isCompatible = true,
     )
 ) : IApp {
-    override fun getIcon(localeList: LocaleListCompat): FileV2? = icon
+    override fun getIcon(localeList: LocaleListCompat): FileV2? = icon?.let { FileV2(it) }
     override fun getDescription(localeList: LocaleListCompat): String? = description
     override fun getFeatureGraphic(localeList: LocaleListCompat): FileV2? = featureGraphic
     override fun getPhoneScreenshots(localeList: LocaleListCompat): List<FileV2> = phoneScreenshots
@@ -125,7 +125,7 @@ val newPipeApp = TestApp(
         categories = listOf("Internet", "Multimedia"),
         isCompatible = true,
     ),
-    icon = FileV2(name = "https://f-droid.org/repo/org.schabi.newpipe/en-US/icon_OHy4y1W-fJCNhHHOBCM9V_cxZNJJgbcNkB-x7UDTY9Q=.png"),
+    icon = "https://f-droid.org/repo/org.schabi.newpipe/en-US/icon_OHy4y1W-fJCNhHHOBCM9V_cxZNJJgbcNkB-x7UDTY9Q=.png",
     featureGraphic = FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/featureGraphic_aeQS-fmo5GZhNiioPTtd8Sjgb53Mvvg6LOV2ww-irYA=.png"),
     phoneScreenshots = listOf(
         FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/00.png"),
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
index 3f2b652db..646c80ba7 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
@@ -23,8 +24,11 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import org.fdroid.basic.ui.Names
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -73,7 +77,16 @@ fun AppBox(app: AppNavigationItem, onAppTap: (AppNavigationItem) -> Unit) {
             .padding(8.dp)
             .clickable { onAppTap(app) },
     ) {
-        Icon(
+        app.icon?.let {
+            AsyncImage(
+                app.icon,
+                contentDescription = null,
+                contentScale = ContentScale.Fit,
+                modifier = Modifier
+                    .requiredSize(76.dp)
+                    .clip(MaterialTheme.shapes.medium),
+            )
+        } ?: Icon(
             Icons.Filled.Android,
             tint = MaterialTheme.colorScheme.secondary,
             contentDescription = null,
@@ -96,11 +109,11 @@ fun AppBox(app: AppNavigationItem, onAppTap: (AppNavigationItem) -> Unit) {
 @Composable
 fun AppCarouselPreview() {
     val apps = listOf(
-        AppNavigationItem("", Names.randomName, "bar", true),
-        AppNavigationItem("", Names.randomName, "bar", false),
-        AppNavigationItem("", Names.randomName, "bar", false),
-        AppNavigationItem("", Names.randomName, "bar", false),
-        AppNavigationItem("", Names.randomName, "bar", false),
+        AppNavigationItem("", Names.randomName, summary = "bar", isNew = true),
+        AppNavigationItem("", Names.randomName, summary = "bar", isNew = false),
+        AppNavigationItem("", Names.randomName, summary = "bar", isNew = false),
+        AppNavigationItem("", Names.randomName, summary = "bar", isNew = false),
+        AppNavigationItem("", Names.randomName, summary = "bar", isNew = false),
     )
     FDroidContent {
         AppCarousel("Preview Apps", apps, onTitleTap = {}) {}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
index 09958bf2d..92cd8afa5 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
@@ -8,6 +8,7 @@ import org.fdroid.basic.ui.main.apps.MinimalApp
 class AppNavigationItem(
     override val packageName: String,
     override val name: String,
+    override val icon: String? = null,
     val summary: String,
     val isNew: Boolean,
 ): MinimalApp, Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
index 7c1468791..1dc67a99c 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
@@ -112,9 +112,9 @@ fun DiscoverScaffold(
 fun DiscoverScaffoldPreview() {
     FDroidContent {
         val apps = listOf(
-            AppNavigationItem("1", "foo", "bar", false),
-            AppNavigationItem("2", "foo", "bar", false),
-            AppNavigationItem("3", "foo", "bar", false),
+            AppNavigationItem("1", "foo", null, "bar", false),
+            AppNavigationItem("2", "foo", null, "bar", false),
+            AppNavigationItem("3", "foo", null, "bar", false),
         )
         var filterExpanded by rememberSaveable { mutableStateOf(true) }
         val filterInfo = object : FilterInfo {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
index b7f127ec7..23b6467fb 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
@@ -18,12 +18,14 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 fun AppItem(
     name: String,
     summary: String,
+    icon: String?,
     isNew: Boolean,
     isSelected: Boolean,
     modifier: Modifier = Modifier,
@@ -39,7 +41,13 @@ fun AppItem(
                     contentDescription = null, modifier = Modifier.size(24.dp),
                 )
             }) {
-                Icon(
+                icon?.let {
+                    AsyncImage(
+                        model = icon,
+                        contentDescription = null,
+                        modifier = Modifier.size(48.dp),
+                    )
+                } ?: Icon(
                     Icons.Filled.Android,
                     tint = MaterialTheme.colorScheme.secondary,
                     contentDescription = null,
@@ -66,7 +74,7 @@ fun AppItem(
 @Composable
 fun AppItemPreview() {
     FDroidContent {
-        AppItem("This is app 1", "It has summary 2", false, false)
+        AppItem("This is app 1", "It has summary 2", null, false, false)
     }
 }
 
@@ -74,7 +82,7 @@ fun AppItemPreview() {
 @Composable
 fun AppItemPreviewNew() {
     FDroidContent {
-        AppItem("This is app 1", "It has summary 2", true, false)
+        AppItem("This is app 1", "It has summary 2", null, true, false)
     }
 }
 
@@ -82,6 +90,6 @@ fun AppItemPreviewNew() {
 @Composable
 fun AppItemPreviewSelected() {
     FDroidContent {
-        AppItem("This is app 1", "It has summary 2", false, true)
+        AppItem("This is app 1", "It has summary 2", null, false, true)
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
index 2ea542eae..f66790725 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
@@ -122,7 +122,14 @@ fun AppList(
                         .animateItem()
                         .padding(horizontal = 8.dp)
                         .then(interactionModifier)
-                    AppItem(navItem.name, navItem.summary, navItem.isNew, isSelected, modifier)
+                    AppItem(
+                        name = navItem.name,
+                        summary = navItem.summary,
+                        icon = navItem.icon,
+                        isNew = navItem.isNew,
+                        isSelected = isSelected,
+                        modifier = modifier,
+                    )
                 }
                 item(contentType = "S") {
                     Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))

From 7eb09632243b43d0d309c312a2f92b57905c5d5a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 30 May 2025 11:04:53 -0300
Subject: [PATCH 019/180] More work on app details

---
 .../basic/ui/main/apps/MyAppsScaffold.kt      |   5 +-
 .../basic/ui/main/details/AppDetails.kt       | 450 ++++++++++++++++--
 .../basic/ui/main/details/AppDetailsLink.kt   |  29 ++
 .../basic/ui/main/details/AppDetailsMenu.kt   |  66 +++
 .../ui/main/details/ExpandableSection.kt      |  67 +++
 .../org/fdroid/basic/ui/main/details/IApp.kt  |   6 +-
 .../basic/ui/main/details/RepoChooser.kt      | 165 +++++++
 .../ui/main/discover/DiscoverScaffold.kt      |   5 +-
 8 files changed, 736 insertions(+), 57 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt

diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
index 0577d750b..2aceaf5f3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
@@ -8,6 +8,7 @@ import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.AnimatedPane
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Detail
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.List
 import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
@@ -46,6 +47,7 @@ fun MyAppsScaffold(
         }
     }
     val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
+    val isListVisible = navigator.scaffoldValue[List] == PaneAdaptedValue.Expanded
     ListDetailPaneScaffold(
         directive = navigator.scaffoldDirective,
         value = navigator.scaffoldValue,
@@ -68,7 +70,8 @@ fun MyAppsScaffold(
         detailPane = {
             AnimatedPane {
                 currentItem?.let {
-                    AppDetails(it)
+                    val back: () -> Unit = { scope.launch { navigator.navigateBack() } }
+                    AppDetails(it, if (isListVisible) null else back)
                 } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
             }
         },
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
index 3b7d90d05..581890e63 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
@@ -1,5 +1,8 @@
 package org.fdroid.basic.ui.main.details
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.ExperimentalSharedTransitionApi
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -10,41 +13,73 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.Notes
+import androidx.compose.material.icons.filled.AccessTime
+import androidx.compose.material.icons.filled.Call
+import androidx.compose.material.icons.filled.ChangeHistory
+import androidx.compose.material.icons.filled.Code
+import androidx.compose.material.icons.filled.EditNote
 import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.filled.KeyboardArrowDown
+import androidx.compose.material.icons.filled.KeyboardArrowUp
+import androidx.compose.material.icons.filled.Link
+import androidx.compose.material.icons.filled.Mail
+import androidx.compose.material.icons.filled.MonetizationOn
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.Security
 import androidx.compose.material.icons.filled.Share
+import androidx.compose.material.icons.filled.Translate
+import androidx.compose.material.icons.filled.WarningAmber
 import androidx.compose.material3.Button
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
 import androidx.compose.material3.carousel.rememberCarouselState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter.Companion.tint
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign.Companion.Center
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
@@ -56,9 +91,13 @@ import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
+@OptIn(
+    ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class,
+    ExperimentalSharedTransitionApi::class
+)
 fun AppDetails(
     appItem: MinimalApp?,
+    onBackNav: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
     val topAppBarState = rememberTopAppBarState()
@@ -77,10 +116,10 @@ fun AppDetails(
                     }
                 },
                 navigationIcon = {
-                    IconButton(onClick = { /* do something */ }) {
+                    if (onBackNav != null) IconButton(onClick = onBackNav) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                            contentDescription = "Localized description"
+                            contentDescription = "Localized description",
                         )
                     }
                 },
@@ -88,15 +127,17 @@ fun AppDetails(
                     IconButton(onClick = { /* do something */ }) {
                         Icon(
                             imageVector = Icons.Filled.Share,
-                            contentDescription = "Localized description"
+                            contentDescription = "Localized description",
                         )
                     }
-                    IconButton(onClick = { /* do something */ }) {
+                    var expanded by remember { mutableStateOf(false) }
+                    IconButton(onClick = { expanded = !expanded }) {
                         Icon(
                             imageVector = Icons.Filled.MoreVert,
-                            contentDescription = "Localized description"
+                            contentDescription = "Localized description",
                         )
                     }
+                    AppDetailsMenu(expanded) { expanded = false }
                 },
                 scrollBehavior = scrollBehavior,
             )
@@ -119,10 +160,23 @@ fun AppDetails(
                     modifier = Modifier
                         .fillMaxWidth()
                         .heightIn(max = 196.dp)
+                        .graphicsLayer { alpha = 0.5f }
+                        .drawWithContent {
+                            val colors = listOf(
+                                Color.Black,
+                                Color.Transparent
+                            )
+                            drawContent()
+                            drawRect(
+                                brush = Brush.verticalGradient(colors),
+                                blendMode = BlendMode.DstIn
+                            )
+                        }
                         .padding(bottom = 8.dp),
                     error = rememberVectorPainter(Icons.Default.Error),
                 )
             } ?: Spacer(modifier = Modifier.padding(innerPadding))
+            // Header
             Row(
                 modifier = Modifier
                     .padding(horizontal = 16.dp),
@@ -155,6 +209,7 @@ fun AppDetails(
                     )
                 }
             }
+            // Summary
             item.app.summary?.let { summary ->
                 Text(
                     text = summary,
@@ -162,14 +217,63 @@ fun AppDetails(
                     modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
                 )
             }
-            Row(
-                horizontalArrangement = spacedBy(8.dp),
+            // Repo Chooser
+            RepoChooser(
+                repos = listOf("F-Droid", "Guardian Project"),
+                currentRepoId = 0L,
+                preferredRepoId = 0L,
+                onRepoChanged = {},
+                onPreferredRepoChanged = {},
                 modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            )
+            // Main Buttons
+            Row(
+                horizontalArrangement = spacedBy(8.dp, CenterHorizontally),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp, vertical = 8.dp),
             ) {
+                OutlinedButton(onClick = {}, modifier = Modifier.weight(1f)) {
+                    Text("Open")
+                }
                 Button(onClick = {}, modifier = Modifier.weight(1f)) {
-                    Text("Install")
+                    Text("Update")
                 }
             }
+            // Warnings
+            ElevatedCard(
+                colors = CardDefaults.elevatedCardColors(
+                    containerColor = MaterialTheme.colorScheme.errorContainer,
+                ),
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Column {
+                    Row(
+                        horizontalArrangement = spacedBy(8.dp),
+                        verticalAlignment = CenterVertically,
+                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                    ) {
+                        Icon(Icons.Default.WarningAmber, "")
+                        Text(
+                            "Can not update this app, because no compatible versions available in repository.",
+                            style = MaterialTheme.typography.bodyLarge,
+                        )
+                    }
+                    HorizontalDivider()
+                    Row(
+                        horizontalArrangement = spacedBy(8.dp),
+                        verticalAlignment = CenterVertically,
+                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                    ) {
+                        Icon(Icons.Default.WarningAmber, "")
+                        Text(
+                            "Auto-update not available, because app targets old version of Android.",
+                            style = MaterialTheme.typography.bodyLarge,
+                        )
+                    }
+                }
+            }
+            // What's New
             item.whatsNew?.let { whatsNew ->
                 ElevatedCard(
                     colors = CardDefaults.elevatedCardColors(
@@ -188,17 +292,89 @@ fun AppDetails(
                     )
                 }
             }
+            // Description
+            var descriptionExpanded by remember { mutableStateOf(false) }
             item.description?.let { description ->
-                Text(
-                    text = description,
-                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-                )
+                AnimatedVisibility(descriptionExpanded) {
+                    Text(
+                        text = description,
+                        modifier = Modifier
+                            .padding(horizontal = 16.dp)
+                            .padding(top = 8.dp),
+                    )
+                }
+                AnimatedVisibility(!descriptionExpanded) {
+                    Text(
+                        text = description,
+                        maxLines = 3,
+                        overflow = TextOverflow.Ellipsis,
+                        modifier = Modifier
+                            .padding(horizontal = 16.dp)
+                            .padding(top = 8.dp),
+                    )
+                }
+                TextButton(onClick = { descriptionExpanded = !descriptionExpanded }) {
+                    Text(
+                        text = if (descriptionExpanded) "Less" else "More",
+                        textAlign = Center,
+                        maxLines = if (descriptionExpanded) Int.MAX_VALUE else 3,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 16.dp)
+                            .padding(bottom = 8.dp),
+                    )
+                }
             }
+            // Anti-features
+            ElevatedCard(
+                colors = CardDefaults.elevatedCardColors(
+                    containerColor = MaterialTheme.colorScheme.inverseSurface,
+                ),
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                ExpandableSection(
+                    icon = rememberVectorPainter(Icons.Default.WarningAmber),
+                    title = "This app has anti-features",
+                    modifier = Modifier.padding(horizontal = 16.dp),
+                ) {
+                    item.antiFeatures?.forEach { antiFeature ->
+                        ListItem(
+                            leadingContent = {
+                                antiFeature.icon?.let { icon ->
+                                    AsyncImage(
+                                        model = icon.name,
+                                        contentDescription = "",
+                                        colorFilter = tint(MaterialTheme.colorScheme.onBackground),
+                                        error = rememberVectorPainter(Icons.Filled.Error),
+                                        modifier = Modifier.size(32.dp),
+                                    )
+                                }
+                            },
+                            headlineContent = {
+                                Text(
+                                    text = antiFeature.name,
+                                    style = MaterialTheme.typography.bodyMediumEmphasized,
+                                )
+                            },
+                            supportingContent = {
+                                antiFeature.reason?.let {
+                                    Text(
+                                        text = antiFeature.reason,
+                                        style = MaterialTheme.typography.labelMedium,
+                                    )
+                                }
+                            },
+                            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
+                        )
+                    }
+                }
+            }
+            // Screenshots
             val carouselState = rememberCarouselState { item.phoneScreenshots.size }
             HorizontalUncontainedCarousel(
                 state = carouselState,
-                itemWidth = 135.dp,
-                itemSpacing = 0.dp,
+                itemWidth = 120.dp,
+                itemSpacing = 4.dp,
                 contentPadding = PaddingValues(horizontal = 16.dp),
                 modifier = Modifier
                     .fillMaxWidth()
@@ -209,46 +385,216 @@ fun AppDetails(
                 AsyncImage(
                     model = item.phoneScreenshots[index].name,
                     contentDescription = "",
+                    contentScale = ContentScale.Fit,
                     placeholder = rememberVectorPainter(Icons.Default.Image),
                     error = rememberVectorPainter(Icons.Default.Error),
-                    modifier = Modifier.widthIn(min = 135.dp)
+                    modifier = Modifier
+                        .clip(MaterialTheme.shapes.medium),
                 )
             }
-            // Anti-Features
-            Text(
-                text = stringResource(R.string.antifeatures),
-                style = MaterialTheme.typography.titleMediumEmphasized,
-                modifier = Modifier.padding(horizontal = 16.dp),
-            )
-            item.antiFeatures?.forEach { antiFeature ->
-                ListItem(
-                    leadingContent = {
-                        antiFeature.icon?.let { icon ->
-                            AsyncImage(
-                                model = icon.name,
-                                contentDescription = "",
-                                colorFilter = tint(MaterialTheme.colorScheme.onBackground),
-                                error = rememberVectorPainter(Icons.Filled.Error),
-                                modifier = Modifier.size(48.dp),
-                            )
-                        }
-                    },
-                    headlineContent = {
-                        Text(
-                            text = antiFeature.name,
-                            style = MaterialTheme.typography.bodyMediumEmphasized,
-                        )
-                    },
-                    supportingContent = {
-                        antiFeature.reason?.let {
-                            Text(
-                                text = antiFeature.reason,
-                                style = MaterialTheme.typography.labelMedium,
-                            )
-                        }
-                    },
-                    colors = ListItemDefaults.colors(containerColor = Color.Transparent),
+            // Donate card
+            ElevatedCard(
+                colors = CardDefaults.elevatedCardColors(),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Text(
+                    text = "Donate",
+                    style = MaterialTheme.typography.titleMediumEmphasized,
+                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
                 )
+                item.app.metadata.donate?.forEach { donation ->
+                    AppDetailsLink(
+                        icon = Icons.Default.Link,
+                        title = donation,
+                        url = donation,
+                        modifier = modifier.padding(horizontal = 16.dp),
+                    )
+                }
+                item.app.metadata.liberapay?.let { liberapay ->
+                    AppDetailsLink(
+                        icon = Icons.Default.ChangeHistory,
+                        title = "LiberaPay",
+                        url = "https://liberapay.com/$liberapay",
+                        modifier = modifier.padding(horizontal = 16.dp),
+                    )
+                }
+            }
+            // Description (expandable section)
+            var sectionExpanded by rememberSaveable { mutableStateOf(false) }
+            Column(
+                modifier = modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
+            ) {
+                Row(
+                    verticalAlignment = CenterVertically,
+                    horizontalArrangement = spacedBy(8.dp),
+                    modifier = Modifier
+                        .heightIn(min = 48.dp)
+                        .clickable(onClick = { sectionExpanded = !sectionExpanded })
+                ) {
+                    Icon(
+                        Icons.AutoMirrored.Default.Notes,
+                        contentDescription = null,
+                    )
+                    Column(modifier = Modifier.weight(1f)) {
+                        Text(
+                            text = "Description",
+                            style = MaterialTheme.typography.titleMedium,
+                        )
+                        AnimatedVisibility(!sectionExpanded) {
+                            Text(
+                                text = item.description ?: "nope",
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+                        }
+                    }
+                    IconButton(onClick = { sectionExpanded = !sectionExpanded }) {
+                        Icon(
+                            imageVector = if (sectionExpanded) {
+                                Icons.Default.KeyboardArrowUp
+                            } else {
+                                Icons.Default.KeyboardArrowDown
+                            },
+                            contentDescription = null,
+                        )
+                    }
+                }
+                AnimatedVisibility(sectionExpanded) {
+                    Text(item.description ?: "nope")
+                }
+            }
+            // Links
+            ExpandableSection(
+                icon = rememberVectorPainter(Icons.Default.Link),
+                title = stringResource(R.string.links),
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Column(modifier = Modifier.padding(start = 16.dp)) {
+                    item.app.metadata.webSite?.let { webSite ->
+                        AppDetailsLink(
+                            icon = Icons.Default.Home,
+                            title = stringResource(R.string.menu_website),
+                            url = webSite,
+                        )
+                    }
+                    item.app.metadata.issueTracker?.let { issueTracker ->
+                        AppDetailsLink(
+                            icon = Icons.Default.EditNote,
+                            title = stringResource(R.string.menu_issues),
+                            url = issueTracker,
+                        )
+                    }
+                    item.app.metadata.changelog?.let { changelog ->
+                        AppDetailsLink(
+                            icon = Icons.Default.ChangeHistory,
+                            title = stringResource(R.string.menu_changelog),
+                            url = changelog,
+                        )
+                    }
+                    item.app.metadata.license?.let { license ->
+                        AppDetailsLink(
+                            icon = License,
+                            title = stringResource(R.string.menu_license, license),
+                            url = "https://spdx.org/licenses/$license",
+                        )
+                    }
+                    item.app.metadata.translation?.let { translation ->
+                        AppDetailsLink(
+                            icon = Icons.Default.Translate,
+                            title = stringResource(R.string.menu_translation),
+                            url = translation,
+                        )
+                    }
+                    item.app.metadata.sourceCode?.let { sourceCode ->
+                        AppDetailsLink(
+                            icon = Icons.Default.Code,
+                            title = stringResource(R.string.menu_source),
+                            url = sourceCode,
+                        )
+                    }
+                }
+            }
+            // Donation (expandable section)
+            ExpandableSection(
+                icon = rememberVectorPainter(Icons.Default.MonetizationOn),
+                title = "Donation links",
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Column(modifier = Modifier.padding(start = 16.dp)) {
+                    item.app.metadata.donate?.forEach { donation ->
+                        AppDetailsLink(
+                            icon = Icons.Default.Link,
+                            title = donation,
+                            url = donation,
+                        )
+                    }
+                    item.app.metadata.liberapay?.let { liberapay ->
+                        AppDetailsLink(
+                            icon = Icons.Default.ChangeHistory,
+                            title = "LiberaPay",
+                            url = "https://liberapay.com/$liberapay",
+                        )
+                    }
+                }
+            }
+            // Versions
+            ExpandableSection(
+                icon = rememberVectorPainter(Icons.Default.AccessTime),
+                title = stringResource(R.string.versions),
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Text("TODO")
+            }
+            // Permissions
+            ExpandableSection(
+                icon = rememberVectorPainter(Icons.Default.Security),
+                title = stringResource(R.string.permissions),
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Text("Do we still want to list all permissions here?")
+            }
+            // Developer contact
+            ExpandableSection(
+                icon = rememberVectorPainter(Icons.Default.Person),
+                title = "Developer contact",
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Column(modifier = Modifier.padding(start = 16.dp)) {
+                    item.app.metadata.authorWebSite?.let { authorWebSite ->
+                        AppDetailsLink(
+                            icon = Icons.Default.Home,
+                            title = stringResource(R.string.menu_website),
+                            url = authorWebSite,
+                        )
+                    }
+                    item.app.metadata.authorEmail?.let { authorEmail ->
+                        AppDetailsLink(
+                            icon = Icons.Default.Mail,
+                            title = stringResource(R.string.menu_email),
+                            url = authorEmail,
+                        )
+                    }
+                    item.app.metadata.authorPhone?.let { authorPhone ->
+                        AppDetailsLink(
+                            icon = Icons.Default.Call,
+                            title = "Call the author",
+                            url = authorPhone,
+                        )
+                    }
+                }
+            }
+            // More apps by dev
+            Button(
+                onClick = {},
+                modifier = Modifier
+                    .align(CenterHorizontally)
+                    .padding(bottom = 16.dp),
+            ) {
+                Text("More apps by ${item.app.metadata.authorName}")
             }
         }
     }
@@ -264,6 +610,6 @@ fun AppDetailsPreview() {
             summary = "This is a nice app!",
             isNew = false,
         )
-        AppDetails(item)
+        AppDetails(item, { })
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
new file mode 100644
index 000000000..fe7dbb7c5
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
@@ -0,0 +1,29 @@
+package org.fdroid.basic.ui.main.details
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun AppDetailsLink(icon: ImageVector, title: String, url: String, modifier: Modifier = Modifier) {
+    val uriHandler = LocalUriHandler.current
+    Row(
+        horizontalArrangement = spacedBy(8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier
+            .heightIn(min = 48.dp)
+            .clickable(onClick = { uriHandler.openUri(url) }),
+    ) {
+        Icon(icon, null)
+        Text(title)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt
new file mode 100644
index 000000000..1ac0e9483
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt
@@ -0,0 +1,66 @@
+package org.fdroid.basic.ui.main.details
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Preview
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material.icons.filled.UpdateDisabled
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+
+@Composable
+fun AppDetailsMenu(expanded: Boolean, onDismiss: () -> Unit) {
+    DropdownMenu(
+        expanded = expanded,
+        onDismissRequest = onDismiss,
+    ) {
+        DropdownMenuItem(
+            leadingIcon = {
+                Icon(Icons.Default.UpdateDisabled, null)
+            },
+            text = { Text("Ignore all updates") },
+            trailingIcon = {
+                Checkbox(false, null)
+            },
+            onClick = { /* Do something... */ },
+        )
+        DropdownMenuItem(
+            leadingIcon = {
+                Icon(Icons.Default.UpdateDisabled, null)
+            },
+            text = { Text("Ignore this updates") },
+            trailingIcon = {
+                Checkbox(false, null)
+            },
+            onClick = { /* Do something... */ },
+        )
+        DropdownMenuItem(
+            leadingIcon = {
+                Icon(Icons.Default.Preview, null)
+            },
+            text = { Text("Allow beta updates") },
+            trailingIcon = {
+                Checkbox(false, null)
+            },
+            onClick = { /* Do something... */ },
+        )
+        DropdownMenuItem(
+            leadingIcon = {
+                Icon(Icons.Default.Share, null)
+            },
+            text = { Text("Share APK") },
+            onClick = { /* Do something... */ },
+        )
+        DropdownMenuItem(
+            leadingIcon = {
+                Icon(Icons.Default.Delete, null)
+            },
+            text = { Text("Uninstall app") },
+            onClick = { /* Do something... */ },
+        )
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt
new file mode 100644
index 000000000..107e40178
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt
@@ -0,0 +1,67 @@
+package org.fdroid.basic.ui.main.details
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.KeyboardArrowDown
+import androidx.compose.material.icons.filled.KeyboardArrowUp
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ExpandableSection(
+    icon: Painter?,
+    title: String,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit
+) {
+    var sectionExpanded by rememberSaveable { mutableStateOf(false) }
+    Column(modifier = modifier.fillMaxWidth()) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = spacedBy(8.dp),
+            modifier = Modifier
+                .heightIn(min = 48.dp)
+                .clickable(onClick = { sectionExpanded = !sectionExpanded })
+        ) {
+            if (icon != null) Icon(
+                painter = icon,
+                contentDescription = null,
+            )
+            Text(
+                text = title,
+                style = MaterialTheme.typography.titleMedium,
+                modifier = Modifier.weight(1f),
+            )
+            IconButton(onClick = { sectionExpanded = !sectionExpanded }) {
+                Icon(
+                    imageVector = if (sectionExpanded) {
+                        Icons.Default.KeyboardArrowUp
+                    } else {
+                        Icons.Default.KeyboardArrowDown
+                    },
+                    contentDescription = null,
+                )
+            }
+        }
+        AnimatedVisibility(sectionExpanded) {
+            content()
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
index e5203bcd8..f86a55fd2 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
@@ -97,7 +97,7 @@ val newPipeApp = TestApp(
         "It only parses the website in order to gain the information it needs. " +
         "Therefore this app can be used on devices without Google Services installed. " +
         "Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.\n\n" +
-        LoremIpsum(256).values.joinToString(" "),
+        LoremIpsum(128).values.joinToString(" "),
     metadata = AppMetadata(
         repoId = 1,
         packageName = "org.schabi.newpipe",
@@ -113,8 +113,8 @@ val newPipeApp = TestApp(
         video = null,
         authorName = "Team NewPipe",
         authorEmail = "team@newpipe.net",
-        authorWebSite = null,
-        authorPhone = null,
+        authorWebSite = "https://newpipe.net",
+        authorPhone = "123456",
         donate = listOf("https://newpipe.net/donate"),
         liberapayID = null,
         liberapay = "TeamNewPipe",
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt
new file mode 100644
index 000000000..ad6514639
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt
@@ -0,0 +1,165 @@
+package org.fdroid.basic.ui.main.details
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment.Companion.End
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight.Companion.Bold
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.R
+import org.fdroid.basic.ui.icons.PackageVariant
+import org.fdroid.database.Repository
+
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+fun RepoChooser(
+    repos: List<String>,
+    currentRepoId: Long,
+    preferredRepoId: Long,
+    onRepoChanged: (Repository) -> Unit,
+    onPreferredRepoChanged: (Long) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    if (repos.isEmpty()) return
+    var expanded by remember { mutableStateOf(false) }
+    val currentRepo = repos[0]
+    val isPreferred = true
+    Column(
+        modifier = modifier.fillMaxWidth(),
+    ) {
+        Box {
+            val borderColor = if (isPreferred) {
+                MaterialTheme.colorScheme.primary
+            } else {
+                MaterialTheme.colorScheme.outline
+            }
+            OutlinedTextField(
+                value = TextFieldValue(
+                    annotatedString = getRepoString(
+                        repo = currentRepo,
+                        isPreferred = repos.size > 1 && isPreferred,
+                    ),
+                ),
+                textStyle = MaterialTheme.typography.bodyMedium,
+                onValueChange = {},
+                label = {
+                    if (repos.size == 1) {
+                        Text(stringResource(R.string.app_details_repository))
+                    } else {
+                        Text(stringResource(R.string.app_details_repositories))
+                    }
+                },
+                leadingIcon = {
+                    Icon(PackageVariant, null, Modifier.size(24.dp))
+                },
+                trailingIcon = {
+                    if (repos.size > 1) Icon(
+                        imageVector = Icons.Default.ArrowDropDown,
+                        contentDescription = stringResource(R.string.app_details_repository_expand),
+                        tint = if (isPreferred) {
+                            MaterialTheme.colorScheme.primary
+                        } else {
+                            MaterialTheme.colorScheme.onSurface
+                        },
+                    )
+                },
+                singleLine = false,
+                enabled = false,
+                colors = OutlinedTextFieldDefaults.colors(
+                    // hack to enable clickable and look like enabled
+                    disabledTextColor = MaterialTheme.colorScheme.onSurface,
+                    disabledBorderColor = borderColor,
+                    disabledLeadingIconColor = MaterialTheme.colorScheme.onSurface,
+                    disabledLabelColor = borderColor,
+                ),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .let {
+                        if (repos.size > 1) it.clickable(onClick = { expanded = true }) else it
+                    },
+            )
+            DropdownMenu(
+                expanded = expanded,
+                onDismissRequest = { expanded = false },
+            ) {
+                repos.iterator().forEach { repo ->
+                    RepoMenuItem(
+                        repo = repo,
+                        isPreferred = repo == repos[0],
+                        onClick = {
+                            // onRepoChanged(repo)
+                            expanded = false
+                        },
+                        modifier = modifier,
+                    )
+                }
+            }
+        }
+        if (!isPreferred) {
+            OutlinedButton(
+                onClick = { onPreferredRepoChanged(0L) },
+                modifier = Modifier
+                    .align(End)
+                    .padding(top = 8.dp),
+            ) {
+                Text(stringResource(R.string.app_details_repository_button_prefer))
+            }
+        }
+    }
+}
+
+@Composable
+private fun RepoMenuItem(
+    repo: String,
+    isPreferred: Boolean,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit
+) {
+    DropdownMenuItem(
+        text = {
+            Text(
+                text = getRepoString(repo, isPreferred),
+                style = MaterialTheme.typography.bodyMedium,
+            )
+        },
+        modifier = modifier,
+        onClick = onClick,
+        leadingIcon = { Icon(PackageVariant, null, Modifier.size(24.dp)) }
+    )
+}
+
+@Composable
+private fun getRepoString(repo: String, isPreferred: Boolean) = buildAnnotatedString {
+    append(repo)
+    if (isPreferred) {
+        append(" ")
+        pushStyle(SpanStyle(fontWeight = Bold))
+        append(" ")
+        append(stringResource(R.string.app_details_repository_preferred))
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
index 1dc67a99c..55989f936 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
@@ -7,6 +7,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.AnimatedPane
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Detail
 import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
@@ -57,6 +58,7 @@ fun DiscoverScaffold(
         }
     }
     val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
+    val isListVisible = navigator.scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
     ListDetailPaneScaffold(
         directive = navigator.scaffoldDirective,
         value = navigator.scaffoldValue,
@@ -99,7 +101,8 @@ fun DiscoverScaffold(
         detailPane = {
             AnimatedPane {
                 currentItem?.let {
-                    AppDetails(it)
+                    val back: () -> Unit = { scope.launch { navigator.navigateBack() } }
+                    AppDetails(it, if (isListVisible) null else back)
                 } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
             }
         },

From 9d73bc7ba27a4e9758dcbdadb546d369c7f331b1 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 26 Jun 2025 17:21:30 -0300
Subject: [PATCH 020/180] Fix release builds

---
 basic/build.gradle.kts                      |  7 ++++++-
 basic/src/main/java/org/fdroid/IndexFile.kt | 10 ----------
 2 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 basic/src/main/java/org/fdroid/IndexFile.kt

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index e43eb1b4d..649a32427 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -29,6 +29,9 @@ android {
                 "proguard-rules.pro"
             )
         }
+        debug {
+            applicationIdSuffix = ".debug"
+        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
@@ -51,6 +54,7 @@ android {
 dependencies {
     implementation(project(":libs:index"))
     implementation(project(":libs:database"))
+    implementation(project(":libs:download"))
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -60,6 +64,7 @@ dependencies {
     implementation(libs.androidx.compose.material.icons.extended)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.material3.adaptive.layout)
@@ -73,7 +78,7 @@ dependencies {
     implementation(libs.androidx.hilt.navigation.compose)
     ksp(libs.hilt.android.compiler)
 
-    debugImplementation(libs.androidx.compose.ui.tooling.preview)
+    debugImplementation(libs.androidx.compose.ui.tooling)
 
     testImplementation(libs.junit)
 
diff --git a/basic/src/main/java/org/fdroid/IndexFile.kt b/basic/src/main/java/org/fdroid/IndexFile.kt
deleted file mode 100644
index 84b646754..000000000
--- a/basic/src/main/java/org/fdroid/IndexFile.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.fdroid
-
-public interface IndexFile {
-    public val name: String
-    public val sha256: String?
-    public val size: Long?
-    public val ipfsCidV1: String?
-
-    public fun serialize(): String
-}

From e9f1e17d53938b8de30e0452c253effa8d1cbaee Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 27 Jun 2025 16:55:53 -0300
Subject: [PATCH 021/180] Add new categories

---
 .../java/org/fdroid/basic/MainViewModel.kt    | 116 ++++++++++++++----
 .../basic/ui/main/discover/AppsSearch.kt      |  32 ++++-
 .../basic/ui/main/discover/CategoryCard.kt    |  56 +++++++++
 .../ui/main/discover/CategoryCarousel.kt      |  35 +++---
 4 files changed, 197 insertions(+), 42 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCard.kt

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index d7754a9ec..50eac6155 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -1,6 +1,50 @@
 package org.fdroid.basic
 
 import android.app.Application
+import androidx.compose.material.icons.Icons.AutoMirrored
+import androidx.compose.material.icons.Icons.Default
+import androidx.compose.material.icons.automirrored.filled.ChromeReaderMode
+import androidx.compose.material.icons.automirrored.filled.Message
+import androidx.compose.material.icons.filled.AccessTime
+import androidx.compose.material.icons.filled.AccountBalanceWallet
+import androidx.compose.material.icons.filled.Airplay
+import androidx.compose.material.icons.filled.AlternateEmail
+import androidx.compose.material.icons.filled.CalendarMonth
+import androidx.compose.material.icons.filled.Cloud
+import androidx.compose.material.icons.filled.Collections
+import androidx.compose.material.icons.filled.DeveloperMode
+import androidx.compose.material.icons.filled.Dns
+import androidx.compose.material.icons.filled.EditNote
+import androidx.compose.material.icons.filled.EnhancedEncryption
+import androidx.compose.material.icons.filled.Games
+import androidx.compose.material.icons.filled.Groups
+import androidx.compose.material.icons.filled.HealthAndSafety
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.filled.Keyboard
+import androidx.compose.material.icons.filled.Language
+import androidx.compose.material.icons.filled.LocalPlay
+import androidx.compose.material.icons.filled.Money
+import androidx.compose.material.icons.filled.MusicVideo
+import androidx.compose.material.icons.filled.Navigation
+import androidx.compose.material.icons.filled.Newspaper
+import androidx.compose.material.icons.filled.OpenInBrowser
+import androidx.compose.material.icons.filled.Password
+import androidx.compose.material.icons.filled.PermPhoneMsg
+import androidx.compose.material.icons.filled.Podcasts
+import androidx.compose.material.icons.filled.Science
+import androidx.compose.material.icons.filled.Security
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.filled.SignalCellularAlt
+import androidx.compose.material.icons.filled.Storefront
+import androidx.compose.material.icons.filled.Style
+import androidx.compose.material.icons.filled.Translate
+import androidx.compose.material.icons.filled.UploadFile
+import androidx.compose.material.icons.filled.VideoChat
+import androidx.compose.material.icons.filled.VpnLock
+import androidx.compose.material.icons.filled.Wallet
+import androidx.compose.material.icons.filled.Wallpaper
+import androidx.compose.material.icons.filled.WbSunny
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
@@ -28,6 +72,8 @@ import org.fdroid.basic.ui.main.discover.Sort
 import org.fdroid.basic.ui.main.lists.AppList
 import javax.inject.Inject
 
+data class Category(val name: String, val imageVector: ImageVector)
+
 @HiltViewModel
 class MainViewModel @Inject constructor(
     app: Application,
@@ -38,30 +84,56 @@ class MainViewModel @Inject constructor(
 ) : AndroidViewModel(app) {
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
-    val categories = listOf(
-        Pair(app.getString(R.string.category_Internet), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Games), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Navigation), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Multimedia), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Security), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Reading), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Time), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Money), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Theming), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Connectivity), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Phone_SMS), R.drawable.ic_launcher),
-        Pair(
-            app.getString(R.string.category_Science_Education),
-            R.drawable.ic_launcher
-        ),
-        Pair(app.getString(R.string.category_Sports_Health), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_System), R.drawable.ic_launcher),
-        Pair(app.getString(R.string.category_Writing), R.drawable.ic_launcher),
-    )
+
+    companion object {
+        val categories = listOf(
+            Category("App Store & Updater", Default.Storefront),
+            Category("Browser", Default.OpenInBrowser),
+            Category("Calendar & Agenda", Default.CalendarMonth),
+            Category("Cloud Storage & File Sync", Default.Cloud),
+            Category("Connectivity", Default.SignalCellularAlt),
+            Category("Development", Default.DeveloperMode),
+            Category("DNS & Hosts", Default.Dns),
+            Category("Email", Default.AlternateEmail),
+            Category("File Encryption & Vault", Default.EnhancedEncryption),
+            Category("File Transfer", Default.UploadFile),
+            Category("Games", Default.Games),
+            Category("Graphics", Default.Image),
+            Category("Icon Pack", Default.Collections),
+            Category("Internet", Default.Language),
+            Category("Keyboard & IME", Default.Keyboard),
+            Category("Local Media Player", Default.LocalPlay),
+            Category("Messaging", AutoMirrored.Default.Message),
+            Category("Money", Default.Money),
+            Category("Multimedia", Default.MusicVideo),
+            Category("Navigation", Default.Navigation),
+            Category("News", Default.Newspaper),
+            Category("Online Media Player", Default.Airplay),
+            Category("Pass Wallet", Default.AccountBalanceWallet),
+            Category("Password & 2FA", Default.Password),
+            Category("Phone & SMS", Default.PermPhoneMsg),
+            Category("Podcast", Default.Podcasts),
+            Category("Reading", AutoMirrored.Default.ChromeReaderMode),
+            Category("Science & Education", Default.Science),
+            Category("Security", Default.Security),
+            Category("Social Network", Default.Groups),
+            Category("Sports & Health", Default.HealthAndSafety),
+            Category("System", Default.Settings),
+            Category("Theming", Default.Style),
+            Category("Time", Default.AccessTime),
+            Category("Translation & Dictionary", Default.Translate),
+            Category("Voice & Video Chat", Default.VideoChat),
+            Category("VPN & Proxy", Default.VpnLock),
+            Category("Wallet", Default.Wallet),
+            Category("Wallpaper", Default.Wallpaper),
+            Category("Weather", Default.WbSunny),
+            Category("Writing", Default.EditNote),
+        )
+    }
 
     val initialApps = buildList {
         repeat(NUM_ITEMS) { i ->
-            val category = categories.getOrElse(i) { categories.random() }.first
+            val category = categories.getOrElse(i) { categories.random() }.name
             val navItem = AppNavigationItem(
                 packageName = "$i",
                 icon = when (i) {
@@ -93,7 +165,7 @@ class MainViewModel @Inject constructor(
             areFiltersShownFlow = showFilters,
             appsFlow = flow { emit(initialApps) },
             sortByFlow = sortBy,
-            allCategories = categories.map { it.first },
+            allCategories = categories.map { it.name },
             addedCategoriesFlow = addedCategories,
         )
     }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
index 294915d8d..f844223ea 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
@@ -1,16 +1,23 @@
 package org.fdroid.basic.ui.main.discover
 
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExpandedFullScreenSearchBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SearchBarState
+import androidx.compose.material3.SearchBarValue
 import androidx.compose.material3.TopSearchBar
+import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.MainViewModel
+import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -36,8 +43,23 @@ fun AppsSearch(
         state = searchBarState,
         inputField = inputField,
     ) {
-        Column(Modifier.verticalScroll(rememberScrollState())) {
-            // TODO
+        LazyVerticalGrid(
+            columns = GridCells.Adaptive(128.dp),
+            contentPadding = PaddingValues(16.dp)
+        ) {
+            items(MainViewModel.categories, key = { it.name }) { category ->
+                CategoryCard(category)
+            }
         }
     }
 }
+
+@Preview
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun AppsSearchPreview() {
+    FDroidContent {
+        val state = rememberSearchBarState(SearchBarValue.Expanded)
+        AppsSearch(state, {})
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCard.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCard.kt
new file mode 100644
index 000000000..e757d22ea
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCard.kt
@@ -0,0 +1,56 @@
+package org.fdroid.basic.ui.main.discover
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons.Default
+import androidx.compose.material.icons.filled.VpnLock
+import androidx.compose.material3.Card
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.Category
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun CategoryCard(category: Category) {
+    Card(modifier = Modifier.padding(8.dp).height(80.dp)) {
+        Row(
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.padding(16.dp).fillMaxHeight(),
+        ) {
+            Text(
+                category.name,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.weight(1f),
+            )
+            Image(
+                imageVector = category.imageVector,
+                contentDescription = null,
+                contentScale = ContentScale.None,
+                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
+                modifier = Modifier.padding(start = 16.dp),
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+fun CategoryCardPreview() {
+    FDroidContent {
+        CategoryCard(Category("VPN & Proxy", Default.VpnLock))
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
index ce3b41f0f..f918667af 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
@@ -10,7 +10,14 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.Icons.Default
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material.icons.filled.CalendarMonth
+import androidx.compose.material.icons.filled.Cloud
+import androidx.compose.material.icons.filled.DeveloperMode
+import androidx.compose.material.icons.filled.OpenInBrowser
+import androidx.compose.material.icons.filled.SignalCellularAlt
+import androidx.compose.material.icons.filled.Storefront
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -22,13 +29,11 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import org.fdroid.basic.Category
 import org.fdroid.basic.MainViewModel
-import org.fdroid.basic.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
@@ -38,13 +43,13 @@ fun CategoryCarousel(
     modifier: Modifier = Modifier,
     viewModel: MainViewModel = hiltViewModel(),
 ) {
-    CategoryCarousel(viewModel.categories, modifier, onTitleTap, onCategoryTap)
+    CategoryCarousel(MainViewModel.categories, modifier, onTitleTap, onCategoryTap)
 }
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun CategoryCarousel(
-    categories: List<Pair<String, Int>>,
+    categories: List<Category>,
     modifier: Modifier = Modifier,
     onTitleTap: () -> Unit,
     onCategoryTap: (String) -> Unit,
@@ -79,15 +84,15 @@ fun CategoryCarousel(
 }
 
 @Composable
-fun CategoryBox(category: Pair<String, Int>, onCategoryTap: (String) -> Unit) {
+fun CategoryBox(category: Category, onCategoryTap: (String) -> Unit) {
     Column(
         verticalArrangement = spacedBy(8.dp),
         modifier = Modifier
             .padding(8.dp)
-            .clickable { onCategoryTap(category.first) },
+            .clickable { onCategoryTap(category.name) },
     ) {
         Image(
-            painter = painterResource(category.second),
+            imageVector = category.imageVector,
             contentDescription = null,
             contentScale = ContentScale.Fit,
             modifier = Modifier
@@ -95,7 +100,7 @@ fun CategoryBox(category: Pair<String, Int>, onCategoryTap: (String) -> Unit) {
                 .size(76.dp),
         )
         Text(
-            text = category.first,
+            text = category.name,
             style = MaterialTheme.typography.bodySmall,
             minLines = 2,
             maxLines = 2,
@@ -107,12 +112,12 @@ fun CategoryBox(category: Pair<String, Int>, onCategoryTap: (String) -> Unit) {
 @Composable
 fun CategoryCarouselPreview() {
     val categories = listOf(
-        Pair(stringResource(R.string.category_Time), R.drawable.ic_launcher),
-        Pair(stringResource(R.string.category_Games), R.drawable.ic_launcher),
-        Pair(stringResource(R.string.category_Money), R.drawable.ic_launcher),
-        Pair(stringResource(R.string.category_Reading), R.drawable.ic_launcher),
-        Pair(stringResource(R.string.category_Theming), R.drawable.ic_launcher),
-        Pair(stringResource(R.string.category_Connectivity), R.drawable.ic_launcher),
+        Category("App Store & Updater", Default.Storefront),
+        Category("Browser", Default.OpenInBrowser),
+        Category("Calendar & Agenda", Default.CalendarMonth),
+        Category("Cloud Storage & File Sync", Default.Cloud),
+        Category("Connectivity", Default.SignalCellularAlt),
+        Category("Development", Default.DeveloperMode),
     )
     FDroidContent {
         CategoryCarousel(categories, onTitleTap = {}) {}

From d3dd7e16dfe1e3a137a5ca0f5e24a8468e92ce4f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 30 Jun 2025 10:35:59 -0300
Subject: [PATCH 022/180] Add real data

---
 basic/build.gradle.kts                        |   7 +
 basic/src/main/AndroidManifest.xml            |  14 +-
 basic/src/main/assets/logback.xml             |  14 ++
 basic/src/main/java/org/fdroid/basic/App.kt   |  66 +++++-
 .../java/org/fdroid/basic/MainViewModel.kt    |  52 +++--
 .../org/fdroid/basic/NotificationManager.kt   |  92 ++++++++
 .../org/fdroid/basic/db/DatabaseModule.kt     |  21 ++
 .../fdroid/basic/download/DownloadModule.kt   |  29 +++
 .../basic/download/DownloaderFactoryImpl.kt   |  63 ++++++
 .../fdroid/basic/manager/RepositoryManager.kt |  41 ----
 .../fdroid/basic/repo/RepoUpdateManager.kt    | 200 ++++++++++++++++++
 .../org/fdroid/basic/repo/RepoUpdateWorker.kt | 121 +++++++++++
 .../fdroid/basic/repo/RepositoryManager.kt    |  74 +++++++
 .../org/fdroid/basic/repo/RepositoryModule.kt |  28 +++
 .../java/org/fdroid/basic/ui/main/Main.kt     |   3 +-
 .../basic/ui/main/discover/AppCarousel.kt     |   6 +-
 .../ui/main/discover/AppNavigationItem.kt     |  11 +-
 .../fdroid/basic/ui/main/discover/Discover.kt |   4 +-
 .../ui/main/discover/DiscoverScaffold.kt      |   3 +-
 .../basic/ui/main/discover/FilterPresenter.kt |   2 +-
 .../org/fdroid/basic/ui/main/lists/AppItem.kt |   7 +-
 .../org/fdroid/basic/ui/main/lists/AppList.kt |   2 +-
 .../main/repositories/RepositoriesScaffold.kt |  65 ++++--
 .../src/main/res/drawable/ic_notification.xml |  16 ++
 basic/src/main/res/drawable/ic_refresh.xml    |  10 +
 gradle/libs.versions.toml                     |   5 +
 26 files changed, 855 insertions(+), 101 deletions(-)
 create mode 100644 basic/src/main/assets/logback.xml
 create mode 100644 basic/src/main/java/org/fdroid/basic/NotificationManager.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/download/DownloadModule.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/download/DownloaderFactoryImpl.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/manager/RepositoryManager.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/repo/RepoUpdateManager.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/repo/RepoUpdateWorker.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/repo/RepositoryModule.kt
 create mode 100644 basic/src/main/res/drawable/ic_notification.xml
 create mode 100644 basic/src/main/res/drawable/ic_refresh.xml

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index 649a32427..db6393cae 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -58,6 +58,8 @@ dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.work.runtime.ktx)
+    implementation(libs.androidx.hilt.work)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
@@ -74,9 +76,14 @@ dependencies {
     implementation(libs.coil.compose)
     implementation(libs.coil.network.okhttp)
 
+    implementation(libs.slf4j.api)
+    implementation(libs.logback.android)
+    implementation(libs.microutils.kotlin.logging)
+
     implementation(libs.hilt.android)
     implementation(libs.androidx.hilt.navigation.compose)
     ksp(libs.hilt.android.compiler)
+    ksp(libs.androidx.hilt.compiler)
 
     debugImplementation(libs.androidx.compose.ui.tooling)
 
diff --git a/basic/src/main/AndroidManifest.xml b/basic/src/main/AndroidManifest.xml
index 5956f2a95..12044e4a3 100644
--- a/basic/src/main/AndroidManifest.xml
+++ b/basic/src/main/AndroidManifest.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
     <application
         android:name=".App"
         android:allowBackup="true"
@@ -21,6 +26,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <!-- disable WorkManager initialization, needed for Hilt -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove">
+        </provider>
     </application>
 
 </manifest>
diff --git a/basic/src/main/assets/logback.xml b/basic/src/main/assets/logback.xml
new file mode 100644
index 000000000..61727b439
--- /dev/null
+++ b/basic/src/main/assets/logback.xml
@@ -0,0 +1,14 @@
+<configuration>
+    <appender name="logcat" class="ch.qos.logback.classic.android.LogcatAppender">
+        <tagEncoder>
+            <pattern>%logger{12}</pattern>
+        </tagEncoder>
+        <encoder>
+            <pattern>[%-20thread] %msg</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="logcat" />
+    </root>
+</configuration>
diff --git a/basic/src/main/java/org/fdroid/basic/App.kt b/basic/src/main/java/org/fdroid/basic/App.kt
index 5ed6d5986..eb7608def 100644
--- a/basic/src/main/java/org/fdroid/basic/App.kt
+++ b/basic/src/main/java/org/fdroid/basic/App.kt
@@ -1,7 +1,71 @@
 package org.fdroid.basic
 
 import android.app.Application
+import android.content.Context
+import androidx.hilt.work.HiltWorkerFactory
+import androidx.work.Configuration
+import coil3.ImageLoader
+import coil3.SingletonImageLoader
+import coil3.disk.DiskCache
+import coil3.disk.directory
+import coil3.key.Keyer
+import coil3.memory.MemoryCache
+import coil3.request.Options
+import coil3.request.crossfade
+import coil3.util.DebugLogger
 import dagger.hilt.android.HiltAndroidApp
+import org.fdroid.basic.repo.RepoUpdateWorker
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.coil.DownloadRequestFetcher
+import java.io.File
+import javax.inject.Inject
 
 @HiltAndroidApp
-class App : Application()
+class App : Application(), Configuration.Provider, SingletonImageLoader.Factory {
+
+    @Inject
+    lateinit var workerFactory: HiltWorkerFactory
+    @Inject
+    lateinit var downloadRequestFetcherFactory: DownloadRequestFetcher.Factory
+
+    override val workManagerConfiguration: Configuration
+        get() = Configuration.Builder()
+            .setWorkerFactory(workerFactory)
+            .build()
+
+    override fun onCreate() {
+        super.onCreate()
+        RepoUpdateWorker.scheduleOrCancel(applicationContext)
+    }
+
+    override fun newImageLoader(context: Context): ImageLoader {
+        return ImageLoader.Builder(context)
+            .crossfade(true)
+            .components {
+                val keyer = object : Keyer<DownloadRequest> {
+                    override fun key(
+                        data: DownloadRequest,
+                        options: Options
+                    ): String {
+                        return data.indexFile.sha256
+                            ?: (data.mirrors[0].baseUrl + data.indexFile.name)
+                    }
+                }
+                add(keyer)
+                add(downloadRequestFetcherFactory)
+            }
+            .memoryCache {
+                MemoryCache.Builder()
+                    .maxSizePercent(context, 0.25)
+                    .build()
+            }
+            .diskCache {
+                DiskCache.Builder()
+                    .directory(File(context.cacheDir, "coil"))
+                    .maxSizePercent(0.05)
+                    .build()
+            }
+            .logger(if (BuildConfig.DEBUG) DebugLogger() else null)
+            .build()
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 50eac6155..b1411e6ff 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -45,8 +45,10 @@ import androidx.compose.material.icons.filled.Wallet
 import androidx.compose.material.icons.filled.Wallpaper
 import androidx.compose.material.icons.filled.WbSunny
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.asFlow
 import androidx.lifecycle.viewModelScope
 import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
@@ -56,20 +58,19 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
+import org.fdroid.basic.download.getDownloadRequest
 import org.fdroid.basic.manager.AppDetailsManager
 import org.fdroid.basic.manager.MyAppsManager
-import org.fdroid.basic.manager.RepositoryManager
-import org.fdroid.basic.ui.Icons
-import org.fdroid.basic.ui.Names
+import org.fdroid.basic.repo.RepositoryManager
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.basic.ui.main.discover.FilterModel
 import org.fdroid.basic.ui.main.discover.FilterPresenter
-import org.fdroid.basic.ui.main.discover.NUM_ITEMS
 import org.fdroid.basic.ui.main.discover.Sort
 import org.fdroid.basic.ui.main.lists.AppList
+import org.fdroid.database.FDroidDatabase
 import javax.inject.Inject
 
 data class Category(val name: String, val imageVector: ImageVector)
@@ -79,6 +80,7 @@ class MainViewModel @Inject constructor(
     app: Application,
     savedStateHandle: SavedStateHandle,
     val myAppsManager: MyAppsManager,
+    private val db: FDroidDatabase,
     private val appDetailsManager: AppDetailsManager,
     val repositoryManager: RepositoryManager,
 ) : AndroidViewModel(app) {
@@ -131,26 +133,6 @@ class MainViewModel @Inject constructor(
         )
     }
 
-    val initialApps = buildList {
-        repeat(NUM_ITEMS) { i ->
-            val category = categories.getOrElse(i) { categories.random() }.name
-            val navItem = AppNavigationItem(
-                packageName = "$i",
-                icon = when (i) {
-                    0 -> "https://f-droid.org/repo/icons/org.wikimedia.commons.wikimedia.1.png"
-                    1 -> "https://f-droid.org/repo/org.videolan.vlc/en-US/icon_yAfSvPRJukZzMMfUzvbYqwaD1XmHXNtiPBtuPVHW-6s=.png"
-                    2 -> "https://f-droid.org/repo/net.thunderbird.android/en-US/icon_llBuXRxsJFITCCuDze-ENOPa1J_HFZLudN5K3gU-xiU=.png"
-                    3 -> "https://f-droid.org/repo/org.schabi.newpipe/en-US/icon_OHy4y1W-fJCNhHHOBCM9V_cxZNJJgbcNkB-x7UDTY9Q=.png"
-                    else -> Icons.randomIcon
-                },
-                name = Names.randomName,
-                summary = "Summary of the app • $category",
-                isNew = i > NUM_ITEMS - 4,
-            )
-            add(navItem)
-        }
-    }
-
     private val _currentList = MutableStateFlow<AppList>(AppList.New)
     val currentList = _currentList.asStateFlow()
     private val _showFilters = savedStateHandle.getMutableStateFlow("showFilters", true)
@@ -160,10 +142,25 @@ class MainViewModel @Inject constructor(
     private val _addedCategories = MutableStateFlow<List<String>>(emptyList())
     val addedCategories = _addedCategories.asStateFlow<List<String>>()
 
+    val localeList = LocaleListCompat.getDefault()
     val filterModel: StateFlow<FilterModel> = scope.launchMolecule(mode = ContextClock) {
         FilterPresenter(
             areFiltersShownFlow = showFilters,
-            appsFlow = flow { emit(initialApps) },
+            appsFlow = db.getAppDao().getAppOverviewItems().asFlow().map { list ->
+                list.mapNotNull {
+                    val repository = repositoryManager.getRepository(it.repoId)
+                        ?: return@mapNotNull null
+                    AppNavigationItem(
+                        packageName = it.packageName,
+                        name = it.name ?: "Unknown",
+                        summary = it.summary ?: "Unknown",
+                        isNew = it.lastUpdated == it.added,
+                        lastUpdated = it.lastUpdated,
+                        iconDownloadRequest = it.getIcon(localeList)
+                            ?.getDownloadRequest(repository),
+                    )
+                }
+            },
             sortByFlow = sortBy,
             allCategories = categories.map { it.name },
             addedCategoriesFlow = addedCategories,
@@ -185,9 +182,8 @@ class MainViewModel @Inject constructor(
                 AppNavigationItem(
                     packageName = it.packageName,
                     name = it.name ?: "Unknown app",
-                    icon = it.icon,
                     summary = "Summary",
-                    isNew = false
+                    isNew = false,
                 )
             }
         appDetailsManager.setAppDetails(newApp)
diff --git a/basic/src/main/java/org/fdroid/basic/NotificationManager.kt b/basic/src/main/java/org/fdroid/basic/NotificationManager.kt
new file mode 100644
index 000000000..de24c8dfb
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/NotificationManager.kt
@@ -0,0 +1,92 @@
+package org.fdroid.basic
+
+import android.Manifest.permission.POST_NOTIFICATIONS
+import android.content.Context
+import android.content.pm.PackageManager.PERMISSION_GRANTED
+import androidx.core.app.NotificationChannelCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.CATEGORY_SERVICE
+import androidx.core.app.NotificationCompat.PRIORITY_HIGH
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.NotificationManagerCompat.IMPORTANCE_LOW
+import androidx.core.content.ContextCompat.checkSelfPermission
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+const val NOTIFICATION_ID_REPO_UPDATE: Int = 0
+const val CHANNEL_UPDATES = "update-channel"
+
+class NotificationManager @Inject constructor(
+    @ApplicationContext private val context: Context,
+) {
+
+    private val nm = NotificationManagerCompat.from(context)
+    private var lastRepoUpdateNotification = 0L
+
+    init {
+        val updateChannel = NotificationChannelCompat.Builder(
+            CHANNEL_UPDATES, IMPORTANCE_LOW
+        ).setName(context.getString(R.string.notification_channel_updates_title))
+            .setDescription(context.getString(R.string.notification_channel_updates_description))
+            .build()
+        nm.createNotificationChannel(updateChannel)
+    }
+
+    fun showUpdateRepoNotification(msg: String, throttle: Boolean = true, progress: Int? = null) {
+        if (!throttle || System.currentTimeMillis() - lastRepoUpdateNotification > 500) {
+            val n = getRepoUpdateNotification(msg, progress).build()
+            lastRepoUpdateNotification = System.currentTimeMillis()
+            if (checkSelfPermission(context, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
+                nm.notify(NOTIFICATION_ID_REPO_UPDATE, n)
+            }
+        }
+    }
+
+    fun cancelUpdateRepoNotification() {
+        nm.cancel(NOTIFICATION_ID_REPO_UPDATE)
+    }
+
+    fun getRepoUpdateNotification(
+        msg: String? = null,
+        progress: Int? = null,
+    ) = NotificationCompat.Builder(context, CHANNEL_UPDATES)
+        .setSmallIcon(R.drawable.ic_refresh)
+        .setCategory(CATEGORY_SERVICE)
+        .setContentTitle(context.getString(R.string.banner_updating_repositories))
+        .setContentText(msg)
+        .setOngoing(true)
+        .setProgress(100, progress ?: 0, progress == null)
+
+    fun getAppUpdateNotification(
+        msg: String? = null,
+    ) = NotificationCompat.Builder(context, CHANNEL_UPDATES)
+        .setSmallIcon(R.drawable.ic_refresh)
+        .setCategory(CATEGORY_SERVICE)
+        .setContentTitle(context.getString(R.string.banner_updating_apps))
+        .setContentText(msg)
+        .setOngoing(true)
+        .setProgress(100, 0, true)
+
+    fun showAppUpdatesAvailableNotification(numUpdates: Int) {
+        val n = getAppUpdatesAvailableNotification(numUpdates).build()
+        if (checkSelfPermission(context, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
+            nm.notify(NOTIFICATION_ID_REPO_UPDATE, n)
+        }
+    }
+
+    private fun getAppUpdatesAvailableNotification(numUpdates: Int): NotificationCompat.Builder {
+        val title = context.resources.getQuantityString(
+            R.plurals.notification_summary_app_updates,
+            numUpdates, numUpdates,
+        )
+        val text = context.getString(R.string.notification_title_summary_app_update_available)
+
+        return NotificationCompat.Builder(context, CHANNEL_UPDATES)
+            .setSmallIcon(R.drawable.ic_notification)
+            .setPriority(PRIORITY_HIGH)
+            .setContentTitle(title)
+            .setContentText(text)
+            .setOngoing(false)
+            .setAutoCancel(true)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt b/basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt
new file mode 100644
index 000000000..b71373bf1
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt
@@ -0,0 +1,21 @@
+package org.fdroid.basic.db
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.database.FDroidDatabaseHolder
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DatabaseModule {
+    @Provides
+    @Singleton
+    fun provideFDroidDatabase(@ApplicationContext context: Context): FDroidDatabase {
+        return FDroidDatabaseHolder.getDb(context)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/download/DownloadModule.kt b/basic/src/main/java/org/fdroid/basic/download/DownloadModule.kt
new file mode 100644
index 000000000..6aacdcb1a
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/download/DownloadModule.kt
@@ -0,0 +1,29 @@
+package org.fdroid.basic.download
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.fdroid.basic.BuildConfig
+import org.fdroid.download.DownloaderFactory
+import org.fdroid.download.HttpManager
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DownloadModule {
+
+    private const val USER_AGENT = "F-Droid ${BuildConfig.VERSION_NAME}"
+
+    @Provides
+    @Singleton
+    fun provideHttpManager(): HttpManager {
+        return HttpManager(userAgent = USER_AGENT)
+    }
+
+    @Provides
+    @Singleton
+    fun provideDownloaderFactory(httpManager: HttpManager): DownloaderFactory {
+        return DownloaderFactoryImpl(httpManager)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/download/DownloaderFactoryImpl.kt b/basic/src/main/java/org/fdroid/basic/download/DownloaderFactoryImpl.kt
new file mode 100644
index 000000000..cadc85d94
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/download/DownloaderFactoryImpl.kt
@@ -0,0 +1,63 @@
+package org.fdroid.basic.download
+
+import android.net.Uri
+import org.fdroid.IndexFile
+import org.fdroid.database.Repository
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.Downloader
+import org.fdroid.download.DownloaderFactory
+import org.fdroid.download.HttpDownloader
+import org.fdroid.download.HttpDownloaderV2
+import org.fdroid.download.HttpManager
+import org.fdroid.download.Mirror
+import org.fdroid.index.IndexFormatVersion
+import java.io.File
+import javax.inject.Inject
+
+class DownloaderFactoryImpl @Inject constructor(
+    private val httpManager: HttpManager,
+) : DownloaderFactory() {
+    override fun create(
+        repo: Repository,
+        uri: Uri,
+        indexFile: IndexFile,
+        destFile: File
+    ): Downloader {
+        return create(repo, repo.getMirrors(), uri, indexFile, destFile, null)
+    }
+
+    override fun create(
+        repo: Repository,
+        mirrors: List<Mirror>,
+        uri: Uri,
+        indexFile: IndexFile,
+        destFile: File,
+        tryFirst: Mirror?
+    ): Downloader {
+        val request = DownloadRequest(
+            indexFile = indexFile,
+            mirrors = mirrors,
+            proxy = null,
+            username = repo.username,
+            password = repo.password,
+            tryFirstMirror = tryFirst,
+        )
+        val v1OrUnknown = repo.formatVersion == null || repo.formatVersion == IndexFormatVersion.ONE
+        return if (v1OrUnknown) {
+            HttpDownloader(httpManager, request, destFile)
+        } else {
+            HttpDownloaderV2(httpManager, request, destFile)
+        }
+    }
+}
+
+// TODO move to a better place
+fun IndexFile.getDownloadRequest(repository: Repository?): DownloadRequest? {
+    return DownloadRequest(
+        indexFile = this,
+        mirrors = repository?.getMirrors() ?: return null,
+        proxy = null,
+        username = repository.username,
+        password = repository.password,
+    )
+}
diff --git a/basic/src/main/java/org/fdroid/basic/manager/RepositoryManager.kt b/basic/src/main/java/org/fdroid/basic/manager/RepositoryManager.kt
deleted file mode 100644
index 6bc4118f6..000000000
--- a/basic/src/main/java/org/fdroid/basic/manager/RepositoryManager.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.fdroid.basic.manager
-
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import org.fdroid.basic.ui.main.repositories.Repository
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RepositoryManager @Inject constructor() {
-
-    private val _repos = MutableStateFlow(
-        listOf(
-            Repository(
-                address = "http://example.org",
-                timestamp = System.currentTimeMillis(),
-                lastUpdated = null,
-                weight = 1,
-                enabled = true,
-                name = "My first repository",
-            ),
-            Repository(
-                address = "http://example.com",
-                timestamp = System.currentTimeMillis(),
-                lastUpdated = null,
-                weight = 2,
-                enabled = true,
-                name = "My second repository",
-            ),
-        )
-    )
-    val repos = _repos.asStateFlow()
-
-    private val _visibleRepository = MutableStateFlow<Repository?>(null)
-    val visibleRepository = _visibleRepository.asStateFlow()
-
-    fun setVisibleRepository(repository: Repository?) {
-        _visibleRepository.value = repository
-    }
-
-}
diff --git a/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateManager.kt b/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateManager.kt
new file mode 100644
index 000000000..b320d0a91
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateManager.kt
@@ -0,0 +1,200 @@
+package org.fdroid.basic.repo
+
+import android.content.Context
+import android.text.format.Formatter
+import android.util.Log
+import androidx.annotation.WorkerThread
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
+import org.fdroid.CompatibilityChecker
+import org.fdroid.CompatibilityCheckerImpl
+import org.fdroid.basic.NotificationManager
+import org.fdroid.basic.R
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.database.Repository
+import org.fdroid.download.DownloaderFactory
+import org.fdroid.index.IndexUpdateListener
+import org.fdroid.index.IndexUpdateResult
+import org.fdroid.index.RepoManager
+import org.fdroid.index.RepoUpdater
+import org.fdroid.index.v1.IndexV1Updater
+import java.io.File
+import javax.inject.Inject
+
+private val TAG = RepoUpdateManager::class.java.simpleName
+
+class RepoUpdateManager(
+    private val context: Context,
+    private val db: FDroidDatabase,
+    private val repoManager: RepoManager,
+    private val downloaderFactory: DownloaderFactory,
+    private val notificationManager: NotificationManager,
+    private val compatibilityChecker: CompatibilityChecker = CompatibilityCheckerImpl(
+        packageManager = context.packageManager,
+        forceTouchApps = false,
+    ),
+    private val indexUpdateListener: IndexUpdateListener = object : IndexUpdateListener {
+        override fun onDownloadProgress(repo: Repository, bytesRead: Long, totalBytes: Long) {
+            Log.d(TAG, "Downloading ${repo.address} ($bytesRead/$totalBytes)")
+
+            val percent = if (totalBytes > 0) {
+                getPercent(bytesRead, totalBytes)
+            } else {
+                -1
+            }
+            val size = Formatter.formatFileSize(context, bytesRead)
+            val message: String = if (totalBytes == -1L) {
+                context.getString(R.string.status_download_unknown_size, repo.address, size)
+            } else {
+                val totalSize = Formatter.formatFileSize(context, totalBytes)
+                context.getString(R.string.status_download, repo.address, size, totalSize, percent)
+            }
+            notificationManager.showUpdateRepoNotification(msg = message, progress = percent)
+        }
+
+        /**
+         * If an updater is unable to know how many apps it has to process (i.e. it
+         * is streaming apps to the database or performing a large database query
+         * which touches all apps, but is unable to report progress), then it call
+         * this listener with [totalApps] = 0. Doing so will result in a message of
+         * "Saving app details" sent to the user. If you know how many apps you have
+         * processed, then a message of "Saving app details (x/total)" is displayed.
+         */
+        override fun onUpdateProgress(repo: Repository, appsProcessed: Int, totalApps: Int) {
+            Log.d(TAG, "Committing ${repo.address} ($appsProcessed/$totalApps)")
+
+            if (totalApps > 0) notificationManager.showUpdateRepoNotification(
+                msg = context.getString(
+                    R.string.status_inserting_x_apps,
+                    appsProcessed,
+                    totalApps,
+                    repo.address,
+                ),
+                progress = getPercent(appsProcessed.toLong(), totalApps.toLong())
+            ) else notificationManager.showUpdateRepoNotification(
+                msg = context.getString(R.string.status_inserting_apps),
+            )
+        }
+
+        fun getPercent(current: Long, total: Long): Int {
+            return (100L * current / total).toInt()
+        }
+    },
+    private val repoUpdater: RepoUpdater = RepoUpdater(
+        tempDir = context.cacheDir,
+        db = db,
+        downloaderFactory = downloaderFactory,
+        compatibilityChecker = compatibilityChecker,
+        listener = indexUpdateListener,
+    ),
+    private val indexV1Updater: IndexV1Updater? = if (false) {
+        IndexV1Updater(
+            database = db,
+            tempFileProvider = { File.createTempFile("dl-", "", context.cacheDir) },
+            downloaderFactory = downloaderFactory,
+            compatibilityChecker = compatibilityChecker,
+            listener = indexUpdateListener,
+        )
+    } else null,
+) {
+
+    @Inject
+    constructor(
+        @ApplicationContext context: Context,
+        db: FDroidDatabase,
+        repositoryManager: RepoManager,
+        downloaderFactory: DownloaderFactory,
+        notificationManager: NotificationManager,
+    ) : this(context, db, repoManager = repositoryManager, downloaderFactory, notificationManager)
+
+    private val isUpdateNotificationEnabled = true
+    private val _isUpdating = MutableStateFlow(false)
+    val isUpdating = _isUpdating.asStateFlow()
+
+    /**
+     * The time in milliseconds of the (earliest!) next automatic repo update check.
+     * This is [Long.MAX_VALUE], if no time is known.
+     */
+    val nextUpdateFlow = RepoUpdateWorker.getAutoUpdateWorkInfo(context).map { workInfo ->
+        workInfo?.nextScheduleTimeMillis ?: Long.MAX_VALUE
+    }
+
+    @WorkerThread
+    fun updateRepos() {
+        if (isUpdating.value) {
+            Log.w(TAG, "Already updating repositories: updateRepos()")
+        }
+        // TODO
+//            if (timeSinceLastCheck < MIN_UPDATE_INTERVAL_MILLIS) {
+//                Log.i(TAG, "Not updating, only $timeSinceLastCheck ms since last check.")
+//                return
+//            }
+        _isUpdating.value = true
+        try {
+            var reposUpdated = false
+            val repoErrors = mutableListOf<Pair<Repository, Exception>>()
+            // always get repos fresh from DB, because
+            // * when an update is requested early at app start,
+            //   the repos above might not be available, yet
+            // * when an update is requested when adding a new repo,
+            //   it might not be in the FDroidApp list, yet
+            db.getRepositoryDao().getRepositories().forEach { repo ->
+                if (!repo.enabled) return@forEach
+
+                // show notification
+                if (isUpdateNotificationEnabled) {
+                    val msg = context.getString(R.string.status_connecting_to_repo, repo.address)
+                    notificationManager.showUpdateRepoNotification(msg, throttle = false)
+                }
+
+                // indexV1Updater only gets used directly if forceIndexV1 was true
+                val result = indexV1Updater?.update(repo) ?: repoUpdater.update(repo)
+
+                if (result is IndexUpdateResult.Processed) reposUpdated = true
+                else if (result is IndexUpdateResult.Error) {
+                    Log.e(TAG, "Error updating repository ${repo.address}", result.e)
+                    repoErrors.add(Pair(repo, result.e))
+                }
+            }
+            db.getRepositoryDao().walCheckpoint()
+            // TODO fdroidPrefs.lastUpdateCheck = System.currentTimeMillis()
+            if (repoErrors.isNotEmpty()) showRepoErrors(repoErrors)
+            if (reposUpdated) {
+                // TODO appUpdateStatusManager.checkForUpdates(true)
+            }
+        } finally {
+            notificationManager.cancelUpdateRepoNotification()
+            _isUpdating.value = false
+        }
+    }
+
+    @WorkerThread
+    fun updateRepo(repoId: Long): IndexUpdateResult {
+        if (isUpdating.value) {
+            Log.w(TAG, "Already updating repositories: updateRepo($repoId)")
+        }
+        val repo = repoManager.getRepository(repoId) ?: return IndexUpdateResult.NotFound
+        _isUpdating.value = true
+        try {
+            // show notification
+            if (isUpdateNotificationEnabled) {
+                val msg = context.getString(R.string.status_connecting_to_repo, repo.address)
+                notificationManager.showUpdateRepoNotification(msg, throttle = false)
+            }
+
+            // indexV1Updater only gets used directly if forceIndexV1 was true
+            return indexV1Updater?.update(repo) ?: repoUpdater.update(repo)
+        } finally {
+            notificationManager.cancelUpdateRepoNotification()
+            _isUpdating.value = false
+            db.getRepositoryDao().walCheckpoint()
+        }
+    }
+
+    private fun showRepoErrors(repoErrors: List<Pair<Repository, Exception>>) {
+        // TODO
+    }
+
+}
diff --git a/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateWorker.kt b/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateWorker.kt
new file mode 100644
index 000000000..e31b4a3b5
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateWorker.kt
@@ -0,0 +1,121 @@
+package org.fdroid.basic.repo
+
+import android.content.Context
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.os.Build.VERSION.SDK_INT
+import android.util.Log
+import androidx.annotation.UiThread
+import androidx.hilt.work.HiltWorker
+import androidx.work.Constraints
+import androidx.work.CoroutineWorker
+import androidx.work.ExistingPeriodicWorkPolicy.UPDATE
+import androidx.work.ForegroundInfo
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
+import androidx.work.workDataOf
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.fdroid.basic.NOTIFICATION_ID_REPO_UPDATE
+import org.fdroid.basic.NotificationManager
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeUnit.MINUTES
+
+private val TAG = RepoUpdateWorker::class.java.simpleName
+
+@HiltWorker
+class RepoUpdateWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted workerParams: WorkerParameters,
+    private val repoUpdateManager: RepoUpdateManager,
+    private val nm: NotificationManager,
+) : CoroutineWorker(appContext, workerParams) {
+
+    companion object {
+        private const val UNIQUE_WORK_NAME_REPO_AUTO_UPDATE = "repoAutoUpdate"
+
+        /**
+         * Use this to trigger a manual repo update if the app is currently in the foreground.
+         *
+         * @param repoId The optional ID of the repo to update.
+         * If no ID is given, all (enabled) repos will be updated.
+         * Also triggers a clean cache job if no ID is given
+         */
+        @UiThread
+        @JvmStatic
+        @JvmOverloads
+        fun updateNow(context: Context, repoId: Long = -1) {
+            val request = OneTimeWorkRequestBuilder<RepoUpdateWorker>()
+                .setExpedited(RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+                .apply {
+                    if (repoId >= 0) setInputData(workDataOf("repoId" to repoId))
+                }
+                .build()
+            WorkManager.getInstance(context)
+                .enqueue(request)
+        }
+
+        @JvmStatic
+        fun scheduleOrCancel(context: Context) {
+            val workManager = WorkManager.getInstance(context)
+            Log.i(TAG, "scheduleOrCancel: enqueueUniquePeriodicWork")
+            val networkType = NetworkType.UNMETERED
+            val constraints = Constraints.Builder()
+                .setRequiresBatteryNotLow(true)
+                .setRequiresStorageNotLow(true)
+                .setRequiredNetworkType(networkType)
+                .build()
+            val workRequest = PeriodicWorkRequestBuilder<RepoUpdateWorker>(
+                repeatInterval = 4,
+                repeatIntervalTimeUnit = TimeUnit.HOURS,
+                flexTimeInterval = 15,
+                flexTimeIntervalUnit = MINUTES,
+            )
+                .setConstraints(constraints)
+                .build()
+            workManager.enqueueUniquePeriodicWork(
+                UNIQUE_WORK_NAME_REPO_AUTO_UPDATE,
+                UPDATE,
+                workRequest,
+            )
+        }
+
+        fun getAutoUpdateWorkInfo(context: Context): Flow<WorkInfo?> {
+            return WorkManager.getInstance(context).getWorkInfosForUniqueWorkFlow(
+                UNIQUE_WORK_NAME_REPO_AUTO_UPDATE
+            ).map { it.getOrNull(0) }
+        }
+    }
+
+    override suspend fun doWork(): Result {
+        try {
+            setForeground(getForegroundInfo())
+        } catch (e: Exception) {
+            Log.e(TAG, "Error while running setForeground", e)
+        }
+        val repoId = inputData.getLong("repoId", -1)
+        return try {
+            if (repoId >= 0) repoUpdateManager.updateRepo(repoId)
+            else repoUpdateManager.updateRepos()
+            Result.success()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error updating repos", e)
+            Result.failure()
+        }
+    }
+
+    override suspend fun getForegroundInfo(): ForegroundInfo {
+        val n = nm.getRepoUpdateNotification().build()
+        return if (SDK_INT >= 29) {
+            ForegroundInfo(NOTIFICATION_ID_REPO_UPDATE, n, FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+        } else {
+            ForegroundInfo(NOTIFICATION_ID_REPO_UPDATE, n)
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt b/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt
new file mode 100644
index 000000000..2eeb56808
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt
@@ -0,0 +1,74 @@
+package org.fdroid.basic.repo
+
+import android.content.Context
+import androidx.core.os.LocaleListCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import org.fdroid.basic.ui.main.repositories.Repository
+import org.fdroid.index.RepoManager
+import org.fdroid.repo.AddRepoError
+import org.fdroid.repo.Added
+import org.fdroid.repo.FetchResult
+import org.fdroid.repo.Fetching
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton // TODO maybe more like a ViewModel name clash with RepoManager
+class RepositoryManager @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val repoManager: RepoManager,
+) {
+
+    val repos: Flow<List<Repository>> = repoManager.repositoriesState.map { repos ->
+        repos.map {
+            Repository(
+                address = it.address,
+                timestamp = it.timestamp,
+                lastUpdated = it.lastUpdated,
+                weight = it.weight,
+                enabled = it.enabled,
+                name = it.getName(LocaleListCompat.getDefault()) ?: "Unknown Repo",
+            )
+        }
+    }
+
+    private val _visibleRepository = MutableStateFlow<Repository?>(null)
+    val visibleRepository = _visibleRepository.asStateFlow()
+
+    fun setVisibleRepository(repository: Repository?) {
+        _visibleRepository.value = repository
+    }
+
+    fun getRepository(repoId: Long) = repoManager.getRepository(repoId)
+
+    fun addRepo() {
+        // just temp code to get repo into DB
+        repoManager.fetchRepositoryPreview("https://f-droid.org/repo")
+        GlobalScope.launch(Dispatchers.IO) {
+            var hasAdded = false
+            repoManager.addRepoState.collect {
+                if (it is Fetching) {
+                    if (!hasAdded && it.fetchResult is FetchResult.IsNewRepository) {
+                        hasAdded = true
+                        repoManager.addFetchedRepository()
+                    }
+                } else if (it is Added ) {
+                    delay(1000) // wait for repo available in DB
+                    RepoUpdateWorker.updateNow(context,it.repo.repoId)
+                    cancel()
+                } else if (it is AddRepoError) {
+                    cancel()
+                }
+            }
+        }
+    }
+
+}
diff --git a/basic/src/main/java/org/fdroid/basic/repo/RepositoryModule.kt b/basic/src/main/java/org/fdroid/basic/repo/RepositoryModule.kt
new file mode 100644
index 000000000..d109b2573
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/repo/RepositoryModule.kt
@@ -0,0 +1,28 @@
+package org.fdroid.basic.repo
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.download.DownloaderFactory
+import org.fdroid.download.HttpManager
+import org.fdroid.index.RepoManager
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RepositoryModule {
+    @Provides
+    @Singleton
+    fun provideRepoManager(
+        @ApplicationContext context: Context,
+        db: FDroidDatabase,
+        downloaderFactory: DownloaderFactory,
+        httpManager: HttpManager
+    ): RepoManager {
+        return RepoManager(context, db, downloaderFactory, httpManager)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index a213fe29a..5ce5aaa77 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -76,13 +76,14 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
             }
             composable(route = NavDestinations.Repos.id) {
                 val repositoryManager = viewModel.repositoryManager
-                val repos = repositoryManager.repos.collectAsStateWithLifecycle().value
+                val repos = repositoryManager.repos.collectAsStateWithLifecycle(null).value
                 val visibleRepository =
                     repositoryManager.visibleRepository.collectAsStateWithLifecycle().value
                 RepositoriesScaffold(
                     repositories = repos,
                     currentRepository = visibleRepository,
                     onRepositorySelected = repositoryManager::setVisibleRepository,
+                    onAddRepo = repositoryManager::addRepo,
                 ) {
                     navController.popBackStack()
                 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
index 646c80ba7..598f38113 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
@@ -77,9 +77,9 @@ fun AppBox(app: AppNavigationItem, onAppTap: (AppNavigationItem) -> Unit) {
             .padding(8.dp)
             .clickable { onAppTap(app) },
     ) {
-        app.icon?.let {
-            AsyncImage(
-                app.icon,
+        app.iconDownloadRequest?.let {
+            AsyncImage( // TODO error handling
+                app.iconDownloadRequest,
                 contentDescription = null,
                 contentScale = ContentScale.Fit,
                 modifier = Modifier
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
index 92cd8afa5..b61d1ed3d 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
@@ -1,14 +1,15 @@
 package org.fdroid.basic.ui.main.discover
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
 import org.fdroid.basic.ui.main.apps.MinimalApp
+import org.fdroid.download.DownloadRequest
 
-@Parcelize
 class AppNavigationItem(
     override val packageName: String,
     override val name: String,
-    override val icon: String? = null,
+    val iconDownloadRequest: DownloadRequest? = null,
     val summary: String,
     val isNew: Boolean,
-): MinimalApp, Parcelable
+    val lastUpdated: Long = -1,
+) : MinimalApp {
+    override val icon: String? = null
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
index 86b499087..fc0c20030 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
@@ -85,13 +85,13 @@ fun Discover(
             AppsSearch(searchBarState, onAppTap, modifier = Modifier.padding(top = 8.dp))
             AppCarousel(
                 title = AppList.New.title,
-                apps = apps,
+                apps = apps.filter { it.isNew },
                 onTitleTap = { onTitleTap(AppList.New) },
                 onAppTap = onAppTap,
             )
             AppCarousel(
                 title = AppList.RecentlyUpdated.title,
-                apps = apps.filter { it.packageName.toInt() % 2 == 0 },
+                apps = apps.filter { !it.isNew },
                 onTitleTap = { onTitleTap(AppList.RecentlyUpdated) },
                 onAppTap = onAppTap,
             )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
index 55989f936..41fc136ef 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
@@ -58,7 +58,8 @@ fun DiscoverScaffold(
         }
     }
     val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
-    val isListVisible = navigator.scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
+    val isListVisible =
+        navigator.scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
     ListDetailPaneScaffold(
         directive = navigator.scaffoldDirective,
         value = navigator.scaffoldValue,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
index dfd1d8f7b..881a263b3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
@@ -28,7 +28,7 @@ fun FilterPresenter(
         apps = if (sortBy == Sort.NAME) {
             newApps.sortedBy { it.name.lowercase(Locale.getDefault()) }
         } else {
-            newApps.sortedByDescending { it.packageName.toInt() }
+            newApps.sortedByDescending { it.lastUpdated }
         },
         sortBy = sortBy,
         allCategories = allCategories,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
index 23b6467fb..3033ef3a5 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
@@ -19,13 +19,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
+import org.fdroid.download.DownloadRequest
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 fun AppItem(
     name: String,
     summary: String,
-    icon: String?,
+    downloadRequest: DownloadRequest?,
     isNew: Boolean,
     isSelected: Boolean,
     modifier: Modifier = Modifier,
@@ -41,9 +42,9 @@ fun AppItem(
                     contentDescription = null, modifier = Modifier.size(24.dp),
                 )
             }) {
-                icon?.let {
+                downloadRequest?.let {
                     AsyncImage(
-                        model = icon,
+                        model = downloadRequest,
                         contentDescription = null,
                         modifier = Modifier.size(48.dp),
                     )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
index f66790725..cf74d9904 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
@@ -125,7 +125,7 @@ fun AppList(
                     AppItem(
                         name = navItem.name,
                         summary = navItem.summary,
-                        icon = navItem.icon,
+                        downloadRequest = navItem.iconDownloadRequest,
                         isNew = navItem.isNew,
                         isSelected = isSelected,
                         modifier = modifier,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt
index cadf2954b..984de2cda 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt
@@ -7,14 +7,20 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
@@ -31,6 +37,7 @@ import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaf
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -43,11 +50,15 @@ import org.fdroid.basic.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
+@OptIn(
+    ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class,
+    ExperimentalMaterial3ExpressiveApi::class
+)
 fun RepositoriesScaffold(
-    repositories: List<Repository>,
+    repositories: List<Repository>?,
     currentRepository: Repository?,
     onRepositorySelected: (Repository) -> Unit,
+    onAddRepo: () -> Unit,
     onBackClicked: () -> Unit,
 ) {
     val navigator = rememberListDetailPaneScaffoldNavigator<Repository>()
@@ -76,17 +87,34 @@ fun RepositoriesScaffold(
                             },
                         )
                     },
+                    floatingActionButton = {
+                        FloatingActionButton(
+                            onClick = onAddRepo,
+                            modifier = Modifier.padding(16.dp)
+                        ) {
+                            Icon(Icons.Default.Add, contentDescription = "Add repo")
+                        }
+                    }
                 ) { paddingValues ->
-                    RepositoriesList(
-                        repositories = repositories,
-                        currentRepository = if (isDetailVisible) currentRepository else null,
-                        onRepositorySelected = {
-                            onRepositorySelected(it)
-                            scope.launch { navigator.navigateTo(Detail, it) }
-                        },
-                        modifier = Modifier
-                            .padding(paddingValues),
-                    )
+                    if (repositories == null) {
+                        Box(
+                            contentAlignment = Alignment.Center,
+                            modifier = Modifier.fillMaxSize(),
+                        ) {
+                            LoadingIndicator(modifier = Modifier.padding(paddingValues))
+                        }
+                    } else {
+                        RepositoriesList(
+                            repositories = repositories,
+                            currentRepository = if (isDetailVisible) currentRepository else null,
+                            onRepositorySelected = {
+                                onRepositorySelected(it)
+                                scope.launch { navigator.navigateTo(Detail, it) }
+                            },
+                            modifier = Modifier
+                                .padding(paddingValues),
+                        )
+                    }
                 }
             }
         },
@@ -122,6 +150,17 @@ fun RepositoriesScaffold(
     )
 }
 
+@Preview(
+    showBackground = true,
+    uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
+)
+@Composable
+fun RepositoriesScaffoldLoadingPreview() {
+    FDroidContent {
+        RepositoriesScaffold(null, null, {}, {}) { }
+    }
+}
+
 @Preview(
     showBackground = true,
     uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
@@ -148,7 +187,7 @@ fun RepositoriesScaffoldPreview() {
                 name = "My second repository",
             ),
         )
-        RepositoriesScaffold(repos, repos[0], {}) { }
+        RepositoriesScaffold(repos, repos[0], {}, {}) { }
     }
 }
 
diff --git a/basic/src/main/res/drawable/ic_notification.xml b/basic/src/main/res/drawable/ic_notification.xml
new file mode 100644
index 000000000..53951dfa5
--- /dev/null
+++ b/basic/src/main/res/drawable/ic_notification.xml
@@ -0,0 +1,16 @@
+<vector android:height="24dp"
+    android:viewportHeight="48.0"
+    android:tint="?android:attr/colorControlNormal"
+    android:viewportWidth="48.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
+        android:pathData="m2.61,1.25c-0.45,0.01 -0.76,0.19 -0.98,0.45 0,0 0,0 0.01,0.01 -0,0 -0.01,0.01 -0.01,0.01 -0,-0 -0,-0 -0,-0.01 -0,0 -0.01,0.02 -0.02,0.03 -0.01,0.01 -0.01,0.02 -0.02,0.03 -0.15,0.2 -0.49,0.8 0.01,1.5L5.21,7.93C5.08,8.26 5,8.62 5,9v3,1 2.46L5,16c0,1.66 1.34,3 3,3h32c1.66,0 3,-1.34 3,-3L43,15.46 43,9.54 43,9C43,8.62 42.92,8.26 42.79,7.93l3.61,-4.66c0.5,-0.7 0.16,-1.3 0.01,-1.5 -0.01,-0.01 -0.01,-0.02 -0.02,-0.03 -0,-0.01 -0.01,-0.02 -0.02,-0.03 -0,0 -0,0 -0,0.01 -0,-0 -0.01,-0.01 -0.01,-0.01 0,-0 0,-0 0.01,-0.01 -0.22,-0.26 -0.53,-0.44 -0.98,-0.45 -0.38,0.01 -0.74,0.18 -0.97,0.49L40.99,6.18C40.86,6.13 40.74,6.09 40.61,6.06 40.41,6.02 40.21,6 40,6L8,6C7.65,6 7.32,6.07 7.01,6.18L3.58,1.74C3.35,1.43 2.99,1.26 2.61,1.25ZM14.38,9.75c1.86,0 3.38,1.51 3.38,3.38 0,1.86 -1.51,3.38 -3.38,3.38C12.51,16.5 11,14.99 11,13.13 11,11.26 12.51,9.75 14.38,9.75ZM33.88,9.75c1.86,0 3.38,1.51 3.38,3.38 0,1.86 -1.51,3.38 -3.38,3.38 -1.86,0 -3.38,-1.51 -3.38,-3.38 0,-1.86 1.51,-3.38 3.38,-3.38zM8,20.97c-1.66,0 -3,1.34 -3,3L5,30 5,36 5,42.23 5,43c0,1.66 1.34,3 3,3h32c1.66,0 3,-1.34 3,-3L43,42.23 43,24.73 43,23.97c0,-1.66 -1.34,-3 -3,-3z"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="2.5" />
+</vector>
diff --git a/basic/src/main/res/drawable/ic_refresh.xml b/basic/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 000000000..15e746762
--- /dev/null
+++ b/basic/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
+</vector>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4f2f5409b..51dd36a22 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,6 +4,7 @@ kotlin = "2.2.21"
 androidGradlePlugin = "8.11.1" # 8.12.0 pulls in aapt2 which has issue on buildserver
 androidKspPlugin = "2.2.21-2.0.4" # first version needs to match kotlin version
 hilt = "2.56.2"
+hiltWork = "1.2.0"
 hiltNavigationCompose = "1.2.0"
 dokka = "2.1.0"
 mavenPublish = "0.34.0"
@@ -27,6 +28,7 @@ androidxLifecycleLivedataKtx = "2.9.4"
 androidxWork = "2.10.5"
 androidxDocumentfile = "1.1.0"
 androidxLocalbroadcastmanager = "1.1.0"
+androidxHiltCompiler = "1.2.0"
 androidxRecyclerview = "1.4.0"
 androidxConstraintlayout = "2.2.1"
 androidxSwipeRefreshLayout = "1.1.0"
@@ -98,6 +100,8 @@ androidx-vectordrawable = { module = "androidx.vectordrawable:vectordrawable", v
 androidx-documentfile = { module = "androidx.documentfile:documentfile", version.ref = "androidxDocumentfile" }
 androidx-localbroadcastmanager = { module = "androidx.localbroadcastmanager:localbroadcastmanager", version.ref = "androidxLocalbroadcastmanager" }
 androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "androidxWork" }
+androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "androidxWork" }
+androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hiltWork" }
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
@@ -114,6 +118,7 @@ androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.ma
 androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout" }
 androidx-compose-material3-adaptive-navigation-suite-android = { module = "androidx.compose.material3:material3-adaptive-navigation-suite-android" }
 androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
+androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidxHiltCompiler" }
 
 androidx-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }

From 063a18e1752f41299488735ec2094c40df6fc9a2 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 8 Jul 2025 17:20:23 -0300
Subject: [PATCH 023/180] Use real data for categories

---
 .../java/org/fdroid/basic/MainViewModel.kt    | 103 ++------------
 .../fdroid/basic/ui/categories/Category.kt    | 129 ++++++++++++++++++
 .../discover => categories}/CategoryCard.kt   |  44 +++---
 .../CategoryCarousel.kt                       |  26 ++--
 .../basic/ui/categories/CategoryList.kt       |  63 +++++++++
 .../fdroid/basic/ui/main/BottomBarScreen.kt   |   2 +-
 .../basic/ui/main/discover/AppsSearch.kt      |  20 +--
 .../fdroid/basic/ui/main/discover/Discover.kt |   7 +-
 .../ui/main/discover/DiscoverScaffold.kt      |   3 +-
 .../basic/ui/main/discover/FilterPresenter.kt |   6 +-
 .../fdroid/basic/ui/main/lists/AppsFilter.kt  |   8 +-
 11 files changed, 254 insertions(+), 157 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/categories/Category.kt
 rename basic/src/main/java/org/fdroid/basic/ui/{main/discover => categories}/CategoryCard.kt (53%)
 rename basic/src/main/java/org/fdroid/basic/ui/{main/discover => categories}/CategoryCarousel.kt (79%)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index b1411e6ff..121c2ee85 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -1,50 +1,6 @@
 package org.fdroid.basic
 
 import android.app.Application
-import androidx.compose.material.icons.Icons.AutoMirrored
-import androidx.compose.material.icons.Icons.Default
-import androidx.compose.material.icons.automirrored.filled.ChromeReaderMode
-import androidx.compose.material.icons.automirrored.filled.Message
-import androidx.compose.material.icons.filled.AccessTime
-import androidx.compose.material.icons.filled.AccountBalanceWallet
-import androidx.compose.material.icons.filled.Airplay
-import androidx.compose.material.icons.filled.AlternateEmail
-import androidx.compose.material.icons.filled.CalendarMonth
-import androidx.compose.material.icons.filled.Cloud
-import androidx.compose.material.icons.filled.Collections
-import androidx.compose.material.icons.filled.DeveloperMode
-import androidx.compose.material.icons.filled.Dns
-import androidx.compose.material.icons.filled.EditNote
-import androidx.compose.material.icons.filled.EnhancedEncryption
-import androidx.compose.material.icons.filled.Games
-import androidx.compose.material.icons.filled.Groups
-import androidx.compose.material.icons.filled.HealthAndSafety
-import androidx.compose.material.icons.filled.Image
-import androidx.compose.material.icons.filled.Keyboard
-import androidx.compose.material.icons.filled.Language
-import androidx.compose.material.icons.filled.LocalPlay
-import androidx.compose.material.icons.filled.Money
-import androidx.compose.material.icons.filled.MusicVideo
-import androidx.compose.material.icons.filled.Navigation
-import androidx.compose.material.icons.filled.Newspaper
-import androidx.compose.material.icons.filled.OpenInBrowser
-import androidx.compose.material.icons.filled.Password
-import androidx.compose.material.icons.filled.PermPhoneMsg
-import androidx.compose.material.icons.filled.Podcasts
-import androidx.compose.material.icons.filled.Science
-import androidx.compose.material.icons.filled.Security
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material.icons.filled.SignalCellularAlt
-import androidx.compose.material.icons.filled.Storefront
-import androidx.compose.material.icons.filled.Style
-import androidx.compose.material.icons.filled.Translate
-import androidx.compose.material.icons.filled.UploadFile
-import androidx.compose.material.icons.filled.VideoChat
-import androidx.compose.material.icons.filled.VpnLock
-import androidx.compose.material.icons.filled.Wallet
-import androidx.compose.material.icons.filled.Wallpaper
-import androidx.compose.material.icons.filled.WbSunny
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
@@ -64,6 +20,7 @@ import org.fdroid.basic.download.getDownloadRequest
 import org.fdroid.basic.manager.AppDetailsManager
 import org.fdroid.basic.manager.MyAppsManager
 import org.fdroid.basic.repo.RepositoryManager
+import org.fdroid.basic.ui.categories.Category
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.basic.ui.main.discover.FilterModel
@@ -71,10 +28,10 @@ import org.fdroid.basic.ui.main.discover.FilterPresenter
 import org.fdroid.basic.ui.main.discover.Sort
 import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.database.FDroidDatabase
+import java.text.Collator
+import java.util.Locale
 import javax.inject.Inject
 
-data class Category(val name: String, val imageVector: ImageVector)
-
 @HiltViewModel
 class MainViewModel @Inject constructor(
     app: Application,
@@ -87,50 +44,14 @@ class MainViewModel @Inject constructor(
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
-    companion object {
-        val categories = listOf(
-            Category("App Store & Updater", Default.Storefront),
-            Category("Browser", Default.OpenInBrowser),
-            Category("Calendar & Agenda", Default.CalendarMonth),
-            Category("Cloud Storage & File Sync", Default.Cloud),
-            Category("Connectivity", Default.SignalCellularAlt),
-            Category("Development", Default.DeveloperMode),
-            Category("DNS & Hosts", Default.Dns),
-            Category("Email", Default.AlternateEmail),
-            Category("File Encryption & Vault", Default.EnhancedEncryption),
-            Category("File Transfer", Default.UploadFile),
-            Category("Games", Default.Games),
-            Category("Graphics", Default.Image),
-            Category("Icon Pack", Default.Collections),
-            Category("Internet", Default.Language),
-            Category("Keyboard & IME", Default.Keyboard),
-            Category("Local Media Player", Default.LocalPlay),
-            Category("Messaging", AutoMirrored.Default.Message),
-            Category("Money", Default.Money),
-            Category("Multimedia", Default.MusicVideo),
-            Category("Navigation", Default.Navigation),
-            Category("News", Default.Newspaper),
-            Category("Online Media Player", Default.Airplay),
-            Category("Pass Wallet", Default.AccountBalanceWallet),
-            Category("Password & 2FA", Default.Password),
-            Category("Phone & SMS", Default.PermPhoneMsg),
-            Category("Podcast", Default.Podcasts),
-            Category("Reading", AutoMirrored.Default.ChromeReaderMode),
-            Category("Science & Education", Default.Science),
-            Category("Security", Default.Security),
-            Category("Social Network", Default.Groups),
-            Category("Sports & Health", Default.HealthAndSafety),
-            Category("System", Default.Settings),
-            Category("Theming", Default.Style),
-            Category("Time", Default.AccessTime),
-            Category("Translation & Dictionary", Default.Translate),
-            Category("Voice & Video Chat", Default.VideoChat),
-            Category("VPN & Proxy", Default.VpnLock),
-            Category("Wallet", Default.Wallet),
-            Category("Wallpaper", Default.Wallpaper),
-            Category("Weather", Default.WbSunny),
-            Category("Writing", Default.EditNote),
-        )
+    val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
+        val collator = Collator.getInstance(Locale.getDefault())
+        categories.map { category ->
+            Category(
+                id = category.id,
+                name = category.getName(localeList) ?: "Unknown Category",
+            )
+        }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
 
     private val _currentList = MutableStateFlow<AppList>(AppList.New)
@@ -162,7 +83,7 @@ class MainViewModel @Inject constructor(
                 }
             },
             sortByFlow = sortBy,
-            allCategories = categories.map { it.name },
+            allCategoriesFlow = categories,
             addedCategoriesFlow = addedCategories,
         )
     }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/categories/Category.kt b/basic/src/main/java/org/fdroid/basic/ui/categories/Category.kt
new file mode 100644
index 000000000..38e1f352a
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/categories/Category.kt
@@ -0,0 +1,129 @@
+package org.fdroid.basic.ui.categories
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.Icons.AutoMirrored
+import androidx.compose.material.icons.automirrored.filled.MenuBook
+import androidx.compose.material.icons.automirrored.filled.Message
+import androidx.compose.material.icons.filled.AccessTime
+import androidx.compose.material.icons.filled.AccountBalanceWallet
+import androidx.compose.material.icons.filled.Airplay
+import androidx.compose.material.icons.filled.AlternateEmail
+import androidx.compose.material.icons.filled.Bookmarks
+import androidx.compose.material.icons.filled.Brush
+import androidx.compose.material.icons.filled.Calculate
+import androidx.compose.material.icons.filled.CalendarMonth
+import androidx.compose.material.icons.filled.Category
+import androidx.compose.material.icons.filled.Cloud
+import androidx.compose.material.icons.filled.Collections
+import androidx.compose.material.icons.filled.CurrencyExchange
+import androidx.compose.material.icons.filled.DeveloperMode
+import androidx.compose.material.icons.filled.DirectionsBus
+import androidx.compose.material.icons.filled.Dns
+import androidx.compose.material.icons.filled.Draw
+import androidx.compose.material.icons.filled.EditNote
+import androidx.compose.material.icons.filled.EnhancedEncryption
+import androidx.compose.material.icons.filled.FitnessCenter
+import androidx.compose.material.icons.filled.Games
+import androidx.compose.material.icons.filled.Groups
+import androidx.compose.material.icons.filled.HealthAndSafety
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.filled.Keyboard
+import androidx.compose.material.icons.filled.Language
+import androidx.compose.material.icons.filled.LocalPlay
+import androidx.compose.material.icons.filled.MonetizationOn
+import androidx.compose.material.icons.filled.Money
+import androidx.compose.material.icons.filled.MusicNote
+import androidx.compose.material.icons.filled.MusicVideo
+import androidx.compose.material.icons.filled.Navigation
+import androidx.compose.material.icons.filled.Newspaper
+import androidx.compose.material.icons.filled.NoteAlt
+import androidx.compose.material.icons.filled.OpenInBrowser
+import androidx.compose.material.icons.filled.Password
+import androidx.compose.material.icons.filled.PermPhoneMsg
+import androidx.compose.material.icons.filled.PhotoSizeSelectActual
+import androidx.compose.material.icons.filled.Podcasts
+import androidx.compose.material.icons.filled.RestaurantMenu
+import androidx.compose.material.icons.filled.Science
+import androidx.compose.material.icons.filled.Security
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.filled.ShoppingCart
+import androidx.compose.material.icons.filled.SignalCellularAlt
+import androidx.compose.material.icons.filled.Storefront
+import androidx.compose.material.icons.filled.Style
+import androidx.compose.material.icons.filled.TaskAlt
+import androidx.compose.material.icons.filled.TrackChanges
+import androidx.compose.material.icons.filled.Translate
+import androidx.compose.material.icons.filled.UploadFile
+import androidx.compose.material.icons.filled.VideoChat
+import androidx.compose.material.icons.filled.VpnLock
+import androidx.compose.material.icons.filled.Wallet
+import androidx.compose.material.icons.filled.Wallpaper
+import androidx.compose.material.icons.filled.WbSunny
+import androidx.compose.ui.graphics.vector.ImageVector
+
+data class Category(val id: String, val name: String) {
+    val imageVector: ImageVector
+        get() = when (id) {
+            "App Store & Updater" -> Icons.Default.Storefront
+            "Bookmark" -> Icons.Default.Bookmarks
+            "Browser" -> Icons.Default.OpenInBrowser
+            "Calculator" -> Icons.Default.Calculate
+            "Calendar & Agenda" -> Icons.Default.CalendarMonth
+            "Cloud Storage & File Sync" -> Icons.Default.Cloud
+            "Connectivity" -> Icons.Default.SignalCellularAlt
+            "Development" -> Icons.Default.DeveloperMode
+            "DNS & Hosts" -> Icons.Default.Dns
+            "Draw" -> Icons.Default.Draw
+            "Ebook Reader" -> AutoMirrored.Default.MenuBook
+            "Email" -> Icons.Default.AlternateEmail
+            "File Encryption & Vault" -> Icons.Default.EnhancedEncryption
+            "File Transfer" -> Icons.Default.UploadFile
+            "Finance Manager" -> Icons.Default.MonetizationOn
+            "Forum" -> Icons.Default.Image
+            "Gallery" -> Icons.Default.PhotoSizeSelectActual
+            "Games" -> Icons.Default.Games
+            "Graphics" -> Icons.Default.Brush
+            "Habit Tracker" -> Icons.Default.TrackChanges
+            "Icon Pack" -> Icons.Default.Collections
+            "Internet" -> Icons.Default.Language
+            "Keyboard & IME" -> Icons.Default.Keyboard
+            "Launcher" -> Icons.Default.Home
+            "Local Media Player" -> Icons.Default.LocalPlay
+            "Messaging" -> AutoMirrored.Default.Message
+            "Money" -> Icons.Default.Money
+            "Multimedia" -> Icons.Default.MusicVideo
+            "Music Practice Tool" -> Icons.Default.MusicNote
+            "Navigation" -> Icons.Default.Navigation
+            "News" -> Icons.Default.Newspaper
+            "Note" -> Icons.Default.NoteAlt
+            "Online Media Player" -> Icons.Default.Airplay
+            "Pass Wallet" -> Icons.Default.AccountBalanceWallet
+            "Password & 2FA" -> Icons.Default.Password
+            "Phone & SMS" -> Icons.Default.PermPhoneMsg
+            "Podcast" -> Icons.Default.Podcasts
+            "Public Transport" -> Icons.Default.DirectionsBus
+            "Reading" -> AutoMirrored.Default.MenuBook
+            "Recipe Manager" -> Icons.Default.RestaurantMenu
+            "Science & Education" -> Icons.Default.Science
+            "Security" -> Icons.Default.Security
+            "Shopping List" -> Icons.Default.ShoppingCart
+            "Social Network" -> Icons.Default.Groups
+            "Sports & Health" -> Icons.Default.HealthAndSafety
+            "System" -> Icons.Default.Settings
+            "Task" -> Icons.Default.TaskAlt
+            "Text Editor" -> Icons.Default.EditNote
+            "Theming" -> Icons.Default.Style
+            "Time" -> Icons.Default.AccessTime
+            "Translation & Dictionary" -> Icons.Default.Translate
+            "Voice & Video Chat" -> Icons.Default.VideoChat
+            "Unit Convertor" -> Icons.Default.CurrencyExchange
+            "VPN & Proxy" -> Icons.Default.VpnLock
+            "Wallet" -> Icons.Default.Wallet
+            "Wallpaper" -> Icons.Default.Wallpaper
+            "Weather" -> Icons.Default.WbSunny
+            "Workout" -> Icons.Default.FitnessCenter
+            "Writing" -> Icons.Default.EditNote
+            else -> Icons.Default.Category
+        }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCard.kt b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt
similarity index 53%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCard.kt
rename to basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt
index e757d22ea..2af5eeba8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCard.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt
@@ -1,56 +1,48 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.basic.ui.categories
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons.Default
-import androidx.compose.material.icons.filled.VpnLock
-import androidx.compose.material3.Card
+import androidx.compose.material3.AssistChip
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.Category
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 fun CategoryCard(category: Category) {
-    Card(modifier = Modifier.padding(8.dp).height(80.dp)) {
-        Row(
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier.padding(16.dp).fillMaxHeight(),
-        ) {
-            Text(
-                category.name,
-                maxLines = 2,
-                overflow = TextOverflow.Ellipsis,
-                modifier = Modifier.weight(1f),
-            )
+    AssistChip(
+        onClick = {},
+        leadingIcon = {
             Image(
                 imageVector = category.imageVector,
                 contentDescription = null,
                 contentScale = ContentScale.None,
                 colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
-                modifier = Modifier.padding(start = 16.dp),
+                modifier = Modifier.padding(end = 8.dp),
             )
-        }
-    }
+        },
+        label = {
+            Text(
+                category.name,
+                maxLines = 2,
+                style = MaterialTheme.typography.bodySmall,
+                overflow = TextOverflow.Ellipsis,
+            )
+        },
+        modifier = Modifier.padding(horizontal = 4.dp)
+    )
 }
 
 @Preview
 @Composable
 fun CategoryCardPreview() {
     FDroidContent {
-        CategoryCard(Category("VPN & Proxy", Default.VpnLock))
+        CategoryCard(Category("VPN & Proxy", "VPN & Proxy"))
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCarousel.kt
similarity index 79%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
rename to basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCarousel.kt
index f918667af..037301601 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCarousel.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.basic.ui.categories
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
@@ -10,14 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.Icons.Default
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
-import androidx.compose.material.icons.filled.CalendarMonth
-import androidx.compose.material.icons.filled.Cloud
-import androidx.compose.material.icons.filled.DeveloperMode
-import androidx.compose.material.icons.filled.OpenInBrowser
-import androidx.compose.material.icons.filled.SignalCellularAlt
-import androidx.compose.material.icons.filled.Storefront
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -32,7 +25,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import org.fdroid.basic.Category
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.fdroid.basic.MainViewModel
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
@@ -43,7 +36,8 @@ fun CategoryCarousel(
     modifier: Modifier = Modifier,
     viewModel: MainViewModel = hiltViewModel(),
 ) {
-    CategoryCarousel(MainViewModel.categories, modifier, onTitleTap, onCategoryTap)
+    val categories = viewModel.categories.collectAsStateWithLifecycle(null).value
+    CategoryCarousel(categories ?: emptyList(), modifier, onTitleTap, onCategoryTap)
 }
 
 @Composable
@@ -112,12 +106,12 @@ fun CategoryBox(category: Category, onCategoryTap: (String) -> Unit) {
 @Composable
 fun CategoryCarouselPreview() {
     val categories = listOf(
-        Category("App Store & Updater", Default.Storefront),
-        Category("Browser", Default.OpenInBrowser),
-        Category("Calendar & Agenda", Default.CalendarMonth),
-        Category("Cloud Storage & File Sync", Default.Cloud),
-        Category("Connectivity", Default.SignalCellularAlt),
-        Category("Development", Default.DeveloperMode),
+        Category("App Store & Updater", "App Store & Updater"),
+        Category("Browser", "Browser"),
+        Category("Calendar & Agenda", "Calendar & Agenda"),
+        Category("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
+        Category("Connectivity", "Connectivity"),
+        Category("Development", "Development"),
     )
     FDroidContent {
         CategoryCarousel(categories, onTitleTap = {}) {}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
new file mode 100644
index 000000000..8cf158926
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
@@ -0,0 +1,63 @@
+package org.fdroid.basic.ui.categories
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.GridItemSpan
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import kotlin.math.max
+
+@Composable
+fun CategoryList(categories: List<Category>?, modifier: Modifier = Modifier) {
+    if (categories != null) Column {
+        val state = rememberLazyGridState()
+        LazyVerticalGrid(
+            state = state,
+            columns = GridCells.Adaptive(150.dp),
+            contentPadding = PaddingValues(12.dp),
+            modifier = modifier,
+        ) {
+            item(key = "header", span = {
+                GridItemSpan(max(1, state.layoutInfo.maxSpan))
+            }) {
+                Text(
+                    text = stringResource(R.string.main_menu__categories),
+                    style = MaterialTheme.typography.titleLarge,
+                    modifier = Modifier.padding(bottom = 8.dp, start = 4.dp),
+                )
+            }
+            items(categories, key = { it.name }) { category ->
+                CategoryCard(category)
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun CategoryListPreview() {
+    FDroidContent {
+        val categories = listOf(
+            Category("App Store & Updater", "App Store & Updater"),
+            Category("Browser", "Browser"),
+            Category("Calendar & Agenda", "Calendar & Agenda"),
+            Category("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
+            Category("Connectivity", "Connectivity"),
+            Category("Development", "Development"),
+            Category("doesn't exist", "Foo bar"),
+        )
+        CategoryList(categories)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
index 15bcc0e29..5329b12fb 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
@@ -138,7 +138,7 @@ fun BottomBarPreview() {
             areFiltersShown = filterExpanded,
             apps = apps,
             sortBy = Sort.NAME,
-            allCategories = listOf("foo", "bar"),
+            allCategories = emptyList(),
             addedCategories = emptyList(),
         )
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
index f844223ea..d960567f7 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
@@ -1,10 +1,6 @@
 package org.fdroid.basic.ui.main.discover
 
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.material3.ExpandedFullScreenSearchBar
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -15,14 +11,15 @@ import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import org.fdroid.basic.MainViewModel
+import org.fdroid.basic.ui.categories.Category
+import org.fdroid.basic.ui.categories.CategoryList
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppsSearch(
     searchBarState: SearchBarState,
+    categories: List<Category>?,
     onItemClick: (AppNavigationItem) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -43,14 +40,7 @@ fun AppsSearch(
         state = searchBarState,
         inputField = inputField,
     ) {
-        LazyVerticalGrid(
-            columns = GridCells.Adaptive(128.dp),
-            contentPadding = PaddingValues(16.dp)
-        ) {
-            items(MainViewModel.categories, key = { it.name }) { category ->
-                CategoryCard(category)
-            }
-        }
+        CategoryList(categories)
     }
 }
 
@@ -60,6 +50,6 @@ fun AppsSearch(
 fun AppsSearchPreview() {
     FDroidContent {
         val state = rememberSearchBarState(SearchBarValue.Expanded)
-        AppsSearch(state, {})
+        AppsSearch(state, emptyList(), {})
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
index fc0c20030..2ab26be9f 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
@@ -2,6 +2,7 @@ package org.fdroid.basic.ui.main.discover
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -27,6 +28,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import org.fdroid.basic.ui.categories.Category
+import org.fdroid.basic.ui.categories.CategoryList
 import org.fdroid.basic.ui.main.MainOverFlowMenu
 import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.basic.ui.main.topBarMenuItems
@@ -35,6 +38,7 @@ import org.fdroid.basic.ui.main.topBarMenuItems
 @OptIn(ExperimentalMaterial3Api::class)
 fun Discover(
     apps: List<AppNavigationItem>,
+    categories: List<Category>?,
     modifier: Modifier = Modifier,
     onTitleTap: (AppList) -> Unit,
     onAppTap: (AppNavigationItem) -> Unit,
@@ -82,7 +86,7 @@ fun Discover(
                 .verticalScroll(rememberScrollState())
                 .padding(paddingValues)
         ) {
-            AppsSearch(searchBarState, onAppTap, modifier = Modifier.padding(top = 8.dp))
+            AppsSearch(searchBarState, categories, onAppTap, modifier = Modifier.padding(top = 8.dp))
             AppCarousel(
                 title = AppList.New.title,
                 apps = apps.filter { it.isNew },
@@ -103,6 +107,7 @@ fun Discover(
             ) {
                 Text(AppList.All.title)
             }
+            CategoryList(categories, Modifier.heightIn(max = 1000.dp))
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
index 41fc136ef..d78b0012e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
@@ -71,6 +71,7 @@ fun DiscoverScaffold(
                     composable("discover") {
                         Discover(
                             apps = apps,
+                            categories = filterInfo.model.allCategories,
                             onTitleTap = {
                                 onAppListChanged(it)
                                 discoverNavController.navigate("list")
@@ -127,7 +128,7 @@ fun DiscoverScaffoldPreview() {
                 areFiltersShown = filterExpanded,
                 apps = apps,
                 sortBy = Sort.NAME,
-                allCategories = listOf("foo", "bar"),
+                allCategories = emptyList(),
                 addedCategories = emptyList(),
             )
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
index 881a263b3..b7b9f02f1 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
+import org.fdroid.basic.ui.categories.Category
 import java.util.Locale
 
 @Composable
@@ -11,11 +12,12 @@ fun FilterPresenter(
     areFiltersShownFlow: StateFlow<Boolean>,
     appsFlow: Flow<List<AppNavigationItem>>,
     sortByFlow: StateFlow<Sort>,
-    allCategories: List<String>,
+    allCategoriesFlow: Flow<List<Category>>,
     addedCategoriesFlow: StateFlow<List<String>>,
 ): FilterModel {
     val apps = appsFlow.collectAsState(null).value
     val sortBy = sortByFlow.collectAsState().value
+    val allCategories = allCategoriesFlow.collectAsState(null).value
     val addedCategories = addedCategoriesFlow.collectAsState().value
 
     val newApps = apps?.filter { app ->
@@ -41,6 +43,6 @@ data class FilterModel(
     val areFiltersShown: Boolean,
     val apps: List<AppNavigationItem>,
     val sortBy: Sort,
-    val allCategories: List<String>,
+    val allCategories: List<Category>?,
     val addedCategories: List<String>,
 )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
index 2ff705922..35016f24e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
@@ -100,7 +100,7 @@ fun ColumnScope.AppsFilter(
                 },
                 onClick = { sortByMenuExpanded = !sortByMenuExpanded },
             )
-            FilterChip(
+            if (!filter.model.allCategories.isNullOrEmpty()) FilterChip(
                 selected = false,
                 leadingIcon = {
                     Icon(
@@ -115,11 +115,11 @@ fun ColumnScope.AppsFilter(
                         expanded = categoryMenuExpanded,
                         onDismissRequest = { categoryMenuExpanded = false },
                     ) {
-                        filter.model.allCategories.forEach { category ->
+                        filter.model.allCategories?.forEach { category ->
                             DropdownMenuItem(
-                                text = { Text(category) },
+                                text = { Text(category.name) },
                                 onClick = {
-                                    filter.addCategory(category)
+                                    filter.addCategory(category.id)
                                     categoryMenuExpanded = false
                                 },
                             )

From 9918eb8b6f8f777a5ebe9019f96907f59c22d08a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 10 Jul 2025 14:46:29 -0300
Subject: [PATCH 024/180] Load default repos on first start

using new JSON format
---
 basic/build.gradle.kts                        |  2 +
 basic/src/main/assets/default_repos.json      | 62 +++++++++++++++++
 .../java/org/fdroid/basic/MainActivity.kt     | 15 +++++
 .../org/fdroid/basic/db/DatabaseModule.kt     |  3 +-
 .../java/org/fdroid/basic/db/InitialData.kt   | 67 +++++++++++++++++++
 .../ui/main/repositories/RepositoryItem.kt    |  2 +-
 6 files changed, 149 insertions(+), 2 deletions(-)
 create mode 100644 basic/src/main/assets/default_repos.json
 create mode 100644 basic/src/main/java/org/fdroid/basic/db/InitialData.kt

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index db6393cae..0db5926db 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.android.hilt)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.jetbrains.kotlin.parcelize)
+    alias(libs.plugins.jetbrains.kotlin.plugin.serialization)
     alias(libs.plugins.jetbrains.compose.compiler)
 }
 
@@ -55,6 +56,7 @@ dependencies {
     implementation(project(":libs:index"))
     implementation(project(":libs:database"))
     implementation(project(":libs:download"))
+    implementation(libs.kotlinx.serialization.json)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
diff --git a/basic/src/main/assets/default_repos.json b/basic/src/main/assets/default_repos.json
new file mode 100644
index 000000000..372371c2d
--- /dev/null
+++ b/basic/src/main/assets/default_repos.json
@@ -0,0 +1,62 @@
+[
+  {
+    "name": "F-Droid",
+    "address": "https://f-droid.org/repo",
+    "mirrors": [
+      "http://fdroidorg6cooksyluodepej4erfctzk7rrjpjbbr6wx24jh3lqyfwyd.onion/fdroid/repo",
+      "http://dotsrccccbidkzg7oc7oj4ugxrlfbt64qebyunxbrgqhxiwj3nl6vcad.onion/fdroid/repo",
+      "http://ftpfaudev4triw2vxiwzf4334e3mynz7osqgtozhbc77fixncqzbyoyd.onion/fdroid/repo",
+      "http://lysator7eknrfl47rlyxvgeamrv7ucefgrrlhk7rouv3sna25asetwid.onion/pub/fdroid/repo",
+      "http://mirror.ossplanetnyou5xifr6liw5vhzwc2g2fmmlohza25wwgnnaw65ytfsad.onion/fdroid/repo",
+      "https://fdroid.tetaneutral.net/fdroid/repo",
+      "https://ftp.agdsn.de/fdroid/repo",
+      "https://ftp.fau.de/fdroid/repo",
+      "https://ftp.gwdg.de/pub/android/fdroid/repo",
+      "https://ftp.lysator.liu.se/pub/fdroid/repo",
+      "https://mirror.cyberbits.eu/fdroid/repo",
+      "https://mirror.fcix.net/fdroid/repo",
+      "https://mirror.kumi.systems/fdroid/repo",
+      "https://mirror.level66.network/fdroid/repo",
+      "https://mirror.ossplanet.net/fdroid/repo",
+      "https://mirrors.dotsrc.org/fdroid/repo",
+      "https://opencolo.mm.fcix.net/fdroid/repo",
+      "https://plug-mirror.rcac.purdue.edu/fdroid/repo",
+      "https://mirror.init7.net/fdroid/repo",
+      "https://mirror.freedif.org/fdroid/repo",
+      "https://de.freedif.org/fdroid/repo"
+    ],
+    "description": "The official F-Droid Free Software repository. Everything in this repository is always built from the source code.",
+    "certificate": "3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef",
+    "enabled": true
+  },
+  {
+    "name": "F-Droid Archive",
+    "address": "https://f-droid.org/archive",
+    "mirrors": [
+      "http://fdroidorg6cooksyluodepej4erfctzk7rrjpjbbr6wx24jh3lqyfwyd.onion/fdroid/archive",
+      "http://dotsrccccbidkzg7oc7oj4ugxrlfbt64qebyunxbrgqhxiwj3nl6vcad.onion/fdroid/archive",
+      "http://ftpfaudev4triw2vxiwzf4334e3mynz7osqgtozhbc77fixncqzbyoyd.onion/fdroid/archive",
+      "http://lysator7eknrfl47rlyxvgeamrv7ucefgrrlhk7rouv3sna25asetwid.onion/pub/fdroid/archive",
+      "http://mirror.ossplanetnyou5xifr6liw5vhzwc2g2fmmlohza25wwgnnaw65ytfsad.onion/fdroid/archive",
+      "https://fdroid.tetaneutral.net/fdroid/archive",
+      "https://ftp.agdsn.de/fdroid/archive",
+      "https://ftp.fau.de/fdroid/archive",
+      "https://ftp.gwdg.de/pub/android/fdroid/archive",
+      "https://ftp.lysator.liu.se/pub/fdroid/archive",
+      "https://mirror.cyberbits.eu/fdroid/archive",
+      "https://mirror.fcix.net/fdroid/archive",
+      "https://mirror.kumi.systems/fdroid/archive",
+      "https://mirror.level66.network/fdroid/archive",
+      "https://mirror.ossplanet.net/fdroid/archive",
+      "https://mirrors.dotsrc.org/fdroid/archive",
+      "https://opencolo.mm.fcix.net/fdroid/archive",
+      "https://plug-mirror.rcac.purdue.edu/fdroid/archive",
+      "https://mirror.init7.net/fdroid/archive",
+      "https://mirror.freedif.org/fdroid/archive",
+      "https://de.freedif.org/fdroid/archive"
+    ],
+    "description": "The archive repository of the F-Droid client. This contains older versions of applications from the main repository.",
+    "certificate": "3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef",
+    "enabled": false
+  }
+]
diff --git a/basic/src/main/java/org/fdroid/basic/MainActivity.kt b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
index 262dedd88..5646e71c5 100644
--- a/basic/src/main/java/org/fdroid/basic/MainActivity.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainActivity.kt
@@ -1,17 +1,32 @@
 package org.fdroid.basic
 
+import android.Manifest.permission.POST_NOTIFICATIONS
+import android.content.pm.PackageManager.PERMISSION_GRANTED
+import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
+import androidx.core.content.ContextCompat
 import dagger.hilt.android.AndroidEntryPoint
 import org.fdroid.basic.ui.main.Main
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
+
+    val requestPermissionLauncher = registerForActivityResult(RequestPermission()) { isGranted ->
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+        if (SDK_INT >= 33 && ContextCompat.checkSelfPermission(
+                this, POST_NOTIFICATIONS
+            ) != PERMISSION_GRANTED
+        ) {
+            requestPermissionLauncher.launch(POST_NOTIFICATIONS)
+        }
         setContent {
             Main()
         }
diff --git a/basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt b/basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt
index b71373bf1..9dee871b3 100644
--- a/basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt
+++ b/basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt
@@ -16,6 +16,7 @@ object DatabaseModule {
     @Provides
     @Singleton
     fun provideFDroidDatabase(@ApplicationContext context: Context): FDroidDatabase {
-        return FDroidDatabaseHolder.getDb(context)
+        val initialData = InitialData(context)
+        return FDroidDatabaseHolder.getDb(context, "fdroid_db", initialData)
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/db/InitialData.kt b/basic/src/main/java/org/fdroid/basic/db/InitialData.kt
new file mode 100644
index 000000000..11795a20d
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/db/InitialData.kt
@@ -0,0 +1,67 @@
+package org.fdroid.basic.db
+
+import android.content.Context
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromStream
+import org.fdroid.basic.repo.RepoUpdateWorker
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.database.FDroidFixture
+import org.fdroid.database.InitialRepository
+import org.fdroid.database.RepositoryDao
+import java.io.File
+
+class InitialData(val context: Context) : FDroidFixture {
+    override fun prePopulateDb(db: FDroidDatabase) {
+        addPreloadedRepositories(db, context.packageName)
+        RepoUpdateWorker.updateNow(context)
+    }
+
+    @OptIn(ExperimentalSerializationApi::class)
+    private fun addPreloadedRepositories(db: FDroidDatabase, packageName: String) {
+        val defaultRepos = context.assets.open("default_repos.json").use { inputStream ->
+            Json.decodeFromStream<List<DefaultRepository>>(inputStream)
+        }
+        addRepositories(db.getRepositoryDao(), defaultRepos)
+        // TODO support file:/// Uri for repo and test additional_repos.json
+        // "system" can be removed when minSdk is 28
+        for (root in listOf("/system", "/system_ext", "/product", "/vendor")) {
+            val romReposFile = File("$root/etc/$packageName/additional_repos.json")
+            if (romReposFile.isFile) {
+                val romRepos = romReposFile.inputStream().use { inputStream ->
+                    Json.decodeFromStream<List<DefaultRepository>>(inputStream)
+                }
+                addRepositories(db.getRepositoryDao(), romRepos)
+            }
+        }
+    }
+
+    private fun addRepositories(
+        repositoryDao: RepositoryDao,
+        repositories: List<DefaultRepository>
+    ) {
+        repositories.forEach { repository ->
+            val initialRepository = InitialRepository(
+                name = repository.name,
+                address = repository.address,
+                mirrors = repository.mirrors,
+                description = repository.description,
+                certificate = repository.certificate,
+                version = 1,
+                enabled = repository.enabled,
+            )
+            repositoryDao.insert(initialRepository)
+        }
+    }
+}
+
+@Serializable
+data class DefaultRepository(
+    val name: String,
+    val address: String,
+    val mirrors: List<String> = emptyList(),
+    val description: String,
+    val certificate: String,
+    val enabled: Boolean,
+)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt
index 10d15faed..9222476e1 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt
@@ -35,7 +35,7 @@ fun RepositoryItem(
             Text(repoItem.address)
         },
         trailingContent = {
-            Switch(true, onCheckedChange = null)
+            Switch(repoItem.enabled, onCheckedChange = null)
         },
         colors = ListItemDefaults.colors(
             containerColor = if (isSelected) {

From a8b0c8c8a4d13355e655e4abf7b5850efff38625 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 10 Jul 2025 16:33:21 -0300
Subject: [PATCH 025/180] Show different states on discover screen

---
 .../java/org/fdroid/basic/MainViewModel.kt    | 40 +++++---
 .../basic/ui/categories/CategoryList.kt       |  1 +
 .../fdroid/basic/ui/main/BottomBarScreen.kt   |  6 +-
 .../java/org/fdroid/basic/ui/main/Main.kt     |  1 +
 .../basic/ui/main/discover/AppsSearch.kt      |  3 +-
 .../fdroid/basic/ui/main/discover/Discover.kt | 96 ++++++++++++++-----
 .../ui/main/discover/DiscoverPresenter.kt     | 46 +++++++++
 .../ui/main/discover/DiscoverScaffold.kt      | 16 +++-
 .../org/fdroid/basic/ui/main/lists/AppList.kt |  2 +-
 9 files changed, 162 insertions(+), 49 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 121c2ee85..4191fe7af 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -23,6 +23,8 @@ import org.fdroid.basic.repo.RepositoryManager
 import org.fdroid.basic.ui.categories.Category
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
+import org.fdroid.basic.ui.main.discover.DiscoverModel
+import org.fdroid.basic.ui.main.discover.DiscoverPresenter
 import org.fdroid.basic.ui.main.discover.FilterModel
 import org.fdroid.basic.ui.main.discover.FilterPresenter
 import org.fdroid.basic.ui.main.discover.Sort
@@ -44,6 +46,21 @@ class MainViewModel @Inject constructor(
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
+    val apps = db.getAppDao().getAppOverviewItems().asFlow().map { list ->
+        list.mapNotNull {
+            val repository = repositoryManager.getRepository(it.repoId)
+                ?: return@mapNotNull null
+            AppNavigationItem(
+                packageName = it.packageName,
+                name = it.name ?: "Unknown",
+                summary = it.summary ?: "Unknown",
+                isNew = it.lastUpdated == it.added,
+                lastUpdated = it.lastUpdated,
+                iconDownloadRequest = it.getIcon(localeList)
+                    ?.getDownloadRequest(repository),
+            )
+        }
+    }
     val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
         val collator = Collator.getInstance(Locale.getDefault())
         categories.map { category ->
@@ -64,24 +81,17 @@ class MainViewModel @Inject constructor(
     val addedCategories = _addedCategories.asStateFlow<List<String>>()
 
     val localeList = LocaleListCompat.getDefault()
+    val discoverModel: StateFlow<DiscoverModel> = scope.launchMolecule(mode = ContextClock) {
+        DiscoverPresenter(
+            appsFlow = apps,
+            categoriesFlow = categories,
+            repositoriesFlow = repositoryManager.repos,
+        )
+    }
     val filterModel: StateFlow<FilterModel> = scope.launchMolecule(mode = ContextClock) {
         FilterPresenter(
             areFiltersShownFlow = showFilters,
-            appsFlow = db.getAppDao().getAppOverviewItems().asFlow().map { list ->
-                list.mapNotNull {
-                    val repository = repositoryManager.getRepository(it.repoId)
-                        ?: return@mapNotNull null
-                    AppNavigationItem(
-                        packageName = it.packageName,
-                        name = it.name ?: "Unknown",
-                        summary = it.summary ?: "Unknown",
-                        isNew = it.lastUpdated == it.added,
-                        lastUpdated = it.lastUpdated,
-                        iconDownloadRequest = it.getIcon(localeList)
-                            ?.getDownloadRequest(repository),
-                    )
-                }
-            },
+            appsFlow = apps,
             sortByFlow = sortBy,
             allCategoriesFlow = categories,
             addedCategoriesFlow = addedCategories,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
index 8cf158926..dcc54d2df 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
@@ -27,6 +27,7 @@ fun CategoryList(categories: List<Category>?, modifier: Modifier = Modifier) {
             state = state,
             columns = GridCells.Adaptive(150.dp),
             contentPadding = PaddingValues(12.dp),
+            userScrollEnabled = false,
             modifier = modifier,
         ) {
             item(key = "header", span = {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
index 5329b12fb..ec3ce86a3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
@@ -31,8 +31,10 @@ import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.apps.MyAppsScaffold
 import org.fdroid.basic.ui.main.apps.UpdatableApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
+import org.fdroid.basic.ui.main.discover.DiscoverModel
 import org.fdroid.basic.ui.main.discover.DiscoverScaffold
 import org.fdroid.basic.ui.main.discover.FilterModel
+import org.fdroid.basic.ui.main.discover.LoadingDiscoverModel
 import org.fdroid.basic.ui.main.discover.Sort
 import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.basic.ui.main.lists.FilterInfo
@@ -52,6 +54,7 @@ fun BottomBarScreen(
     updates: List<UpdatableApp>,
     installed: List<InstalledApp>,
     appList: AppList,
+    discoverModel: DiscoverModel,
     filterInfo: FilterInfo,
     currentItem: MinimalApp?,
     onSelectAppItem: (MinimalApp) -> Unit,
@@ -101,8 +104,8 @@ fun BottomBarScreen(
     ) {
         when (currentDestination) {
             BottomNavDestinations.APPS -> DiscoverScaffold(
+                discoverModel = discoverModel,
                 appList = appList,
-                apps = filterInfo.model.apps,
                 filterInfo = filterInfo,
                 onMainNav = onMainNav,
                 currentItem = currentItem,
@@ -155,6 +158,7 @@ fun BottomBarPreview() {
         updates = emptyList(),
         installed = emptyList(),
         appList = AppList.New,
+        discoverModel = LoadingDiscoverModel(true),
         filterInfo = filterInfo,
         currentItem = null,
         onSelectAppItem = {},
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index 5ce5aaa77..3725978f2 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -67,6 +67,7 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                     installed = installed,
                     onAppListChanged = viewModel::setAppList,
                     appList = viewModel.currentList.collectAsStateWithLifecycle().value,
+                    discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
                     filterInfo = filterInfo,
                     currentItem = currentItem,
                     onSelectAppItem = viewModel::setAppDetails,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
index d960567f7..7c48ac604 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
@@ -12,7 +12,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import org.fdroid.basic.ui.categories.Category
-import org.fdroid.basic.ui.categories.CategoryList
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
@@ -40,7 +39,7 @@ fun AppsSearch(
         state = searchBarState,
         inputField = inputField,
     ) {
-        CategoryList(categories)
+
     }
 }
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
index 2ab26be9f..661a0c982 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
@@ -1,17 +1,23 @@
 package org.fdroid.basic.ui.main.discover
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -23,22 +29,24 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 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
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.ui.categories.Category
 import org.fdroid.basic.ui.categories.CategoryList
 import org.fdroid.basic.ui.main.MainOverFlowMenu
 import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.basic.ui.main.topBarMenuItems
+import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun Discover(
-    apps: List<AppNavigationItem>,
-    categories: List<Category>?,
+    discoverModel: DiscoverModel,
     modifier: Modifier = Modifier,
     onTitleTap: (AppList) -> Unit,
     onAppTap: (AppNavigationItem) -> Unit,
@@ -86,28 +94,66 @@ fun Discover(
                 .verticalScroll(rememberScrollState())
                 .padding(paddingValues)
         ) {
-            AppsSearch(searchBarState, categories, onAppTap, modifier = Modifier.padding(top = 8.dp))
-            AppCarousel(
-                title = AppList.New.title,
-                apps = apps.filter { it.isNew },
-                onTitleTap = { onTitleTap(AppList.New) },
-                onAppTap = onAppTap,
-            )
-            AppCarousel(
-                title = AppList.RecentlyUpdated.title,
-                apps = apps.filter { !it.isNew },
-                onTitleTap = { onTitleTap(AppList.RecentlyUpdated) },
-                onAppTap = onAppTap,
-            )
-            FilledTonalButton(
-                onClick = { onTitleTap(AppList.All) },
-                modifier = Modifier
-                    .align(End)
-                    .padding(16.dp),
-            ) {
-                Text(AppList.All.title)
+            when (discoverModel) {
+                is LoadingDiscoverModel -> {
+                    AnimatedVisibility(discoverModel.isFirstStart) {
+                        Text(
+                            "This is the first start, loading repositories...",
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier
+                                .padding(16.dp)
+                                .fillMaxWidth()
+                        )
+                    }
+                    Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                        LoadingIndicator(Modifier.size(128.dp))
+                    }
+                }
+                is LoadedDiscoverModel -> {
+                    AppsSearch(
+                        searchBarState = searchBarState,
+                        categories = discoverModel.categories,
+                        onItemClick = onAppTap,
+                        modifier = Modifier.padding(top = 8.dp),
+                    )
+                    AppCarousel(
+                        title = AppList.New.title,
+                        apps = discoverModel.newApps,
+                        onTitleTap = { onTitleTap(AppList.New) },
+                        onAppTap = onAppTap,
+                    )
+                    AppCarousel(
+                        title = AppList.RecentlyUpdated.title,
+                        apps = discoverModel.recentlyUpdatedApps,
+                        onTitleTap = { onTitleTap(AppList.RecentlyUpdated) },
+                        onAppTap = onAppTap,
+                    )
+                    FilledTonalButton(
+                        onClick = { onTitleTap(AppList.All) },
+                        modifier = Modifier
+                            .align(End)
+                            .padding(16.dp),
+                    ) {
+                        Text(AppList.All.title)
+                    }
+                }
+                NoEnabledReposDiscoverModel -> {
+                    Text("No repositories enabled.\nEnable at least one repository to see apps.")
+                }
+            }
+            AnimatedVisibility(discoverModel is LoadedDiscoverModel) {
+                val categories = (discoverModel as LoadedDiscoverModel).categories
+                // TODO remove max height hack
+                CategoryList(categories, Modifier.heightIn(max = 2000.dp))
             }
-            CategoryList(categories, Modifier.heightIn(max = 1000.dp))
         }
     }
 }
+
+@Preview
+@Composable
+fun LoadingDiscoverPreview() {
+    FDroidContent {
+        Discover(LoadingDiscoverModel(true), Modifier, {}, {}, {})
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt
new file mode 100644
index 000000000..6629b9226
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt
@@ -0,0 +1,46 @@
+package org.fdroid.basic.ui.main.discover
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.Flow
+import org.fdroid.basic.ui.categories.Category
+import org.fdroid.basic.ui.main.repositories.Repository
+
+@Composable
+fun DiscoverPresenter(
+    appsFlow: Flow<List<AppNavigationItem>>,
+    categoriesFlow: Flow<List<Category>>,
+    repositoriesFlow: Flow<List<Repository>>,
+): DiscoverModel {
+    val apps = appsFlow.collectAsState(null).value
+    val categories = categoriesFlow.collectAsState(null).value
+
+    return if (apps.isNullOrEmpty()) {
+        val repositories = repositoriesFlow.collectAsState(null).value
+        if (apps == null) {
+            LoadingDiscoverModel(false)
+        } else if (repositories?.all { !it.enabled } == true) {
+            NoEnabledReposDiscoverModel
+        } else {
+            // apps are empty, if we have enabled repos assume this is first start (still loading)
+            // TODO use more reliable check for first start
+            val isFirstStart = repositories?.find { it.enabled } != null
+            LoadingDiscoverModel(isFirstStart)
+        }
+    } else {
+        LoadedDiscoverModel(
+            newApps = apps.filter { it.isNew },
+            recentlyUpdatedApps = apps.filter { !it.isNew },
+            categories = categories,
+        )
+    }
+}
+
+sealed class DiscoverModel
+data class LoadingDiscoverModel(val isFirstStart: Boolean) : DiscoverModel()
+object NoEnabledReposDiscoverModel : DiscoverModel()
+data class LoadedDiscoverModel(
+    val newApps: List<AppNavigationItem>,
+    val recentlyUpdatedApps: List<AppNavigationItem>,
+    val categories: List<Category>?,
+) : DiscoverModel()
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
index d78b0012e..c2767e9bc 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
@@ -42,7 +42,7 @@ const val NUM_ITEMS = 42
 @OptIn(ExperimentalMaterial3AdaptiveApi::class, ExperimentalMaterial3Api::class)
 fun DiscoverScaffold(
     appList: AppList,
-    apps: List<AppNavigationItem>,
+    discoverModel: DiscoverModel,
     filterInfo: FilterInfo,
     onMainNav: (String) -> Unit,
     onSelectAppItem: (MinimalApp) -> Unit,
@@ -70,8 +70,7 @@ fun DiscoverScaffold(
                 NavHost(navController = discoverNavController, startDestination = "discover") {
                     composable("discover") {
                         Discover(
-                            apps = apps,
-                            categories = filterInfo.model.allCategories,
+                            discoverModel = discoverModel,
                             onTitleTap = {
                                 onAppListChanged(it)
                                 discoverNavController.navigate("list")
@@ -87,7 +86,6 @@ fun DiscoverScaffold(
                     composable("list") {
                         AppList(
                             appList = appList,
-                            apps = apps,
                             filterInfo = filterInfo,
                             currentItem = if (isDetailVisible) currentItem else null,
                             onBackClicked = { discoverNavController.popBackStack() },
@@ -140,6 +138,14 @@ fun DiscoverScaffoldPreview() {
             override fun addCategory(category: String) {}
             override fun removeCategory(category: String) {}
         }
-        DiscoverScaffold(AppList.New, apps, filterInfo, {}, {}, {}, null)
+        DiscoverScaffold(
+            appList = AppList.New,
+            discoverModel = LoadingDiscoverModel(true),
+            filterInfo = filterInfo,
+            onMainNav = {},
+            onSelectAppItem = {},
+            onAppListChanged = {},
+            currentItem = null,
+        )
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
index cf74d9904..20fd98ba9 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
@@ -49,7 +49,6 @@ sealed class AppList(val title: String) {
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppList(
     appList: AppList,
-    apps: List<AppNavigationItem>,
     filterInfo: FilterInfo,
     currentItem: MinimalApp?,
     modifier: Modifier = Modifier,
@@ -105,6 +104,7 @@ fun AppList(
                     else Modifier.selectableGroup()
                 ),
             ) {
+                val apps = filterInfo.model.apps
                 items(apps, key = { it.packageName }, contentType = { "A" }) { navItem ->
                     val isSelected = currentItem?.packageName == navItem.packageName
                     val interactionModifier = if (currentItem == null) {

From fa53a8fb11d6bd2708089a26537a5421230e1135 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 11 Jul 2025 17:20:21 -0300
Subject: [PATCH 026/180] Real data app details

---
 basic/src/main/java/org/fdroid/basic/App.kt   |   5 +-
 .../java/org/fdroid/basic/MainViewModel.kt    |  14 +-
 .../fdroid/basic/details/AppDetailsItem.kt    | 280 ++++++++++
 .../fdroid/basic/details/AppDetailsManager.kt |  68 +++
 .../fdroid/basic/details/DetailsPresenter.kt  |  97 ++++
 .../basic/install/SessionInstallManager.kt    |  25 +
 .../fdroid/basic/manager/AppDetailsManager.kt |  17 -
 .../main/java/org/fdroid/basic/ui/Utils.kt    |  13 +
 .../ui/{main/details => icons}/License.kt     |   4 +-
 .../fdroid/basic/ui/main/BottomBarScreen.kt   |   3 +-
 .../fdroid/basic/ui/main/apps/MyAppsList.kt   |   7 +-
 .../basic/ui/main/apps/MyAppsScaffold.kt      |   3 +-
 .../basic/ui/main/details/AntiFeatures.kt     |  90 ++++
 .../basic/ui/main/details/AppDetails.kt       | 495 ++++++------------
 .../basic/ui/main/details/AppDetailsHeader.kt | 196 +++++++
 .../basic/ui/main/details/AppDetailsLink.kt   |  26 +-
 .../ui/main/details/AppDetailsWarnings.kt     |  70 +++
 .../ui/main/details/ExpandableSection.kt      |   6 +-
 .../org/fdroid/basic/ui/main/details/IApp.kt  | 168 ------
 .../basic/ui/main/details/RepoChooser.kt      |  74 ++-
 .../fdroid/basic/ui/main/details/Versions.kt  | 179 +++++++
 .../ui/main/discover/DiscoverScaffold.kt      |   5 +-
 .../org/fdroid/basic/ui/main/lists/AppList.kt |   8 +-
 .../basic/ui/main/repositories/RepoIcon.kt    |  21 +
 .../basic/ui/utils/FDroidOutlineButton.kt     |  42 ++
 .../org/fdroid/basic/updates/UpdatesModule.kt |  41 ++
 .../basic/utils/CoroutinesScopesModule.kt     |  27 +
 .../main/res/drawable/ic_repo_app_default.xml |  14 +
 28 files changed, 1416 insertions(+), 582 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/details/AppDetailsManager.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/install/SessionInstallManager.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/manager/AppDetailsManager.kt
 rename basic/src/main/java/org/fdroid/basic/ui/{main/details => icons}/License.kt (97%)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/AntiFeatures.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsWarnings.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/Versions.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepoIcon.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/utils/FDroidOutlineButton.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/updates/UpdatesModule.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/utils/CoroutinesScopesModule.kt
 create mode 100644 basic/src/main/res/drawable/ic_repo_app_default.xml

diff --git a/basic/src/main/java/org/fdroid/basic/App.kt b/basic/src/main/java/org/fdroid/basic/App.kt
index eb7608def..10afa220f 100644
--- a/basic/src/main/java/org/fdroid/basic/App.kt
+++ b/basic/src/main/java/org/fdroid/basic/App.kt
@@ -17,7 +17,6 @@ import dagger.hilt.android.HiltAndroidApp
 import org.fdroid.basic.repo.RepoUpdateWorker
 import org.fdroid.download.DownloadRequest
 import org.fdroid.download.coil.DownloadRequestFetcher
-import java.io.File
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -60,8 +59,10 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
                     .build()
             }
             .diskCache {
+                // TODO disk cache needs to be manually filled by the Fetcher
+                //  this is not automatic like it is with Glide
                 DiskCache.Builder()
-                    .directory(File(context.cacheDir, "coil"))
+                    .directory(context.cacheDir.resolve("coil"))
                     .maxSizePercent(0.05)
                     .build()
             }
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 4191fe7af..4b21c50fe 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -16,8 +16,8 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
+import org.fdroid.basic.details.AppDetailsManager
 import org.fdroid.basic.download.getDownloadRequest
-import org.fdroid.basic.manager.AppDetailsManager
 import org.fdroid.basic.manager.MyAppsManager
 import org.fdroid.basic.repo.RepositoryManager
 import org.fdroid.basic.ui.categories.Category
@@ -107,17 +107,7 @@ class MainViewModel @Inject constructor(
     }
 
     fun setAppDetails(app: MinimalApp) {
-        val newApp = filterModel.value.apps.find { it.packageName == app.packageName }
-            ?: (updates.value.find { it.packageName == app.packageName }
-                ?: installed.value.find { it.packageName == app.packageName })?.let {
-                AppNavigationItem(
-                    packageName = it.packageName,
-                    name = it.name ?: "Unknown app",
-                    summary = "Summary",
-                    isNew = false,
-                )
-            }
-        appDetailsManager.setAppDetails(newApp)
+        appDetailsManager.setAppDetails(app)
     }
 
     fun toggleListFilterVisibility() {
diff --git a/basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt b/basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt
new file mode 100644
index 000000000..2171e9c6b
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt
@@ -0,0 +1,280 @@
+package org.fdroid.basic.details
+
+import android.content.Intent
+import android.os.Build.VERSION.SDK_INT
+import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
+import androidx.core.os.LocaleListCompat
+import org.fdroid.basic.download.getDownloadRequest
+import org.fdroid.basic.install.SessionInstallManager
+import org.fdroid.database.App
+import org.fdroid.database.AppMetadata
+import org.fdroid.database.AppPrefs
+import org.fdroid.database.AppVersion
+import org.fdroid.database.Repository
+import org.fdroid.download.DownloadRequest
+import org.fdroid.index.v2.PackageManifest
+import org.fdroid.index.v2.PackageVersion
+import org.fdroid.index.v2.SignerV2
+import java.util.concurrent.TimeUnit.DAYS
+
+enum class MainButtonState {
+    NONE, INSTALL, UPDATE
+}
+
+data class AppDetailsItem(
+    val app: AppMetadata,
+    /**
+     * The ID of the repo that is currently set as preferred.
+     * Note that the repository ID of this [app] may be different.
+     */
+    val preferredRepoId: Long = app.repoId,
+    /**
+     * A list of [Repository]s the app is in. If this is empty, the list doesn't matter,
+     * because the user only has one repo.
+     */
+    val repositories: List<Repository> = emptyList(),
+    val name: String,
+    val summary: String? = null,
+    val description: String? = null,
+    val icon: DownloadRequest? = null,
+    val featureGraphic: DownloadRequest? = null,
+    val phoneScreenshots: List<DownloadRequest> = emptyList(),
+    val versions: List<PackageVersion>? = null,
+    val installedVersion: PackageVersion? = null,
+    /**
+     * Needed, because the [installedVersion] may not be available, e.g. too old.
+     */
+    val installedVersionCode: Long? = null,
+    val suggestedVersion: PackageVersion? = null,
+    val appPrefs: AppPrefs? = null,
+    val whatsNew: String? = null,
+    val antiFeatures: List<AntiFeature>? = null,
+    val launchIntent: Intent? = null,
+    /**
+     * true if this app from this repository has no versions with a
+     * compatible signer. This means that the app is installed, but does not receive updates either
+     * because the signer in the repo has changed or a wrong repo is set as preferred.
+     */
+    val noCompatibleVersions: Boolean = false,
+    val authorHasMoreThanOneApp: Boolean = false,
+) {
+    constructor(
+        repository: Repository,
+        preferredRepoId: Long,
+        repositories: List<Repository>,
+        dbApp: App,
+        versions: List<AppVersion>?,
+        installedVersion: AppVersion?,
+        installedVersionCode: Long?,
+        suggestedVersion: AppVersion?,
+        appPrefs: AppPrefs?,
+        launchIntent: Intent?,
+        noCompatibleVersions: Boolean,
+        authorHasMoreThanOneApp: Boolean,
+        localeList: LocaleListCompat,
+    ) : this(
+        app = dbApp.metadata,
+        preferredRepoId = preferredRepoId,
+        repositories = repositories,
+        name = dbApp.name ?: "Unknown App",
+        summary = dbApp.summary,
+        description = dbApp.getDescription(localeList)
+            ?.replace(" (https://\\S+) ".toRegex()) {
+                val url = it.groups[1]?.value ?: it.value
+                "<a href=\"$url\">$url</a>"
+            }
+            ?.replace("\n", "<br>"),
+        icon = dbApp.getIcon(localeList)?.getDownloadRequest(repository),
+        featureGraphic = dbApp.getFeatureGraphic(localeList)?.getDownloadRequest(repository),
+        phoneScreenshots = dbApp.getPhoneScreenshots(localeList).mapNotNull {
+            it.getDownloadRequest(repository)
+        },
+        versions = versions,
+        installedVersion = installedVersion,
+        installedVersionCode = installedVersionCode,
+        suggestedVersion = suggestedVersion,
+        appPrefs = appPrefs,
+        whatsNew = installedVersion?.getWhatsNew(localeList),
+        antiFeatures = installedVersion?.getAntiFeatures(repository, localeList)
+            ?: suggestedVersion?.getAntiFeatures(repository, localeList)
+            ?: versions?.first()?.getAntiFeatures(repository, localeList),
+        launchIntent = launchIntent,
+        noCompatibleVersions = noCompatibleVersions,
+        authorHasMoreThanOneApp = authorHasMoreThanOneApp,
+    )
+
+    /**
+     * True if the app is installed (and has a launch intent)
+     * and thus the 'Open' button should be shown.
+     */
+    val showOpenButton: Boolean get() = launchIntent != null
+
+    /**
+     * Specifies what main button should be shown.
+     */
+    val mainButtonState: MainButtonState
+        get() {
+            return if (installedVersionCode == null) { // app is not installed
+                if (suggestedVersion == null) MainButtonState.NONE
+                else MainButtonState.INSTALL
+            } else { // app is installed
+                if (suggestedVersion == null ||
+                    suggestedVersion.versionCode <= installedVersionCode
+                ) MainButtonState.NONE
+                else MainButtonState.UPDATE
+            }
+        }
+
+    /**
+     * True if this app has warnings, we need to show to the user.
+     */
+    val showWarnings: Boolean get() = oldTargetSdk || noCompatibleVersions
+
+    /**
+     * True if the targetSdk of the suggested version is so old
+     * that auto updates for this app are not available (due to system restrictions).
+     */
+    val oldTargetSdk: Boolean
+        get() {
+            val targetSdk = suggestedVersion?.packageManifest?.targetSdkVersion
+            // auto-updates are only available on SDK 31 and up
+            return if (targetSdk != null && SDK_INT >= 31) {
+                !SessionInstallManager.isTargetSdkSupported(targetSdk)
+            } else {
+                false
+            }
+        }
+    val showAuthorContact: Boolean get() = app.authorEmail != null || app.authorWebSite != null
+    val showDonate: Boolean
+        get() = !app.donate.isNullOrEmpty() ||
+            app.liberapay != null ||
+            app.openCollective != null ||
+            app.litecoin != null ||
+            app.bitcoin != null
+    val liberapayUri = app.liberapay?.let { "https://liberapay.com/$it/donate" }
+    val openCollectiveUri = app.openCollective?.let { "https://opencollective.com/$it/donate" }
+    val litecoinUri = app.litecoin?.let { "litecoin:$it" }
+    val bitcoinUri = app.bitcoin?.let { "bitcoin:$it" }
+}
+
+private fun AppVersion?.getAntiFeatures(
+    repository: Repository,
+    localeList: LocaleListCompat,
+): List<AntiFeature>? {
+    return this?.antiFeatureKeys?.mapNotNull { key ->
+        val antiFeature = repository.getAntiFeatures()[key] ?: return@mapNotNull null
+        AntiFeature(
+            id = key,
+            icon = antiFeature.getIcon(localeList)?.getDownloadRequest(repository),
+            name = antiFeature.getName(localeList) ?: key,
+            reason = getAntiFeatureReason(key, localeList),
+        )
+    }
+}
+
+data class AntiFeature(
+    val id: String,
+    val icon: DownloadRequest? = null,
+    val name: String = id,
+    val reason: String? = null,
+)
+
+// TODO exclude from release builds, @Preview only?
+val testVersion1 = object : PackageVersion {
+    override val versionCode: Long = 42
+    override val versionName: String = "42.23.0-alpha1337-33d2252b90"
+    override val added: Long = System.currentTimeMillis() - DAYS.toMillis(4)
+    override val size: Long? = 1024 * 1024 * 42
+    override val signer: SignerV2? = SignerV2(
+        listOf("271721a9cddc96660336c19a39ae3cca4375072c80d3c8170860c333d2252b90")
+    )
+    override val releaseChannels: List<String>? = null
+    override val packageManifest: PackageManifest = object : PackageManifest {
+        override val minSdkVersion: Int? = null
+        override val maxSdkVersion: Int? = null
+        override val featureNames: List<String>? = null
+        override val nativecode: List<String>? = listOf("amd64", "x86")
+        override val targetSdkVersion: Int? = 13
+    }
+    override val hasKnownVulnerability: Boolean = false
+}
+val testVersion2 = object : PackageVersion {
+    override val versionCode: Long = 23
+    override val versionName: String = "23.42.0"
+    override val added: Long = System.currentTimeMillis() - DAYS.toMillis(4)
+    override val size: Long? = 1024 * 1024 * 23
+    override val signer: SignerV2? = SignerV2(
+        listOf("271721a9cddc96660336c19a39ae3cca4375072c80d3c8170860c333d2252b90")
+    )
+    override val releaseChannels: List<String>? = null
+    override val packageManifest: PackageManifest = object : PackageManifest {
+        override val minSdkVersion: Int? = null
+        override val maxSdkVersion: Int? = null
+        override val featureNames: List<String>? = null
+        override val nativecode: List<String>? = null
+        override val targetSdkVersion: Int? = 13
+    }
+    override val hasKnownVulnerability: Boolean = false
+}
+val testApp = AppDetailsItem(
+    app = AppMetadata(
+        repoId = 1,
+        packageName = "org.schabi.newpipe",
+        added = 1441756800000,
+        lastUpdated = 1747214796000,
+        webSite = "https://newpipe.net",
+        changelog = "https://github.com/TeamNewPipe/NewPipe/releases",
+        license = "GPL-3.0-or-later",
+        sourceCode = "https://github.com/TeamNewPipe/NewPipe",
+        issueTracker = "https://github.com/TeamNewPipe/NewPipe/issues",
+        translation = "https://hosted.weblate.org/projects/newpipe/",
+        preferredSigner = "cb84069bd68116bafae5ee4ee5b08a567aa6d898404e7cb12f9e756df5cf5cab",
+        video = null,
+        authorName = "Team NewPipe",
+        authorEmail = "team@newpipe.net",
+        authorWebSite = "https://newpipe.net",
+        authorPhone = "123456",
+        donate = listOf("https://newpipe.net/donate"),
+        liberapayID = null,
+        liberapay = "TeamNewPipe",
+        openCollective = "TeamNewPipe",
+        bitcoin = "TeamNewPipe",
+        litecoin = "TeamNewPipe",
+        flattrID = null,
+        categories = listOf("Internet", "Multimedia"),
+        isCompatible = true,
+    ),
+    name = "New Pipe",
+    summary = "Lightweight YouTube frontend",
+    description = "NewPipe does not use any Google framework libraries, or the YouTube API. " +
+        "It only parses the website in order to gain the information it needs. " +
+        "Therefore this app can be used on devices without Google Services installed. " +
+        "Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.\n\n" +
+        LoremIpsum(128).values.joinToString(" "),
+    antiFeatures = listOf(
+        AntiFeature(
+            id = "NonFreeNet",
+            icon = null,
+            name = "This app promotes or depends entirely on a non-free network service",
+            reason = "Depends on Youtube for videos.",
+        ),
+        AntiFeature(
+            id = "FooBar",
+            icon = null,
+            name = "This app promotes or depends entirely on a non-free network service",
+            reason = "Depends on Youtube for videos.",
+        ),
+    ),
+    whatsNew = "This release fixes YouTube only providing a 360p stream.\n\n" +
+        "Note that the solution employed in this version is likely temporary, " +
+        "and in the long run the SABR video protocol needs to be implemented, " +
+        "but TeamNewPipe members are currently busy so any help would be greatly appreciated! " +
+        "https://github.com/TeamNewPipe/NewPipe/issues/12248",
+    authorHasMoreThanOneApp = true,
+    versions = listOf(
+        testVersion1,
+        testVersion2,
+    ),
+    installedVersion = testVersion2,
+    suggestedVersion = testVersion1,
+)
diff --git a/basic/src/main/java/org/fdroid/basic/details/AppDetailsManager.kt b/basic/src/main/java/org/fdroid/basic/details/AppDetailsManager.kt
new file mode 100644
index 000000000..ead848ede
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/details/AppDetailsManager.kt
@@ -0,0 +1,68 @@
+package org.fdroid.basic.details
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.GET_SIGNATURES
+import app.cash.molecule.RecompositionMode.Immediate
+import app.cash.molecule.launchMolecule
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import org.fdroid.UpdateChecker
+import org.fdroid.basic.ui.main.apps.MinimalApp
+import org.fdroid.basic.utils.IoDispatcher
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.index.RepoManager
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppDetailsManager @Inject constructor(
+    @ApplicationContext private val context: Context,
+    @IoDispatcher private val scope: CoroutineScope,
+    private val db: FDroidDatabase,
+    private val repoManager: RepoManager,
+    private val updateChecker: UpdateChecker,
+) {
+    private val packageInfoFlow = MutableStateFlow<AppInfo?>(null)
+
+    val appDetails: StateFlow<AppDetailsItem?> = scope.launchMolecule(
+        context = Dispatchers.IO, mode = Immediate,
+    ) {
+        DetailsPresenter(
+            db = db,
+            repoManager = repoManager,
+            updateChecker = updateChecker,
+            packageInfoFlow = packageInfoFlow,
+        )
+    }
+
+    fun setAppDetails(minimalApp: MinimalApp?) {
+        packageInfoFlow.value = null
+        val packageManager = context.packageManager
+        if (minimalApp != null) scope.launch {
+            val packageInfo = try {
+                packageManager.getPackageInfo(minimalApp.packageName, GET_SIGNATURES)
+            } catch (_: PackageManager.NameNotFoundException) {
+                null
+            }
+            packageInfoFlow.value = if (packageInfo == null) {
+                AppInfo(minimalApp.packageName)
+            } else {
+                val intent = packageManager.getLaunchIntentForPackage(minimalApp.packageName)
+                AppInfo(minimalApp.packageName, packageInfo, intent)
+            }
+        }
+    }
+}
+
+class AppInfo(
+    val packageName: String,
+    val packageInfo: PackageInfo? = null,
+    val launchIntent: Intent? = null,
+)
diff --git a/basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt b/basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt
new file mode 100644
index 000000000..628c6d26b
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt
@@ -0,0 +1,97 @@
+package org.fdroid.basic.details
+
+import android.util.Log
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.remember
+import androidx.core.content.pm.PackageInfoCompat.getLongVersionCode
+import androidx.core.os.LocaleListCompat
+import androidx.lifecycle.asFlow
+import kotlinx.coroutines.flow.StateFlow
+import org.fdroid.UpdateChecker
+import org.fdroid.basic.ui.sha256
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.index.RepoManager
+
+private const val TAG = "DetailsPresenter"
+
+// TODO write tests for this function
+//  see: https://github.com/cashapp/molecule?tab=readme-ov-file#testing
+@Composable
+fun DetailsPresenter(
+    db: FDroidDatabase,
+    repoManager: RepoManager,
+    updateChecker: UpdateChecker,
+    packageInfoFlow: StateFlow<AppInfo?>,
+): AppDetailsItem? {
+    val packagePair = packageInfoFlow.collectAsState().value ?: return null
+    val packageName = packagePair.packageName
+    val app = db.getAppDao().getApp(packageName).asFlow().collectAsState(null).value
+        ?: return null
+    val repo = repoManager.getRepository(app.repoId) ?: return null
+    val preferredRepoId = remember(packageName) {
+        app.repoId // DB loads preferred repo first, so we remember it
+    }
+    val repositories = remember(packageName) {
+        db.getAppDao().getRepositoryIdsForApp(packageName).mapNotNull { repoId ->
+            repoManager.getRepository(repoId)
+        }
+    }
+
+    val versions =
+        db.getVersionDao().getAppVersions(packageName).asFlow().collectAsState(null).value
+    val appPrefs = db.getAppPrefsDao().getAppPrefs(packageName).asFlow().collectAsState(null).value
+    val suggestedVersion = if (versions == null || appPrefs == null) {
+        null
+    } else {
+        updateChecker.getSuggestedVersion(
+            versions = versions,
+            preferredSigner = app.metadata.preferredSigner,
+            // TODO releaseChannels beta
+            releaseChannels = null,
+            preferencesGetter = { appPrefs },
+        )
+    }
+    val installedVersionCode = packagePair.packageInfo?.let {
+        getLongVersionCode(packagePair.packageInfo)
+    }
+    val installedVersion = packagePair.packageInfo?.let {
+        versions?.find { it.versionCode == installedVersionCode }
+    }
+    val noCompatibleVersions = if (packagePair.packageInfo != null && versions != null) {
+        // get installed signer
+        val signer = packagePair.packageInfo.signatures?.get(0)?.let {
+            sha256(it.toByteArray())
+        }
+        // return true of no version has same signer
+        versions.none { version ->
+            version.manifest.signer?.sha256?.get(0) == signer
+        }
+    } else {
+        false
+    }
+    val authorName = app.authorName
+    val authorHasMoreThanOneApp = if (authorName == null) false else {
+        db.getAppDao().hasAuthorMoreThanOneApp(authorName).asFlow().collectAsState(false).value
+    }
+    val locales = LocaleListCompat.getDefault()
+    Log.d(TAG, "Presenting app details:")
+    Log.d(TAG, "   app '${app.name}' ($packageName) in ${repo.address}")
+    Log.d(TAG, "   versions: ${versions?.size}")
+    Log.d(TAG, "   appPrefs: $appPrefs")
+    return AppDetailsItem(
+        repository = repo,
+        preferredRepoId = preferredRepoId,
+        repositories = repositories, // TODO maybe use emptyList() when only in F-Droid repo
+        dbApp = app,
+        versions = versions,
+        installedVersion = installedVersion,
+        installedVersionCode = installedVersionCode,
+        suggestedVersion = suggestedVersion,
+        appPrefs = appPrefs,
+        launchIntent = packagePair.launchIntent,
+        noCompatibleVersions = noCompatibleVersions,
+        authorHasMoreThanOneApp = authorHasMoreThanOneApp,
+        localeList = locales,
+    )
+}
diff --git a/basic/src/main/java/org/fdroid/basic/install/SessionInstallManager.kt b/basic/src/main/java/org/fdroid/basic/install/SessionInstallManager.kt
new file mode 100644
index 000000000..3293bb217
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/install/SessionInstallManager.kt
@@ -0,0 +1,25 @@
+package org.fdroid.basic.install
+
+import android.os.Build.VERSION.SDK_INT
+
+object SessionInstallManager {
+
+    /**
+     * If this returns true, we can use
+     * [android.content.pm.PackageInstaller.SessionParams.setRequireUserAction] with false,
+     * thus updating the app with the given targetSdk without user action.
+     */
+    fun isTargetSdkSupported(targetSdk: Int): Boolean {
+        if (SDK_INT < 31) return false // not supported below Android 12
+
+        if (SDK_INT == 31 && targetSdk >= 29) return true
+        if (SDK_INT == 32 && targetSdk >= 29) return true
+        if (SDK_INT == 33 && targetSdk >= 30) return true
+        if (SDK_INT == 34 && targetSdk >= 31) return true
+        // This needs to be adjusted as new Android versions are released
+        // https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionParams#setRequireUserAction(int)
+        // https://cs.android.com/android/platform/superproject/+/android-16.0.0_r2:frameworks/base/services/core/java/com/android/server/pm/PackageInstallerSession.java;l=329;drc=73caa0299d9196ddeefe4f659f557fb880f6536d
+        // current code requires targetSdk 33 on SDK 35+
+        return SDK_INT >= 35 && targetSdk >= 33
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/manager/AppDetailsManager.kt b/basic/src/main/java/org/fdroid/basic/manager/AppDetailsManager.kt
deleted file mode 100644
index 56df2c3ff..000000000
--- a/basic/src/main/java/org/fdroid/basic/manager/AppDetailsManager.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.fdroid.basic.manager
-
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import org.fdroid.basic.ui.main.discover.AppNavigationItem
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AppDetailsManager @Inject constructor() {
-    private val _appDetails = MutableStateFlow<AppNavigationItem?>(null)
-    val appDetails = _appDetails.asStateFlow()
-
-    fun setAppDetails(app: AppNavigationItem?) {
-        _appDetails.value = app
-    }
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Utils.kt b/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
index 9ecdde674..e13df4e44 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
@@ -1,6 +1,8 @@
 package org.fdroid.basic.ui
 
 import android.text.format.DateUtils
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
 
 fun Long.asRelativeTimeString(): String {
     return DateUtils.getRelativeTimeSpanString(
@@ -10,3 +12,14 @@ fun Long.asRelativeTimeString(): String {
         DateUtils.FORMAT_ABBREV_ALL
     ).toString()
 }
+
+@OptIn(ExperimentalStdlibApi::class)
+fun sha256(bytes: ByteArray): String {
+    val messageDigest: MessageDigest = try {
+        MessageDigest.getInstance("SHA-256")
+    } catch (e: NoSuchAlgorithmException) {
+        throw AssertionError(e)
+    }
+    messageDigest.update(bytes)
+    return messageDigest.digest().toHexString()
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/License.kt b/basic/src/main/java/org/fdroid/basic/ui/icons/License.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/License.kt
rename to basic/src/main/java/org/fdroid/basic/ui/icons/License.kt
index 1c6932657..bea3b8ac3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/License.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/icons/License.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.basic.ui.icons
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.PathFillType
@@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 
-public val License: ImageVector
+val License: ImageVector
     get() {
         if (_License != null) {
             return _License!!
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
index ec3ce86a3..6f8d05098 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.window.core.layout.WindowWidthSizeClass
 import org.fdroid.basic.R
+import org.fdroid.basic.details.AppDetailsItem
 import org.fdroid.basic.ui.main.apps.InstalledApp
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.apps.MyAppsScaffold
@@ -56,7 +57,7 @@ fun BottomBarScreen(
     appList: AppList,
     discoverModel: DiscoverModel,
     filterInfo: FilterInfo,
-    currentItem: MinimalApp?,
+    currentItem: AppDetailsItem?,
     onSelectAppItem: (MinimalApp) -> Unit,
     sortBy: Sort,
     onSortChanged: (Sort) -> Unit,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
index 5be721956..4acbe6889 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import org.fdroid.basic.R
+import org.fdroid.basic.details.AppDetailsItem
 import org.fdroid.basic.ui.main.discover.Sort
 
 @Composable
@@ -42,7 +43,7 @@ import org.fdroid.basic.ui.main.discover.Sort
 fun MyAppsList(
     updatableApps: List<UpdatableApp>,
     installedApps: List<InstalledApp>,
-    currentItem: MinimalApp?,
+    currentItem: AppDetailsItem?,
     onItemClick: (MinimalApp) -> Unit,
     sortBy: Sort,
     onSortChanged: (Sort) -> Unit,
@@ -137,7 +138,7 @@ fun MyAppsList(
                 )
             }
             items(updatableApps, key = { it.packageName }, contentType = { "A" }) { app ->
-                val isSelected = app.packageName == currentItem?.packageName
+                val isSelected = app.packageName == currentItem?.app?.packageName
                 val interactionModifier = if (currentItem == null) {
                     Modifier.clickable(
                         onClick = { onItemClick(app) }
@@ -161,7 +162,7 @@ fun MyAppsList(
                 )
             }
             items(installedApps, key = { it.packageName }, contentType = { "B" }) { app ->
-                val isSelected = app.packageName == currentItem?.packageName
+                val isSelected = app.packageName == currentItem?.app?.packageName
                 val interactionModifier = if (currentItem == null) {
                     Modifier.clickable(
                         onClick = { onItemClick(app) }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
index 2aceaf5f3..88abcaabb 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
+import org.fdroid.basic.details.AppDetailsItem
 import org.fdroid.basic.ui.Icons
 import org.fdroid.basic.ui.Names
 import org.fdroid.basic.ui.main.details.AppDetails
@@ -33,7 +34,7 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 fun MyAppsScaffold(
     updatableApps: List<UpdatableApp>,
     installedApps: List<InstalledApp>,
-    currentItem: MinimalApp?,
+    currentItem: AppDetailsItem?,
     onSelectAppItem: (MinimalApp) -> Unit,
     sortBy: Sort,
     onSortChanged: (Sort) -> Unit,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AntiFeatures.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AntiFeatures.kt
new file mode 100644
index 000000000..136688995
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AntiFeatures.kt
@@ -0,0 +1,90 @@
+package org.fdroid.basic.ui.main.details
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.WarningAmber
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter.Companion.tint
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import org.fdroid.basic.details.AppDetailsItem
+import org.fdroid.basic.details.testApp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun AntiFeatures(
+    item: AppDetailsItem,
+) {
+    ElevatedCard(
+        colors = CardDefaults.elevatedCardColors(
+            containerColor = MaterialTheme.colorScheme.inverseSurface,
+        ),
+        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
+    ) {
+        ExpandableSection(
+            icon = rememberVectorPainter(Icons.Default.WarningAmber),
+            title = "This app has anti-features",
+            modifier = Modifier.padding(horizontal = 16.dp),
+        ) {
+            Column {
+                item.antiFeatures?.forEach { antiFeature ->
+                    ListItem(
+                        leadingContent = {
+                            antiFeature.icon?.let { icon ->
+                                AsyncImage(
+                                    model = icon,
+                                    contentDescription = "",
+                                    colorFilter = tint(MaterialTheme.colorScheme.inverseOnSurface),
+                                    error = rememberVectorPainter(Icons.Default.Error),
+                                    modifier = Modifier.size(32.dp),
+                                )
+                            }
+                        },
+                        headlineContent = {
+                            Text(
+                                text = antiFeature.name,
+                                color = MaterialTheme.colorScheme.inverseOnSurface,
+                                style = MaterialTheme.typography.bodyMediumEmphasized,
+                            )
+                        },
+                        supportingContent = {
+                            antiFeature.reason?.let {
+                                Text(
+                                    text = antiFeature.reason,
+                                    color = MaterialTheme.colorScheme.inverseOnSurface,
+                                    style = MaterialTheme.typography.labelMedium,
+                                )
+                            }
+                        },
+                        colors = ListItemDefaults.colors(containerColor = Color.Transparent),
+                        modifier = Modifier.padding(bottom = 8.dp),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun AntiFeaturesPreview() {
+    FDroidContent {
+        AntiFeatures(testApp)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
index 581890e63..9d1593697 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
@@ -2,54 +2,42 @@ package org.fdroid.basic.ui.main.details
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalSharedTransitionApi
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.filled.Notes
-import androidx.compose.material.icons.filled.AccessTime
-import androidx.compose.material.icons.filled.Call
 import androidx.compose.material.icons.filled.ChangeHistory
 import androidx.compose.material.icons.filled.Code
+import androidx.compose.material.icons.filled.CurrencyBitcoin
 import androidx.compose.material.icons.filled.EditNote
 import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.Groups
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Image
-import androidx.compose.material.icons.filled.KeyboardArrowDown
-import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material.icons.filled.Link
 import androidx.compose.material.icons.filled.Mail
-import androidx.compose.material.icons.filled.MonetizationOn
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Person
-import androidx.compose.material.icons.filled.Security
 import androidx.compose.material.icons.filled.Share
 import androidx.compose.material.icons.filled.Translate
-import androidx.compose.material.icons.filled.WarningAmber
 import androidx.compose.material3.Button
 import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -62,32 +50,31 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
-import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.graphics.BlendMode
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter.Companion.tint
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.fromHtml
 import androidx.compose.ui.text.style.TextAlign.Companion.Center
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import org.fdroid.basic.R
+import org.fdroid.basic.details.AppDetailsItem
+import org.fdroid.basic.details.testApp
 import org.fdroid.basic.ui.Names.names
-import org.fdroid.basic.ui.asRelativeTimeString
-import org.fdroid.basic.ui.main.apps.MinimalApp
-import org.fdroid.basic.ui.main.discover.AppNavigationItem
+import org.fdroid.basic.ui.icons.License
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
@@ -96,14 +83,18 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
     ExperimentalSharedTransitionApi::class
 )
 fun AppDetails(
-    appItem: MinimalApp?,
+    appItem: AppDetailsItem?,
     onBackNav: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
     val topAppBarState = rememberTopAppBarState()
     val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(topAppBarState)
-    if (appItem == null) CircularProgressIndicator()
-    else Scaffold(
+    if (appItem == null) Box(
+        contentAlignment = Alignment.Center,
+        modifier = Modifier.fillMaxSize(),
+    ) {
+        LoadingIndicator(Modifier.size(128.dp))
+    } else Scaffold(
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             TopAppBar(
@@ -112,7 +103,7 @@ fun AppDetails(
                 ),
                 title = {
                     if (topAppBarState.overlappedFraction == 1f) {
-                        Text(appItem.name ?: "unknown app")
+                        Text(appItem.name)
                     }
                 },
                 navigationIcon = {
@@ -143,172 +134,71 @@ fun AppDetails(
             )
         },
     ) { innerPadding ->
-        val item = newPipe
+        val item = appItem
         Column(
             modifier = modifier
                 .verticalScroll(rememberScrollState())
-                .fillMaxWidth(),
+                .fillMaxWidth()
+                .padding(bottom = innerPadding.calculateBottomPadding()),
         ) {
-            item.featureGraphic?.let { featureGraphic ->
-                AsyncImage(
-                    model = featureGraphic.name,
-                    contentDescription = "",
-                    contentScale = ContentScale.FillWidth,
-                    onError = {
-                        // TODO Spacer(modifier = Modifier.padding(innerPadding))
-                    },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .heightIn(max = 196.dp)
-                        .graphicsLayer { alpha = 0.5f }
-                        .drawWithContent {
-                            val colors = listOf(
-                                Color.Black,
-                                Color.Transparent
-                            )
-                            drawContent()
-                            drawRect(
-                                brush = Brush.verticalGradient(colors),
-                                blendMode = BlendMode.DstIn
-                            )
-                        }
-                        .padding(bottom = 8.dp),
-                    error = rememberVectorPainter(Icons.Default.Error),
-                )
-            } ?: Spacer(modifier = Modifier.padding(innerPadding))
-            // Header
-            Row(
-                modifier = Modifier
-                    .padding(horizontal = 16.dp),
-                horizontalArrangement = spacedBy(8.dp),
-            ) {
-                item.icon?.let { icon ->
-                    AsyncImage(
-                        model = icon.name,
-                        contentDescription = "",
-                        placeholder = rememberVectorPainter(Icons.Default.Image),
-                        error = rememberVectorPainter(Icons.Default.Error),
-                        modifier = Modifier.size(64.dp),
-                    )
-                }
-                Column {
-                    Text(
-                        item.app.name ?: "Unknown app",
-                        style = MaterialTheme.typography.headlineMediumEmphasized
-                    )
-                    item.app.metadata.authorName?.let { authorName ->
-                        Text(
-                            text = "By $authorName",
-                            style = MaterialTheme.typography.bodyMedium,
-                        )
-                    }
-                    val lastUpdated = item.app.metadata.lastUpdated.asRelativeTimeString()
-                    Text(
-                        text = "Last updated: $lastUpdated (11.91 MB)",
-                        style = MaterialTheme.typography.bodyMedium,
-                    )
-                }
-            }
-            // Summary
-            item.app.summary?.let { summary ->
-                Text(
-                    text = summary,
-                    style = MaterialTheme.typography.bodyLargeEmphasized,
-                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-                )
-            }
-            // Repo Chooser
-            RepoChooser(
-                repos = listOf("F-Droid", "Guardian Project"),
-                currentRepoId = 0L,
-                preferredRepoId = 0L,
-                onRepoChanged = {},
-                onPreferredRepoChanged = {},
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            )
-            // Main Buttons
-            Row(
-                horizontalArrangement = spacedBy(8.dp, CenterHorizontally),
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp, vertical = 8.dp),
-            ) {
-                OutlinedButton(onClick = {}, modifier = Modifier.weight(1f)) {
-                    Text("Open")
-                }
-                Button(onClick = {}, modifier = Modifier.weight(1f)) {
-                    Text("Update")
-                }
-            }
-            // Warnings
-            ElevatedCard(
-                colors = CardDefaults.elevatedCardColors(
-                    containerColor = MaterialTheme.colorScheme.errorContainer,
-                ),
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            ) {
-                Column {
-                    Row(
-                        horizontalArrangement = spacedBy(8.dp),
-                        verticalAlignment = CenterVertically,
-                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-                    ) {
-                        Icon(Icons.Default.WarningAmber, "")
-                        Text(
-                            "Can not update this app, because no compatible versions available in repository.",
-                            style = MaterialTheme.typography.bodyLarge,
-                        )
-                    }
-                    HorizontalDivider()
-                    Row(
-                        horizontalArrangement = spacedBy(8.dp),
-                        verticalAlignment = CenterVertically,
-                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-                    ) {
-                        Icon(Icons.Default.WarningAmber, "")
-                        Text(
-                            "Auto-update not available, because app targets old version of Android.",
-                            style = MaterialTheme.typography.bodyLarge,
-                        )
-                    }
-                }
-            }
+            // Header is taking care of top innerPadding
+            AppDetailsHeader(item, innerPadding)
+            AnimatedVisibility(item.showWarnings) { AppDetailsWarnings(item) }
             // What's New
-            item.whatsNew?.let { whatsNew ->
+            if (item.installedVersion != null &&
+                (item.whatsNew != null || item.app.changelog != null)
+            ) {
                 ElevatedCard(
                     colors = CardDefaults.elevatedCardColors(
                         containerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
                     ),
-                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp, vertical = 8.dp),
                 ) {
                     Text(
                         text = "What's new",
                         style = MaterialTheme.typography.titleMediumEmphasized,
                         modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
                     )
-                    Text(
-                        text = whatsNew,
-                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-                    )
+                    if (item.whatsNew != null) SelectionContainer {
+                        Text(
+                            text = item.whatsNew,
+                            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                        )
+                    } else if (item.app.changelog != null) {
+                        Text(
+                            text = buildAnnotatedString {
+                                withLink(LinkAnnotation.Url(item.app.changelog!!)) {
+                                    append(item.app.changelog)
+                                }
+                            },
+                            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                        )
+                    }
                 }
             }
             // Description
             var descriptionExpanded by remember { mutableStateOf(false) }
             item.description?.let { description ->
+                val htmlDescription = AnnotatedString.fromHtml(description)
                 AnimatedVisibility(descriptionExpanded) {
-                    Text(
-                        text = description,
-                        modifier = Modifier
-                            .padding(horizontal = 16.dp)
-                            .padding(top = 8.dp),
-                    )
+                    SelectionContainer {
+                        Text(
+                            text = htmlDescription,
+                            modifier = Modifier
+                                .padding(horizontal = 16.dp)
+                                .padding(top = 8.dp),
+                        )
+                    }
                 }
                 AnimatedVisibility(!descriptionExpanded) {
                     Text(
-                        text = description,
+                        text = htmlDescription,
                         maxLines = 3,
                         overflow = TextOverflow.Ellipsis,
                         modifier = Modifier
+                            .fillMaxWidth()
                             .padding(horizontal = 16.dp)
                             .padding(top = 8.dp),
                     )
@@ -326,74 +216,36 @@ fun AppDetails(
                 }
             }
             // Anti-features
-            ElevatedCard(
-                colors = CardDefaults.elevatedCardColors(
-                    containerColor = MaterialTheme.colorScheme.inverseSurface,
-                ),
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            ) {
-                ExpandableSection(
-                    icon = rememberVectorPainter(Icons.Default.WarningAmber),
-                    title = "This app has anti-features",
-                    modifier = Modifier.padding(horizontal = 16.dp),
-                ) {
-                    item.antiFeatures?.forEach { antiFeature ->
-                        ListItem(
-                            leadingContent = {
-                                antiFeature.icon?.let { icon ->
-                                    AsyncImage(
-                                        model = icon.name,
-                                        contentDescription = "",
-                                        colorFilter = tint(MaterialTheme.colorScheme.onBackground),
-                                        error = rememberVectorPainter(Icons.Filled.Error),
-                                        modifier = Modifier.size(32.dp),
-                                    )
-                                }
-                            },
-                            headlineContent = {
-                                Text(
-                                    text = antiFeature.name,
-                                    style = MaterialTheme.typography.bodyMediumEmphasized,
-                                )
-                            },
-                            supportingContent = {
-                                antiFeature.reason?.let {
-                                    Text(
-                                        text = antiFeature.reason,
-                                        style = MaterialTheme.typography.labelMedium,
-                                    )
-                                }
-                            },
-                            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
-                        )
-                    }
-                }
+            if (!item.antiFeatures.isNullOrEmpty()) {
+                AntiFeatures(item)
             }
             // Screenshots
-            val carouselState = rememberCarouselState { item.phoneScreenshots.size }
-            HorizontalUncontainedCarousel(
-                state = carouselState,
-                itemWidth = 120.dp,
-                itemSpacing = 4.dp,
-                contentPadding = PaddingValues(horizontal = 16.dp),
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(240.dp)
-                    .padding(vertical = 8.dp)
-            ) { index ->
-                names
-                AsyncImage(
-                    model = item.phoneScreenshots[index].name,
-                    contentDescription = "",
-                    contentScale = ContentScale.Fit,
-                    placeholder = rememberVectorPainter(Icons.Default.Image),
-                    error = rememberVectorPainter(Icons.Default.Error),
+            if (item.phoneScreenshots.isNotEmpty()) {
+                val carouselState = rememberCarouselState { item.phoneScreenshots.size }
+                HorizontalUncontainedCarousel(
+                    state = carouselState,
+                    itemWidth = 120.dp,
+                    itemSpacing = 4.dp,
+                    contentPadding = PaddingValues(horizontal = 16.dp),
                     modifier = Modifier
-                        .clip(MaterialTheme.shapes.medium),
-                )
+                        .fillMaxWidth()
+                        .height(240.dp)
+                        .padding(vertical = 8.dp)
+                ) { index ->
+                    names
+                    AsyncImage(
+                        model = item.phoneScreenshots[index],
+                        contentDescription = "",
+                        contentScale = ContentScale.Fit,
+                        placeholder = rememberVectorPainter(Icons.Default.Image),
+                        error = rememberVectorPainter(Icons.Default.Error),
+                        modifier = Modifier
+                            .clip(MaterialTheme.shapes.medium),
+                    )
+                }
             }
             // Donate card
-            ElevatedCard(
+            if (item.showDonate) ElevatedCard(
                 colors = CardDefaults.elevatedCardColors(),
                 modifier = Modifier
                     .fillMaxWidth()
@@ -404,67 +256,55 @@ fun AppDetails(
                     style = MaterialTheme.typography.titleMediumEmphasized,
                     modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
                 )
-                item.app.metadata.donate?.forEach { donation ->
+                item.app.donate?.forEach { donation ->
                     AppDetailsLink(
                         icon = Icons.Default.Link,
                         title = donation,
                         url = donation,
-                        modifier = modifier.padding(horizontal = 16.dp),
+                        modifier = modifier
+                            .padding(horizontal = 16.dp)
+                            .padding(bottom = 8.dp),
                     )
                 }
-                item.app.metadata.liberapay?.let { liberapay ->
+                item.liberapayUri?.let { liberapayUri ->
                     AppDetailsLink(
                         icon = Icons.Default.ChangeHistory,
                         title = "LiberaPay",
-                        url = "https://liberapay.com/$liberapay",
-                        modifier = modifier.padding(horizontal = 16.dp),
+                        url = liberapayUri,
+                        modifier = modifier
+                            .padding(horizontal = 16.dp)
+                            .padding(bottom = 8.dp),
                     )
                 }
-            }
-            // Description (expandable section)
-            var sectionExpanded by rememberSaveable { mutableStateOf(false) }
-            Column(
-                modifier = modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp)
-            ) {
-                Row(
-                    verticalAlignment = CenterVertically,
-                    horizontalArrangement = spacedBy(8.dp),
-                    modifier = Modifier
-                        .heightIn(min = 48.dp)
-                        .clickable(onClick = { sectionExpanded = !sectionExpanded })
-                ) {
-                    Icon(
-                        Icons.AutoMirrored.Default.Notes,
-                        contentDescription = null,
+                item.openCollectiveUri?.let { openCollectiveUri ->
+                    AppDetailsLink(
+                        icon = Icons.Default.Groups,
+                        title = "OpenCollective",
+                        url = openCollectiveUri,
+                        modifier = modifier
+                            .padding(horizontal = 16.dp)
+                            .padding(bottom = 8.dp),
                     )
-                    Column(modifier = Modifier.weight(1f)) {
-                        Text(
-                            text = "Description",
-                            style = MaterialTheme.typography.titleMedium,
-                        )
-                        AnimatedVisibility(!sectionExpanded) {
-                            Text(
-                                text = item.description ?: "nope",
-                                maxLines = 1,
-                                overflow = TextOverflow.Ellipsis,
-                            )
-                        }
-                    }
-                    IconButton(onClick = { sectionExpanded = !sectionExpanded }) {
-                        Icon(
-                            imageVector = if (sectionExpanded) {
-                                Icons.Default.KeyboardArrowUp
-                            } else {
-                                Icons.Default.KeyboardArrowDown
-                            },
-                            contentDescription = null,
-                        )
-                    }
                 }
-                AnimatedVisibility(sectionExpanded) {
-                    Text(item.description ?: "nope")
+                item.bitcoinUri?.let { bitcoinUri ->
+                    AppDetailsLink(
+                        icon = Icons.Default.CurrencyBitcoin,
+                        title = "Bitcoin",
+                        url = bitcoinUri,
+                        modifier = modifier
+                            .padding(horizontal = 16.dp)
+                            .padding(bottom = 8.dp),
+                    )
+                }
+                item.litecoinUri?.let { litecoinUri ->
+                    AppDetailsLink(
+                        icon = Icons.Default.CurrencyBitcoin,
+                        title = "Litecoin",
+                        url = litecoinUri,
+                        modifier = modifier
+                            .padding(horizontal = 16.dp)
+                            .padding(bottom = 8.dp),
+                    )
                 }
             }
             // Links
@@ -474,42 +314,42 @@ fun AppDetails(
                 modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
             ) {
                 Column(modifier = Modifier.padding(start = 16.dp)) {
-                    item.app.metadata.webSite?.let { webSite ->
+                    item.app.webSite?.let { webSite ->
                         AppDetailsLink(
                             icon = Icons.Default.Home,
                             title = stringResource(R.string.menu_website),
                             url = webSite,
                         )
                     }
-                    item.app.metadata.issueTracker?.let { issueTracker ->
+                    item.app.issueTracker?.let { issueTracker ->
                         AppDetailsLink(
                             icon = Icons.Default.EditNote,
                             title = stringResource(R.string.menu_issues),
                             url = issueTracker,
                         )
                     }
-                    item.app.metadata.changelog?.let { changelog ->
+                    item.app.changelog?.let { changelog ->
                         AppDetailsLink(
                             icon = Icons.Default.ChangeHistory,
                             title = stringResource(R.string.menu_changelog),
                             url = changelog,
                         )
                     }
-                    item.app.metadata.license?.let { license ->
+                    item.app.license?.let { license ->
                         AppDetailsLink(
                             icon = License,
                             title = stringResource(R.string.menu_license, license),
                             url = "https://spdx.org/licenses/$license",
                         )
                     }
-                    item.app.metadata.translation?.let { translation ->
+                    item.app.translation?.let { translation ->
                         AppDetailsLink(
                             icon = Icons.Default.Translate,
                             title = stringResource(R.string.menu_translation),
                             url = translation,
                         )
                     }
-                    item.app.metadata.sourceCode?.let { sourceCode ->
+                    item.app.sourceCode?.let { sourceCode ->
                         AppDetailsLink(
                             icon = Icons.Default.Code,
                             title = stringResource(R.string.menu_source),
@@ -518,83 +358,46 @@ fun AppDetails(
                     }
                 }
             }
-            // Donation (expandable section)
-            ExpandableSection(
-                icon = rememberVectorPainter(Icons.Default.MonetizationOn),
-                title = "Donation links",
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            ) {
-                Column(modifier = Modifier.padding(start = 16.dp)) {
-                    item.app.metadata.donate?.forEach { donation ->
-                        AppDetailsLink(
-                            icon = Icons.Default.Link,
-                            title = donation,
-                            url = donation,
-                        )
-                    }
-                    item.app.metadata.liberapay?.let { liberapay ->
-                        AppDetailsLink(
-                            icon = Icons.Default.ChangeHistory,
-                            title = "LiberaPay",
-                            url = "https://liberapay.com/$liberapay",
-                        )
-                    }
-                }
-            }
             // Versions
-            ExpandableSection(
-                icon = rememberVectorPainter(Icons.Default.AccessTime),
-                title = stringResource(R.string.versions),
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            ) {
-                Text("TODO")
-            }
-            // Permissions
-            ExpandableSection(
-                icon = rememberVectorPainter(Icons.Default.Security),
-                title = stringResource(R.string.permissions),
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            ) {
-                Text("Do we still want to list all permissions here?")
+            if (!item.versions.isNullOrEmpty()) {
+                Versions(item)
             }
             // Developer contact
-            ExpandableSection(
+            if (item.showAuthorContact) ExpandableSection(
                 icon = rememberVectorPainter(Icons.Default.Person),
                 title = "Developer contact",
                 modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
             ) {
                 Column(modifier = Modifier.padding(start = 16.dp)) {
-                    item.app.metadata.authorWebSite?.let { authorWebSite ->
+                    item.app.authorWebSite?.let { authorWebSite ->
                         AppDetailsLink(
                             icon = Icons.Default.Home,
                             title = stringResource(R.string.menu_website),
                             url = authorWebSite,
                         )
                     }
-                    item.app.metadata.authorEmail?.let { authorEmail ->
+                    item.app.authorEmail?.let { authorEmail ->
                         AppDetailsLink(
                             icon = Icons.Default.Mail,
                             title = stringResource(R.string.menu_email),
                             url = authorEmail,
                         )
                     }
-                    item.app.metadata.authorPhone?.let { authorPhone ->
-                        AppDetailsLink(
-                            icon = Icons.Default.Call,
-                            title = "Call the author",
-                            url = authorPhone,
-                        )
-                    }
                 }
             }
             // More apps by dev
-            Button(
+            if (item.authorHasMoreThanOneApp) Button(
                 onClick = {},
                 modifier = Modifier
                     .align(CenterHorizontally)
                     .padding(bottom = 16.dp),
             ) {
-                Text("More apps by ${item.app.metadata.authorName}")
+                val s =
+                    stringResource(
+                        R.string.app_details_more_apps_by_author,
+                        item.app.authorName!!
+                    )
+                Text(s)
             }
         }
     }
@@ -602,14 +405,16 @@ fun AppDetails(
 
 @Preview
 @Composable
-fun AppDetailsPreview() {
+fun AppDetailsLoadingPreview() {
     FDroidContent {
-        val item = AppNavigationItem(
-            packageName = "foo",
-            name = "bar",
-            summary = "This is a nice app!",
-            isNew = false,
-        )
-        AppDetails(item, { })
+        AppDetails(null, { })
+    }
+}
+
+@Preview
+@Composable
+fun AppDetailsPreview() {
+    FDroidContent {
+        AppDetails(testApp, { })
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
new file mode 100644
index 000000000..08683df6d
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
@@ -0,0 +1,196 @@
+package org.fdroid.basic.ui.main.details
+
+import android.text.format.Formatter
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import org.fdroid.basic.R
+import org.fdroid.basic.details.AppDetailsItem
+import org.fdroid.basic.details.MainButtonState
+import org.fdroid.basic.details.testApp
+import org.fdroid.basic.ui.asRelativeTimeString
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun AppDetailsHeader(
+    item: AppDetailsItem,
+    innerPadding: PaddingValues,
+) {
+    var showTopSpacer by rememberSaveable(item.app.packageName) { mutableStateOf(true) }
+    if (showTopSpacer) {
+        Spacer(modifier = Modifier.padding(innerPadding))
+    }
+    item.featureGraphic?.let { featureGraphic ->
+        AsyncImage(
+            model = featureGraphic,
+            contentDescription = "",
+            contentScale = ContentScale.FillWidth,
+            onSuccess = {
+                showTopSpacer = false
+            },
+            modifier = Modifier
+                .fillMaxWidth()
+                .heightIn(max = 196.dp)
+                .graphicsLayer { alpha = 0.5f }
+                .drawWithContent {
+                    val colors = listOf(
+                        Color.Black,
+                        Color.Transparent
+                    )
+                    drawContent()
+                    drawRect(
+                        brush = Brush.verticalGradient(colors),
+                        blendMode = BlendMode.DstIn
+                    )
+                }
+                .padding(bottom = 8.dp),
+            error = rememberVectorPainter(Icons.Default.Error),
+        )
+    }
+    // Header
+    Row(
+        modifier = Modifier
+            .padding(horizontal = 16.dp),
+        horizontalArrangement = spacedBy(8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        item.icon?.let { icon ->
+            AsyncImage(
+                model = icon,
+                contentDescription = "",
+                placeholder = rememberVectorPainter(Icons.Default.Image),
+                error = rememberVectorPainter(Icons.Default.Error),
+                modifier = Modifier.size(64.dp),
+            )
+        } ?: Image(
+            painter = rememberVectorPainter(Icons.Default.Image),
+            contentDescription = null,
+            modifier = Modifier.size(64.dp),
+        )
+        Column {
+            SelectionContainer {
+                Text(
+                    item.name,
+                    style = MaterialTheme.typography.headlineMediumEmphasized
+                )
+            }
+            item.app.authorName?.let { authorName ->
+                SelectionContainer {
+                    Text(
+                        text = "By $authorName",
+                        style = MaterialTheme.typography.bodyMedium,
+                    )
+                }
+            }
+            val lastUpdated = item.app.lastUpdated.asRelativeTimeString()
+            val version = item.suggestedVersion ?: item.versions?.first()
+            val size = version?.size?.let { size ->
+                Formatter.formatFileSize(LocalContext.current, size)
+            }
+            SelectionContainer {
+                Text(
+                    text = if (size == null) {
+                        "Last updated: $lastUpdated"
+                    } else {
+                        "Last updated: $lastUpdated ($size)"
+                    },
+                    style = MaterialTheme.typography.bodyMedium,
+                )
+            }
+        }
+    }
+    // Summary
+    item.summary?.let { summary ->
+        SelectionContainer {
+            Text(
+                text = summary,
+                style = MaterialTheme.typography.bodyLargeEmphasized,
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            )
+        }
+    }
+    // Repo Chooser
+    RepoChooser(
+        repos = item.repositories,
+        currentRepoId = item.app.repoId,
+        preferredRepoId = item.preferredRepoId,
+        onRepoChanged = {},
+        onPreferredRepoChanged = {},
+        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+    )
+    // Main Buttons
+    if (item.showOpenButton || item.mainButtonState != MainButtonState.NONE) Row(
+        horizontalArrangement = spacedBy(8.dp, CenterHorizontally),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 8.dp),
+    ) {
+        if (item.showOpenButton) {
+            val context = LocalContext.current
+            OutlinedButton(
+                onClick = {
+                    context.startActivity(item.launchIntent)
+                },
+                modifier = Modifier.weight(1f)
+            ) {
+                Text(stringResource(R.string.menu_open))
+            }
+        }
+        if (item.mainButtonState != MainButtonState.NONE) {
+            Button(onClick = {}, modifier = Modifier.weight(1f)) {
+                if (item.mainButtonState == MainButtonState.INSTALL) {
+                    Text(stringResource(R.string.menu_install))
+                } else if (item.mainButtonState == MainButtonState.UPDATE) {
+                    Text(stringResource(R.string.app__install_downloaded_update))
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun AppDetailsHeaderPreview() {
+    FDroidContent {
+        Column {
+            AppDetailsHeader(testApp, PaddingValues())
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
index fe7dbb7c5..9e1aaf822 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
@@ -1,27 +1,49 @@
 package org.fdroid.basic.ui.main.details
 
-import androidx.compose.foundation.clickable
+import android.content.ClipData
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.ClipEntry
+import androidx.compose.ui.platform.LocalClipboard
+import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
 
 @Composable
 fun AppDetailsLink(icon: ImageVector, title: String, url: String, modifier: Modifier = Modifier) {
     val uriHandler = LocalUriHandler.current
+    val haptics = LocalHapticFeedback.current
+    val clipboardManager = LocalClipboard.current
+    val coroutineScope = rememberCoroutineScope()
     Row(
         horizontalArrangement = spacedBy(8.dp),
         verticalAlignment = Alignment.CenterVertically,
         modifier = modifier
             .heightIn(min = 48.dp)
-            .clickable(onClick = { uriHandler.openUri(url) }),
+            .fillMaxWidth()
+            .combinedClickable(
+                onClick = { uriHandler.openUri(url) },
+                onLongClick = {
+                    haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+                    val entry = ClipEntry(ClipData.newPlainText("", url))
+                    coroutineScope.launch {
+                        clipboardManager.setClipEntry(entry)
+                    }
+                },
+                onLongClickLabel = "Copy link",
+            ),
     ) {
         Icon(icon, null)
         Text(title)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsWarnings.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsWarnings.kt
new file mode 100644
index 000000000..13f1ee049
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsWarnings.kt
@@ -0,0 +1,70 @@
+package org.fdroid.basic.ui.main.details
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.WarningAmber
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.details.AppDetailsItem
+import org.fdroid.basic.details.testApp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun AppDetailsWarnings(
+    item: AppDetailsItem,
+) {
+    ElevatedCard(
+        colors = CardDefaults.elevatedCardColors(
+            containerColor = MaterialTheme.colorScheme.errorContainer,
+        ),
+        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+    ) {
+        Column {
+            if (item.noCompatibleVersions) Row(
+                horizontalArrangement = spacedBy(8.dp),
+                verticalAlignment = CenterVertically,
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Icon(Icons.Default.WarningAmber, "")
+                Text(
+                    "Can not update this app, because no compatible versions available in repository.",
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+            }
+            if (item.noCompatibleVersions && item.oldTargetSdk) HorizontalDivider()
+            if (item.oldTargetSdk) Row(
+                horizontalArrangement = spacedBy(8.dp),
+                verticalAlignment = CenterVertically,
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Icon(Icons.Default.WarningAmber, "")
+                Text(
+                    "Auto-update not available, because app targets old version of Android.",
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun AppDetailsWarningsPreview() {
+    FDroidContent {
+        Column {
+            AppDetailsWarnings(testApp)
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt
index 107e40178..cbba3c3e9 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt
@@ -22,6 +22,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.unit.dp
 
 @Composable
@@ -29,9 +30,10 @@ fun ExpandableSection(
     icon: Painter?,
     title: String,
     modifier: Modifier = Modifier,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
-    var sectionExpanded by rememberSaveable { mutableStateOf(false) }
+    val isPreview = LocalInspectionMode.current
+    var sectionExpanded by rememberSaveable { mutableStateOf(isPreview) }
     Column(modifier = modifier.fillMaxWidth()) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
deleted file mode 100644
index f86a55fd2..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/IApp.kt
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.fdroid.basic.ui.main.details
-
-import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
-import androidx.core.os.LocaleListCompat
-import org.fdroid.basic.ui.main.apps.MinimalApp
-import org.fdroid.database.AppMetadata
-import org.fdroid.database.AppVersion
-import org.fdroid.index.v2.FileV2
-import java.util.concurrent.TimeUnit
-import kotlin.random.Random
-
-data class AppDetailsItem(
-    val app: IApp,
-    val whatsNew: String? = null,
-    val versions: List<AppVersion>? = null,
-    val installedVersion: AppVersion? = null,
-    val suggestedVersion: AppVersion? = null,
-    val antiFeatures: List<AntiFeature>? = null,
-) {
-    private val localeList = LocaleListCompat.getDefault()
-    val description: String? get() = app.getDescription(localeList)
-    val icon: FileV2? get() = app.getIcon(localeList)
-    val video: String? get() = app.getVideo(localeList)
-    val featureGraphic: FileV2? get() = app.getFeatureGraphic(localeList)
-    val phoneScreenshots: List<FileV2> get() = app.getPhoneScreenshots(localeList)
-    val installedVersionCode: Long? get() = installedVersion?.manifest?.versionCode
-    val installedVersionName: String? get() = installedVersion?.manifest?.versionName
-}
-
-data class AntiFeature(
-    val id: String,
-    val icon: FileV2?,
-    val name: String,
-    val reason: String? = null,
-)
-
-interface IApp : MinimalApp {
-    val repoId: Long
-    override val packageName: String
-    override val name: String?
-    val summary: String?
-    val metadata: AppMetadata
-
-    fun getDescription(localeList: LocaleListCompat): String?
-    fun getVideo(localeList: LocaleListCompat): String?
-    fun getIcon(localeList: LocaleListCompat): FileV2?
-    fun getFeatureGraphic(localeList: LocaleListCompat): FileV2?
-    fun getPromoGraphic(localeList: LocaleListCompat): FileV2?
-    fun getTvBanner(localeList: LocaleListCompat): FileV2?
-    fun getPhoneScreenshots(localeList: LocaleListCompat): List<FileV2>
-    fun getSevenInchScreenshots(localeList: LocaleListCompat): List<FileV2>
-    fun getTenInchScreenshots(localeList: LocaleListCompat): List<FileV2>
-    fun getTvScreenshots(localeList: LocaleListCompat): List<FileV2>
-    fun getWearScreenshots(localeList: LocaleListCompat): List<FileV2>
-}
-
-private val long_min = TimeUnit.DAYS.toMillis(1)
-private val long_max = TimeUnit.DAYS.toMillis(365 * 3)
-
-data class TestApp(
-    override val repoId: Long = -1,
-    override val packageName: String,
-    override val name: String?,
-    override val summary: String?,
-    val description: String? = null,
-    override val icon: String? = null,
-    val featureGraphic: FileV2? = null,
-    val phoneScreenshots: List<FileV2> = emptyList(),
-    override val metadata: AppMetadata = AppMetadata(
-        repoId = repoId,
-        packageName = packageName,
-        added = System.currentTimeMillis() - Random.nextLong(),
-        lastUpdated = System.currentTimeMillis() - Random.nextLong(long_min, long_max),
-        isCompatible = true,
-    )
-) : IApp {
-    override fun getIcon(localeList: LocaleListCompat): FileV2? = icon?.let { FileV2(it) }
-    override fun getDescription(localeList: LocaleListCompat): String? = description
-    override fun getFeatureGraphic(localeList: LocaleListCompat): FileV2? = featureGraphic
-    override fun getPhoneScreenshots(localeList: LocaleListCompat): List<FileV2> = phoneScreenshots
-
-    override fun getVideo(localeList: LocaleListCompat): String? = null
-    override fun getPromoGraphic(localeList: LocaleListCompat): FileV2? = null
-    override fun getTvBanner(localeList: LocaleListCompat): FileV2? = null
-
-    override fun getSevenInchScreenshots(localeList: LocaleListCompat): List<FileV2> = emptyList()
-    override fun getTenInchScreenshots(localeList: LocaleListCompat): List<FileV2> = emptyList()
-    override fun getTvScreenshots(localeList: LocaleListCompat): List<FileV2> = emptyList()
-    override fun getWearScreenshots(localeList: LocaleListCompat): List<FileV2> = emptyList()
-}
-
-val newPipeApp = TestApp(
-    packageName = "org.schabi.newpipe",
-    name = "NewPipe",
-    summary = "Lightweight YouTube frontend",
-    description = "NewPipe does not use any Google framework libraries, or the YouTube API. " +
-        "It only parses the website in order to gain the information it needs. " +
-        "Therefore this app can be used on devices without Google Services installed. " +
-        "Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.\n\n" +
-        LoremIpsum(128).values.joinToString(" "),
-    metadata = AppMetadata(
-        repoId = 1,
-        packageName = "org.schabi.newpipe",
-        added = 1441756800000,
-        lastUpdated = 1747214796000,
-        webSite = "https://newpipe.net",
-        changelog = "https://github.com/TeamNewPipe/NewPipe/releases",
-        license = "GPL-3.0-or-later",
-        sourceCode = "https://github.com/TeamNewPipe/NewPipe",
-        issueTracker = "https://github.com/TeamNewPipe/NewPipe/issues",
-        translation = "https://hosted.weblate.org/projects/newpipe/",
-        preferredSigner = "cb84069bd68116bafae5ee4ee5b08a567aa6d898404e7cb12f9e756df5cf5cab",
-        video = null,
-        authorName = "Team NewPipe",
-        authorEmail = "team@newpipe.net",
-        authorWebSite = "https://newpipe.net",
-        authorPhone = "123456",
-        donate = listOf("https://newpipe.net/donate"),
-        liberapayID = null,
-        liberapay = "TeamNewPipe",
-        openCollective = null,
-        bitcoin = null,
-        litecoin = null,
-        flattrID = null,
-        categories = listOf("Internet", "Multimedia"),
-        isCompatible = true,
-    ),
-    icon = "https://f-droid.org/repo/org.schabi.newpipe/en-US/icon_OHy4y1W-fJCNhHHOBCM9V_cxZNJJgbcNkB-x7UDTY9Q=.png",
-    featureGraphic = FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/featureGraphic_aeQS-fmo5GZhNiioPTtd8Sjgb53Mvvg6LOV2ww-irYA=.png"),
-    phoneScreenshots = listOf(
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/00.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/01.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/02.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/03.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/04.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/05.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/06.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/07.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/08.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_01.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_02.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_03.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_04.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_05.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_06.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_07.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_08.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_09.png"),
-        FileV2("https://f-droid.org/repo/org.schabi.newpipe/en-US/phoneScreenshots/shot_10.png"),
-    ),
-)
-
-val newPipe = AppDetailsItem(
-    app = newPipeApp,
-    antiFeatures = listOf(
-        AntiFeature(
-            id = "NonFreeNet",
-            icon = FileV2("https://f-droid.org/repo/icons/ic_antifeature_nonfreenet.png"),
-            name = "This app promotes or depends entirely on a non-free network service",
-            reason = "Depends on Youtube for videos.",
-        )
-    ),
-    whatsNew = "This release fixes YouTube only providing a 360p stream.\n\n" +
-        "Note that the solution employed in this version is likely temporary, " +
-        "and in the long run the SABR video protocol needs to be implemented, " +
-        "but TeamNewPipe members are currently busy so any help would be greatly appreciated! " +
-        "https://github.com/TeamNewPipe/NewPipe/issues/12248",
-)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt
index ad6514639..af388df32 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt
@@ -1,5 +1,6 @@
 package org.fdroid.basic.ui.main.details
 
+import android.content.res.Configuration
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -10,10 +11,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Text
@@ -29,16 +28,19 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight.Companion.Bold
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
 import org.fdroid.basic.R
-import org.fdroid.basic.ui.icons.PackageVariant
+import org.fdroid.basic.ui.main.repositories.RepoIcon
+import org.fdroid.basic.ui.utils.FDroidOutlineButton
 import org.fdroid.database.Repository
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.index.IndexFormatVersion.TWO
 
-
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun RepoChooser(
-    repos: List<String>,
+    repos: List<Repository>,
     currentRepoId: Long,
     preferredRepoId: Long,
     onRepoChanged: (Repository) -> Unit,
@@ -47,8 +49,10 @@ fun RepoChooser(
 ) {
     if (repos.isEmpty()) return
     var expanded by remember { mutableStateOf(false) }
-    val currentRepo = repos[0]
-    val isPreferred = true
+    val currentRepo = remember(currentRepoId) {
+        repos.find { it.repoId == currentRepoId } ?: error("Current repoId not in list")
+    }
+    val isPreferred = currentRepo.repoId == preferredRepoId
     Column(
         modifier = modifier.fillMaxWidth(),
     ) {
@@ -75,7 +79,7 @@ fun RepoChooser(
                     }
                 },
                 leadingIcon = {
-                    Icon(PackageVariant, null, Modifier.size(24.dp))
+                    RepoIcon(repo = currentRepo, modifier = Modifier.size(24.dp))
                 },
                 trailingIcon = {
                     if (repos.size > 1) Icon(
@@ -110,9 +114,9 @@ fun RepoChooser(
                 repos.iterator().forEach { repo ->
                     RepoMenuItem(
                         repo = repo,
-                        isPreferred = repo == repos[0],
+                        isPreferred = repo.repoId == preferredRepoId,
                         onClick = {
-                            // onRepoChanged(repo)
+                            onRepoChanged(repo)
                             expanded = false
                         },
                         modifier = modifier,
@@ -121,21 +125,20 @@ fun RepoChooser(
             }
         }
         if (!isPreferred) {
-            OutlinedButton(
-                onClick = { onPreferredRepoChanged(0L) },
+            FDroidOutlineButton(
+                text = stringResource(R.string.app_details_repository_button_prefer),
+                onClick = { onPreferredRepoChanged(currentRepo.repoId) },
                 modifier = Modifier
                     .align(End)
                     .padding(top = 8.dp),
-            ) {
-                Text(stringResource(R.string.app_details_repository_button_prefer))
-            }
+            )
         }
     }
 }
 
 @Composable
 private fun RepoMenuItem(
-    repo: String,
+    repo: Repository,
     isPreferred: Boolean,
     modifier: Modifier = Modifier,
     onClick: () -> Unit
@@ -149,13 +152,13 @@ private fun RepoMenuItem(
         },
         modifier = modifier,
         onClick = onClick,
-        leadingIcon = { Icon(PackageVariant, null, Modifier.size(24.dp)) }
+        leadingIcon = { RepoIcon(repo, Modifier.size(24.dp)) }
     )
 }
 
 @Composable
-private fun getRepoString(repo: String, isPreferred: Boolean) = buildAnnotatedString {
-    append(repo)
+private fun getRepoString(repo: Repository, isPreferred: Boolean) = buildAnnotatedString {
+    append(repo.getName(LocaleListCompat.getDefault()) ?: "Unknown Repository")
     if (isPreferred) {
         append(" ")
         pushStyle(SpanStyle(fontWeight = Bold))
@@ -163,3 +166,34 @@ private fun getRepoString(repo: String, isPreferred: Boolean) = buildAnnotatedSt
         append(stringResource(R.string.app_details_repository_preferred))
     }
 }
+
+@Composable
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+fun RepoChooserSingleRepoPreview() {
+    val repo1 = Repository(1L, "1", 1L, TWO, "null", 1L, 1, 1L)
+    FDroidContent(pureBlack = true) {
+        RepoChooser(listOf(repo1), 1L, 1L, {}, {})
+    }
+}
+
+@Composable
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+fun RepoChooserPreview() {
+    val repo1 = Repository(1L, "1", 1L, TWO, "null", 1L, 1, 1L)
+    val repo2 = Repository(2L, "2", 2L, TWO, "null", 2L, 2, 2L)
+    val repo3 = Repository(3L, "2", 3L, TWO, "null", 3L, 3, 3L)
+    FDroidContent(pureBlack = true) {
+        RepoChooser(listOf(repo1, repo2, repo3), 1L, 1L, {}, {})
+    }
+}
+
+@Composable
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
+fun RepoChooserNightPreview() {
+    val repo1 = Repository(1L, "1", 1L, TWO, "null", 1L, 1, 1L)
+    val repo2 = Repository(2L, "2", 2L, TWO, "null", 2L, 2, 2L)
+    val repo3 = Repository(3L, "2", 3L, TWO, "null", 3L, 3, 3L)
+    FDroidContent(pureBlack = true) {
+        RepoChooser(listOf(repo1, repo2, repo3), 1L, 2L, {}, {})
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/Versions.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/Versions.kt
new file mode 100644
index 000000000..dad25959f
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/Versions.kt
@@ -0,0 +1,179 @@
+package org.fdroid.basic.ui.main.details
+
+import android.text.format.Formatter
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AccessTime
+import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material3.Badge
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.basic.R
+import org.fdroid.basic.details.AppDetailsItem
+import org.fdroid.basic.details.testApp
+import org.fdroid.basic.ui.asRelativeTimeString
+import org.fdroid.basic.ui.utils.FDroidOutlineButton
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.index.v2.PackageVersion
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun Versions(
+    item: AppDetailsItem,
+) {
+    ExpandableSection(
+        icon = rememberVectorPainter(Icons.Default.AccessTime),
+        title = stringResource(R.string.versions),
+        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+    ) {
+        Column(modifier = Modifier) {
+            item.versions?.forEach { version ->
+                Version(
+                    version = version,
+                    isInstalled = item.installedVersion == version,
+                    isSuggested = item.suggestedVersion == version,
+                    isInstallable = if (item.installedVersion == null) {
+                        true
+                    } else {
+                        // TODO take compatibility and signer into account
+                        item.installedVersion.versionCode < version.versionCode
+                    },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun Version(
+    version: PackageVersion,
+    isInstalled: Boolean,
+    isSuggested: Boolean,
+    isInstallable: Boolean,
+) {
+    val isPreview = LocalInspectionMode.current
+    var expanded by rememberSaveable { mutableStateOf(isPreview) }
+    Column(modifier = Modifier.padding(bottom = 16.dp)) {
+        Row(
+            horizontalArrangement = spacedBy(16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .padding(bottom = 8.dp)
+                .clickable {
+                    expanded = !expanded
+                }
+        ) {
+            Icon(
+                imageVector = if (expanded) {
+                    Icons.Default.ExpandLess
+                } else {
+                    Icons.Default.ExpandMore
+                },
+                contentDescription = null,
+            )
+            Row {
+                Column(modifier = Modifier.weight(1f)) {
+                    Text(
+                        text = version.versionName,
+                        style = MaterialTheme.typography.titleMedium,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                    Text(
+                        text = "Added " + version.added.asRelativeTimeString(),
+                        style = MaterialTheme.typography.bodyMedium,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+                if (isInstalled) Badge(
+                    containerColor = MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.padding(start = 8.dp)
+                ) {
+                    Text(
+                        text = stringResource(R.string.app_installed),
+                        modifier = Modifier.padding(2.dp)
+                    )
+                }
+                if (isSuggested) Badge(
+                    containerColor = MaterialTheme.colorScheme.secondary,
+                    modifier = Modifier.padding(start = 8.dp)
+                ) {
+                    Text(
+                        text = stringResource(R.string.app_suggested),
+                        modifier = Modifier.padding(2.dp)
+                    )
+                }
+            }
+        }
+        AnimatedVisibility(expanded) {
+            Row(
+                horizontalArrangement = spacedBy(16.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Column(modifier = Modifier.weight(1f)) {
+                    version.size?.let { size ->
+                        Text(
+                            text = "Size: " + Formatter.formatFileSize(LocalContext.current, size),
+                            style = MaterialTheme.typography.bodySmall,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    }
+                    version.packageManifest.nativecode?.let { nativeCode ->
+                        if (nativeCode.isNotEmpty()) {
+                            Text(
+                                text = "Architectures: " + nativeCode.joinToString(", "),
+                                style = MaterialTheme.typography.bodySmall,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+                        }
+                    }
+                    version.signer?.let { signer ->
+                        Text(
+                            text = "Signer: " + signer.sha256[0].substring(0..15),
+                            style = MaterialTheme.typography.bodySmall,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    }
+                }
+                if (isInstallable) FDroidOutlineButton(
+                    text = stringResource(R.string.menu_install),
+                    onClick = {},
+                )
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun VersionsPreview() {
+    FDroidContent {
+        Versions(testApp)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
index c2767e9bc..f93f22134 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
@@ -25,6 +25,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import kotlinx.coroutines.launch
+import org.fdroid.basic.details.AppDetailsItem
 import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.details.AppDetails
 import org.fdroid.basic.ui.main.lists.AppList
@@ -36,8 +37,6 @@ enum class Sort {
     LATEST,
 }
 
-const val NUM_ITEMS = 42
-
 @Composable
 @OptIn(ExperimentalMaterial3AdaptiveApi::class, ExperimentalMaterial3Api::class)
 fun DiscoverScaffold(
@@ -47,7 +46,7 @@ fun DiscoverScaffold(
     onMainNav: (String) -> Unit,
     onSelectAppItem: (MinimalApp) -> Unit,
     onAppListChanged: (AppList) -> Unit,
-    currentItem: MinimalApp?,
+    currentItem: AppDetailsItem?,
     modifier: Modifier = Modifier,
 ) {
     val navigator = rememberListDetailPaneScaffoldNavigator<MinimalApp>()
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
index 20fd98ba9..a25148b41 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
@@ -36,8 +36,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
+import org.fdroid.basic.details.AppDetailsItem
 import org.fdroid.basic.ui.main.apps.MinimalApp
-import org.fdroid.basic.ui.main.discover.AppNavigationItem
 
 sealed class AppList(val title: String) {
     data object New : AppList("New apps")
@@ -50,10 +50,10 @@ sealed class AppList(val title: String) {
 fun AppList(
     appList: AppList,
     filterInfo: FilterInfo,
-    currentItem: MinimalApp?,
+    currentItem: AppDetailsItem?,
     modifier: Modifier = Modifier,
     onBackClicked: () -> Unit,
-    onItemClick: (AppNavigationItem) -> Unit,
+    onItemClick: (MinimalApp) -> Unit,
 ) {
     val scrollBehavior = exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
     val addedRepos = remember { mutableStateListOf<String>() }
@@ -106,7 +106,7 @@ fun AppList(
             ) {
                 val apps = filterInfo.model.apps
                 items(apps, key = { it.packageName }, contentType = { "A" }) { navItem ->
-                    val isSelected = currentItem?.packageName == navItem.packageName
+                    val isSelected = currentItem?.app?.packageName == navItem.packageName
                     val interactionModifier = if (currentItem == null) {
                         Modifier.clickable(
                             onClick = { onItemClick(navItem) }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepoIcon.kt b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepoIcon.kt
new file mode 100644
index 000000000..4121266c7
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepoIcon.kt
@@ -0,0 +1,21 @@
+package org.fdroid.basic.ui.main.repositories
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.core.os.LocaleListCompat
+import coil3.compose.AsyncImage
+import org.fdroid.basic.R
+import org.fdroid.basic.download.getDownloadRequest
+import org.fdroid.database.Repository
+
+@Composable
+fun RepoIcon(repo: Repository, modifier: Modifier = Modifier) {
+    AsyncImage(
+        model = repo.getIcon(LocaleListCompat.getDefault())?.getDownloadRequest(repo),
+        contentDescription = null,
+        error = painterResource(R.drawable.ic_repo_app_default),
+        placeholder = painterResource(R.drawable.ic_repo_app_default),
+        modifier = modifier,
+    )
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/utils/FDroidOutlineButton.kt b/basic/src/main/java/org/fdroid/basic/ui/utils/FDroidOutlineButton.kt
new file mode 100644
index 000000000..8ac2ea8fa
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/utils/FDroidOutlineButton.kt
@@ -0,0 +1,42 @@
+package org.fdroid.basic.ui.utils
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun FDroidOutlineButton(
+    text: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    imageVector: ImageVector? = null,
+    color: Color = MaterialTheme.colorScheme.primary,
+) {
+    OutlinedButton(
+        onClick = onClick,
+        shape = RoundedCornerShape(32.dp),
+        modifier = modifier.heightIn(min = ButtonDefaults.MinHeight),
+        colors = ButtonDefaults.outlinedButtonColors(contentColor = color),
+    ) {
+        if (imageVector != null) {
+            Icon(
+                imageVector = imageVector,
+                contentDescription = text,
+                modifier = Modifier.size(ButtonDefaults.IconSize),
+            )
+            Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
+        }
+        Text(text = text, maxLines = 1)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/updates/UpdatesModule.kt b/basic/src/main/java/org/fdroid/basic/updates/UpdatesModule.kt
new file mode 100644
index 000000000..f458cd5fe
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/updates/UpdatesModule.kt
@@ -0,0 +1,41 @@
+package org.fdroid.basic.updates
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import org.fdroid.CompatibilityChecker
+import org.fdroid.CompatibilityCheckerImpl
+import org.fdroid.UpdateChecker
+import org.fdroid.database.DbUpdateChecker
+import org.fdroid.database.FDroidDatabase
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object UpdatesModule {
+    @Provides
+    @Singleton
+    fun provideCompatibilityChecker(@ApplicationContext context: Context): CompatibilityChecker {
+        return CompatibilityCheckerImpl(context.packageManager)
+    }
+
+    @Provides
+    @Singleton
+    fun provideUpdateChecker(compatibilityChecker: CompatibilityChecker): UpdateChecker {
+        return UpdateChecker(compatibilityChecker)
+    }
+
+    @Provides
+    @Singleton
+    fun provideDbUpdateChecker(
+        @ApplicationContext context: Context,
+        db: FDroidDatabase,
+        updateChecker: UpdateChecker,
+        compatibilityChecker: CompatibilityChecker,
+    ): DbUpdateChecker {
+        return DbUpdateChecker(db, context.packageManager, compatibilityChecker, updateChecker)
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/utils/CoroutinesScopesModule.kt b/basic/src/main/java/org/fdroid/basic/utils/CoroutinesScopesModule.kt
new file mode 100644
index 000000000..3d63a427f
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/utils/CoroutinesScopesModule.kt
@@ -0,0 +1,27 @@
+package org.fdroid.basic.utils
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CoroutinesScopesModule {
+    @Singleton
+    @Provides
+    @IoDispatcher
+    fun providesCoroutineIoScope(): CoroutineScope {
+        // Run this code when providing an instance of CoroutineScope
+        return CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    }
+}
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class IoDispatcher
diff --git a/basic/src/main/res/drawable/ic_repo_app_default.xml b/basic/src/main/res/drawable/ic_repo_app_default.xml
new file mode 100644
index 000000000..f7eecb681
--- /dev/null
+++ b/basic/src/main/res/drawable/ic_repo_app_default.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillAlpha="0.5058822"
+        android:fillColor="#595959"
+        android:pathData="M24,2A22,22 0,0 0,2 24A22,22 0,0 0,24 46A22,22 0,0 0,46 24A22,22 0,0 0,24 2zM10.492,9.781A0.79,0.79 0,0 1,11.104 10.096L13.271,12.902C13.468,12.834 13.676,12.789 13.896,12.789L34.107,12.789C34.327,12.789 34.535,12.834 34.73,12.902L36.896,10.096A0.79,0.79 0,0 1,37.484 9.781A0.79,0.79 0,0 1,38.146 11.063L35.871,14.006C35.952,14.217 36.002,14.443 36.002,14.684L36.002,14.77L36.002,16.578L36.002,19.105C36.002,20.155 35.157,21 34.107,21L13.896,21C12.847,21 12.002,20.155 12.002,19.105L12.002,19.02L12.002,17.211L12.002,14.684C12.002,14.444 12.049,14.218 12.129,14.008L9.854,11.063A0.79,0.79 0,0 1,10.492 9.781zM17.922,15.158A2.132,2.132 0,0 0,15.789 17.289A2.132,2.132 0,0 0,17.922 19.422A2.132,2.132 0,0 0,20.053 17.289A2.132,2.132 0,0 0,17.922 15.158zM30.236,15.158A2.132,2.132 0,0 0,28.105 17.289A2.132,2.132 0,0 0,30.236 19.422A2.132,2.132 0,0 0,32.369 17.289A2.132,2.132 0,0 0,30.236 15.158zM13.895,22L34.105,22C34.237,22 34.365,22.013 34.488,22.037C35.353,22.207 36,22.942 36,23.828L36,23.844L36,36.154C36,37.177 35.155,38 34.105,38L13.895,38C12.845,38 12,37.177 12,36.154L12,36.035L12,36.02L12,23.846L12,23.828C12,22.942 12.647,22.207 13.512,22.037C13.635,22.012 13.763,22 13.895,22z"
+        android:strokeWidth="3"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="miter" />
+</vector>

From acbb4320c295ea7c2735a549d17ca04f18d75f16 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 16 Jul 2025 17:29:35 -0300
Subject: [PATCH 027/180] Use experimental navigation3 library

which is still buggy, but so was the old implementation and this seems to be the future
---
 basic/build.gradle.kts                        |  12 +-
 .../java/org/fdroid/basic/MainViewModel.kt    |   6 +-
 .../org/fdroid/basic/manager/MyAppsManager.kt |   2 +-
 .../fdroid/basic/repo/RepositoryManager.kt    |   8 +-
 .../java/org/fdroid/basic/ui/Navigation.kt    |  47 ++++
 .../org/fdroid/basic/ui/main/BottomBar.kt     |  65 +++++
 .../fdroid/basic/ui/main/BottomBarScreen.kt   | 170 ------------
 .../java/org/fdroid/basic/ui/main/Main.kt     | 247 +++++++++++++-----
 .../ui/main/apps/{MyAppsList.kt => MyApps.kt} |  55 +++-
 .../basic/ui/main/apps/MyAppsScaffold.kt      | 114 --------
 .../fdroid/basic/ui/main/discover/Discover.kt |  23 +-
 .../ui/main/discover/DiscoverScaffold.kt      | 150 -----------
 .../fdroid/basic/ui/main/lists/AppsFilter.kt  |   2 -
 .../{discover => lists}/FilterPresenter.kt    |   8 +-
 .../main/repositories/RepositoriesScaffold.kt | 204 ---------------
 .../ui/main/repositories/RepositoryList.kt    | 141 ++++++++++
 gradle/libs.versions.toml                     |  18 +-
 17 files changed, 544 insertions(+), 728 deletions(-)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/Navigation.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
 rename basic/src/main/java/org/fdroid/basic/ui/main/apps/{MyAppsList.kt => MyApps.kt} (81%)
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
 rename basic/src/main/java/org/fdroid/basic/ui/main/{discover => lists}/FilterPresenter.kt (91%)
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryList.kt

diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index 0db5926db..a23d5748a 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -67,13 +67,15 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.compose.material.icons.extended)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.compose.material3.adaptive.navigation3)
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.material3.adaptive)
-    implementation(libs.androidx.compose.material3.adaptive.layout)
-    implementation(libs.androidx.compose.material3.adaptive.navigation)
-    implementation(libs.androidx.compose.material3.adaptive.navigation.suite.android)
+
+    implementation(libs.androidx.navigation3.ui)
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
+    implementation(libs.kotlinx.serialization.core)
+
     implementation(libs.molecule.runtime)
     implementation(libs.coil.compose)
     implementation(libs.coil.network.okhttp)
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 4b21c50fe..a087f8bf1 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -25,9 +25,9 @@ import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.basic.ui.main.discover.DiscoverModel
 import org.fdroid.basic.ui.main.discover.DiscoverPresenter
-import org.fdroid.basic.ui.main.discover.FilterModel
-import org.fdroid.basic.ui.main.discover.FilterPresenter
-import org.fdroid.basic.ui.main.discover.Sort
+import org.fdroid.basic.ui.main.lists.FilterModel
+import org.fdroid.basic.ui.main.lists.FilterPresenter
+import org.fdroid.basic.ui.main.lists.Sort
 import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.database.FDroidDatabase
 import java.text.Collator
diff --git a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
index 93a7264b9..bbdc7737b 100644
--- a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
+++ b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
@@ -11,7 +11,7 @@ import org.fdroid.basic.ui.Icons
 import org.fdroid.basic.ui.Names
 import org.fdroid.basic.ui.main.apps.InstalledApp
 import org.fdroid.basic.ui.main.apps.UpdatableApp
-import org.fdroid.basic.ui.main.discover.Sort
+import org.fdroid.basic.ui.main.lists.Sort
 import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt b/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt
index 2eeb56808..d4281b787 100644
--- a/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt
+++ b/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt
@@ -3,8 +3,7 @@ package org.fdroid.basic.repo
 import android.content.Context
 import androidx.core.os.LocaleListCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
@@ -13,6 +12,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import org.fdroid.basic.ui.main.repositories.Repository
+import org.fdroid.basic.utils.IoDispatcher
 import org.fdroid.index.RepoManager
 import org.fdroid.repo.AddRepoError
 import org.fdroid.repo.Added
@@ -24,12 +24,14 @@ import javax.inject.Singleton
 @Singleton // TODO maybe more like a ViewModel name clash with RepoManager
 class RepositoryManager @Inject constructor(
     @ApplicationContext private val context: Context,
+    @IoDispatcher private val coroutineScope: CoroutineScope,
     private val repoManager: RepoManager,
 ) {
 
     val repos: Flow<List<Repository>> = repoManager.repositoriesState.map { repos ->
         repos.map {
             Repository(
+                repoId = it.repoId,
                 address = it.address,
                 timestamp = it.timestamp,
                 lastUpdated = it.lastUpdated,
@@ -52,7 +54,7 @@ class RepositoryManager @Inject constructor(
     fun addRepo() {
         // just temp code to get repo into DB
         repoManager.fetchRepositoryPreview("https://f-droid.org/repo")
-        GlobalScope.launch(Dispatchers.IO) {
+        coroutineScope.launch {
             var hasAdded = false
             repoManager.addRepoState.collect {
                 if (it is Fetching) {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Navigation.kt b/basic/src/main/java/org/fdroid/basic/ui/Navigation.kt
new file mode 100644
index 000000000..98cb6f5e8
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/Navigation.kt
@@ -0,0 +1,47 @@
+package org.fdroid.basic.ui
+
+import androidx.annotation.StringRes
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Apps
+import androidx.compose.material.icons.filled.Explore
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.navigation3.runtime.NavKey
+import kotlinx.serialization.Serializable
+import org.fdroid.basic.R
+
+sealed interface NavigationKey : NavKey {
+
+    @Serializable
+    data object Discover : NavigationKey
+
+    @Serializable
+    data object MyApps : NavigationKey
+
+    @Serializable
+    data class AppDetails(val packageName: String) : NavigationKey
+
+    @Serializable
+    data object AppList : NavigationKey
+
+    @Serializable
+    data object Repos : NavigationKey
+
+    @Serializable
+    data class RepoDetails(val repoId: Long) : NavigationKey
+
+    @Serializable
+    data object Settings : NavigationKey
+
+    @Serializable
+    data object About : NavigationKey
+
+}
+
+enum class BottomNavDestinations(
+    val key: NavigationKey,
+    @StringRes val label: Int,
+    val icon: ImageVector,
+) {
+    DISCOVER(NavigationKey.Discover, R.string.discover, Icons.Filled.Explore),
+    MY_APPS(NavigationKey.MyApps, R.string.apps_my, Icons.Filled.Apps),
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt
new file mode 100644
index 000000000..9d2d1a6d7
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt
@@ -0,0 +1,65 @@
+package org.fdroid.basic.ui.main
+
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.NavigationRail
+import androidx.compose.material3.NavigationRailItem
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.navigation3.runtime.NavKey
+import org.fdroid.basic.ui.BottomNavDestinations
+import org.fdroid.basic.ui.NavigationKey
+
+@Composable
+fun BottomBar(numUpdates: Int, currentNavKey: NavKey, onNav: (NavigationKey) -> Unit) {
+    NavigationBar {
+        BottomNavDestinations.entries.forEach { dest ->
+            NavigationBarItem(
+                icon = { NavIcon(dest, numUpdates) },
+                label = { Text(stringResource(dest.label)) },
+                selected = dest.key == currentNavKey,
+                onClick = {
+                    if (dest.key != currentNavKey) onNav(dest.key)
+                },
+            )
+        }
+    }
+}
+
+@Composable
+fun NavigationRail(numUpdates: Int, currentNavKey: NavKey, onNav: (NavigationKey) -> Unit) {
+    NavigationRail {
+        BottomNavDestinations.entries.forEach { dest ->
+            NavigationRailItem(
+                icon = { NavIcon(dest, numUpdates) },
+                label = { Text(stringResource(dest.label)) },
+                selected = dest.key == currentNavKey,
+                onClick = {
+                    if (dest.key != currentNavKey) onNav(dest.key)
+                },
+            )
+        }
+    }
+}
+
+@Composable
+private fun NavIcon(dest: BottomNavDestinations, numUpdates: Int) {
+    BadgedBox(
+        badge = {
+            if (dest == BottomNavDestinations.MY_APPS && numUpdates > 0) {
+                Badge {
+                    Text(text = numUpdates.toString())
+                }
+            }
+        }
+    ) {
+        Icon(
+            dest.icon,
+            contentDescription = stringResource(dest.label)
+        )
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
deleted file mode 100644
index 6f8d05098..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBarScreen.kt
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.fdroid.basic.ui.main
-
-import androidx.annotation.StringRes
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Apps
-import androidx.compose.material.icons.filled.Explore
-import androidx.compose.material3.Badge
-import androidx.compose.material3.BadgedBox
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewScreenSizes
-import androidx.window.core.layout.WindowWidthSizeClass
-import org.fdroid.basic.R
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.ui.main.apps.InstalledApp
-import org.fdroid.basic.ui.main.apps.MinimalApp
-import org.fdroid.basic.ui.main.apps.MyAppsScaffold
-import org.fdroid.basic.ui.main.apps.UpdatableApp
-import org.fdroid.basic.ui.main.discover.AppNavigationItem
-import org.fdroid.basic.ui.main.discover.DiscoverModel
-import org.fdroid.basic.ui.main.discover.DiscoverScaffold
-import org.fdroid.basic.ui.main.discover.FilterModel
-import org.fdroid.basic.ui.main.discover.LoadingDiscoverModel
-import org.fdroid.basic.ui.main.discover.Sort
-import org.fdroid.basic.ui.main.lists.AppList
-import org.fdroid.basic.ui.main.lists.FilterInfo
-
-enum class BottomNavDestinations(
-    @StringRes val label: Int,
-    val icon: ImageVector,
-) {
-    APPS(R.string.discover, Icons.Filled.Explore),
-    UPDATES(R.string.apps_my, Icons.Filled.Apps),
-}
-
-@Composable
-fun BottomBarScreen(
-    onMainNav: (String) -> Unit,
-    numUpdates: Int,
-    updates: List<UpdatableApp>,
-    installed: List<InstalledApp>,
-    appList: AppList,
-    discoverModel: DiscoverModel,
-    filterInfo: FilterInfo,
-    currentItem: AppDetailsItem?,
-    onSelectAppItem: (MinimalApp) -> Unit,
-    sortBy: Sort,
-    onSortChanged: (Sort) -> Unit,
-    onAppListChanged: (AppList) -> Unit,
-) {
-    var currentDestination by rememberSaveable { mutableStateOf(BottomNavDestinations.APPS) }
-    val adaptiveInfo = currentWindowAdaptiveInfo()
-    val customNavSuiteType = with(adaptiveInfo) {
-        when (windowSizeClass.windowWidthSizeClass) {
-            WindowWidthSizeClass.COMPACT -> NavigationSuiteType.NavigationBar
-            else -> NavigationSuiteType.NavigationRail
-        }
-    }
-    NavigationSuiteScaffold(
-        modifier = Modifier.fillMaxSize(),
-        layoutType = customNavSuiteType,
-        navigationSuiteColors = NavigationSuiteDefaults.colors(
-            navigationBarContainerColor = Color.Transparent,
-        ),
-        navigationSuiteItems = {
-            BottomNavDestinations.entries.forEach { dest ->
-                item(
-                    icon = {
-                        BadgedBox(
-                            badge = {
-                                if (dest == BottomNavDestinations.UPDATES && numUpdates > 0) {
-                                    Badge {
-                                        Text(text = numUpdates.toString())
-                                    }
-                                }
-                            }
-                        ) {
-                            Icon(
-                                dest.icon,
-                                contentDescription = stringResource(dest.label)
-                            )
-                        }
-                    },
-                    label = { Text(stringResource(dest.label)) },
-                    selected = dest == currentDestination,
-                    onClick = { currentDestination = dest }
-                )
-            }
-        }
-    ) {
-        when (currentDestination) {
-            BottomNavDestinations.APPS -> DiscoverScaffold(
-                discoverModel = discoverModel,
-                appList = appList,
-                filterInfo = filterInfo,
-                onMainNav = onMainNav,
-                currentItem = currentItem,
-                onSelectAppItem = onSelectAppItem,
-                onAppListChanged = onAppListChanged,
-                modifier = Modifier,
-            )
-            BottomNavDestinations.UPDATES -> MyAppsScaffold(
-                updatableApps = updates,
-                installedApps = installed,
-                currentItem = currentItem,
-                onSelectAppItem = onSelectAppItem,
-                sortBy = sortBy,
-                onSortChanged = onSortChanged,
-            )
-        }
-    }
-}
-
-@Preview
-@PreviewScreenSizes
-@Composable
-fun BottomBarPreview() {
-    val apps = listOf(
-        AppNavigationItem("", "foo", null, "bar", false),
-        AppNavigationItem("", "foo", null, "bar", false),
-        AppNavigationItem("", "foo", null, "bar", false),
-    )
-    var filterExpanded by rememberSaveable { mutableStateOf(true) }
-    val filterInfo = object : FilterInfo {
-        override val model = FilterModel(
-            isLoading = false,
-            areFiltersShown = filterExpanded,
-            apps = apps,
-            sortBy = Sort.NAME,
-            allCategories = emptyList(),
-            addedCategories = emptyList(),
-        )
-
-        override fun toggleFilterVisibility() {}
-        override fun sortBy(sort: Sort) {}
-        override fun addCategory(category: String) {}
-        override fun removeCategory(category: String) {
-            filterExpanded = !filterExpanded
-        }
-    }
-    BottomBarScreen(
-        onMainNav = { },
-        numUpdates = 2,
-        updates = emptyList(),
-        installed = emptyList(),
-        appList = AppList.New,
-        discoverModel = LoadingDiscoverModel(true),
-        filterInfo = filterInfo,
-        currentItem = null,
-        onSelectAppItem = {},
-        sortBy = Sort.NAME,
-        onSortChanged = {},
-        onAppListChanged = {},
-    )
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index 3725978f2..4698e9020 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -1,33 +1,59 @@
 package org.fdroid.basic.ui.main
 
 import androidx.annotation.StringRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
+import androidx.compose.material3.adaptive.layout.calculatePaneScaffoldDirective
+import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
+import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneStrategy
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
+import androidx.navigation3.runtime.NavKey
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberNavBackStack
+import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
+import androidx.navigation3.scene.rememberSceneSetupNavEntryDecorator
+import androidx.navigation3.ui.NavDisplay
+import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import org.fdroid.basic.MainViewModel
 import org.fdroid.basic.R
+import org.fdroid.basic.ui.NavigationKey
 import org.fdroid.basic.ui.icons.PackageVariant
-import org.fdroid.basic.ui.main.discover.Sort
+import org.fdroid.basic.ui.main.apps.MyApps
+import org.fdroid.basic.ui.main.details.AppDetails
+import org.fdroid.basic.ui.main.discover.Discover
+import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.basic.ui.main.lists.FilterInfo
-import org.fdroid.basic.ui.main.repositories.RepositoriesScaffold
+import org.fdroid.basic.ui.main.lists.Sort
+import org.fdroid.basic.ui.main.repositories.RepositoryList
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 sealed class NavDestinations(
-    val id: String,
+    val id: NavigationKey,
     @StringRes val label: Int,
     val icon: ImageVector,
 ) {
-    object Main : NavDestinations("main", R.string.app_name, Icons.Default.Info)
-    object Repos : NavDestinations("repos", R.string.app_details_repositories, PackageVariant)
-    object Settings : NavDestinations("settings", R.string.menu_settings, Icons.Filled.Settings)
-    object About : NavDestinations("about", R.string.about, Icons.Filled.Info)
+    object Repos :
+        NavDestinations(NavigationKey.Repos, R.string.app_details_repositories, PackageVariant)
+
+    object Settings :
+        NavDestinations(NavigationKey.Settings, R.string.menu_settings, Icons.Filled.Settings)
+
+    object About : NavDestinations(NavigationKey.About, R.string.about, Icons.Filled.Info)
 }
 
 val topBarMenuItems = listOf(
@@ -39,64 +65,159 @@ val moreMenuItems = listOf(
     NavDestinations.About,
 )
 
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
 fun Main(viewModel: MainViewModel = hiltViewModel()) {
+    val backStack = rememberNavBackStack<NavigationKey>(NavigationKey.Discover)
+    // Override the defaults so that there isn't a horizontal space between the panes.
+    val windowAdaptiveInfo = currentWindowAdaptiveInfo()
+    val directive = remember(windowAdaptiveInfo) {
+        calculatePaneScaffoldDirective(windowAdaptiveInfo)
+            .copy(horizontalPartitionSpacerSize = 0.dp)
+    }
+    val isBigScreen = remember(windowAdaptiveInfo) {
+        windowAdaptiveInfo.windowSizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND)
+    }
+    val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>()//(directive = directive)
     FDroidContent {
-        val navController = rememberNavController()
-        NavHost(navController = navController, startDestination = NavDestinations.Main.id) {
-            composable(route = NavDestinations.Main.id) {
-                val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
-                val updates = viewModel.updates.collectAsStateWithLifecycle().value
-                val installed = viewModel.installed.collectAsStateWithLifecycle().value
-                val filterInfo = object : FilterInfo {
-                    override val model = viewModel.filterModel.collectAsStateWithLifecycle().value
-                    override fun toggleFilterVisibility() {
-                        viewModel.toggleListFilterVisibility()
-                    }
-
-                    override fun sortBy(sort: Sort) = viewModel.sortBy(sort)
-                    override fun addCategory(category: String) = viewModel.addCategory(category)
-                    override fun removeCategory(category: String) =
-                        viewModel.removeCategory(category)
-                }
-                val currentItem = viewModel.appDetails.collectAsStateWithLifecycle().value
-                BottomBarScreen(
-                    onMainNav = { navController.navigate(it) },
-                    numUpdates = numUpdates,
-                    updates = updates,
-                    installed = installed,
-                    onAppListChanged = viewModel::setAppList,
-                    appList = viewModel.currentList.collectAsStateWithLifecycle().value,
-                    discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
-                    filterInfo = filterInfo,
-                    currentItem = currentItem,
-                    onSelectAppItem = viewModel::setAppDetails,
-                    sortBy = viewModel.myAppsManager.sortBy.collectAsStateWithLifecycle().value,
-                    onSortChanged = viewModel.myAppsManager::sortBy,
-                )
-            }
-            composable(route = NavDestinations.Repos.id) {
-                val repositoryManager = viewModel.repositoryManager
-                val repos = repositoryManager.repos.collectAsStateWithLifecycle(null).value
-                val visibleRepository =
-                    repositoryManager.visibleRepository.collectAsStateWithLifecycle().value
-                RepositoriesScaffold(
-                    repositories = repos,
-                    currentRepository = visibleRepository,
-                    onRepositorySelected = repositoryManager::setVisibleRepository,
-                    onAddRepo = repositoryManager::addRepo,
+        NavDisplay(
+            backStack = backStack,
+            onBack = { keysToRemove ->
+                repeat(keysToRemove) { backStack.removeLastOrNull() }
+            },
+            sceneStrategy = listDetailStrategy,
+            entryDecorators = listOf(
+                rememberSceneSetupNavEntryDecorator(),
+                rememberSavedStateNavEntryDecorator(),
+//                rememberViewModelStoreNavEntryDecorator(),
+            ),
+            entryProvider = entryProvider {
+                entry<NavigationKey.Discover>(
+                    metadata = ListDetailSceneStrategy.listPane("appdetails") {
+                        Text("No app selected")
+                    },
                 ) {
-                    navController.popBackStack()
+                    val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
+                    Discover(
+                        discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
+                        onTitleTap = {
+                            viewModel.setAppList(it)
+                            backStack.add(NavigationKey.AppList)
+                        },
+                        onAppTap = {
+                            viewModel.setAppDetails(it)
+                            backStack.add(NavigationKey.AppDetails(it.packageName))
+                        },
+                        onNav = { backStack.add(it) },
+                        numUpdates = numUpdates,
+                        isBigScreen = isBigScreen,
+                        modifier = Modifier,
+                    )
                 }
-            }
-            composable(route = NavDestinations.Settings.id) {
-                Settings { navController.popBackStack() }
-            }
-            composable(route = NavDestinations.About.id) {
-                About { navController.popBackStack() }
-            }
-            // Add more destinations similarly.
-        }
+                entry<NavigationKey.MyApps>(
+                    metadata = ListDetailSceneStrategy.listPane("appdetails") {
+                        Text("No app selected")
+                    },
+                ) {
+                    val updates = viewModel.updates.collectAsStateWithLifecycle().value
+                    val installed = viewModel.installed.collectAsStateWithLifecycle().value
+                    val currentItem = viewModel.appDetails.collectAsStateWithLifecycle().value
+                    MyApps(
+                        updatableApps = updates,
+                        installedApps = installed,
+                        currentItem = currentItem,
+                        onItemClick = {
+                            viewModel.setAppDetails(it)
+                            backStack.add(NavigationKey.AppDetails(it.packageName))
+                        },
+                        onNav = { backStack.add(it) },
+                        sortBy = viewModel.myAppsManager.sortBy.collectAsStateWithLifecycle().value,
+                        isBigScreen = isBigScreen,
+                        onSortChanged = viewModel.myAppsManager::sortBy,
+                    )
+                }
+                entry<NavigationKey.AppDetails>(
+                    metadata = ListDetailSceneStrategy.detailPane("appdetails")
+                ) {
+                    val currentItem = viewModel.appDetails.collectAsStateWithLifecycle().value
+                    it.packageName // TODO use?
+                    AppDetails(
+                        appItem = currentItem,
+                        onBackNav = { backStack.removeLastOrNull() },
+                        modifier = Modifier,
+                    )
+                }
+                entry<NavigationKey.AppList>(
+                    metadata = ListDetailSceneStrategy.listPane("appdetails") {
+                        Text("No app selected")
+                    },
+                ) {
+                    val filterInfo = object : FilterInfo {
+                        override val model =
+                            viewModel.filterModel.collectAsStateWithLifecycle().value
 
+                        override fun toggleFilterVisibility() {
+                            viewModel.toggleListFilterVisibility()
+                        }
+
+                        override fun sortBy(sort: Sort) = viewModel.sortBy(sort)
+                        override fun addCategory(category: String) = viewModel.addCategory(category)
+                        override fun removeCategory(category: String) =
+                            viewModel.removeCategory(category)
+                    }
+                    val currentItem = viewModel.appDetails.collectAsStateWithLifecycle().value
+                    AppList(
+                        appList = viewModel.currentList.collectAsStateWithLifecycle().value,
+                        filterInfo = filterInfo,
+                        currentItem = currentItem,
+                        onBackClicked = { backStack.removeLastOrNull() },
+                        modifier = Modifier,
+                    ) {
+                        viewModel.setAppDetails(it)
+                        backStack.add(NavigationKey.AppDetails(it.packageName))
+                    }
+                }
+                entry<NavigationKey.Repos>(
+                    metadata = ListDetailSceneStrategy.listPane("repos") {
+                        Text(text = "No repository selected")
+                    },
+                ) {
+                    val repositoryManager = viewModel.repositoryManager
+                    val repos = repositoryManager.repos.collectAsStateWithLifecycle(null).value
+                    val visibleRepository =
+                        repositoryManager.visibleRepository.collectAsStateWithLifecycle().value
+                    RepositoryList(
+                        repositories = repos,
+                        currentRepository = visibleRepository,
+                        onRepositorySelected = {
+                            repositoryManager.setVisibleRepository(it)
+                            backStack.add(NavigationKey.RepoDetails(it.repoId))
+                        } ,
+                        onAddRepo = repositoryManager::addRepo,
+                    ) {
+                        backStack.removeLastOrNull()
+                    }
+                }
+                entry<NavigationKey.RepoDetails>(
+                    metadata = ListDetailSceneStrategy.detailPane("repos")
+                ) {
+                    Column(
+                        verticalArrangement = spacedBy(16.dp),
+                        modifier = Modifier
+                            .background(MaterialTheme.colorScheme.background)
+                            .safeDrawingPadding(),
+                    ) {
+                        Text("Repo ${it.repoId}")
+                        Text("This will basically be the repo details screen from latest client")
+                    }
+                }
+                entry(NavigationKey.Settings) {
+                    Settings { backStack.removeLastOrNull() }
+                }
+                entry(NavigationKey.About) {
+                    About { backStack.removeLastOrNull() }
+                }
+            },
+        )
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
similarity index 81%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
index 4acbe6889..f1ad3a1e5 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
@@ -33,20 +33,29 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.compose.ui.unit.dp
+import androidx.navigation3.runtime.NavKey
 import org.fdroid.basic.R
 import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.ui.main.discover.Sort
+import org.fdroid.basic.ui.Names
+import org.fdroid.basic.ui.NavigationKey
+import org.fdroid.basic.ui.main.BottomBar
+import org.fdroid.basic.ui.main.lists.Sort
+import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-fun MyAppsList(
+fun MyApps(
     updatableApps: List<UpdatableApp>,
     installedApps: List<InstalledApp>,
     currentItem: AppDetailsItem?,
     onItemClick: (MinimalApp) -> Unit,
+    onNav: (NavKey) -> Unit,
     sortBy: Sort,
     onSortChanged: (Sort) -> Unit,
+    isBigScreen: Boolean,
     modifier: Modifier = Modifier,
 ) {
     val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
@@ -120,6 +129,9 @@ fun MyAppsList(
                 scrollBehavior = scrollBehavior,
             )
         },
+        bottomBar = {
+            if (!isBigScreen) BottomBar(updatableApps.size, NavigationKey.MyApps, onNav)
+        },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         LazyColumn(
@@ -181,3 +193,42 @@ fun MyAppsList(
         }
     }
 }
+
+@Preview
+@PreviewScreenSizes
+@Composable
+fun MyAppsScaffoldPreview() {
+    FDroidContent {
+        val app1 = UpdatableApp(
+            packageName = "A",
+            name = Names.randomName,
+            currentVersionName = "1.0.1",
+            updateVersionName = "1.1.0",
+            size = 123456789,
+        )
+        val app2 = UpdatableApp(
+            packageName = "B",
+            name = Names.randomName,
+            currentVersionName = "3.0.1",
+            updateVersionName = "3.1.0",
+            size = 9876543,
+        )
+        val installedApp1 =
+            InstalledApp("1", Names.randomName, org.fdroid.basic.ui.Icons.randomIcon, "3.0.1")
+        val installedApp2 =
+            InstalledApp("2", Names.randomName, org.fdroid.basic.ui.Icons.randomIcon, "1.0")
+        val installedApp3 =
+            InstalledApp("3", Names.randomName, org.fdroid.basic.ui.Icons.randomIcon, "0.1")
+        var sortBy by remember { mutableStateOf(Sort.NAME) }
+        MyApps(
+            updatableApps = listOf(app1, app2),
+            installedApps = listOf(installedApp1, installedApp2, installedApp3),
+            currentItem = null,
+            onItemClick = {},
+            onNav = {},
+            sortBy = sortBy,
+            onSortChanged = { sortBy = it },
+            isBigScreen = false,
+        )
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
deleted file mode 100644
index 88abcaabb..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsScaffold.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.fdroid.basic.ui.main.apps
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.material3.adaptive.layout.AnimatedPane
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Detail
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.List
-import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
-import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewScreenSizes
-import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.launch
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.ui.Icons
-import org.fdroid.basic.ui.Names
-import org.fdroid.basic.ui.main.details.AppDetails
-import org.fdroid.basic.ui.main.discover.Sort
-import org.fdroid.fdroid.ui.theme.FDroidContent
-
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
-@Composable
-fun MyAppsScaffold(
-    updatableApps: List<UpdatableApp>,
-    installedApps: List<InstalledApp>,
-    currentItem: AppDetailsItem?,
-    onSelectAppItem: (MinimalApp) -> Unit,
-    sortBy: Sort,
-    onSortChanged: (Sort) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    val navigator = rememberListDetailPaneScaffoldNavigator<MinimalApp>()
-    val scope = rememberCoroutineScope()
-    BackHandler(enabled = navigator.canNavigateBack()) {
-        scope.launch {
-            navigator.navigateBack()
-        }
-    }
-    val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
-    val isListVisible = navigator.scaffoldValue[List] == PaneAdaptedValue.Expanded
-    ListDetailPaneScaffold(
-        directive = navigator.scaffoldDirective,
-        value = navigator.scaffoldValue,
-        modifier = modifier,
-        listPane = {
-            AnimatedPane {
-                MyAppsList(
-                    updatableApps = updatableApps,
-                    installedApps = installedApps,
-                    currentItem = if (isDetailVisible) currentItem else null,
-                    onItemClick = {
-                        onSelectAppItem(it)
-                        scope.launch { navigator.navigateTo(Detail, it) }
-                    },
-                    sortBy = sortBy,
-                    onSortChanged = onSortChanged,
-                )
-            }
-        },
-        detailPane = {
-            AnimatedPane {
-                currentItem?.let {
-                    val back: () -> Unit = { scope.launch { navigator.navigateBack() } }
-                    AppDetails(it, if (isListVisible) null else back)
-                } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
-            }
-        },
-    )
-}
-
-@Preview
-@PreviewScreenSizes
-@Composable
-fun MyAppsScaffoldPreview() {
-    FDroidContent {
-        val app1 = UpdatableApp(
-            packageName = "",
-            name = Names.randomName,
-            currentVersionName = "1.0.1",
-            updateVersionName = "1.1.0",
-            size = 123456789,
-        )
-        val app2 = UpdatableApp(
-            packageName = "",
-            name = Names.randomName,
-            currentVersionName = "3.0.1",
-            updateVersionName = "3.1.0",
-            size = 9876543,
-        )
-        val installedApp1 = InstalledApp("", Names.randomName, Icons.randomIcon, "3.0.1")
-        val installedApp2 = InstalledApp("", Names.randomName, Icons.randomIcon, "1.0")
-        val installedApp3 = InstalledApp("", Names.randomName, Icons.randomIcon, "0.1")
-        var sortBy by remember { mutableStateOf<Sort>(Sort.NAME) }
-        MyAppsScaffold(
-            updatableApps = listOf(app1, app2),
-            installedApps = listOf(installedApp1, installedApp2, installedApp3),
-            currentItem = null,
-            onSelectAppItem = {},
-            sortBy = sortBy,
-            onSortChanged = { sortBy = it },
-        )
-    }
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
index 661a0c982..1e951d360 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
@@ -37,7 +37,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.navigation3.runtime.NavKey
+import org.fdroid.basic.ui.NavigationKey
 import org.fdroid.basic.ui.categories.CategoryList
+import org.fdroid.basic.ui.main.BottomBar
 import org.fdroid.basic.ui.main.MainOverFlowMenu
 import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.basic.ui.main.topBarMenuItems
@@ -47,10 +50,12 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun Discover(
     discoverModel: DiscoverModel,
+    numUpdates: Int,
+    isBigScreen: Boolean,
     modifier: Modifier = Modifier,
     onTitleTap: (AppList) -> Unit,
     onAppTap: (AppNavigationItem) -> Unit,
-    onMainNav: (String) -> Unit,
+    onNav: (NavKey) -> Unit,
 ) {
     val searchBarState = rememberSearchBarState()
     val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
@@ -62,7 +67,7 @@ fun Discover(
                 },
                 actions = {
                     topBarMenuItems.forEach { dest ->
-                        IconButton(onClick = { onMainNav(dest.id) }) {
+                        IconButton(onClick = { onNav(dest.id) }) {
                             Icon(
                                 imageVector = dest.icon,
                                 contentDescription = stringResource(dest.label),
@@ -78,7 +83,7 @@ fun Discover(
                     }
                     MainOverFlowMenu(menuExpanded, {
                         menuExpanded = false
-                        onMainNav(it.id)
+                        onNav(it.id)
                     }) {
                         menuExpanded = false
                     }
@@ -86,6 +91,9 @@ fun Discover(
                 scrollBehavior = scrollBehavior,
             )
         },
+        bottomBar = {
+            if (!isBigScreen) BottomBar(numUpdates, NavigationKey.Discover, onNav)
+        },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         Column(
@@ -154,6 +162,13 @@ fun Discover(
 @Composable
 fun LoadingDiscoverPreview() {
     FDroidContent {
-        Discover(LoadingDiscoverModel(true), Modifier, {}, {}, {})
+        Discover(
+            discoverModel = LoadingDiscoverModel(true),
+            numUpdates = 23,
+            isBigScreen = false,
+            onTitleTap = {},
+            onAppTap = {},
+            onNav = {},
+        )
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
deleted file mode 100644
index f93f22134..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverScaffold.kt
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.fdroid.basic.ui.main.discover
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.material3.adaptive.layout.AnimatedPane
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Detail
-import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
-import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewScreenSizes
-import androidx.compose.ui.unit.dp
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import kotlinx.coroutines.launch
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.ui.main.apps.MinimalApp
-import org.fdroid.basic.ui.main.details.AppDetails
-import org.fdroid.basic.ui.main.lists.AppList
-import org.fdroid.basic.ui.main.lists.FilterInfo
-import org.fdroid.fdroid.ui.theme.FDroidContent
-
-enum class Sort {
-    NAME,
-    LATEST,
-}
-
-@Composable
-@OptIn(ExperimentalMaterial3AdaptiveApi::class, ExperimentalMaterial3Api::class)
-fun DiscoverScaffold(
-    appList: AppList,
-    discoverModel: DiscoverModel,
-    filterInfo: FilterInfo,
-    onMainNav: (String) -> Unit,
-    onSelectAppItem: (MinimalApp) -> Unit,
-    onAppListChanged: (AppList) -> Unit,
-    currentItem: AppDetailsItem?,
-    modifier: Modifier = Modifier,
-) {
-    val navigator = rememberListDetailPaneScaffoldNavigator<MinimalApp>()
-    val scope = rememberCoroutineScope()
-    BackHandler(enabled = navigator.canNavigateBack()) {
-        scope.launch {
-            navigator.navigateBack()
-        }
-    }
-    val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
-    val isListVisible =
-        navigator.scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
-    ListDetailPaneScaffold(
-        directive = navigator.scaffoldDirective,
-        value = navigator.scaffoldValue,
-        modifier = modifier,
-        listPane = {
-            AnimatedPane {
-                val discoverNavController = rememberNavController()
-                NavHost(navController = discoverNavController, startDestination = "discover") {
-                    composable("discover") {
-                        Discover(
-                            discoverModel = discoverModel,
-                            onTitleTap = {
-                                onAppListChanged(it)
-                                discoverNavController.navigate("list")
-                            },
-                            onAppTap = {
-                                onSelectAppItem(it)
-                                scope.launch { navigator.navigateTo(Detail, it) }
-                            },
-                            onMainNav = { onMainNav(it) },
-                            modifier = Modifier,
-                        )
-                    }
-                    composable("list") {
-                        AppList(
-                            appList = appList,
-                            filterInfo = filterInfo,
-                            currentItem = if (isDetailVisible) currentItem else null,
-                            onBackClicked = { discoverNavController.popBackStack() },
-                            modifier = Modifier,
-                        ) {
-                            onSelectAppItem(it)
-                            scope.launch { navigator.navigateTo(Detail, it) }
-                        }
-                    }
-                }
-            }
-        },
-        detailPane = {
-            AnimatedPane {
-                currentItem?.let {
-                    val back: () -> Unit = { scope.launch { navigator.navigateBack() } }
-                    AppDetails(it, if (isListVisible) null else back)
-                } ?: Text("No app selected", modifier = Modifier.padding(16.dp))
-            }
-        },
-    )
-}
-
-@Preview
-@PreviewScreenSizes
-@Composable
-fun DiscoverScaffoldPreview() {
-    FDroidContent {
-        val apps = listOf(
-            AppNavigationItem("1", "foo", null, "bar", false),
-            AppNavigationItem("2", "foo", null, "bar", false),
-            AppNavigationItem("3", "foo", null, "bar", false),
-        )
-        var filterExpanded by rememberSaveable { mutableStateOf(true) }
-        val filterInfo = object : FilterInfo {
-            override val model = FilterModel(
-                isLoading = false,
-                areFiltersShown = filterExpanded,
-                apps = apps,
-                sortBy = Sort.NAME,
-                allCategories = emptyList(),
-                addedCategories = emptyList(),
-            )
-
-            override fun toggleFilterVisibility() {
-                filterExpanded = !filterExpanded
-            }
-
-            override fun sortBy(sort: Sort) {}
-            override fun addCategory(category: String) {}
-            override fun removeCategory(category: String) {}
-        }
-        DiscoverScaffold(
-            appList = AppList.New,
-            discoverModel = LoadingDiscoverModel(true),
-            filterInfo = filterInfo,
-            onMainNav = {},
-            onSelectAppItem = {},
-            onAppListChanged = {},
-            currentItem = null,
-        )
-    }
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
index 35016f24e..3b018ff0b 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
@@ -26,8 +26,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.ui.main.discover.FilterModel
-import org.fdroid.basic.ui.main.discover.Sort
 
 interface FilterInfo {
     val model: FilterModel
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/FilterPresenter.kt
similarity index 91%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/lists/FilterPresenter.kt
index b7b9f02f1..5aad35c1d 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/FilterPresenter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/FilterPresenter.kt
@@ -1,12 +1,18 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.basic.ui.main.lists
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.basic.ui.categories.Category
+import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import java.util.Locale
 
+enum class Sort {
+    NAME,
+    LATEST,
+}
+
 @Composable
 fun FilterPresenter(
     areFiltersShownFlow: StateFlow<Boolean>,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt
deleted file mode 100644
index 984de2cda..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesScaffold.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-package org.fdroid.basic.ui.main.repositories
-
-import android.content.res.Configuration.UI_MODE_NIGHT_YES
-import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
-import android.os.Parcelable
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.background
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement.spacedBy
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawingPadding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LoadingIndicator
-import androidx.compose.material3.LocalMinimumInteractiveComponentSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.VerticalDragHandle
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.material3.adaptive.layout.AnimatedPane
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole.Detail
-import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
-import androidx.compose.material3.adaptive.layout.defaultDragHandleSemantics
-import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewScreenSizes
-import androidx.compose.ui.unit.dp
-import androidx.core.os.LocaleListCompat
-import kotlinx.coroutines.launch
-import kotlinx.parcelize.Parcelize
-import org.fdroid.basic.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
-
-@Composable
-@OptIn(
-    ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class,
-    ExperimentalMaterial3ExpressiveApi::class
-)
-fun RepositoriesScaffold(
-    repositories: List<Repository>?,
-    currentRepository: Repository?,
-    onRepositorySelected: (Repository) -> Unit,
-    onAddRepo: () -> Unit,
-    onBackClicked: () -> Unit,
-) {
-    val navigator = rememberListDetailPaneScaffoldNavigator<Repository>()
-    val scope = rememberCoroutineScope()
-    BackHandler(enabled = navigator.canNavigateBack()) {
-        scope.launch {
-            navigator.navigateBack()
-        }
-    }
-    val isDetailVisible = navigator.scaffoldValue[Detail] == PaneAdaptedValue.Expanded
-    ListDetailPaneScaffold(
-        directive = navigator.scaffoldDirective,
-        value = navigator.scaffoldValue,
-        listPane = {
-            AnimatedPane {
-                Scaffold(
-                    topBar = {
-                        TopAppBar(
-                            navigationIcon = {
-                                IconButton(onClick = onBackClicked) {
-                                    Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
-                                }
-                            },
-                            title = {
-                                Text(stringResource(R.string.app_details_repositories))
-                            },
-                        )
-                    },
-                    floatingActionButton = {
-                        FloatingActionButton(
-                            onClick = onAddRepo,
-                            modifier = Modifier.padding(16.dp)
-                        ) {
-                            Icon(Icons.Default.Add, contentDescription = "Add repo")
-                        }
-                    }
-                ) { paddingValues ->
-                    if (repositories == null) {
-                        Box(
-                            contentAlignment = Alignment.Center,
-                            modifier = Modifier.fillMaxSize(),
-                        ) {
-                            LoadingIndicator(modifier = Modifier.padding(paddingValues))
-                        }
-                    } else {
-                        RepositoriesList(
-                            repositories = repositories,
-                            currentRepository = if (isDetailVisible) currentRepository else null,
-                            onRepositorySelected = {
-                                onRepositorySelected(it)
-                                scope.launch { navigator.navigateTo(Detail, it) }
-                            },
-                            modifier = Modifier
-                                .padding(paddingValues),
-                        )
-                    }
-                }
-            }
-        },
-        detailPane = {
-            AnimatedPane {
-                Column(
-                    verticalArrangement = spacedBy(16.dp),
-                    modifier = Modifier
-                        .background(MaterialTheme.colorScheme.background)
-                        .safeDrawingPadding(),
-                ) {
-                    currentRepository?.let {
-                        Text(it.getName(LocaleListCompat.getDefault()) ?: "Unknown repo")
-                        Text("This will basically be the repo details screen from latest client")
-                    } ?: Text(text = "No repository selected")
-                }
-            }
-        },
-        paneExpansionDragHandle = { state ->
-            val interactionSource = remember { MutableInteractionSource() }
-            VerticalDragHandle(
-                modifier =
-                    Modifier.paneExpansionDraggable(
-                        state,
-                        LocalMinimumInteractiveComponentSize.current,
-                        interactionSource,
-                        state.defaultDragHandleSemantics(),
-                    ),
-                interactionSource = interactionSource
-            )
-        },
-        modifier = Modifier.background(MaterialTheme.colorScheme.background),
-    )
-}
-
-@Preview(
-    showBackground = true,
-    uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
-)
-@Composable
-fun RepositoriesScaffoldLoadingPreview() {
-    FDroidContent {
-        RepositoriesScaffold(null, null, {}, {}) { }
-    }
-}
-
-@Preview(
-    showBackground = true,
-    uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
-)
-@PreviewScreenSizes
-@Composable
-fun RepositoriesScaffoldPreview() {
-    FDroidContent {
-        val repos = listOf(
-            Repository(
-                address = "http://example.org",
-                timestamp = System.currentTimeMillis(),
-                lastUpdated = null,
-                weight = 1,
-                enabled = true,
-                name = "My first repository",
-            ),
-            Repository(
-                address = "http://example.com",
-                timestamp = System.currentTimeMillis(),
-                lastUpdated = null,
-                weight = 2,
-                enabled = true,
-                name = "My second repository",
-            ),
-        )
-        RepositoriesScaffold(repos, repos[0], {}, {}) { }
-    }
-}
-
-@Parcelize
-data class Repository(
-    val address: String,
-    val timestamp: Long,
-    val lastUpdated: Long?,
-    val weight: Int,
-    val enabled: Boolean,
-    private val name: String,
-) : Parcelable {
-    fun getName(localeList: LocaleListCompat): String? = name
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryList.kt
new file mode 100644
index 000000000..a0d37bbc6
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryList.kt
@@ -0,0 +1,141 @@
+package org.fdroid.basic.ui.main.repositories
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
+import android.os.Parcelable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LoadingIndicator
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
+import kotlinx.parcelize.Parcelize
+import org.fdroid.basic.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+@OptIn(
+    ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class,
+    ExperimentalMaterial3ExpressiveApi::class
+)
+fun RepositoryList(
+    repositories: List<Repository>?,
+    currentRepository: Repository?,
+    onRepositorySelected: (Repository) -> Unit,
+    onAddRepo: () -> Unit,
+    onBackClicked: () -> Unit,
+) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                navigationIcon = {
+                    IconButton(onClick = onBackClicked) {
+                        Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
+                    }
+                },
+                title = {
+                    Text(stringResource(R.string.app_details_repositories))
+                },
+            )
+        },
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = onAddRepo,
+                modifier = Modifier.padding(16.dp)
+            ) {
+                Icon(Icons.Default.Add, contentDescription = "Add repo")
+            }
+        }
+    ) { paddingValues ->
+        if (repositories == null) {
+            Box(
+                contentAlignment = Alignment.Center,
+                modifier = Modifier.fillMaxSize(),
+            ) {
+                LoadingIndicator(modifier = Modifier.padding(paddingValues))
+            }
+        } else {
+            RepositoriesList(
+                repositories = repositories,
+                currentRepository = currentRepository,
+                onRepositorySelected = {
+                    onRepositorySelected(it)
+                },
+                modifier = Modifier
+                    .padding(paddingValues),
+            )
+        }
+    }
+}
+
+@Preview(
+    showBackground = true,
+    uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
+)
+@Composable
+fun RepositoriesScaffoldLoadingPreview() {
+    FDroidContent {
+        RepositoryList(null, null, {}, {}) { }
+    }
+}
+
+@Preview(
+    showBackground = true,
+    uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
+)
+@Composable
+fun RepositoriesScaffoldPreview() {
+    FDroidContent {
+        val repos = listOf(
+            Repository(
+                repoId = 1,
+                address = "http://example.org",
+                timestamp = System.currentTimeMillis(),
+                lastUpdated = null,
+                weight = 1,
+                enabled = true,
+                name = "My first repository",
+            ),
+            Repository(
+                repoId = 2,
+                address = "http://example.com",
+                timestamp = System.currentTimeMillis(),
+                lastUpdated = null,
+                weight = 2,
+                enabled = true,
+                name = "My second repository",
+            ),
+        )
+        RepositoryList(repos, repos[0], {}, {}) { }
+    }
+}
+
+@Parcelize
+data class Repository(
+    val repoId: Long,
+    val address: String,
+    val timestamp: Long,
+    val lastUpdated: Long?,
+    val weight: Int,
+    val enabled: Boolean,
+    private val name: String,
+) : Parcelable {
+    fun getName(localeList: LocaleListCompat): String? = name
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 51dd36a22..e5510c5cd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,6 +10,7 @@ dokka = "2.1.0"
 mavenPublish = "0.34.0"
 jlleitschuhKtlint = "13.1.0"
 
+kotlinxSerializationCore = "1.8.1"
 kotlinxSerializationJson = "1.9.0"
 kotlinxCoroutinesTest = "1.10.2"
 
@@ -36,8 +37,13 @@ androidxVectordrawable = "1.2.0"
 androidxGridlayout = "1.1.0"
 androidxComposeBom = "2025.09.01"
 androidxActivityCompose = "1.11.0"
-androidxNavCompose = "2.9.1"
 accompanistDrawablepainter = "0.37.3"
+
+# navigation3
+nav3Core = "1.0.0-alpha10"
+lifecycleViewmodelNav3 = "2.10.0-alpha04"
+material3AdaptiveNav3 = "1.0.0-alpha03"
+
 material = "1.13.0"
 
 #noinspection GradleDependency newer version need minSdk 24 or library desugering
@@ -84,6 +90,7 @@ json = "20220320"
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerializationCore" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
 
@@ -110,13 +117,12 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom-alpha",
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose" }
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavCompose" }
+androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "lifecycleViewmodelNav3" }
+androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "nav3Core" }
+androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "nav3Core" }
 androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
-androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" }
-androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation" }
-androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout" }
-androidx-compose-material3-adaptive-navigation-suite-android = { module = "androidx.compose.material3:material3-adaptive-navigation-suite-android" }
+androidx-compose-material3-adaptive-navigation3 = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation3", version.ref = "material3AdaptiveNav3" }
 androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
 androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidxHiltCompiler" }
 

From ffb762016ffb041b6dcc19cf7952662c4e2bfb5c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 17 Jul 2025 17:39:38 -0300
Subject: [PATCH 028/180] Use real data for 'My apps' and make app details menu
 functional

---
 basic/src/main/AndroidManifest.xml            |   5 +-
 basic/src/main/java/org/fdroid/basic/App.kt   |  13 +-
 .../java/org/fdroid/basic/MainViewModel.kt    |  17 +-
 .../fdroid/basic/details/AppDetailsItem.kt    |  48 ++-
 ...tailsManager.kt => AppDetailsViewModel.kt} |  62 +++-
 .../fdroid/basic/details/DetailsPresenter.kt  |  62 +++-
 .../org/fdroid/basic/manager/MyAppsManager.kt | 168 +++-------
 .../main/java/org/fdroid/basic/ui/Utils.kt    |  21 ++
 .../basic/ui/icons/ApplicationIconFetcher.kt  |  65 ++++
 .../org/fdroid/basic/ui/main/BottomBar.kt     |  10 +-
 .../java/org/fdroid/basic/ui/main/Main.kt     |  51 +--
 .../fdroid/basic/ui/main/apps/InstalledApp.kt |  12 +-
 .../basic/ui/main/apps/InstalledAppRow.kt     |  36 +--
 .../org/fdroid/basic/ui/main/apps/MyApps.kt   | 303 +++++++++++-------
 .../basic/ui/main/apps/MyAppsPresenter.kt     |  44 +++
 .../basic/ui/main/apps/MyAppsViewModel.kt     |  94 ++++++
 .../fdroid/basic/ui/main/apps/UpdatableApp.kt |  15 -
 .../basic/ui/main/apps/UpdatableAppRow.kt     |  67 ++--
 .../basic/ui/main/details/AppDetails.kt       |  58 +---
 .../basic/ui/main/details/AppDetailsHeader.kt |  20 +-
 .../basic/ui/main/details/AppDetailsMenu.kt   | 113 +++++--
 .../ui/main/details/AppDetailsTopAppBar.kt    |  73 +++++
 .../org/fdroid/basic/ui/main/lists/AppList.kt |   9 +-
 23 files changed, 866 insertions(+), 500 deletions(-)
 rename basic/src/main/java/org/fdroid/basic/details/{AppDetailsManager.kt => AppDetailsViewModel.kt} (51%)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/icons/ApplicationIconFetcher.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt

diff --git a/basic/src/main/AndroidManifest.xml b/basic/src/main/AndroidManifest.xml
index 12044e4a3..f779415c6 100644
--- a/basic/src/main/AndroidManifest.xml
+++ b/basic/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -31,8 +31,7 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove">
-        </provider>
+            tools:node="remove" />
     </application>
 
 </manifest>
diff --git a/basic/src/main/java/org/fdroid/basic/App.kt b/basic/src/main/java/org/fdroid/basic/App.kt
index 10afa220f..4af5014d5 100644
--- a/basic/src/main/java/org/fdroid/basic/App.kt
+++ b/basic/src/main/java/org/fdroid/basic/App.kt
@@ -15,6 +15,8 @@ import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.HiltAndroidApp
 import org.fdroid.basic.repo.RepoUpdateWorker
+import org.fdroid.basic.ui.icons.ApplicationIconFetcher
+import org.fdroid.basic.ui.icons.PackageName
 import org.fdroid.download.DownloadRequest
 import org.fdroid.download.coil.DownloadRequestFetcher
 import javax.inject.Inject
@@ -24,6 +26,7 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
 
     @Inject
     lateinit var workerFactory: HiltWorkerFactory
+
     @Inject
     lateinit var downloadRequestFetcherFactory: DownloadRequestFetcher.Factory
 
@@ -41,7 +44,7 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
         return ImageLoader.Builder(context)
             .crossfade(true)
             .components {
-                val keyer = object : Keyer<DownloadRequest> {
+                val downloadRequestKeyer = object : Keyer<DownloadRequest> {
                     override fun key(
                         data: DownloadRequest,
                         options: Options
@@ -50,8 +53,14 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
                             ?: (data.mirrors[0].baseUrl + data.indexFile.name)
                     }
                 }
-                add(keyer)
+                add(downloadRequestKeyer)
                 add(downloadRequestFetcherFactory)
+
+                val packageNameKeyer = object : Keyer<PackageName> {
+                    override fun key(data: PackageName, options: Options): String = data.packageName
+                }
+                add(packageNameKeyer)
+                add(ApplicationIconFetcher.Factory(this@App.applicationContext, downloadRequestFetcherFactory))
             }
             .memoryCache {
                 MemoryCache.Builder()
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index a087f8bf1..717102bae 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -16,19 +16,16 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
-import org.fdroid.basic.details.AppDetailsManager
 import org.fdroid.basic.download.getDownloadRequest
-import org.fdroid.basic.manager.MyAppsManager
 import org.fdroid.basic.repo.RepositoryManager
 import org.fdroid.basic.ui.categories.Category
-import org.fdroid.basic.ui.main.apps.MinimalApp
 import org.fdroid.basic.ui.main.discover.AppNavigationItem
 import org.fdroid.basic.ui.main.discover.DiscoverModel
 import org.fdroid.basic.ui.main.discover.DiscoverPresenter
+import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.basic.ui.main.lists.FilterModel
 import org.fdroid.basic.ui.main.lists.FilterPresenter
 import org.fdroid.basic.ui.main.lists.Sort
-import org.fdroid.basic.ui.main.lists.AppList
 import org.fdroid.database.FDroidDatabase
 import java.text.Collator
 import java.util.Locale
@@ -38,9 +35,7 @@ import javax.inject.Inject
 class MainViewModel @Inject constructor(
     app: Application,
     savedStateHandle: SavedStateHandle,
-    val myAppsManager: MyAppsManager,
-    private val db: FDroidDatabase,
-    private val appDetailsManager: AppDetailsManager,
+    db: FDroidDatabase,
     val repositoryManager: RepositoryManager,
 ) : AndroidViewModel(app) {
 
@@ -97,19 +92,11 @@ class MainViewModel @Inject constructor(
             addedCategoriesFlow = addedCategories,
         )
     }
-    val updates = myAppsManager.updates
-    val installed = myAppsManager.installed
-    val numUpdates = myAppsManager.numUpdates
-    val appDetails = appDetailsManager.appDetails
 
     fun setAppList(appList: AppList) {
         _currentList.value = appList
     }
 
-    fun setAppDetails(app: MinimalApp) {
-        appDetailsManager.setAppDetails(app)
-    }
-
     fun toggleListFilterVisibility() {
         _showFilters.update { !it }
     }
diff --git a/basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt b/basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt
index 2171e9c6b..b0865296e 100644
--- a/basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt
+++ b/basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt
@@ -12,6 +12,7 @@ import org.fdroid.database.AppPrefs
 import org.fdroid.database.AppVersion
 import org.fdroid.database.Repository
 import org.fdroid.download.DownloadRequest
+import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
@@ -21,8 +22,19 @@ enum class MainButtonState {
     NONE, INSTALL, UPDATE
 }
 
+class AppDetailsActions(
+    val allowBetaVersions: () -> Unit,
+    val ignoreAllUpdates: (() -> Unit)? = null,
+    val ignoreThisUpdate: (() -> Unit)? = null,
+    val shareApk: (() -> Unit)? = null,
+    val uninstallApp: (() -> Unit)? = null,
+    val launchIntent: Intent? = null,
+    val shareIntent: Intent? = null,
+)
+
 data class AppDetailsItem(
     val app: AppMetadata,
+    val actions: AppDetailsActions,
     /**
      * The ID of the repo that is currently set as preferred.
      * Note that the repository ID of this [app] may be different.
@@ -45,11 +57,18 @@ data class AppDetailsItem(
      * Needed, because the [installedVersion] may not be available, e.g. too old.
      */
     val installedVersionCode: Long? = null,
+    /**
+     * The currently suggested version for installation.
+     */
     val suggestedVersion: PackageVersion? = null,
+    /**
+     * Similar to [suggestedVersion], but doesn't obey [appPrefs] for ignoring versions.
+     * This is useful for (un-)ignoring this version.
+     */
+    val possibleUpdate: PackageVersion? = null,
     val appPrefs: AppPrefs? = null,
     val whatsNew: String? = null,
     val antiFeatures: List<AntiFeature>? = null,
-    val launchIntent: Intent? = null,
     /**
      * true if this app from this repository has no versions with a
      * compatible signer. This means that the app is installed, but does not receive updates either
@@ -63,17 +82,19 @@ data class AppDetailsItem(
         preferredRepoId: Long,
         repositories: List<Repository>,
         dbApp: App,
+        actions: AppDetailsActions,
         versions: List<AppVersion>?,
         installedVersion: AppVersion?,
         installedVersionCode: Long?,
         suggestedVersion: AppVersion?,
+        possibleUpdate: AppVersion?,
         appPrefs: AppPrefs?,
-        launchIntent: Intent?,
         noCompatibleVersions: Boolean,
         authorHasMoreThanOneApp: Boolean,
         localeList: LocaleListCompat,
     ) : this(
         app = dbApp.metadata,
+        actions = actions,
         preferredRepoId = preferredRepoId,
         repositories = repositories,
         name = dbApp.name ?: "Unknown App",
@@ -93,12 +114,12 @@ data class AppDetailsItem(
         installedVersion = installedVersion,
         installedVersionCode = installedVersionCode,
         suggestedVersion = suggestedVersion,
+        possibleUpdate = possibleUpdate,
         appPrefs = appPrefs,
         whatsNew = installedVersion?.getWhatsNew(localeList),
         antiFeatures = installedVersion?.getAntiFeatures(repository, localeList)
             ?: suggestedVersion?.getAntiFeatures(repository, localeList)
             ?: versions?.first()?.getAntiFeatures(repository, localeList),
-        launchIntent = launchIntent,
         noCompatibleVersions = noCompatibleVersions,
         authorHasMoreThanOneApp = authorHasMoreThanOneApp,
     )
@@ -107,7 +128,23 @@ data class AppDetailsItem(
      * True if the app is installed (and has a launch intent)
      * and thus the 'Open' button should be shown.
      */
-    val showOpenButton: Boolean get() = launchIntent != null
+    val showOpenButton: Boolean get() = actions.launchIntent != null
+    val allowsBetaVersions: Boolean
+        get() = appPrefs?.releaseChannels?.contains(RELEASE_CHANNEL_BETA) == true
+
+    val ignoresAllUpdates: Boolean get() = appPrefs?.ignoreAllUpdates == true
+
+    /**
+     * True if the update from [possibleUpdate] is being ignored
+     * and not already ignoring all updates anyway.
+     */
+    val ignoresCurrentUpdate: Boolean
+        get() {
+            if (ignoresAllUpdates) return false
+            val prefs = appPrefs ?: return false
+            val updateVersionCode = possibleUpdate?.versionCode ?: return false
+            return actions.ignoreThisUpdate != null && prefs.shouldIgnoreUpdate(updateVersionCode)
+        }
 
     /**
      * Specifies what main button should be shown.
@@ -244,6 +281,8 @@ val testApp = AppDetailsItem(
         categories = listOf("Internet", "Multimedia"),
         isCompatible = true,
     ),
+    actions = AppDetailsActions({}, {}, {}, {}, {}, Intent(), Intent()),
+    appPrefs = AppPrefs("org.schabi.newpipe"),
     name = "New Pipe",
     summary = "Lightweight YouTube frontend",
     description = "NewPipe does not use any Google framework libraries, or the YouTube API. " +
@@ -277,4 +316,5 @@ val testApp = AppDetailsItem(
     ),
     installedVersion = testVersion2,
     suggestedVersion = testVersion1,
+    possibleUpdate = testVersion1,
 )
diff --git a/basic/src/main/java/org/fdroid/basic/details/AppDetailsManager.kt b/basic/src/main/java/org/fdroid/basic/details/AppDetailsViewModel.kt
similarity index 51%
rename from basic/src/main/java/org/fdroid/basic/details/AppDetailsManager.kt
rename to basic/src/main/java/org/fdroid/basic/details/AppDetailsViewModel.kt
index ead848ede..ee6237c44 100644
--- a/basic/src/main/java/org/fdroid/basic/details/AppDetailsManager.kt
+++ b/basic/src/main/java/org/fdroid/basic/details/AppDetailsViewModel.kt
@@ -1,34 +1,37 @@
 package org.fdroid.basic.details
 
-import android.content.Context
+import android.app.Application
 import android.content.Intent
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.GET_SIGNATURES
+import androidx.annotation.UiThread
+import androidx.lifecycle.AndroidViewModel
 import app.cash.molecule.RecompositionMode.Immediate
 import app.cash.molecule.launchMolecule
-import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.fdroid.UpdateChecker
-import org.fdroid.basic.ui.main.apps.MinimalApp
+import org.fdroid.basic.manager.MyAppsManager
 import org.fdroid.basic.utils.IoDispatcher
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.RepoManager
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
-class AppDetailsManager @Inject constructor(
-    @ApplicationContext private val context: Context,
+@HiltViewModel
+class AppDetailsViewModel @Inject constructor(
+    private val app: Application,
     @IoDispatcher private val scope: CoroutineScope,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
     private val updateChecker: UpdateChecker,
-) {
+    private val myAppsManager: MyAppsManager,
+) : AndroidViewModel(app) {
     private val packageInfoFlow = MutableStateFlow<AppInfo?>(null)
 
     val appDetails: StateFlow<AppDetailsItem?> = scope.launchMolecule(
@@ -38,27 +41,56 @@ class AppDetailsManager @Inject constructor(
             db = db,
             repoManager = repoManager,
             updateChecker = updateChecker,
+            viewModel = this,
             packageInfoFlow = packageInfoFlow,
         )
     }
 
-    fun setAppDetails(minimalApp: MinimalApp?) {
+    fun setAppDetails(packageName: String) {
         packageInfoFlow.value = null
-        val packageManager = context.packageManager
-        if (minimalApp != null) scope.launch {
+        val packageManager = app.packageManager
+        scope.launch {
             val packageInfo = try {
-                packageManager.getPackageInfo(minimalApp.packageName, GET_SIGNATURES)
+                packageManager.getPackageInfo(packageName, GET_SIGNATURES)
             } catch (_: PackageManager.NameNotFoundException) {
                 null
             }
             packageInfoFlow.value = if (packageInfo == null) {
-                AppInfo(minimalApp.packageName)
+                AppInfo(packageName)
             } else {
-                val intent = packageManager.getLaunchIntentForPackage(minimalApp.packageName)
-                AppInfo(minimalApp.packageName, packageInfo, intent)
+                val intent = packageManager.getLaunchIntentForPackage(packageName)
+                AppInfo(packageName, packageInfo, intent)
             }
         }
     }
+
+    @UiThread
+    fun allowBetaUpdates() {
+        val appPrefs = appDetails.value?.appPrefs ?: return
+        scope.launch {
+            db.getAppPrefsDao().update(appPrefs.toggleReleaseChannel(RELEASE_CHANNEL_BETA))
+            myAppsManager.loadUpdates()
+        }
+    }
+
+    @UiThread
+    fun ignoreAllUpdates() {
+        val appPrefs = appDetails.value?.appPrefs ?: return
+        scope.launch {
+            db.getAppPrefsDao().update(appPrefs.toggleIgnoreAllUpdates())
+            myAppsManager.loadUpdates()
+        }
+    }
+
+    @UiThread
+    fun ignoreThisUpdate() {
+        val appPrefs = appDetails.value?.appPrefs ?: return
+        val versionCode = appDetails.value?.possibleUpdate?.versionCode ?: return
+        scope.launch {
+            db.getAppPrefsDao().update(appPrefs.toggleIgnoreVersionCodeUpdate(versionCode))
+            myAppsManager.loadUpdates()
+        }
+    }
 }
 
 class AppInfo(
diff --git a/basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt b/basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt
index 628c6d26b..46ad81710 100644
--- a/basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt
+++ b/basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt
@@ -1,10 +1,12 @@
 package org.fdroid.basic.details
 
+import android.content.Intent
 import android.util.Log
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.core.content.pm.PackageInfoCompat.getLongVersionCode
+import androidx.core.net.toUri
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.asFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -22,6 +24,7 @@ fun DetailsPresenter(
     db: FDroidDatabase,
     repoManager: RepoManager,
     updateChecker: UpdateChecker,
+    viewModel: AppDetailsViewModel,
     packageInfoFlow: StateFlow<AppInfo?>,
 ): AppDetailsItem? {
     val packagePair = packageInfoFlow.collectAsState().value ?: return null
@@ -47,25 +50,33 @@ fun DetailsPresenter(
         updateChecker.getSuggestedVersion(
             versions = versions,
             preferredSigner = app.metadata.preferredSigner,
-            // TODO releaseChannels beta
-            releaseChannels = null,
+            releaseChannels = appPrefs.releaseChannels,
             preferencesGetter = { appPrefs },
         )
     }
+    val possibleUpdate = if (versions == null || appPrefs == null) {
+        null
+    } else {
+        updateChecker.getUpdate(
+            versions = versions,
+            allowedSignersGetter = app.metadata.preferredSigner?.let { { setOf(it) } },
+            allowedReleaseChannels = appPrefs.releaseChannels,
+            preferencesGetter = null, // ignoring existing preferences to include ignored versions
+        )
+    }
     val installedVersionCode = packagePair.packageInfo?.let {
         getLongVersionCode(packagePair.packageInfo)
     }
     val installedVersion = packagePair.packageInfo?.let {
         versions?.find { it.versionCode == installedVersionCode }
     }
+    val installedSigner = packagePair.packageInfo?.signatures?.get(0)?.let {
+        sha256(it.toByteArray())
+    }
     val noCompatibleVersions = if (packagePair.packageInfo != null && versions != null) {
-        // get installed signer
-        val signer = packagePair.packageInfo.signatures?.get(0)?.let {
-            sha256(it.toByteArray())
-        }
         // return true of no version has same signer
         versions.none { version ->
-            version.manifest.signer?.sha256?.get(0) == signer
+            version.manifest.signer?.sha256?.get(0) == installedSigner
         }
     } else {
         false
@@ -84,14 +95,49 @@ fun DetailsPresenter(
         preferredRepoId = preferredRepoId,
         repositories = repositories, // TODO maybe use emptyList() when only in F-Droid repo
         dbApp = app,
+        actions = AppDetailsActions(
+            allowBetaVersions = viewModel::allowBetaUpdates,
+            ignoreAllUpdates = if (installedVersionCode == null) {
+                null
+            } else {
+                viewModel::ignoreAllUpdates
+            },
+            ignoreThisUpdate = if (installedVersionCode == null || possibleUpdate == null ||
+                possibleUpdate.versionCode <= installedVersionCode
+            ) {
+                null
+            } else {
+                viewModel::ignoreThisUpdate
+            },
+            shareApk = null, // TODO
+            uninstallApp = null, // TODO
+            launchIntent = packagePair.launchIntent,
+            shareIntent = getShareIntent(repo, packageName, app.name ?: ""),
+        ),
         versions = versions,
         installedVersion = installedVersion,
         installedVersionCode = installedVersionCode,
         suggestedVersion = suggestedVersion,
+        possibleUpdate = possibleUpdate,
         appPrefs = appPrefs,
-        launchIntent = packagePair.launchIntent,
         noCompatibleVersions = noCompatibleVersions,
         authorHasMoreThanOneApp = authorHasMoreThanOneApp,
         localeList = locales,
     )
 }
+
+private fun getShareIntent(
+    repo: org.fdroid.database.Repository,
+    packageName: String,
+    appName: String,
+): Intent? {
+    val webBaseUrl = repo.webBaseUrl ?: return null
+    val shareUri = webBaseUrl.toUri().buildUpon().appendPath(packageName).build()
+    val uriIntent = Intent(Intent.ACTION_SEND).apply {
+        setType("text/plain")
+        putExtra(Intent.EXTRA_SUBJECT, appName)
+        putExtra(Intent.EXTRA_TITLE, appName)
+        putExtra(Intent.EXTRA_TEXT, shareUri.toString())
+    }
+    return Intent.createChooser(uriIntent, appName)
+}
diff --git a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
index bbdc7737b..02cb7c615 100644
--- a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
+++ b/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
@@ -1,143 +1,59 @@
 package org.fdroid.basic.manager
 
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
+import androidx.core.os.LocaleListCompat
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.fdroid.basic.ui.Icons
-import org.fdroid.basic.ui.Names
-import org.fdroid.basic.ui.main.apps.InstalledApp
-import org.fdroid.basic.ui.main.apps.UpdatableApp
-import org.fdroid.basic.ui.main.lists.Sort
-import java.util.Locale
+import org.fdroid.basic.download.getDownloadRequest
+import org.fdroid.basic.repo.RepositoryManager
+import org.fdroid.basic.utils.IoDispatcher
+import org.fdroid.database.DbUpdateChecker
+import org.fdroid.download.DownloadRequest
+import org.fdroid.index.v2.PackageVersion
 import javax.inject.Inject
 import javax.inject.Singleton
 
+data class AppUpdateItem(
+    val packageName: String,
+    val name: String,
+    val installedVersionName: String,
+    val update: PackageVersion,
+    val whatsNew: String?,
+    val iconDownloadRequest: DownloadRequest? = null,
+)
+
 @Singleton
-class MyAppsManager @Inject constructor() {
-
-    private val _updates = MutableStateFlow<List<UpdatableApp>>(emptyList())
+class MyAppsManager @Inject constructor(
+    private val dbUpdateChecker: DbUpdateChecker,
+    @IoDispatcher private val coroutineScope: CoroutineScope,
+    private val repositoryManager: RepositoryManager,
+) {
+    private val _updates = MutableStateFlow<List<AppUpdateItem>?>(null)
     val updates = _updates.asStateFlow()
-    private val _installed = MutableStateFlow<List<InstalledApp>>(installedApps)
-    val installed = _installed.asStateFlow()
-    val numUpdates = _updates.map { it.size }
-    private val _sortBy = MutableStateFlow<Sort>(Sort.NAME)
-    val sortBy = _sortBy.asStateFlow()
-
-    companion object {
-        val installedApps = listOf(
-            InstalledApp(
-                packageName = "1000",
-                name = Names.randomName,
-                icon = Icons.randomIcon,
-                versionName = "1.0.1",
-            ),
-            InstalledApp(
-                packageName = "1001",
-                name = Names.randomName,
-                icon = Icons.randomIcon,
-                versionName = "0.1",
-            ),
-            InstalledApp(
-                packageName = "1002",
-                name = Names.randomName,
-                icon = Icons.randomIcon,
-                versionName = "3.0.1",
-            ),
-            InstalledApp(
-                packageName = "1003",
-                name = Names.randomName,
-                icon = Icons.randomIcon,
-                versionName = "0.2.1",
-            ),
-            InstalledApp(
-                packageName = "1004",
-                name = Names.randomName,
-                icon = Icons.randomIcon,
-                versionName = "0.0.1",
-            ),
-            InstalledApp(
-                packageName = "1005",
-                name = Names.randomName,
-                icon = Icons.randomIcon,
-                versionName = "1.1.1",
-            ),
-            InstalledApp(
-                packageName = "1006",
-                name = Names.randomName,
-                icon = Icons.randomIcon,
-                versionName = "2.0.1",
-            ),
-        ).sortedBy { it.name.lowercase(Locale.getDefault()) }
-    }
+    private val _numUpdates = MutableStateFlow(0)
+    val numUpdates = _numUpdates.asStateFlow()
 
     init {
-        GlobalScope.launch {
-            delay(5_000)
-            _updates.update {
-                listOf(
-                    UpdatableApp(
-                        packageName = "2000",
-                        name = Names.randomName,
-                        icon = Icons.randomIcon,
-                        currentVersionName = "1.0.1",
-                        updateVersionName = "1.1.0",
-                        size = 123456789,
-                        whatsNew = "Lots of changes in this version!\nThey are all awesome.\n" +
-                            "Only the best changes."
-                    ),
-                    UpdatableApp(
-                        packageName = "2001",
-                        name = Names.randomName,
-                        icon = Icons.randomIcon,
-                        currentVersionName = "3.0.1",
-                        updateVersionName = "3.1.0",
-                        size = 9876543,
-                    ),
-                    UpdatableApp(
-                        packageName = "2002",
-                        name = Names.randomName,
-                        currentVersionName = "4.0.1",
-                        updateVersionName = "4.3.0",
-                        size = 4561237,
-                        whatsNew = "This new version is super fast and aimed at fixing some bugs and enhancing your experience even more. So take the chance to update your app and always enjoy the best of Inter. In addition to the exciting new features in the latest version, we regularly release new versions to improve what you are already using on our app. To keep making your life simpler, keep your app up to date and take advantage of everything we prepare for you. "
-                    ),
-                    UpdatableApp(
-                        packageName = "2003",
-                        name = Names.randomName,
-                        icon = Icons.randomIcon,
-                        currentVersionName = "3.0.1",
-                        updateVersionName = "3.1.0",
-                        size = 9876543,
-                    ),
-                ).sortedBy { it.name.lowercase(Locale.getDefault()) }
-            }
-        }
+        loadUpdates()
     }
 
-    fun sortBy(sort: Sort) {
-        when (sort) {
-            Sort.NAME -> {
-                _updates.update {
-                    it.sortedBy { it.name.lowercase(Locale.getDefault()) }
-                }
-                _installed.update {
-                    it.sortedBy { it.name.lowercase(Locale.getDefault()) }
-                }
-            }
-            Sort.LATEST -> {
-                _updates.update {
-                    it.sortedBy { it.packageName }
-                }
-                _installed.update {
-                    it.sortedBy { it.packageName }
-                }
-            }
+    fun loadUpdates() = coroutineScope.launch {
+        // TODO (includeKnownVulnerabilities = true) and show in AppDetails
+        val localeList = LocaleListCompat.getDefault()
+        val updates = dbUpdateChecker.getUpdatableApps(onlyFromPreferredRepo = true).map { update ->
+            AppUpdateItem(
+                packageName = update.packageName,
+                name = update.name ?: "Unknown app",
+                installedVersionName = update.installedVersionName,
+                update = update.update,
+                whatsNew = update.update.getWhatsNew(localeList),
+                iconDownloadRequest = repositoryManager.getRepository(update.repoId)?.let { repo ->
+                    update.getIcon(localeList)?.getDownloadRequest(repo)
+                },
+            )
         }
-        _sortBy.value = sort
+        _updates.value = updates
+        _numUpdates.value = updates.size
     }
-
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Utils.kt b/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
index e13df4e44..2e0f56645 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
@@ -1,8 +1,29 @@
 package org.fdroid.basic.ui
 
 import android.text.format.DateUtils
+import org.fdroid.index.v2.PackageManifest
+import org.fdroid.index.v2.PackageVersion
+import org.fdroid.index.v2.SignerV2
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
+import java.util.concurrent.TimeUnit
+
+fun getPreviewVersion(versionName: String, size: Long? = null) = object : PackageVersion {
+    override val versionCode: Long = 23
+    override val versionName: String = versionName
+    override val added: Long = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(3)
+    override val size: Long? = size
+    override val signer: SignerV2? = null
+    override val releaseChannels: List<String>? = null
+    override val packageManifest: PackageManifest = object : PackageManifest {
+        override val minSdkVersion: Int? = null
+        override val maxSdkVersion: Int? = null
+        override val featureNames: List<String>? = null
+        override val nativecode: List<String>? = null
+        override val targetSdkVersion: Int? = null
+    }
+    override val hasKnownVulnerability: Boolean = false
+}
 
 fun Long.asRelativeTimeString(): String {
     return DateUtils.getRelativeTimeSpanString(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/icons/ApplicationIconFetcher.kt b/basic/src/main/java/org/fdroid/basic/ui/icons/ApplicationIconFetcher.kt
new file mode 100644
index 000000000..be7d717d2
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/icons/ApplicationIconFetcher.kt
@@ -0,0 +1,65 @@
+package org.fdroid.basic.ui.icons
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build.VERSION.SDK_INT
+import coil3.ImageLoader
+import coil3.asImage
+import coil3.decode.DataSource
+import coil3.fetch.FetchResult
+import coil3.fetch.Fetcher
+import coil3.fetch.ImageFetchResult
+import mu.KotlinLogging
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.coil.DownloadRequestFetcher
+import javax.inject.Inject
+
+data class PackageName(val packageName: String, val iconDownloadRequest: DownloadRequest?)
+
+class ApplicationIconFetcher(
+    private val packageManager: PackageManager,
+    private val data: PackageName,
+    private val downloadRequestFetcher: Fetcher?,
+) : Fetcher {
+
+    private val log = KotlinLogging.logger { }
+
+    override suspend fun fetch(): FetchResult? {
+        val drawable = try {
+            val info = packageManager.getApplicationInfo(data.packageName, 0)
+            info.loadUnbadgedIcon(packageManager)
+        } catch (e: PackageManager.NameNotFoundException) {
+            log.error(e) { "Error getting icon from packageManager: " }
+            return downloadRequestFetcher?.fetch()
+        }
+
+        if (SDK_INT >= 30 && packageManager.isDefaultApplicationIcon(drawable)) {
+            log.warn {
+                "Could not extract image for ${data.packageName}"
+            }
+            return downloadRequestFetcher?.fetch()
+        }
+        return ImageFetchResult(
+            image = drawable.asImage(),
+            isSampled = false,
+            dataSource = DataSource.DISK,
+        )
+    }
+
+    class Factory @Inject constructor(
+        private val context: Context,
+        private val downloadRequestFetcherFactory: DownloadRequestFetcher.Factory,
+    ) : Fetcher.Factory<PackageName> {
+        override fun create(
+            data: PackageName,
+            options: coil3.request.Options,
+            imageLoader: ImageLoader,
+        ): Fetcher? = ApplicationIconFetcher(
+            packageManager = context.packageManager,
+            data = data,
+            downloadRequestFetcher = data.iconDownloadRequest?.let {
+                downloadRequestFetcherFactory.create(it, options, imageLoader)
+            },
+        )
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt
index 9d2d1a6d7..97f2576b8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt
@@ -9,6 +9,7 @@ import androidx.compose.material3.NavigationRail
 import androidx.compose.material3.NavigationRailItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.basic.ui.BottomNavDestinations
@@ -31,8 +32,13 @@ fun BottomBar(numUpdates: Int, currentNavKey: NavKey, onNav: (NavigationKey) ->
 }
 
 @Composable
-fun NavigationRail(numUpdates: Int, currentNavKey: NavKey, onNav: (NavigationKey) -> Unit) {
-    NavigationRail {
+fun NavigationRail(
+    numUpdates: Int,
+    currentNavKey: NavKey,
+    onNav: (NavigationKey) -> Unit,
+    modifier: Modifier,
+) {
+    NavigationRail(modifier) {
         BottomNavDestinations.entries.forEach { dest ->
             NavigationRailItem(
                 icon = { NavIcon(dest, numUpdates) },
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index 4698e9020..43fff63dd 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -16,6 +16,7 @@ import androidx.compose.material3.adaptive.layout.calculatePaneScaffoldDirective
 import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
 import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneStrategy
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -31,9 +32,11 @@ import androidx.navigation3.ui.NavDisplay
 import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import org.fdroid.basic.MainViewModel
 import org.fdroid.basic.R
+import org.fdroid.basic.details.AppDetailsViewModel
 import org.fdroid.basic.ui.NavigationKey
 import org.fdroid.basic.ui.icons.PackageVariant
 import org.fdroid.basic.ui.main.apps.MyApps
+import org.fdroid.basic.ui.main.apps.MyAppsViewModel
 import org.fdroid.basic.ui.main.details.AppDetails
 import org.fdroid.basic.ui.main.discover.Discover
 import org.fdroid.basic.ui.main.lists.AppList
@@ -78,7 +81,7 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
     val isBigScreen = remember(windowAdaptiveInfo) {
         windowAdaptiveInfo.windowSizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND)
     }
-    val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>()//(directive = directive)
+    val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>(directive = directive)
     FDroidContent {
         NavDisplay(
             backStack = backStack,
@@ -97,7 +100,8 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                         Text("No app selected")
                     },
                 ) {
-                    val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
+                    val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
+                    val numUpdates = myAppsViewModel.numUpdates.collectAsStateWithLifecycle(0).value
                     Discover(
                         discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
                         onTitleTap = {
@@ -105,7 +109,6 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                             backStack.add(NavigationKey.AppList)
                         },
                         onAppTap = {
-                            viewModel.setAppDetails(it)
                             backStack.add(NavigationKey.AppDetails(it.packageName))
                         },
                         onNav = { backStack.add(it) },
@@ -119,31 +122,35 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                         Text("No app selected")
                     },
                 ) {
-                    val updates = viewModel.updates.collectAsStateWithLifecycle().value
-                    val installed = viewModel.installed.collectAsStateWithLifecycle().value
-                    val currentItem = viewModel.appDetails.collectAsStateWithLifecycle().value
+                    val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
+                    val myAppsModel =
+                        myAppsViewModel.myAppsModel.collectAsStateWithLifecycle().value
                     MyApps(
-                        updatableApps = updates,
-                        installedApps = installed,
-                        currentItem = currentItem,
-                        onItemClick = {
-                            viewModel.setAppDetails(it)
-                            backStack.add(NavigationKey.AppDetails(it.packageName))
+                        myAppsModel = myAppsModel,
+                        currentPackageName = if (isBigScreen) {
+                            (backStack.last() as? NavigationKey.AppDetails)?.packageName
+                        } else null,
+                        onAppItemClick = {
+                            backStack.add(NavigationKey.AppDetails(it))
                         },
                         onNav = { backStack.add(it) },
-                        sortBy = viewModel.myAppsManager.sortBy.collectAsStateWithLifecycle().value,
+                        onRefresh = myAppsViewModel::refresh,
                         isBigScreen = isBigScreen,
-                        onSortChanged = viewModel.myAppsManager::sortBy,
+                        onSortChanged = myAppsViewModel::changeSortOrder,
                     )
                 }
                 entry<NavigationKey.AppDetails>(
                     metadata = ListDetailSceneStrategy.detailPane("appdetails")
                 ) {
-                    val currentItem = viewModel.appDetails.collectAsStateWithLifecycle().value
-                    it.packageName // TODO use?
+                    val appDetailsViewModel = hiltViewModel<AppDetailsViewModel>()
+                    LaunchedEffect(it.packageName) {
+                        appDetailsViewModel.setAppDetails(it.packageName)
+                    }
                     AppDetails(
-                        appItem = currentItem,
-                        onBackNav = { backStack.removeLastOrNull() },
+                        item = appDetailsViewModel.appDetails.collectAsStateWithLifecycle().value,
+                        onBackNav = if (isBigScreen) null else {
+                            { backStack.removeLastOrNull() }
+                        },
                         modifier = Modifier,
                     )
                 }
@@ -165,15 +172,15 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                         override fun removeCategory(category: String) =
                             viewModel.removeCategory(category)
                     }
-                    val currentItem = viewModel.appDetails.collectAsStateWithLifecycle().value
                     AppList(
                         appList = viewModel.currentList.collectAsStateWithLifecycle().value,
                         filterInfo = filterInfo,
-                        currentItem = currentItem,
+                        currentPackageName = if (isBigScreen) {
+                            (backStack.last() as? NavigationKey.AppDetails)?.packageName
+                        } else null,
                         onBackClicked = { backStack.removeLastOrNull() },
                         modifier = Modifier,
                     ) {
-                        viewModel.setAppDetails(it)
                         backStack.add(NavigationKey.AppDetails(it.packageName))
                     }
                 }
@@ -192,7 +199,7 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                         onRepositorySelected = {
                             repositoryManager.setVisibleRepository(it)
                             backStack.add(NavigationKey.RepoDetails(it.repoId))
-                        } ,
+                        },
                         onAddRepo = repositoryManager::addRepo,
                     ) {
                         backStack.removeLastOrNull()
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
index 10b0fce51..7c464373e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
@@ -1,18 +1,8 @@
 package org.fdroid.basic.ui.main.apps
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
+// TODO remove
 interface MinimalApp {
     val packageName: String
     val name: String?
     val icon: String?
 }
-
-@Parcelize
-data class InstalledApp(
-    override val packageName: String,
-    override val icon: String? = null,
-    override val name: String,
-    val versionName: String,
-) : MinimalApp, Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
index 4e4cf100a..77e33a784 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
@@ -1,57 +1,44 @@
 package org.fdroid.basic.ui.main.apps
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Android
-import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
+import org.fdroid.basic.R
 import org.fdroid.basic.ui.Names
+import org.fdroid.basic.ui.icons.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 fun InstalledAppRow(
-    app: InstalledApp,
+    app: InstalledAppItem,
     isSelected: Boolean,
     modifier: Modifier = Modifier,
 ) {
     Column(modifier = modifier) {
         ListItem(
             leadingContent = {
-                app.icon?.let {
-                    AsyncImage(
-                        model = app.icon,
-                        contentDescription = null,
-                        modifier = Modifier.size(48.dp),
-                    )
-                } ?: Icon(
-                    Icons.Filled.Android,
-                    tint = MaterialTheme.colorScheme.secondary,
+                AsyncImage(
+                    model = PackageName(app.packageName, app.iconDownloadRequest),
+                    error = painterResource(R.drawable.ic_repo_app_default),
                     contentDescription = null,
-                    modifier = Modifier
-                        .clip(MaterialTheme.shapes.medium)
-                        .size(48.dp)
-                        .background(Color.White)
-                        .padding(8.dp),
+                    modifier = Modifier.size(48.dp),
                 )
             },
             headlineContent = {
                 Text(app.name)
             },
             supportingContent = {
-                Text(app.versionName)
+                Text(app.installedVersionName)
             },
             colors = ListItemDefaults.colors(
                 containerColor = if (isSelected) {
@@ -68,10 +55,11 @@ fun InstalledAppRow(
 @Preview
 @Composable
 fun InstalledAppRowPreview() {
-    val app = InstalledApp(
+    val app = InstalledAppItem(
         packageName = "",
         name = Names.randomName,
-        versionName = "1.0.1",
+        installedVersionName = "1.0.1",
+        lastUpdated = System.currentTimeMillis() - 5000,
     )
     FDroidContent {
         Column {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
index f1ad3a1e5..d98b39652 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
@@ -1,7 +1,9 @@
 package org.fdroid.basic.ui.main.apps
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -10,16 +12,18 @@ import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccessTime
-import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.SortByAlpha
 import androidx.compose.material3.Button
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FilterChip
-import androidx.compose.material3.FilterChipDefaults
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -30,135 +34,146 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.basic.R
-import org.fdroid.basic.details.AppDetailsItem
+import org.fdroid.basic.manager.AppUpdateItem
 import org.fdroid.basic.ui.Names
 import org.fdroid.basic.ui.NavigationKey
+import org.fdroid.basic.ui.getPreviewVersion
 import org.fdroid.basic.ui.main.BottomBar
 import org.fdroid.basic.ui.main.lists.Sort
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import java.util.concurrent.TimeUnit.DAYS
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun MyApps(
-    updatableApps: List<UpdatableApp>,
-    installedApps: List<InstalledApp>,
-    currentItem: AppDetailsItem?,
-    onItemClick: (MinimalApp) -> Unit,
+    myAppsModel: MyAppsModel,
+    currentPackageName: String?,
+    onAppItemClick: (String) -> Unit,
     onNav: (NavKey) -> Unit,
-    sortBy: Sort,
     onSortChanged: (Sort) -> Unit,
+    onRefresh: () -> Unit,
     isBigScreen: Boolean,
     modifier: Modifier = Modifier,
 ) {
+    LifecycleStartEffect(myAppsModel) {
+        onRefresh()
+        onStopOrDispose { }
+    }
+    val updatableApps = myAppsModel.appUpdates
+    val installedApps = myAppsModel.installedApps
     val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
     Scaffold(
         topBar = {
             TopAppBar(
                 title = {
-                    var sortByMenuExpanded by remember { mutableStateOf(false) }
-                    Column {
-                        Text("My apps")
-                        FilterChip(
-                            selected = false,
-                            leadingIcon = {
-                                val vector = when (sortBy) {
-                                    Sort.NAME -> Icons.Filled.SortByAlpha
-                                    Sort.LATEST -> Icons.Filled.AccessTime
-                                }
-                                Icon(
-                                    vector,
-                                    null,
-                                    modifier = Modifier.size(FilterChipDefaults.IconSize)
-                                )
-                            },
-                            trailingIcon = {
-                                Icon(Icons.Filled.ArrowDropDown, null)
-                            },
-                            label = {
-                                val s = when (sortBy) {
-                                    Sort.NAME -> "Sort by name"
-                                    Sort.LATEST -> "Sort by latest"
-                                }
-                                Text(s)
-                                DropdownMenu(
-                                    expanded = sortByMenuExpanded,
-                                    onDismissRequest = { sortByMenuExpanded = false },
-                                ) {
-                                    DropdownMenuItem(
-                                        text = { Text("Sort by name") },
-                                        leadingIcon = {
-                                            Icon(Icons.Filled.SortByAlpha, null)
-                                        },
-                                        onClick = {
-                                            onSortChanged(Sort.NAME)
-                                            sortByMenuExpanded = false
-                                        },
-                                    )
-                                    DropdownMenuItem(
-                                        text = { Text("Sort by latest") },
-                                        leadingIcon = {
-                                            Icon(Icons.Filled.AccessTime, null)
-                                        },
-                                        onClick = {
-                                            onSortChanged(Sort.LATEST)
-                                            sortByMenuExpanded = false
-                                        },
-                                    )
-                                }
-                            },
-                            onClick = { sortByMenuExpanded = !sortByMenuExpanded },
-                        )
-                    }
+                    Text("My apps")
                 },
                 actions = {
-                    if (updatableApps.isNotEmpty()) Button(
-                        onClick = {},
-                        modifier = Modifier.padding(end = 16.dp),
+                    var sortByMenuExpanded by remember { mutableStateOf(false) }
+                    IconButton(onClick = { sortByMenuExpanded = !sortByMenuExpanded }) {
+                        Icon(Icons.Filled.MoreVert, null)
+                    }
+                    DropdownMenu(
+                        expanded = sortByMenuExpanded,
+                        onDismissRequest = { sortByMenuExpanded = false },
                     ) {
-                        Text("Update all")
+                        DropdownMenuItem(
+                            text = { Text("Sort by name") },
+                            leadingIcon = {
+                                Icon(Icons.Filled.SortByAlpha, null)
+                            },
+                            trailingIcon = {
+                                RadioButton(
+                                    selected = myAppsModel.sortOrder == Sort.NAME,
+                                    onClick = null,
+                                )
+                            },
+                            onClick = {
+                                onSortChanged(Sort.NAME)
+                                sortByMenuExpanded = false
+                            },
+                        )
+                        DropdownMenuItem(
+                            text = { Text("Sort by latest") },
+                            leadingIcon = {
+                                Icon(Icons.Filled.AccessTime, null)
+                            },
+                            trailingIcon = {
+                                RadioButton(
+                                    selected = myAppsModel.sortOrder == Sort.LATEST,
+                                    onClick = null,
+                                )
+                            },
+                            onClick = {
+                                onSortChanged(Sort.LATEST)
+                                sortByMenuExpanded = false
+                            },
+                        )
                     }
                 },
                 scrollBehavior = scrollBehavior,
             )
         },
         bottomBar = {
-            if (!isBigScreen) BottomBar(updatableApps.size, NavigationKey.MyApps, onNav)
+            if (!isBigScreen) BottomBar(updatableApps?.size ?: 0, NavigationKey.MyApps, onNav)
         },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
-        LazyColumn(
+        if (updatableApps == null && installedApps == null) Box(
+            contentAlignment = Alignment.Center,
+            modifier = Modifier.fillMaxSize()
+        ) {
+            LoadingIndicator(Modifier.size(128.dp))
+        } else LazyColumn(
             modifier
                 .padding(paddingValues)
                 .then(
-                    if (currentItem == null) Modifier
+                    if (currentPackageName == null) Modifier
                     else Modifier.selectableGroup()
                 ),
         ) {
-            if (updatableApps.isNotEmpty()) item(key = "A", contentType = "header") {
-                Text(
-                    text = stringResource(R.string.updates),
-                    style = MaterialTheme.typography.titleMedium,
-                    modifier = Modifier.padding(16.dp),
-                )
+            if (updatableApps == null || updatableApps.isNotEmpty()) {
+                item(key = "A", contentType = "header") {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        Text(
+                            text = stringResource(R.string.updates),
+                            style = MaterialTheme.typography.titleMedium,
+                            modifier = Modifier
+                                .padding(16.dp)
+                                .weight(1f),
+                        )
+                        if (updatableApps?.isNotEmpty() == true) Button(
+                            onClick = {},
+                            modifier = Modifier.padding(end = 16.dp),
+                        ) {
+                            Text("Update all")
+                        }
+                    }
+                }
             }
-            items(updatableApps, key = { it.packageName }, contentType = { "A" }) { app ->
-                val isSelected = app.packageName == currentItem?.app?.packageName
-                val interactionModifier = if (currentItem == null) {
+            if (updatableApps != null) items(
+                items = updatableApps,
+                key = { it.packageName },
+                contentType = { "A" },
+            ) { app ->
+                val isSelected = app.packageName == currentPackageName
+                val interactionModifier = if (currentPackageName == null) {
                     Modifier.clickable(
-                        onClick = { onItemClick(app) }
+                        onClick = { onAppItemClick(app.packageName) }
                     )
                 } else {
                     Modifier.selectable(
                         selected = isSelected,
-                        onClick = { onItemClick(app) }
+                        onClick = { onAppItemClick(app.packageName) }
                     )
                 }
                 val modifier = Modifier
@@ -166,23 +181,29 @@ fun MyApps(
                     .then(interactionModifier)
                 UpdatableAppRow(app, isSelected, modifier)
             }
-            if (updatableApps.isNotEmpty()) item(key = "B", contentType = "header") {
-                Text(
-                    text = stringResource(R.string.installed_apps__activity_title),
-                    style = MaterialTheme.typography.titleMedium,
-                    modifier = Modifier.padding(16.dp),
-                )
+            if (!updatableApps.isNullOrEmpty() && !installedApps.isNullOrEmpty()) {
+                item(key = "B", contentType = "header") {
+                    Text(
+                        text = stringResource(R.string.installed_apps__activity_title),
+                        style = MaterialTheme.typography.titleMedium,
+                        modifier = Modifier.padding(16.dp),
+                    )
+                }
             }
-            items(installedApps, key = { it.packageName }, contentType = { "B" }) { app ->
-                val isSelected = app.packageName == currentItem?.app?.packageName
-                val interactionModifier = if (currentItem == null) {
+            if (installedApps != null) items(
+                items = installedApps,
+                key = { it.packageName },
+                contentType = { "B" },
+            ) { app ->
+                val isSelected = app.packageName == currentPackageName
+                val interactionModifier = if (currentPackageName == null) {
                     Modifier.clickable(
-                        onClick = { onItemClick(app) }
+                        onClick = { onAppItemClick(app.packageName) }
                     )
                 } else {
                     Modifier.selectable(
                         selected = isSelected,
-                        onClick = { onItemClick(app) }
+                        onClick = { onAppItemClick(app.packageName) }
                     )
                 }
                 val modifier = Modifier
@@ -195,40 +216,74 @@ fun MyApps(
 }
 
 @Preview
-@PreviewScreenSizes
 @Composable
-fun MyAppsScaffoldPreview() {
+fun MyAppsLoadingPreview() {
     FDroidContent {
-        val app1 = UpdatableApp(
-            packageName = "A",
-            name = Names.randomName,
-            currentVersionName = "1.0.1",
-            updateVersionName = "1.1.0",
-            size = 123456789,
-        )
-        val app2 = UpdatableApp(
-            packageName = "B",
-            name = Names.randomName,
-            currentVersionName = "3.0.1",
-            updateVersionName = "3.1.0",
-            size = 9876543,
-        )
-        val installedApp1 =
-            InstalledApp("1", Names.randomName, org.fdroid.basic.ui.Icons.randomIcon, "3.0.1")
-        val installedApp2 =
-            InstalledApp("2", Names.randomName, org.fdroid.basic.ui.Icons.randomIcon, "1.0")
-        val installedApp3 =
-            InstalledApp("3", Names.randomName, org.fdroid.basic.ui.Icons.randomIcon, "0.1")
-        var sortBy by remember { mutableStateOf(Sort.NAME) }
         MyApps(
-            updatableApps = listOf(app1, app2),
-            installedApps = listOf(installedApp1, installedApp2, installedApp3),
-            currentItem = null,
-            onItemClick = {},
+            myAppsModel = MyAppsModel(
+                appUpdates = null,
+                installedApps = null,
+                sortOrder = Sort.NAME,
+            ),
+            currentPackageName = null,
+            onAppItemClick = {},
             onNav = {},
-            sortBy = sortBy,
-            onSortChanged = { sortBy = it },
+            onSortChanged = { },
             isBigScreen = false,
+            onRefresh = {},
+        )
+    }
+}
+
+@Preview
+@Composable
+fun MyAppsPreview() {
+    FDroidContent {
+        val app1 = AppUpdateItem(
+            packageName = "AX",
+            name = "App Update 123",
+            installedVersionName = "1.0.1",
+            update = getPreviewVersion("1.1.0", 123456789),
+            whatsNew = "This is new, all is new, nothing old.",
+        )
+        val app2 = AppUpdateItem(
+            packageName = "BX",
+            name = Names.randomName,
+            installedVersionName = "3.0.1",
+            update = getPreviewVersion("3.1.0", 9876543),
+            whatsNew = null,
+        )
+        val installedApp1 = InstalledAppItem(
+            packageName = "1",
+            name = Names.randomName,
+            installedVersionName = "1",
+            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(1)
+        )
+        val installedApp2 = InstalledAppItem(
+            packageName = "2",
+            name = Names.randomName,
+            installedVersionName = "2",
+            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(2)
+        )
+        val installedApp3 = InstalledAppItem(
+            packageName = "3",
+            name = Names.randomName,
+            installedVersionName = "3",
+            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(3)
+        )
+        val model = MyAppsModel(
+            appUpdates = listOf(app1, app2),
+            installedApps = listOf(installedApp1, installedApp2, installedApp3),
+            sortOrder = Sort.NAME,
+        )
+        MyApps(
+            myAppsModel = model,
+            currentPackageName = null,
+            onAppItemClick = {},
+            onNav = {},
+            onSortChanged = { },
+            isBigScreen = false,
+            onRefresh = {},
         )
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt
new file mode 100644
index 000000000..6e9035d0c
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt
@@ -0,0 +1,44 @@
+package org.fdroid.basic.ui.main.apps
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.StateFlow
+import org.fdroid.basic.manager.AppUpdateItem
+import org.fdroid.basic.ui.main.lists.Sort
+import java.text.Collator
+import java.util.Locale
+
+@Composable
+fun MyAppsPresenter(
+    appUpdatesFlow: StateFlow<List<AppUpdateItem>?>,
+    installedAppsFlow: StateFlow<List<InstalledAppItem>?>,
+    sortOrderFlow: StateFlow<Sort>,
+): MyAppsModel {
+    val appUpdates = appUpdatesFlow.collectAsState().value
+    val installedApps = installedAppsFlow.collectAsState().value
+    val sortOrder = sortOrderFlow.collectAsState().value
+    val packageNames = appUpdates?.map { it.packageName } ?: emptyList()
+    val collator = Collator.getInstance(Locale.getDefault())
+    return MyAppsModel(
+        appUpdates = when (sortOrder) {
+            Sort.NAME -> appUpdates?.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
+            Sort.LATEST -> appUpdates?.sortedByDescending { it.update.added }
+        },
+        installedApps = installedApps?.filter {
+            // filter out apps already in updates
+            it.packageName !in packageNames
+        }?.let { apps ->
+            when (sortOrder) {
+                Sort.NAME -> apps.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
+                Sort.LATEST -> apps.sortedByDescending { it.lastUpdated }
+            }
+        },
+        sortOrder = sortOrder,
+    )
+}
+
+data class MyAppsModel(
+    val appUpdates: List<AppUpdateItem>? = null,
+    val installedApps: List<InstalledAppItem>? = null,
+    val sortOrder: Sort = Sort.NAME,
+)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt
new file mode 100644
index 000000000..3df9ff41e
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt
@@ -0,0 +1,94 @@
+package org.fdroid.basic.ui.main.apps
+
+import android.app.Application
+import androidx.core.os.LocaleListCompat
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.Observer
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.application
+import androidx.lifecycle.viewModelScope
+import app.cash.molecule.AndroidUiDispatcher
+import app.cash.molecule.RecompositionMode.ContextClock
+import app.cash.molecule.launchMolecule
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import org.fdroid.basic.download.getDownloadRequest
+import org.fdroid.basic.manager.MyAppsManager
+import org.fdroid.basic.repo.RepositoryManager
+import org.fdroid.basic.ui.main.lists.Sort
+import org.fdroid.database.AppListItem
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.download.DownloadRequest
+import javax.inject.Inject
+
+data class InstalledAppItem(
+    val packageName: String,
+    val name: String,
+    val installedVersionName: String,
+    val lastUpdated: Long,
+    val iconDownloadRequest: DownloadRequest? = null,
+)
+
+@HiltViewModel
+class MyAppsViewModel @Inject constructor(
+    app: Application,
+    savedStateHandle: SavedStateHandle,
+    private val db: FDroidDatabase,
+    private val myAppsManager: MyAppsManager,
+    private val repositoryManager: RepositoryManager,
+) : AndroidViewModel(app) {
+
+    val updates = myAppsManager.updates
+    val numUpdates = myAppsManager.numUpdates
+    private val installedApps = MutableStateFlow<List<InstalledAppItem>?>(null)
+    private var installedAppsLiveData =
+        db.getAppDao().getInstalledAppListItems(application.packageManager)
+    private val sortOrder = savedStateHandle.getMutableStateFlow("sort", Sort.NAME)
+    private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+    private val localeList = LocaleListCompat.getDefault()
+    private val installedAppsObserver = Observer<List<AppListItem>> { list ->
+        installedApps.value = list.map { app ->
+            InstalledAppItem(
+                packageName = app.packageName,
+                name = app.name ?: "Unknown app",
+                installedVersionName = app.installedVersionName ?: "???",
+                lastUpdated = app.lastUpdated,
+                iconDownloadRequest = repositoryManager.getRepository(app.repoId)?.let { repo ->
+                    app.getIcon(localeList)?.getDownloadRequest(repo)
+                },
+            )
+        }
+    }
+    val myAppsModel: StateFlow<MyAppsModel> = scope.launchMolecule(mode = ContextClock) {
+        MyAppsPresenter(
+            appUpdatesFlow = updates,
+            installedAppsFlow = installedApps,
+            sortOrderFlow = sortOrder,
+        )
+    }
+
+    init {
+        installedAppsLiveData.observeForever(installedAppsObserver)
+    }
+
+    override fun onCleared() {
+        installedAppsLiveData.removeObserver(installedAppsObserver)
+    }
+
+    fun changeSortOrder(sort: Sort) {
+        sortOrder.value = sort
+    }
+
+    fun refresh() {
+        myAppsManager.loadUpdates()
+
+        // need to get new liveData from the DB, so it re-queries installed packages
+        installedAppsLiveData.removeObserver(installedAppsObserver)
+        installedAppsLiveData =
+            db.getAppDao().getInstalledAppListItems(application.packageManager).apply {
+                observeForever(installedAppsObserver)
+            }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt
deleted file mode 100644
index 0cb7d1b6a..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableApp.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.fdroid.basic.ui.main.apps
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class UpdatableApp(
-    override val packageName: String,
-    override val name: String,
-    val currentVersionName: String,
-    val updateVersionName: String,
-    val size: Long,
-    override val icon: String? = null,
-    val whatsNew: String? = null,
-): MinimalApp, Parcelable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
index 2e97b109e..f4311d4ad 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
@@ -2,17 +2,16 @@ package org.fdroid.basic.ui.main.apps
 
 import android.text.format.Formatter
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Android
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.ArrowDropUp
 import androidx.compose.material.icons.filled.NewReleases
 import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Card
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
@@ -25,17 +24,21 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
+import org.fdroid.basic.R
+import org.fdroid.basic.manager.AppUpdateItem
+import org.fdroid.basic.ui.getPreviewVersion
+import org.fdroid.basic.ui.icons.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 fun UpdatableAppRow(
-    app: UpdatableApp,
+    app: AppUpdateItem,
     isSelected: Boolean,
     modifier: Modifier = Modifier
 ) {
@@ -50,21 +53,11 @@ fun UpdatableAppRow(
                         contentDescription = null, modifier = Modifier.size(24.dp),
                     )
                 }) {
-                    app.icon?.let {
-                        AsyncImage(
-                            model = app.icon,
-                            contentDescription = null,
-                            modifier = Modifier.size(48.dp),
-                        )
-                    } ?: Icon(
-                        Icons.Filled.Android,
-                        tint = MaterialTheme.colorScheme.secondary,
+                    AsyncImage(
+                        model = PackageName(app.packageName, app.iconDownloadRequest),
+                        error = painterResource(R.drawable.ic_repo_app_default),
                         contentDescription = null,
-                        modifier = Modifier
-                            .clip(MaterialTheme.shapes.medium)
-                            .size(48.dp)
-                            .background(Color.White)
-                            .padding(8.dp),
+                        modifier = Modifier.size(48.dp),
                     )
                 }
             },
@@ -72,10 +65,10 @@ fun UpdatableAppRow(
                 Text(app.name)
             },
             supportingContent = {
-                val size = app.size.let {
+                val size = app.update.size?.let {
                     Formatter.formatFileSize(LocalContext.current, it)
                 }
-                Text("${app.currentVersionName} → ${app.updateVersionName} • $size")
+                Text("${app.installedVersionName} → ${app.update.versionName} • $size")
             },
             trailingContent = {
                 if (app.whatsNew != null) IconButton(onClick = { isExpanded = !isExpanded }) {
@@ -96,13 +89,13 @@ fun UpdatableAppRow(
             modifier = modifier,
         )
         AnimatedVisibility(visible = isExpanded, modifier = Modifier.padding(8.dp)) {
-            Text(
-                text = app.whatsNew ?: "",
-                modifier = Modifier
-                    .background(MaterialTheme.colorScheme.surfaceVariant)
-                    .fillMaxWidth()
-                    .padding(8.dp)
-            )
+            Card(modifier = Modifier.fillMaxWidth()) {
+                Text(
+                    text = app.whatsNew ?: "",
+                    style = MaterialTheme.typography.bodyMedium,
+                    modifier = Modifier.padding(8.dp)
+                )
+            }
         }
     }
 }
@@ -110,18 +103,24 @@ fun UpdatableAppRow(
 @Preview
 @Composable
 fun UpdatableAppRowPreview() {
-    val app = UpdatableApp(
-        packageName = "",
+    val app1 = AppUpdateItem(
+        packageName = "A",
         name = "App Update 123",
-        currentVersionName = "1.0.1",
-        updateVersionName = "1.1.0",
-        size = 123456789,
+        installedVersionName = "1.0.1",
+        update = getPreviewVersion("1.1.0", 123456789),
+        whatsNew = "This is new, all is new, nothing old.",
+    )
+    val app2 = AppUpdateItem(
+        packageName = "B",
+        name = "App Update 456",
+        installedVersionName = "1.0.1",
+        update = getPreviewVersion("1.1.0", 123456789),
         whatsNew = "This is new, all is new, nothing old.",
     )
     FDroidContent {
         Column {
-            UpdatableAppRow(app, false)
-            UpdatableAppRow(app, true)
+            UpdatableAppRow(app1, false)
+            UpdatableAppRow(app2, true)
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
index 9d1593697..dc1fb0e39 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
@@ -14,7 +14,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.ChangeHistory
 import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.CurrencyBitcoin
@@ -25,23 +24,19 @@ import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Image
 import androidx.compose.material.icons.filled.Link
 import androidx.compose.material.icons.filled.Mail
-import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.OndemandVideo
 import androidx.compose.material.icons.filled.Person
-import androidx.compose.material.icons.filled.Share
 import androidx.compose.material.icons.filled.Translate
 import androidx.compose.material3.Button
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
 import androidx.compose.material3.carousel.rememberCarouselState
@@ -55,7 +50,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
@@ -69,7 +63,9 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.withLink
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
 import coil3.compose.AsyncImage
+import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.basic.R
 import org.fdroid.basic.details.AppDetailsItem
 import org.fdroid.basic.details.testApp
@@ -83,13 +79,13 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
     ExperimentalSharedTransitionApi::class
 )
 fun AppDetails(
-    appItem: AppDetailsItem?,
+    item: AppDetailsItem?,
     onBackNav: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
     val topAppBarState = rememberTopAppBarState()
     val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(topAppBarState)
-    if (appItem == null) Box(
+    if (item == null) Box(
         contentAlignment = Alignment.Center,
         modifier = Modifier.fillMaxSize(),
     ) {
@@ -97,44 +93,9 @@ fun AppDetails(
     } else Scaffold(
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
-            TopAppBar(
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = Color.Transparent,
-                ),
-                title = {
-                    if (topAppBarState.overlappedFraction == 1f) {
-                        Text(appItem.name)
-                    }
-                },
-                navigationIcon = {
-                    if (onBackNav != null) IconButton(onClick = onBackNav) {
-                        Icon(
-                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                            contentDescription = "Localized description",
-                        )
-                    }
-                },
-                actions = {
-                    IconButton(onClick = { /* do something */ }) {
-                        Icon(
-                            imageVector = Icons.Filled.Share,
-                            contentDescription = "Localized description",
-                        )
-                    }
-                    var expanded by remember { mutableStateOf(false) }
-                    IconButton(onClick = { expanded = !expanded }) {
-                        Icon(
-                            imageVector = Icons.Filled.MoreVert,
-                            contentDescription = "Localized description",
-                        )
-                    }
-                    AppDetailsMenu(expanded) { expanded = false }
-                },
-                scrollBehavior = scrollBehavior,
-            )
+            AppDetailsTopAppBar(item, topAppBarState, scrollBehavior, onBackNav)
         },
     ) { innerPadding ->
-        val item = appItem
         Column(
             modifier = modifier
                 .verticalScroll(rememberScrollState())
@@ -356,6 +317,13 @@ fun AppDetails(
                             url = sourceCode,
                         )
                     }
+                    item.app.video?.getBestLocale(LocaleListCompat.getDefault())?.let { video ->
+                        AppDetailsLink(
+                            icon = Icons.Default.OndemandVideo,
+                            title = stringResource(R.string.menu_video),
+                            url = video,
+                        )
+                    }
                 }
             }
             // Versions
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
index 08683df6d..40863c5c7 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
@@ -1,7 +1,6 @@
 package org.fdroid.basic.ui.main.details
 
 import android.text.format.Formatter
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -14,7 +13,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Error
-import androidx.compose.material.icons.filled.Image
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
@@ -36,6 +34,7 @@ import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -91,17 +90,10 @@ fun AppDetailsHeader(
         horizontalArrangement = spacedBy(8.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        item.icon?.let { icon ->
-            AsyncImage(
-                model = icon,
-                contentDescription = "",
-                placeholder = rememberVectorPainter(Icons.Default.Image),
-                error = rememberVectorPainter(Icons.Default.Error),
-                modifier = Modifier.size(64.dp),
-            )
-        } ?: Image(
-            painter = rememberVectorPainter(Icons.Default.Image),
-            contentDescription = null,
+        AsyncImage(
+            model = item.icon,
+            contentDescription = "",
+            error = painterResource(R.drawable.ic_repo_app_default),
             modifier = Modifier.size(64.dp),
         )
         Column {
@@ -166,7 +158,7 @@ fun AppDetailsHeader(
             val context = LocalContext.current
             OutlinedButton(
                 onClick = {
-                    context.startActivity(item.launchIntent)
+                    context.startActivity(item.actions.launchIntent)
                 },
                 modifier = Modifier.weight(1f)
             ) {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt
index 1ac0e9483..912a1d5c0 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt
@@ -1,5 +1,6 @@
 package org.fdroid.basic.ui.main.details
 
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Preview
@@ -11,56 +12,106 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import org.fdroid.basic.R
+import org.fdroid.basic.details.AppDetailsItem
+import org.fdroid.basic.details.testApp
+import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
-fun AppDetailsMenu(expanded: Boolean, onDismiss: () -> Unit) {
+fun AppDetailsMenu(
+    item: AppDetailsItem,
+    expanded: Boolean,
+    onDismiss: () -> Unit,
+) {
     DropdownMenu(
         expanded = expanded,
         onDismissRequest = onDismiss,
     ) {
-        DropdownMenuItem(
-            leadingIcon = {
-                Icon(Icons.Default.UpdateDisabled, null)
-            },
-            text = { Text("Ignore all updates") },
-            trailingIcon = {
-                Checkbox(false, null)
-            },
-            onClick = { /* Do something... */ },
-        )
-        DropdownMenuItem(
-            leadingIcon = {
-                Icon(Icons.Default.UpdateDisabled, null)
-            },
-            text = { Text("Ignore this updates") },
-            trailingIcon = {
-                Checkbox(false, null)
-            },
-            onClick = { /* Do something... */ },
-        )
-        DropdownMenuItem(
+        if (item.appPrefs != null) DropdownMenuItem(
             leadingIcon = {
                 Icon(Icons.Default.Preview, null)
             },
-            text = { Text("Allow beta updates") },
+            text = { Text(stringResource(R.string.menu_release_channel_beta)) },
             trailingIcon = {
-                Checkbox(false, null)
+                Checkbox(
+                    checked = item.allowsBetaVersions,
+                    onCheckedChange = null,
+                    enabled = !item.ignoresAllUpdates,
+                )
+            },
+            enabled = !item.ignoresAllUpdates,
+            onClick = {
+                item.actions.allowBetaVersions()
+                onDismiss()
             },
-            onClick = { /* Do something... */ },
         )
-        DropdownMenuItem(
+        if (item.actions.ignoreAllUpdates != null) DropdownMenuItem(
+            leadingIcon = {
+                Icon(Icons.Default.UpdateDisabled, null)
+            },
+            text = { Text(stringResource(R.string.menu_ignore_all)) },
+            trailingIcon = {
+                Checkbox(item.ignoresAllUpdates, null)
+            },
+            onClick = {
+                item.actions.ignoreAllUpdates()
+                onDismiss()
+            },
+        )
+        if (item.actions.ignoreThisUpdate != null) DropdownMenuItem(
+            leadingIcon = {
+                Icon(Icons.Default.UpdateDisabled, null)
+            },
+            text = { Text(stringResource(R.string.menu_ignore_this)) },
+            trailingIcon = {
+                Checkbox(
+                    checked = item.ignoresCurrentUpdate,
+                    onCheckedChange = null,
+                    enabled = !item.ignoresAllUpdates,
+                )
+            },
+            enabled = !item.ignoresAllUpdates,
+            onClick = {
+                item.actions.ignoreThisUpdate()
+                onDismiss()
+            },
+        )
+        if (item.actions.shareApk != null) DropdownMenuItem(
             leadingIcon = {
                 Icon(Icons.Default.Share, null)
             },
-            text = { Text("Share APK") },
-            onClick = { /* Do something... */ },
+            text = { Text(stringResource(R.string.menu_share_apk)) },
+            onClick = {
+                item.actions.shareApk()
+                onDismiss()
+            },
         )
-        DropdownMenuItem(
+        if (item.actions.uninstallApp != null) DropdownMenuItem(
             leadingIcon = {
                 Icon(Icons.Default.Delete, null)
             },
-            text = { Text("Uninstall app") },
-            onClick = { /* Do something... */ },
+            text = { Text(stringResource(R.string.menu_uninstall)) },
+            onClick = {
+                item.actions.uninstallApp()
+                onDismiss()
+            },
         )
     }
 }
+
+@Preview
+@Composable
+fun AppDetailsMenuPreview() {
+    AppDetailsMenu(testApp, true) {}
+}
+
+@Preview(uiMode = UI_MODE_NIGHT_YES)
+@Composable
+fun AppDetailsMenuAllIgnoredPreview() {
+    val appPrefs = testApp.appPrefs!!.toggleIgnoreAllUpdates()
+    FDroidContent {
+        AppDetailsMenu(testApp.copy(appPrefs = appPrefs), true) {}
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt
new file mode 100644
index 000000000..b7052a146
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt
@@ -0,0 +1,73 @@
+package org.fdroid.basic.ui.main.details
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.material3.TopAppBarState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import org.fdroid.basic.R
+import org.fdroid.basic.details.AppDetailsItem
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AppDetailsTopAppBar(
+    item: AppDetailsItem,
+    topAppBarState: TopAppBarState,
+    scrollBehavior: TopAppBarScrollBehavior,
+    onBackNav: (() -> Unit)?,
+) {
+    TopAppBar(
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = Color.Transparent,
+        ),
+        title = {
+            if (topAppBarState.overlappedFraction == 1f) {
+                Text(item.name, maxLines = 1, overflow = TextOverflow.Ellipsis)
+            }
+        },
+        navigationIcon = {
+            if (onBackNav != null) IconButton(onClick = onBackNav) {
+                Icon(
+                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                    contentDescription = stringResource(R.string.back),
+                )
+            }
+        },
+        actions = {
+            val context = LocalContext.current
+            item.actions.shareIntent?.let { shareIntent ->
+                IconButton(onClick = { context.startActivity(shareIntent) }) {
+                    Icon(
+                        imageVector = Icons.Filled.Share,
+                        contentDescription = stringResource(R.string.menu_share),
+                    )
+                }
+            }
+            var expanded by remember { mutableStateOf(false) }
+            IconButton(onClick = { expanded = !expanded }) {
+                Icon(
+                    imageVector = Icons.Filled.MoreVert,
+                    contentDescription = "Localized description",
+                )
+            }
+            AppDetailsMenu(item, expanded) { expanded = false }
+        },
+        scrollBehavior = scrollBehavior,
+    )
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
index a25148b41..14b7d3b75 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
@@ -36,7 +36,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.details.AppDetailsItem
 import org.fdroid.basic.ui.main.apps.MinimalApp
 
 sealed class AppList(val title: String) {
@@ -50,7 +49,7 @@ sealed class AppList(val title: String) {
 fun AppList(
     appList: AppList,
     filterInfo: FilterInfo,
-    currentItem: AppDetailsItem?,
+    currentPackageName: String?,
     modifier: Modifier = Modifier,
     onBackClicked: () -> Unit,
     onItemClick: (MinimalApp) -> Unit,
@@ -100,14 +99,14 @@ fun AppList(
                 contentPadding = PaddingValues(vertical = 8.dp),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
                 modifier = Modifier.then(
-                    if (currentItem == null) Modifier
+                    if (currentPackageName == null) Modifier
                     else Modifier.selectableGroup()
                 ),
             ) {
                 val apps = filterInfo.model.apps
                 items(apps, key = { it.packageName }, contentType = { "A" }) { navItem ->
-                    val isSelected = currentItem?.app?.packageName == navItem.packageName
-                    val interactionModifier = if (currentItem == null) {
+                    val isSelected = currentPackageName == navItem.packageName
+                    val interactionModifier = if (currentPackageName == null) {
                         Modifier.clickable(
                             onClick = { onItemClick(navItem) }
                         )

From 8a240f1da243bcc58ef1700795cbf7a9d46bebad Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 18 Jul 2025 17:19:28 -0300
Subject: [PATCH 029/180] Don't crash for ActivityNotFoundException

---
 .../main/java/org/fdroid/basic/ui/Utils.kt    | 21 +++++++++++++++++++
 .../java/org/fdroid/basic/ui/main/About.kt    |  5 +++--
 .../basic/ui/main/details/AppDetailsHeader.kt |  3 ++-
 .../basic/ui/main/details/AppDetailsLink.kt   |  3 ++-
 .../ui/main/details/AppDetailsTopAppBar.kt    |  3 ++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/basic/src/main/java/org/fdroid/basic/ui/Utils.kt b/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
index 2e0f56645..109c68aa2 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
@@ -1,6 +1,10 @@
 package org.fdroid.basic.ui
 
+import android.content.Context
+import android.content.Intent
 import android.text.format.DateUtils
+import android.util.Log
+import androidx.compose.ui.platform.UriHandler
 import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
@@ -8,6 +12,23 @@ import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 import java.util.concurrent.TimeUnit
 
+fun Context.startActivitySafe(i: Intent?) {
+    if (i == null) return
+    try {
+        startActivity(i)
+    } catch (e: Exception) {
+        Log.e("Context", "Error opening $i ", e)
+    }
+}
+
+fun UriHandler.openUriSafe(uri: String) {
+    try {
+        openUri(uri)
+    } catch (e: Exception) {
+        Log.e("UriHandler", "Error opening $uri ", e)
+    }
+}
+
 fun getPreviewVersion(versionName: String, size: Long? = null) = object : PackageVersion {
     override val versionCode: Long = 23
     override val versionName: String = versionName
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/About.kt b/basic/src/main/java/org/fdroid/basic/ui/main/About.kt
index 5b03e7890..60ee5fc20 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/About.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/About.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.basic.BuildConfig.VERSION_NAME
 import org.fdroid.basic.R
+import org.fdroid.basic.ui.openUriSafe
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
@@ -78,7 +79,7 @@ fun About(onBackClicked: () -> Unit) {
                     color = MaterialTheme.colorScheme.secondary,
                     modifier = Modifier
                         .padding(top = 4.dp)
-                        .clickable { uriHandler.openUri("https://f-droid.org") }
+                        .clickable { uriHandler.openUriSafe("https://f-droid.org") }
                 )
                 Text(
                     text = "Gitlab",
@@ -86,7 +87,7 @@ fun About(onBackClicked: () -> Unit) {
                     color = MaterialTheme.colorScheme.secondary,
                     modifier = Modifier
                         .padding(top = 4.dp)
-                        .clickable { uriHandler.openUri("https://gitlab.com/fdroid") }
+                        .clickable { uriHandler.openUriSafe("https://gitlab.com/fdroid") }
                 )
             }
             Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
index 40863c5c7..1e10a782b 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
@@ -44,6 +44,7 @@ import org.fdroid.basic.details.AppDetailsItem
 import org.fdroid.basic.details.MainButtonState
 import org.fdroid.basic.details.testApp
 import org.fdroid.basic.ui.asRelativeTimeString
+import org.fdroid.basic.ui.startActivitySafe
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
@@ -158,7 +159,7 @@ fun AppDetailsHeader(
             val context = LocalContext.current
             OutlinedButton(
                 onClick = {
-                    context.startActivity(item.actions.launchIntent)
+                    context.startActivitySafe(item.actions.launchIntent)
                 },
                 modifier = Modifier.weight(1f)
             ) {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
index 9e1aaf822..07f55e505 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
@@ -20,6 +20,7 @@ import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
+import org.fdroid.basic.ui.openUriSafe
 
 @Composable
 fun AppDetailsLink(icon: ImageVector, title: String, url: String, modifier: Modifier = Modifier) {
@@ -34,7 +35,7 @@ fun AppDetailsLink(icon: ImageVector, title: String, url: String, modifier: Modi
             .heightIn(min = 48.dp)
             .fillMaxWidth()
             .combinedClickable(
-                onClick = { uriHandler.openUri(url) },
+                onClick = { uriHandler.openUriSafe(url) },
                 onLongClick = {
                     haptics.performHapticFeedback(HapticFeedbackType.LongPress)
                     val entry = ClipEntry(ClipData.newPlainText("", url))
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt
index b7052a146..7b9d9b595 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt
@@ -23,6 +23,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import org.fdroid.basic.R
 import org.fdroid.basic.details.AppDetailsItem
+import org.fdroid.basic.ui.startActivitySafe
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -52,7 +53,7 @@ fun AppDetailsTopAppBar(
         actions = {
             val context = LocalContext.current
             item.actions.shareIntent?.let { shareIntent ->
-                IconButton(onClick = { context.startActivity(shareIntent) }) {
+                IconButton(onClick = { context.startActivitySafe(shareIntent) }) {
                     Icon(
                         imageVector = Icons.Filled.Share,
                         contentDescription = stringResource(R.string.menu_share),

From 94e3df48af732616e1905682df4207b08b12c708 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 18 Jul 2025 18:04:21 -0300
Subject: [PATCH 030/180] Real data for app lists

they are still just a prototype, e.g. all apps doesn't really show all of them and filters don't work, yet.
---
 .../java/org/fdroid/basic/MainViewModel.kt    |  57 +----
 .../java/org/fdroid/basic/ui/Navigation.kt    |   3 +-
 .../basic/ui/categories/CategoryCard.kt       |  18 +-
 .../basic/ui/categories/CategoryList.kt       |  11 +-
 .../java/org/fdroid/basic/ui/main/Main.kt     |  36 +--
 .../fdroid/basic/ui/main/apps/InstalledApp.kt |   8 -
 .../org/fdroid/basic/ui/main/apps/MyApps.kt   |  16 +-
 .../basic/ui/main/apps/MyAppsPresenter.kt     |  14 +-
 .../basic/ui/main/apps/MyAppsViewModel.kt     |   6 +-
 .../basic/ui/main/details/AppDetails.kt       |  33 +--
 .../basic/ui/main/discover/AppCarousel.kt     |  16 +-
 .../basic/ui/main/discover/AppDiscoverItem.kt |  11 +
 .../ui/main/discover/AppNavigationItem.kt     |  15 --
 .../basic/ui/main/discover/AppsSearch.kt      |   5 +-
 .../fdroid/basic/ui/main/discover/Discover.kt |  32 +--
 .../ui/main/discover/DiscoverPresenter.kt     |   6 +-
 .../org/fdroid/basic/ui/main/lists/AppItem.kt |  96 --------
 .../org/fdroid/basic/ui/main/lists/AppList.kt |  40 ++--
 .../fdroid/basic/ui/main/lists/AppListItem.kt |  11 +
 ...FilterPresenter.kt => AppListPresenter.kt} |  40 ++--
 .../fdroid/basic/ui/main/lists/AppListRow.kt  |  72 ++++++
 .../fdroid/basic/ui/main/lists/AppListType.kt |  27 +++
 .../basic/ui/main/lists/AppListViewModel.kt   | 214 ++++++++++++++++++
 .../fdroid/basic/ui/main/lists/AppsFilter.kt  |  37 +--
 basic/src/main/res/values/strings-next.xml    |   5 +
 25 files changed, 508 insertions(+), 321 deletions(-)
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/discover/AppDiscoverItem.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListItem.kt
 rename basic/src/main/java/org/fdroid/basic/ui/main/lists/{FilterPresenter.kt => AppListPresenter.kt} (62%)
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListRow.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListType.kt
 create mode 100644 basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListViewModel.kt

diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
index 717102bae..7ab516b5e 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
@@ -11,21 +11,14 @@ import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.update
 import org.fdroid.basic.download.getDownloadRequest
 import org.fdroid.basic.repo.RepositoryManager
 import org.fdroid.basic.ui.categories.Category
-import org.fdroid.basic.ui.main.discover.AppNavigationItem
+import org.fdroid.basic.ui.main.discover.AppDiscoverItem
 import org.fdroid.basic.ui.main.discover.DiscoverModel
 import org.fdroid.basic.ui.main.discover.DiscoverPresenter
-import org.fdroid.basic.ui.main.lists.AppList
-import org.fdroid.basic.ui.main.lists.FilterModel
-import org.fdroid.basic.ui.main.lists.FilterPresenter
-import org.fdroid.basic.ui.main.lists.Sort
 import org.fdroid.database.FDroidDatabase
 import java.text.Collator
 import java.util.Locale
@@ -45,10 +38,9 @@ class MainViewModel @Inject constructor(
         list.mapNotNull {
             val repository = repositoryManager.getRepository(it.repoId)
                 ?: return@mapNotNull null
-            AppNavigationItem(
+            AppDiscoverItem(
                 packageName = it.packageName,
                 name = it.name ?: "Unknown",
-                summary = it.summary ?: "Unknown",
                 isNew = it.lastUpdated == it.added,
                 lastUpdated = it.lastUpdated,
                 iconDownloadRequest = it.getIcon(localeList)
@@ -66,15 +58,6 @@ class MainViewModel @Inject constructor(
         }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
 
-    private val _currentList = MutableStateFlow<AppList>(AppList.New)
-    val currentList = _currentList.asStateFlow()
-    private val _showFilters = savedStateHandle.getMutableStateFlow("showFilters", true)
-    val showFilters = _showFilters.asStateFlow()
-    private val _sortBy = MutableStateFlow<Sort>(Sort.LATEST)
-    val sortBy = _sortBy.asStateFlow<Sort>()
-    private val _addedCategories = MutableStateFlow<List<String>>(emptyList())
-    val addedCategories = _addedCategories.asStateFlow<List<String>>()
-
     val localeList = LocaleListCompat.getDefault()
     val discoverModel: StateFlow<DiscoverModel> = scope.launchMolecule(mode = ContextClock) {
         DiscoverPresenter(
@@ -83,41 +66,5 @@ class MainViewModel @Inject constructor(
             repositoriesFlow = repositoryManager.repos,
         )
     }
-    val filterModel: StateFlow<FilterModel> = scope.launchMolecule(mode = ContextClock) {
-        FilterPresenter(
-            areFiltersShownFlow = showFilters,
-            appsFlow = apps,
-            sortByFlow = sortBy,
-            allCategoriesFlow = categories,
-            addedCategoriesFlow = addedCategories,
-        )
-    }
 
-    fun setAppList(appList: AppList) {
-        _currentList.value = appList
-    }
-
-    fun toggleListFilterVisibility() {
-        _showFilters.update { !it }
-    }
-
-    fun sortBy(sort: Sort) {
-        _sortBy.update { sort }
-    }
-
-    fun addCategory(category: String) {
-        _addedCategories.update {
-            addedCategories.value.toMutableList().apply {
-                add(category)
-            }
-        }
-    }
-
-    fun removeCategory(category: String) {
-        _addedCategories.update {
-            addedCategories.value.toMutableList().apply {
-                remove(category)
-            }
-        }
-    }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Navigation.kt b/basic/src/main/java/org/fdroid/basic/ui/Navigation.kt
index 98cb6f5e8..226e0beb1 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/Navigation.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/Navigation.kt
@@ -8,6 +8,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation3.runtime.NavKey
 import kotlinx.serialization.Serializable
 import org.fdroid.basic.R
+import org.fdroid.basic.ui.main.lists.AppListType
 
 sealed interface NavigationKey : NavKey {
 
@@ -21,7 +22,7 @@ sealed interface NavigationKey : NavKey {
     data class AppDetails(val packageName: String) : NavigationKey
 
     @Serializable
-    data object AppList : NavigationKey
+    data class AppList(val type: AppListType) : NavigationKey
 
     @Serializable
     data object Repos : NavigationKey
diff --git a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt
index 2af5eeba8..57cd212ec 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt
@@ -12,12 +12,22 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.basic.ui.NavigationKey
+import org.fdroid.basic.ui.main.lists.AppListType
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
-fun CategoryCard(category: Category) {
+fun CategoryCard(
+    category: Category,
+    onNav: (NavigationKey) -> Unit,
+    modifier: Modifier = Modifier,
+) {
     AssistChip(
-        onClick = {},
+        onClick = {
+            val type = AppListType.Category(category.name, category.id)
+            val navKey = NavigationKey.AppList(type)
+            onNav(navKey)
+        },
         leadingIcon = {
             Image(
                 imageVector = category.imageVector,
@@ -35,7 +45,7 @@ fun CategoryCard(category: Category) {
                 overflow = TextOverflow.Ellipsis,
             )
         },
-        modifier = Modifier.padding(horizontal = 4.dp)
+        modifier = modifier.padding(horizontal = 4.dp)
     )
 }
 
@@ -43,6 +53,6 @@ fun CategoryCard(category: Category) {
 @Composable
 fun CategoryCardPreview() {
     FDroidContent {
-        CategoryCard(Category("VPN & Proxy", "VPN & Proxy"))
+        CategoryCard(Category("VPN & Proxy", "VPN & Proxy"), {})
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
index dcc54d2df..d776149cb 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
@@ -15,12 +15,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.navigation3.runtime.NavKey
 import org.fdroid.basic.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import kotlin.math.max
 
 @Composable
-fun CategoryList(categories: List<Category>?, modifier: Modifier = Modifier) {
+fun CategoryList(
+    categories: List<Category>?,
+    onNav: (NavKey) -> Unit,
+    modifier: Modifier = Modifier
+) {
     if (categories != null) Column {
         val state = rememberLazyGridState()
         LazyVerticalGrid(
@@ -40,7 +45,7 @@ fun CategoryList(categories: List<Category>?, modifier: Modifier = Modifier) {
                 )
             }
             items(categories, key = { it.name }) { category ->
-                CategoryCard(category)
+                CategoryCard(category, onNav)
             }
         }
     }
@@ -59,6 +64,6 @@ fun CategoryListPreview() {
             Category("Development", "Development"),
             Category("doesn't exist", "Foo bar"),
         )
-        CategoryList(categories)
+        CategoryList(categories, {})
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
index 43fff63dd..b2a54517e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
@@ -40,9 +40,10 @@ import org.fdroid.basic.ui.main.apps.MyAppsViewModel
 import org.fdroid.basic.ui.main.details.AppDetails
 import org.fdroid.basic.ui.main.discover.Discover
 import org.fdroid.basic.ui.main.lists.AppList
-import org.fdroid.basic.ui.main.lists.FilterInfo
-import org.fdroid.basic.ui.main.lists.Sort
+import org.fdroid.basic.ui.main.lists.AppListInfo
+import org.fdroid.basic.ui.main.lists.AppListViewModel
 import org.fdroid.basic.ui.main.repositories.RepositoryList
+import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 sealed class NavDestinations(
@@ -104,9 +105,8 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                     val numUpdates = myAppsViewModel.numUpdates.collectAsStateWithLifecycle(0).value
                     Discover(
                         discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
-                        onTitleTap = {
-                            viewModel.setAppList(it)
-                            backStack.add(NavigationKey.AppList)
+                        onListTap = {
+                            backStack.add(NavigationKey.AppList(it))
                         },
                         onAppTap = {
                             backStack.add(NavigationKey.AppDetails(it.packageName))
@@ -148,6 +148,7 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                     }
                     AppDetails(
                         item = appDetailsViewModel.appDetails.collectAsStateWithLifecycle().value,
+                        onNav = { navKey -> backStack.add(navKey) },
                         onBackNav = if (isBigScreen) null else {
                             { backStack.removeLastOrNull() }
                         },
@@ -159,29 +160,34 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                         Text("No app selected")
                     },
                 ) {
-                    val filterInfo = object : FilterInfo {
+                    val appListViewModel = hiltViewModel<AppListViewModel>()
+                    LaunchedEffect(it.type) {
+                        appListViewModel.load(it.type)
+                    }
+                    val appListInfo = object : AppListInfo {
                         override val model =
-                            viewModel.filterModel.collectAsStateWithLifecycle().value
+                            appListViewModel.appListModel.collectAsStateWithLifecycle().value
 
                         override fun toggleFilterVisibility() {
-                            viewModel.toggleListFilterVisibility()
+                            appListViewModel.toggleListFilterVisibility()
                         }
 
-                        override fun sortBy(sort: Sort) = viewModel.sortBy(sort)
-                        override fun addCategory(category: String) = viewModel.addCategory(category)
+                        override fun sortBy(sort: AppListSortOrder) = appListViewModel.sortBy(sort)
+                        override fun addCategory(category: String) =
+                            appListViewModel.addCategory(category)
+
                         override fun removeCategory(category: String) =
-                            viewModel.removeCategory(category)
+                            appListViewModel.removeCategory(category)
                     }
                     AppList(
-                        appList = viewModel.currentList.collectAsStateWithLifecycle().value,
-                        filterInfo = filterInfo,
+                        appListInfo = appListInfo,
                         currentPackageName = if (isBigScreen) {
                             (backStack.last() as? NavigationKey.AppDetails)?.packageName
                         } else null,
                         onBackClicked = { backStack.removeLastOrNull() },
                         modifier = Modifier,
-                    ) {
-                        backStack.add(NavigationKey.AppDetails(it.packageName))
+                    ) { packageName ->
+                        backStack.add(NavigationKey.AppDetails(packageName))
                     }
                 }
                 entry<NavigationKey.Repos>(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
deleted file mode 100644
index 7c464373e..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledApp.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.fdroid.basic.ui.main.apps
-
-// TODO remove
-interface MinimalApp {
-    val packageName: String
-    val name: String?
-    val icon: String?
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
index d98b39652..cef2935e3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
@@ -48,7 +48,7 @@ import org.fdroid.basic.ui.Names
 import org.fdroid.basic.ui.NavigationKey
 import org.fdroid.basic.ui.getPreviewVersion
 import org.fdroid.basic.ui.main.BottomBar
-import org.fdroid.basic.ui.main.lists.Sort
+import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import java.util.concurrent.TimeUnit.DAYS
 
@@ -59,7 +59,7 @@ fun MyApps(
     currentPackageName: String?,
     onAppItemClick: (String) -> Unit,
     onNav: (NavKey) -> Unit,
-    onSortChanged: (Sort) -> Unit,
+    onSortChanged: (AppListSortOrder) -> Unit,
     onRefresh: () -> Unit,
     isBigScreen: Boolean,
     modifier: Modifier = Modifier,
@@ -93,12 +93,12 @@ fun MyApps(
                             },
                             trailingIcon = {
                                 RadioButton(
-                                    selected = myAppsModel.sortOrder == Sort.NAME,
+                                    selected = myAppsModel.sortOrder == AppListSortOrder.NAME,
                                     onClick = null,
                                 )
                             },
                             onClick = {
-                                onSortChanged(Sort.NAME)
+                                onSortChanged(AppListSortOrder.NAME)
                                 sortByMenuExpanded = false
                             },
                         )
@@ -109,12 +109,12 @@ fun MyApps(
                             },
                             trailingIcon = {
                                 RadioButton(
-                                    selected = myAppsModel.sortOrder == Sort.LATEST,
+                                    selected = myAppsModel.sortOrder == AppListSortOrder.LAST_UPDATED,
                                     onClick = null,
                                 )
                             },
                             onClick = {
-                                onSortChanged(Sort.LATEST)
+                                onSortChanged(AppListSortOrder.LAST_UPDATED)
                                 sortByMenuExpanded = false
                             },
                         )
@@ -223,7 +223,7 @@ fun MyAppsLoadingPreview() {
             myAppsModel = MyAppsModel(
                 appUpdates = null,
                 installedApps = null,
-                sortOrder = Sort.NAME,
+                sortOrder = AppListSortOrder.NAME,
             ),
             currentPackageName = null,
             onAppItemClick = {},
@@ -274,7 +274,7 @@ fun MyAppsPreview() {
         val model = MyAppsModel(
             appUpdates = listOf(app1, app2),
             installedApps = listOf(installedApp1, installedApp2, installedApp3),
-            sortOrder = Sort.NAME,
+            sortOrder = AppListSortOrder.NAME,
         )
         MyApps(
             myAppsModel = model,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt
index 6e9035d0c..a8a6eeb59 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.basic.manager.AppUpdateItem
-import org.fdroid.basic.ui.main.lists.Sort
+import org.fdroid.database.AppListSortOrder
 import java.text.Collator
 import java.util.Locale
 
@@ -12,7 +12,7 @@ import java.util.Locale
 fun MyAppsPresenter(
     appUpdatesFlow: StateFlow<List<AppUpdateItem>?>,
     installedAppsFlow: StateFlow<List<InstalledAppItem>?>,
-    sortOrderFlow: StateFlow<Sort>,
+    sortOrderFlow: StateFlow<AppListSortOrder>,
 ): MyAppsModel {
     val appUpdates = appUpdatesFlow.collectAsState().value
     val installedApps = installedAppsFlow.collectAsState().value
@@ -21,16 +21,16 @@ fun MyAppsPresenter(
     val collator = Collator.getInstance(Locale.getDefault())
     return MyAppsModel(
         appUpdates = when (sortOrder) {
-            Sort.NAME -> appUpdates?.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
-            Sort.LATEST -> appUpdates?.sortedByDescending { it.update.added }
+            AppListSortOrder.NAME -> appUpdates?.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
+            AppListSortOrder.LAST_UPDATED -> appUpdates?.sortedByDescending { it.update.added }
         },
         installedApps = installedApps?.filter {
             // filter out apps already in updates
             it.packageName !in packageNames
         }?.let { apps ->
             when (sortOrder) {
-                Sort.NAME -> apps.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
-                Sort.LATEST -> apps.sortedByDescending { it.lastUpdated }
+                AppListSortOrder.NAME -> apps.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
+                AppListSortOrder.LAST_UPDATED -> apps.sortedByDescending { it.lastUpdated }
             }
         },
         sortOrder = sortOrder,
@@ -40,5 +40,5 @@ fun MyAppsPresenter(
 data class MyAppsModel(
     val appUpdates: List<AppUpdateItem>? = null,
     val installedApps: List<InstalledAppItem>? = null,
-    val sortOrder: Sort = Sort.NAME,
+    val sortOrder: AppListSortOrder = AppListSortOrder.NAME,
 )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt
index 3df9ff41e..c358fab86 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt
@@ -17,8 +17,8 @@ import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.basic.download.getDownloadRequest
 import org.fdroid.basic.manager.MyAppsManager
 import org.fdroid.basic.repo.RepositoryManager
-import org.fdroid.basic.ui.main.lists.Sort
 import org.fdroid.database.AppListItem
+import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.DownloadRequest
 import javax.inject.Inject
@@ -45,7 +45,7 @@ class MyAppsViewModel @Inject constructor(
     private val installedApps = MutableStateFlow<List<InstalledAppItem>?>(null)
     private var installedAppsLiveData =
         db.getAppDao().getInstalledAppListItems(application.packageManager)
-    private val sortOrder = savedStateHandle.getMutableStateFlow("sort", Sort.NAME)
+    private val sortOrder = savedStateHandle.getMutableStateFlow("sort", AppListSortOrder.NAME)
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
     private val localeList = LocaleListCompat.getDefault()
     private val installedAppsObserver = Observer<List<AppListItem>> { list ->
@@ -77,7 +77,7 @@ class MyAppsViewModel @Inject constructor(
         installedAppsLiveData.removeObserver(installedAppsObserver)
     }
 
-    fun changeSortOrder(sort: Sort) {
+    fun changeSortOrder(sort: AppListSortOrder) {
         sortOrder.value = sort
     }
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
index dc1fb0e39..8750f1edf 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
@@ -70,7 +70,9 @@ import org.fdroid.basic.R
 import org.fdroid.basic.details.AppDetailsItem
 import org.fdroid.basic.details.testApp
 import org.fdroid.basic.ui.Names.names
+import org.fdroid.basic.ui.NavigationKey
 import org.fdroid.basic.ui.icons.License
+import org.fdroid.basic.ui.main.lists.AppListType
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
@@ -80,6 +82,7 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 )
 fun AppDetails(
     item: AppDetailsItem?,
+    onNav: (NavigationKey) -> Unit,
     onBackNav: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
@@ -354,18 +357,20 @@ fun AppDetails(
                 }
             }
             // More apps by dev
-            if (item.authorHasMoreThanOneApp) Button(
-                onClick = {},
-                modifier = Modifier
-                    .align(CenterHorizontally)
-                    .padding(bottom = 16.dp),
-            ) {
-                val s =
-                    stringResource(
-                        R.string.app_details_more_apps_by_author,
-                        item.app.authorName!!
-                    )
-                Text(s)
+            if (item.authorHasMoreThanOneApp) {
+                val authorName = item.app.authorName!!
+                val title = stringResource(R.string.app_list_author, authorName)
+                Button(
+                    onClick = {
+                        onNav(NavigationKey.AppList(AppListType.Author(title, authorName)))
+                    },
+                    modifier = Modifier
+                        .align(CenterHorizontally)
+                        .padding(bottom = 16.dp),
+                ) {
+                    val s = stringResource(R.string.app_details_more_apps_by_author, authorName)
+                    Text(s)
+                }
             }
         }
     }
@@ -375,7 +380,7 @@ fun AppDetails(
 @Composable
 fun AppDetailsLoadingPreview() {
     FDroidContent {
-        AppDetails(null, { })
+        AppDetails(null, { }, {})
     }
 }
 
@@ -383,6 +388,6 @@ fun AppDetailsLoadingPreview() {
 @Composable
 fun AppDetailsPreview() {
     FDroidContent {
-        AppDetails(testApp, { })
+        AppDetails(testApp, { }, {})
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
index 598f38113..bd150bfd3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
@@ -35,10 +35,10 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 @Composable
 fun AppCarousel(
     title: String,
-    apps: List<AppNavigationItem>,
+    apps: List<AppDiscoverItem>,
     modifier: Modifier = Modifier,
     onTitleTap: () -> Unit,
-    onAppTap: (AppNavigationItem) -> Unit,
+    onAppTap: (AppDiscoverItem) -> Unit,
 ) {
     val carouselState = rememberCarouselState { apps.size }
     Column(modifier = modifier) {
@@ -70,7 +70,7 @@ fun AppCarousel(
 }
 
 @Composable
-fun AppBox(app: AppNavigationItem, onAppTap: (AppNavigationItem) -> Unit) {
+fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
     Column(
         verticalArrangement = spacedBy(8.dp),
         modifier = Modifier
@@ -109,11 +109,11 @@ fun AppBox(app: AppNavigationItem, onAppTap: (AppNavigationItem) -> Unit) {
 @Composable
 fun AppCarouselPreview() {
     val apps = listOf(
-        AppNavigationItem("", Names.randomName, summary = "bar", isNew = true),
-        AppNavigationItem("", Names.randomName, summary = "bar", isNew = false),
-        AppNavigationItem("", Names.randomName, summary = "bar", isNew = false),
-        AppNavigationItem("", Names.randomName, summary = "bar", isNew = false),
-        AppNavigationItem("", Names.randomName, summary = "bar", isNew = false),
+        AppDiscoverItem("", Names.randomName, isNew = true),
+        AppDiscoverItem("", Names.randomName, isNew = false),
+        AppDiscoverItem("", Names.randomName, isNew = false),
+        AppDiscoverItem("", Names.randomName, isNew = false),
+        AppDiscoverItem("", Names.randomName, isNew = false),
     )
     FDroidContent {
         AppCarousel("Preview Apps", apps, onTitleTap = {}) {}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppDiscoverItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppDiscoverItem.kt
new file mode 100644
index 000000000..5f74d209b
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppDiscoverItem.kt
@@ -0,0 +1,11 @@
+package org.fdroid.basic.ui.main.discover
+
+import org.fdroid.download.DownloadRequest
+
+class AppDiscoverItem(
+    val packageName: String,
+    val name: String,
+    val iconDownloadRequest: DownloadRequest? = null,
+    val isNew: Boolean,
+    val lastUpdated: Long = -1,
+)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
deleted file mode 100644
index b61d1ed3d..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppNavigationItem.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.fdroid.basic.ui.main.discover
-
-import org.fdroid.basic.ui.main.apps.MinimalApp
-import org.fdroid.download.DownloadRequest
-
-class AppNavigationItem(
-    override val packageName: String,
-    override val name: String,
-    val iconDownloadRequest: DownloadRequest? = null,
-    val summary: String,
-    val isNew: Boolean,
-    val lastUpdated: Long = -1,
-) : MinimalApp {
-    override val icon: String? = null
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
index 7c48ac604..72dd13253 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
@@ -11,15 +11,12 @@ import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import org.fdroid.basic.ui.categories.Category
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppsSearch(
     searchBarState: SearchBarState,
-    categories: List<Category>?,
-    onItemClick: (AppNavigationItem) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val textFieldState = rememberTextFieldState()
@@ -49,6 +46,6 @@ fun AppsSearch(
 fun AppsSearchPreview() {
     FDroidContent {
         val state = rememberSearchBarState(SearchBarValue.Expanded)
-        AppsSearch(state, emptyList(), {})
+        AppsSearch(state)
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
index 1e951d360..062a7a563 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
@@ -38,11 +38,12 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
+import org.fdroid.basic.R
 import org.fdroid.basic.ui.NavigationKey
 import org.fdroid.basic.ui.categories.CategoryList
 import org.fdroid.basic.ui.main.BottomBar
 import org.fdroid.basic.ui.main.MainOverFlowMenu
-import org.fdroid.basic.ui.main.lists.AppList
+import org.fdroid.basic.ui.main.lists.AppListType
 import org.fdroid.basic.ui.main.topBarMenuItems
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
@@ -53,8 +54,8 @@ fun Discover(
     numUpdates: Int,
     isBigScreen: Boolean,
     modifier: Modifier = Modifier,
-    onTitleTap: (AppList) -> Unit,
-    onAppTap: (AppNavigationItem) -> Unit,
+    onListTap: (AppListType) -> Unit,
+    onAppTap: (AppDiscoverItem) -> Unit,
     onNav: (NavKey) -> Unit,
 ) {
     val searchBarState = rememberSearchBarState()
@@ -120,29 +121,34 @@ fun Discover(
                 is LoadedDiscoverModel -> {
                     AppsSearch(
                         searchBarState = searchBarState,
-                        categories = discoverModel.categories,
-                        onItemClick = onAppTap,
                         modifier = Modifier.padding(top = 8.dp),
                     )
+                    val listNew = AppListType.New(stringResource(R.string.app_list_new))
                     AppCarousel(
-                        title = AppList.New.title,
+                        title = listNew.title,
                         apps = discoverModel.newApps,
-                        onTitleTap = { onTitleTap(AppList.New) },
+                        onTitleTap = { onListTap(listNew) },
                         onAppTap = onAppTap,
                     )
+                    val listRecentlyUpdated = AppListType.RecentlyUpdated(
+                        stringResource(R.string.app_list_recently_updated),
+                    )
                     AppCarousel(
-                        title = AppList.RecentlyUpdated.title,
+                        title = listRecentlyUpdated.title,
                         apps = discoverModel.recentlyUpdatedApps,
-                        onTitleTap = { onTitleTap(AppList.RecentlyUpdated) },
+                        onTitleTap = { onListTap(listRecentlyUpdated) },
                         onAppTap = onAppTap,
                     )
+                    val listAll = AppListType.All(
+                        title = stringResource(R.string.app_list_all),
+                    )
                     FilledTonalButton(
-                        onClick = { onTitleTap(AppList.All) },
+                        onClick = { onListTap(listAll) },
                         modifier = Modifier
                             .align(End)
                             .padding(16.dp),
                     ) {
-                        Text(AppList.All.title)
+                        Text(listAll.title)
                     }
                 }
                 NoEnabledReposDiscoverModel -> {
@@ -152,7 +158,7 @@ fun Discover(
             AnimatedVisibility(discoverModel is LoadedDiscoverModel) {
                 val categories = (discoverModel as LoadedDiscoverModel).categories
                 // TODO remove max height hack
-                CategoryList(categories, Modifier.heightIn(max = 2000.dp))
+                CategoryList(categories, onNav, Modifier.heightIn(max = 2000.dp))
             }
         }
     }
@@ -166,7 +172,7 @@ fun LoadingDiscoverPreview() {
             discoverModel = LoadingDiscoverModel(true),
             numUpdates = 23,
             isBigScreen = false,
-            onTitleTap = {},
+            onListTap = {},
             onAppTap = {},
             onNav = {},
         )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt
index 6629b9226..68baf2038 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt
@@ -8,7 +8,7 @@ import org.fdroid.basic.ui.main.repositories.Repository
 
 @Composable
 fun DiscoverPresenter(
-    appsFlow: Flow<List<AppNavigationItem>>,
+    appsFlow: Flow<List<AppDiscoverItem>>,
     categoriesFlow: Flow<List<Category>>,
     repositoriesFlow: Flow<List<Repository>>,
 ): DiscoverModel {
@@ -40,7 +40,7 @@ sealed class DiscoverModel
 data class LoadingDiscoverModel(val isFirstStart: Boolean) : DiscoverModel()
 object NoEnabledReposDiscoverModel : DiscoverModel()
 data class LoadedDiscoverModel(
-    val newApps: List<AppNavigationItem>,
-    val recentlyUpdatedApps: List<AppNavigationItem>,
+    val newApps: List<AppDiscoverItem>,
+    val recentlyUpdatedApps: List<AppDiscoverItem>,
     val categories: List<Category>?,
 ) : DiscoverModel()
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
deleted file mode 100644
index 3033ef3a5..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppItem.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.fdroid.basic.ui.main.lists
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Android
-import androidx.compose.material.icons.filled.NewReleases
-import androidx.compose.material3.BadgedBox
-import androidx.compose.material3.Icon
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.ListItemDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
-import org.fdroid.download.DownloadRequest
-import org.fdroid.fdroid.ui.theme.FDroidContent
-
-@Composable
-fun AppItem(
-    name: String,
-    summary: String,
-    downloadRequest: DownloadRequest?,
-    isNew: Boolean,
-    isSelected: Boolean,
-    modifier: Modifier = Modifier,
-) {
-    ListItem(
-        headlineContent = { Text(name) },
-        supportingContent = { Text(summary) },
-        leadingContent = {
-            BadgedBox(badge = {
-                if (isNew) Icon(
-                    imageVector = Icons.Filled.NewReleases,
-                    tint = MaterialTheme.colorScheme.primary,
-                    contentDescription = null, modifier = Modifier.size(24.dp),
-                )
-            }) {
-                downloadRequest?.let {
-                    AsyncImage(
-                        model = downloadRequest,
-                        contentDescription = null,
-                        modifier = Modifier.size(48.dp),
-                    )
-                } ?: Icon(
-                    Icons.Filled.Android,
-                    tint = MaterialTheme.colorScheme.secondary,
-                    contentDescription = null,
-                    modifier = Modifier
-                        .clip(MaterialTheme.shapes.medium)
-                        .size(48.dp)
-                        .background(Color.White)
-                        .padding(8.dp),
-                )
-            }
-        },
-        colors = ListItemDefaults.colors(
-            containerColor = if (isSelected) {
-                MaterialTheme.colorScheme.surfaceVariant
-            } else {
-                Color.Transparent
-            }
-        ),
-        modifier = modifier,
-    )
-}
-
-@Preview
-@Composable
-fun AppItemPreview() {
-    FDroidContent {
-        AppItem("This is app 1", "It has summary 2", null, false, false)
-    }
-}
-
-@Preview
-@Composable
-fun AppItemPreviewNew() {
-    FDroidContent {
-        AppItem("This is app 1", "It has summary 2", null, true, false)
-    }
-}
-
-@Preview
-@Composable
-fun AppItemPreviewSelected() {
-    FDroidContent {
-        AppItem("This is app 1", "It has summary 2", null, false, true)
-    }
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
index 14b7d3b75..4fc8d42e8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
@@ -21,8 +21,10 @@ import androidx.compose.material.icons.filled.FilterList
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -36,23 +38,15 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.ui.main.apps.MinimalApp
-
-sealed class AppList(val title: String) {
-    data object New : AppList("New apps")
-    data object RecentlyUpdated : AppList("Recently updated")
-    data object All : AppList("All apps")
-}
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun AppList(
-    appList: AppList,
-    filterInfo: FilterInfo,
+    appListInfo: AppListInfo,
     currentPackageName: String?,
     modifier: Modifier = Modifier,
     onBackClicked: () -> Unit,
-    onItemClick: (MinimalApp) -> Unit,
+    onItemClick: (String) -> Unit,
 ) {
     val scrollBehavior = exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
     val addedRepos = remember { mutableStateListOf<String>() }
@@ -60,7 +54,7 @@ fun AppList(
         topBar = {
             TopAppBar(
                 title = {
-                    Text(appList.title)
+                    Text(appListInfo.model.list.title)
                 },
                 navigationIcon = {
                     IconButton(onClick = onBackClicked) {
@@ -68,9 +62,9 @@ fun AppList(
                     }
                 },
                 actions = {
-                    IconButton(onClick = { filterInfo.toggleFilterVisibility() }) {
+                    IconButton(onClick = { appListInfo.toggleFilterVisibility() }) {
                         val showFilterBadge = addedRepos.isNotEmpty() ||
-                            filterInfo.model.addedCategories.isNotEmpty()
+                            appListInfo.model.addedCategories.isNotEmpty()
                         BadgedBox(badge = {
                             if (showFilterBadge) Badge(containerColor = MaterialTheme.colorScheme.secondary)
                         }) {
@@ -91,11 +85,13 @@ fun AppList(
                 .padding(paddingValues),
         ) {
             AppsFilter(
-                filter = filterInfo,
+                info = appListInfo,
                 addedRepos = addedRepos,
                 modifier = Modifier.background(TopAppBarDefaults.topAppBarColors().containerColor),
             )
-            LazyColumn(
+            val apps = appListInfo.model.apps
+            if (apps == null) LoadingIndicator()
+            else LazyColumn(
                 contentPadding = PaddingValues(vertical = 8.dp),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
                 modifier = Modifier.then(
@@ -103,17 +99,16 @@ fun AppList(
                     else Modifier.selectableGroup()
                 ),
             ) {
-                val apps = filterInfo.model.apps
                 items(apps, key = { it.packageName }, contentType = { "A" }) { navItem ->
                     val isSelected = currentPackageName == navItem.packageName
                     val interactionModifier = if (currentPackageName == null) {
                         Modifier.clickable(
-                            onClick = { onItemClick(navItem) }
+                            onClick = { onItemClick(navItem.packageName) }
                         )
                     } else {
                         Modifier.selectable(
                             selected = isSelected,
-                            onClick = { onItemClick(navItem) }
+                            onClick = { onItemClick(navItem.packageName) }
                         )
                     }
                     val modifier = Modifier
@@ -121,11 +116,8 @@ fun AppList(
                         .animateItem()
                         .padding(horizontal = 8.dp)
                         .then(interactionModifier)
-                    AppItem(
-                        name = navItem.name,
-                        summary = navItem.summary,
-                        downloadRequest = navItem.iconDownloadRequest,
-                        isNew = navItem.isNew,
+                    AppListRow(
+                        item = navItem,
                         isSelected = isSelected,
                         modifier = modifier,
                     )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListItem.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListItem.kt
new file mode 100644
index 000000000..0ec0f2e56
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListItem.kt
@@ -0,0 +1,11 @@
+package org.fdroid.basic.ui.main.lists
+
+import org.fdroid.download.DownloadRequest
+
+data class AppListItem(
+    val packageName: String,
+    val name: String,
+    val summary: String,
+    val lastUpdated: Long,
+    val iconDownloadRequest: DownloadRequest?,
+)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/FilterPresenter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListPresenter.kt
similarity index 62%
rename from basic/src/main/java/org/fdroid/basic/ui/main/lists/FilterPresenter.kt
rename to basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListPresenter.kt
index 5aad35c1d..f41c3f9db 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/FilterPresenter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListPresenter.kt
@@ -5,50 +5,46 @@ import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.basic.ui.categories.Category
-import org.fdroid.basic.ui.main.discover.AppNavigationItem
+import org.fdroid.database.AppListSortOrder
 import java.util.Locale
 
-enum class Sort {
-    NAME,
-    LATEST,
-}
-
 @Composable
-fun FilterPresenter(
+fun AppListPresenter(
+    listFlow: StateFlow<AppListType>,
+    appsFlow: StateFlow<List<AppListItem>?>,
     areFiltersShownFlow: StateFlow<Boolean>,
-    appsFlow: Flow<List<AppNavigationItem>>,
-    sortByFlow: StateFlow<Sort>,
+    sortByFlow: StateFlow<AppListSortOrder>,
     allCategoriesFlow: Flow<List<Category>>,
     addedCategoriesFlow: StateFlow<List<String>>,
-): FilterModel {
+): AppListModel {
     val apps = appsFlow.collectAsState(null).value
     val sortBy = sortByFlow.collectAsState().value
     val allCategories = allCategoriesFlow.collectAsState(null).value
     val addedCategories = addedCategoriesFlow.collectAsState().value
 
-    val newApps = apps?.filter { app ->
+    val filteredApps = apps?.filter { app ->
         addedCategories.isEmpty() || addedCategories.any { app.summary.contains(it) }
-    } ?: emptyList()
+    }
 
-    return FilterModel(
-        isLoading = apps == null,
-        areFiltersShown = areFiltersShownFlow.collectAsState().value,
-        apps = if (sortBy == Sort.NAME) {
-            newApps.sortedBy { it.name.lowercase(Locale.getDefault()) }
+    return AppListModel(
+        list = listFlow.collectAsState().value,
+        apps = if (sortBy == AppListSortOrder.NAME) {
+            filteredApps?.sortedBy { it.name.lowercase(Locale.getDefault()) }
         } else {
-            newApps.sortedByDescending { it.lastUpdated }
+            filteredApps?.sortedByDescending { it.lastUpdated }
         },
+        areFiltersShown = areFiltersShownFlow.collectAsState().value,
         sortBy = sortBy,
         allCategories = allCategories,
         addedCategories = addedCategories,
     )
 }
 
-data class FilterModel(
-    val isLoading: Boolean,
+data class AppListModel(
+    val list: AppListType,
+    val apps: List<AppListItem>?,
     val areFiltersShown: Boolean,
-    val apps: List<AppNavigationItem>,
-    val sortBy: Sort,
+    val sortBy: AppListSortOrder,
     val allCategories: List<Category>?,
     val addedCategories: List<String>,
 )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListRow.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListRow.kt
new file mode 100644
index 000000000..af0d8c0ad
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListRow.kt
@@ -0,0 +1,72 @@
+package org.fdroid.basic.ui.main.lists
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import org.fdroid.basic.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun AppListRow(
+    item: AppListItem,
+    isSelected: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        headlineContent = { Text(item.name) },
+        supportingContent = { Text(item.summary) },
+        leadingContent = {
+            AsyncImage(
+                model = item.iconDownloadRequest,
+                error = painterResource(R.drawable.ic_repo_app_default),
+                contentDescription = null,
+                modifier = Modifier.size(48.dp),
+            )
+        },
+        colors = ListItemDefaults.colors(
+            containerColor = if (isSelected) {
+                MaterialTheme.colorScheme.surfaceVariant
+            } else {
+                Color.Transparent
+            }
+        ),
+        modifier = modifier,
+    )
+}
+
+@Preview
+@Composable
+fun AppListRowPreview() {
+    FDroidContent {
+        val item1 = AppListItem("1", "This is app 1", "It has summary 2", 0, null)
+        val item2 = AppListItem("2", "This is app 2", "It has summary 2", 0, null)
+        Column {
+            AppListRow(item1, false)
+            AppListRow(item2, true)
+        }
+    }
+}
+
+@Preview(uiMode = UI_MODE_NIGHT_YES)
+@Composable
+fun AppListRowPreviewNight() {
+    FDroidContent {
+        val item1 = AppListItem("1", "This is app 1", "It has summary 2", 0, null)
+        val item2 = AppListItem("2", "This is app 2", "It has summary 2", 0, null)
+        Column {
+            AppListRow(item1, false)
+            AppListRow(item2, true)
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListType.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListType.kt
new file mode 100644
index 000000000..941c7f8ff
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListType.kt
@@ -0,0 +1,27 @@
+package org.fdroid.basic.ui.main.lists
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed class AppListType {
+    abstract val title: String
+
+    @Serializable
+    data class New(override val title: String) : AppListType()
+
+    @Serializable
+    data class RecentlyUpdated(override val title: String) : AppListType()
+
+    @Serializable
+    data class All(override val title: String) : AppListType()
+
+    @Serializable
+    data class Category(override val title: String, val categoryId: String) : AppListType()
+
+    @Serializable
+    data class Repository(override val title: String, val repoId: Long) : AppListType()
+
+    @Serializable
+    data class Author(override val title: String, val authorName: String) : AppListType()
+
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListViewModel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListViewModel.kt
new file mode 100644
index 000000000..e0998a15d
--- /dev/null
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListViewModel.kt
@@ -0,0 +1,214 @@
+package org.fdroid.basic.ui.main.lists
+
+import android.app.Application
+import androidx.annotation.UiThread
+import androidx.core.os.LocaleListCompat
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.application
+import androidx.lifecycle.asFlow
+import androidx.lifecycle.map
+import androidx.lifecycle.viewModelScope
+import app.cash.molecule.AndroidUiDispatcher
+import app.cash.molecule.RecompositionMode.ContextClock
+import app.cash.molecule.launchMolecule
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import mu.KotlinLogging
+import org.fdroid.basic.R
+import org.fdroid.basic.download.getDownloadRequest
+import org.fdroid.basic.repo.RepositoryManager
+import org.fdroid.basic.ui.categories.Category
+import org.fdroid.database.AppListSortOrder
+import org.fdroid.database.AppOverviewItem
+import org.fdroid.database.FDroidDatabase
+import java.text.Collator
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+@HiltViewModel
+class AppListViewModel @Inject constructor(
+    app: Application,
+    savedStateHandle: SavedStateHandle,
+    private val db: FDroidDatabase,
+    private val repositoryManager: RepositoryManager,
+) : AndroidViewModel(app) {
+
+    private val log = KotlinLogging.logger { }
+    private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+
+    private val localeList = LocaleListCompat.getDefault()
+    private val apps = MutableStateFlow<List<AppListItem>?>(null)
+    private var appsLiveData: LiveData<*>? = null
+    private val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
+        val collator = Collator.getInstance(Locale.getDefault())
+        categories.map { category ->
+            Category(
+                id = category.id,
+                name = category.getName(localeList) ?: "Unknown Category",
+            )
+        }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
+    }
+
+    private val currentList =
+        MutableStateFlow<AppListType>(AppListType.New(app.getString(R.string.app_list_new)))
+    private val showFilters = savedStateHandle.getMutableStateFlow("showFilters", true)
+    private val sortBy = MutableStateFlow(AppListSortOrder.LAST_UPDATED)
+    private val addedCategories = MutableStateFlow<List<String>>(emptyList())
+
+    val appListModel: StateFlow<AppListModel> = scope.launchMolecule(mode = ContextClock) {
+        AppListPresenter(
+            listFlow = currentList,
+            appsFlow = apps,
+            areFiltersShownFlow = showFilters,
+            sortByFlow = sortBy,
+            allCategoriesFlow = categories,
+            addedCategoriesFlow = addedCategories,
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private val appsObserver = Observer<Any> { items ->
+        val list = items as? List<*> ?: return@Observer
+        if (list.isEmpty()) {
+            apps.value = emptyList()
+        } else {
+            when (items[0]) {
+                is AppOverviewItem -> onAppOverviewItems(items as List<AppOverviewItem>)
+                is org.fdroid.database.AppListItem -> onAppListItems(items as List<org.fdroid.database.AppListItem>)
+                else -> error("Unknown item class: ${items[0]?.javaClass?.name}")
+            }
+        }
+    }
+
+    init {
+        log.info("init $this")
+    }
+
+    override fun onCleared() {
+        log.info("onCleared $this")
+        appsLiveData?.removeObserver(appsObserver)
+    }
+
+    @UiThread
+    fun load(type: AppListType) {
+        apps.value = null
+        appsLiveData?.removeObserver(appsObserver)
+        appsLiveData = null
+
+        currentList.value = type
+        when (type) {
+            is AppListType.Author -> {
+                appsLiveData = db.getAppDao().getAppListItemsForAuthor(
+                    packageManager = application.packageManager,
+                    author = type.authorName,
+                    searchQuery = null,
+                    sortOrder = sortBy.value,
+                ).apply {
+                    observeForever(appsObserver)
+                }
+            }
+            is AppListType.Category -> {
+                appsLiveData = db.getAppDao().getAppListItems(
+                    packageManager = application.packageManager,
+                    category = type.categoryId,
+                    searchQuery = null,
+                    sortOrder = sortBy.value,
+                ).apply {
+                    observeForever(appsObserver)
+                }
+            }
+            is AppListType.New -> {
+                val cutOffMillis = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(14)
+                appsLiveData = db.getAppDao().getAppOverviewItems().map { list ->
+                    list.filter { it.added > cutOffMillis && it.lastUpdated == it.added }
+                }.apply {
+                    observeForever(appsObserver)
+                }
+            }
+            is AppListType.RecentlyUpdated -> {
+                appsLiveData = db.getAppDao().getAppOverviewItems().apply {
+                    observeForever(appsObserver)
+                }
+            }
+            is AppListType.All -> {
+                appsLiveData = db.getAppDao().getAppListItems(
+                    packageManager = application.packageManager,
+                    searchQuery = null,
+                    sortOrder = sortBy.value,
+                ).apply {
+                    observeForever(appsObserver)
+                }
+            }
+            is AppListType.Repository -> {
+                appsLiveData = db.getAppDao().getAppListItems(
+                    packageManager = application.packageManager,
+                    repoId = type.repoId,
+                    searchQuery = null,
+                    sortOrder = sortBy.value,
+                ).apply {
+                    observeForever(appsObserver)
+                }
+            }
+        }
+    }
+
+    fun toggleListFilterVisibility() {
+        showFilters.update { !it }
+    }
+
+    fun sortBy(sort: AppListSortOrder) {
+        sortBy.update { sort }
+    }
+
+    fun addCategory(category: String) {
+        addedCategories.update {
+            addedCategories.value.toMutableList().apply {
+                add(category)
+            }
+        }
+    }
+
+    fun removeCategory(category: String) {
+        addedCategories.update {
+            addedCategories.value.toMutableList().apply {
+                remove(category)
+            }
+        }
+    }
+
+    fun onAppOverviewItems(items: List<AppOverviewItem>) {
+        apps.value = items.mapNotNull {
+            val repository = repositoryManager.getRepository(it.repoId)
+                ?: return@mapNotNull null
+            AppListItem(
+                packageName = it.packageName,
+                name = it.name ?: "Unknown",
+                summary = it.summary ?: "Unknown",
+                lastUpdated = it.lastUpdated,
+                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
+            )
+        }
+    }
+
+    private fun onAppListItems(items: List<org.fdroid.database.AppListItem>) {
+        apps.value = items.mapNotNull {
+            val repository = repositoryManager.getRepository(it.repoId)
+                ?: return@mapNotNull null
+            AppListItem(
+                packageName = it.packageName,
+                name = it.name ?: "Unknown",
+                summary = it.summary ?: "Unknown",
+                lastUpdated = it.lastUpdated,
+                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
+            )
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
index 3b018ff0b..208e0725a 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
+++ b/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
@@ -26,23 +26,24 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import org.fdroid.database.AppListSortOrder
 
-interface FilterInfo {
-    val model: FilterModel
+interface AppListInfo {
+    val model: AppListModel
 
     fun toggleFilterVisibility()
-    fun sortBy(sort: Sort)
+    fun sortBy(sort: AppListSortOrder)
     fun addCategory(category: String)
     fun removeCategory(category: String)
 }
 
 @Composable
 fun ColumnScope.AppsFilter(
-    filter: FilterInfo,
+    info: AppListInfo,
     addedRepos: MutableList<String>,
     modifier: Modifier = Modifier,
 ) {
-    AnimatedVisibility(filter.model.areFiltersShown) {
+    AnimatedVisibility(info.model.areFiltersShown) {
         FlowRow(
             modifier = modifier
                 .fillMaxWidth()
@@ -55,9 +56,9 @@ fun ColumnScope.AppsFilter(
             FilterChip(
                 selected = false,
                 leadingIcon = {
-                    val vector = when (filter.model.sortBy) {
-                        Sort.NAME -> Icons.Filled.SortByAlpha
-                        Sort.LATEST -> Icons.Filled.AccessTime
+                    val vector = when (info.model.sortBy) {
+                        AppListSortOrder.NAME -> Icons.Filled.SortByAlpha
+                        AppListSortOrder.LAST_UPDATED -> Icons.Filled.AccessTime
                     }
                     Icon(vector, null, modifier = Modifier.size(FilterChipDefaults.IconSize))
                 },
@@ -65,9 +66,9 @@ fun ColumnScope.AppsFilter(
                     Icon(Icons.Filled.ArrowDropDown, null)
                 },
                 label = {
-                    val s = when (filter.model.sortBy) {
-                        Sort.NAME -> "Sort by name"
-                        Sort.LATEST -> "Sort by latest"
+                    val s = when (info.model.sortBy) {
+                        AppListSortOrder.NAME -> "Sort by name"
+                        AppListSortOrder.LAST_UPDATED -> "Sort by latest"
                     }
                     Text(s)
                     DropdownMenu(
@@ -80,7 +81,7 @@ fun ColumnScope.AppsFilter(
                                 Icon(Icons.Filled.SortByAlpha, null)
                             },
                             onClick = {
-                                filter.sortBy(Sort.NAME)
+                                info.sortBy(AppListSortOrder.NAME)
                                 sortByMenuExpanded = false
                             },
                         )
@@ -90,7 +91,7 @@ fun ColumnScope.AppsFilter(
                                 Icon(Icons.Filled.AccessTime, null)
                             },
                             onClick = {
-                                filter.sortBy(Sort.LATEST)
+                                info.sortBy(AppListSortOrder.LAST_UPDATED)
                                 sortByMenuExpanded = false
                             },
                         )
@@ -98,7 +99,7 @@ fun ColumnScope.AppsFilter(
                 },
                 onClick = { sortByMenuExpanded = !sortByMenuExpanded },
             )
-            if (!filter.model.allCategories.isNullOrEmpty()) FilterChip(
+            if (!info.model.allCategories.isNullOrEmpty()) FilterChip(
                 selected = false,
                 leadingIcon = {
                     Icon(
@@ -113,11 +114,11 @@ fun ColumnScope.AppsFilter(
                         expanded = categoryMenuExpanded,
                         onDismissRequest = { categoryMenuExpanded = false },
                     ) {
-                        filter.model.allCategories?.forEach { category ->
+                        info.model.allCategories?.forEach { category ->
                             DropdownMenuItem(
                                 text = { Text(category.name) },
                                 onClick = {
-                                    filter.addCategory(category.id)
+                                    info.addCategory(category.id)
                                     categoryMenuExpanded = false
                                 },
                             )
@@ -159,7 +160,7 @@ fun ColumnScope.AppsFilter(
                 },
                 onClick = { repoMenuExpanded = !repoMenuExpanded },
             )
-            filter.model.addedCategories.forEach { category ->
+            info.model.addedCategories.forEach { category ->
                 FilterChip(
                     selected = true,
                     trailingIcon = {
@@ -170,7 +171,7 @@ fun ColumnScope.AppsFilter(
                         )
                     },
                     label = { Text(category) },
-                    onClick = { filter.removeCategory(category) }
+                    onClick = { info.removeCategory(category) }
                 )
             }
             addedRepos.forEach { repo ->
diff --git a/basic/src/main/res/values/strings-next.xml b/basic/src/main/res/values/strings-next.xml
index 121ed9945..891d1768f 100644
--- a/basic/src/main/res/values/strings-next.xml
+++ b/basic/src/main/res/values/strings-next.xml
@@ -7,4 +7,9 @@
     <string name="discover">Discover</string>
     <string name="apps_my">My apps</string>
 
+    <string name="app_list_new">New apps</string>
+    <string name="app_list_recently_updated">Recently updated</string>
+    <string name="app_list_all">All apps</string>
+    <string name="app_list_author">Apps by %s</string>
+
 </resources>

From 165762fec5ede00e60a105b18308f649c3ea8b56 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 22 Jul 2025 18:58:57 -0300
Subject: [PATCH 031/180] Clean up current state, move things around, rename
 them, etc.

---
 .../fdroid/basic/repo/RepositoryManager.kt    |   76 -
 .../main/java/org/fdroid/basic/ui/Icons.kt    |  572 ---
 .../main/java/org/fdroid/basic/ui/Names.kt    | 4302 -----------------
 .../main/java/org/fdroid/basic/ui/Utils.kt    |   67 -
 .../basic/ui/categories/CategoryCarousel.kt   |  119 -
 {basic => next}/.gitignore                    |    0
 {basic => next}/build.gradle.kts              |    3 +-
 {basic => next}/proguard-rules.pro            |    0
 {basic => next}/src/main/AndroidManifest.xml  |   10 +-
 .../src/main/assets/default_repos.json        |    0
 {basic => next}/src/main/assets/logback.xml   |    0
 .../src/main/kotlin/org/fdroid}/App.kt        |   13 +-
 .../main/kotlin/org/fdroid}/MainActivity.kt   |    4 +-
 .../kotlin/org/fdroid}/NotificationManager.kt |    3 +-
 .../kotlin/org/fdroid}/db/DatabaseModule.kt   |    2 +-
 .../main/kotlin/org/fdroid}/db/InitialData.kt |    6 +-
 .../org/fdroid}/download/DownloadModule.kt    |    6 +-
 .../fdroid}/download/DownloaderFactoryImpl.kt |    2 +-
 .../org/fdroid/download/LocalIconFetcher.kt   |   10 +-
 .../main/kotlin}/org/fdroid/fdroid/Compat.kt  |    0
 .../org/fdroid/fdroid}/ui/theme/Color.kt      |    0
 .../org/fdroid/fdroid}/ui/theme/Theme.kt      |    0
 .../fdroid}/install/SessionInstallManager.kt  |    2 +-
 .../org/fdroid}/repo/RepoUpdateManager.kt     |    6 +-
 .../org/fdroid}/repo/RepoUpdateWorker.kt      |    6 +-
 .../org/fdroid}/repo/RepositoryModule.kt      |    2 +-
 .../src/main/kotlin/org/fdroid/ui}/About.kt   |    8 +-
 .../main/kotlin/org/fdroid/ui}/BottomBar.kt   |    4 +-
 .../src/main/kotlin/org/fdroid/ui}/Main.kt    |   75 +-
 .../kotlin/org/fdroid/ui}/MainOverflowMenu.kt |    2 +-
 .../main/kotlin/org/fdroid}/ui/Navigation.kt  |   32 +-
 .../main/kotlin/org/fdroid/ui}/Settings.kt    |    4 +-
 .../org/fdroid/ui/apps/AppUpdateItem.kt       |   13 +
 .../org/fdroid/ui}/apps/InstalledAppRow.kt    |    8 +-
 .../main/kotlin/org/fdroid/ui}/apps/MyApps.kt |   17 +-
 .../org/fdroid/ui}/apps/MyAppsPresenter.kt    |    3 +-
 .../org/fdroid/ui}/apps/MyAppsViewModel.kt    |   20 +-
 .../org/fdroid/ui}/apps/UpdatableAppRow.kt    |    9 +-
 .../org/fdroid}/ui/categories/CategoryCard.kt |   16 +-
 .../org/fdroid/ui/categories/CategoryItem.kt  |    4 +-
 .../org/fdroid}/ui/categories/CategoryList.kt |   20 +-
 .../org/fdroid/ui}/details/AntiFeatures.kt    |    5 +-
 .../org/fdroid/ui}/details/AppDetails.kt      |   17 +-
 .../fdroid/ui}/details/AppDetailsHeader.kt    |   12 +-
 .../org/fdroid/ui}/details/AppDetailsItem.kt  |  169 +-
 .../org/fdroid/ui}/details/AppDetailsLink.kt  |    4 +-
 .../org/fdroid/ui}/details/AppDetailsMenu.kt  |    7 +-
 .../fdroid/ui}/details/AppDetailsTopAppBar.kt |    7 +-
 .../fdroid/ui}/details/AppDetailsViewModel.kt |   14 +-
 .../fdroid/ui}/details/AppDetailsWarnings.kt  |    8 +-
 .../fdroid/ui}/details/DetailsPresenter.kt    |    7 +-
 .../fdroid/ui}/details/ExpandableSection.kt   |    2 +-
 .../org/fdroid/ui}/details/RepoChooser.kt     |    8 +-
 .../kotlin/org/fdroid/ui}/details/Versions.kt |   11 +-
 .../org/fdroid/ui}/discover/AppCarousel.kt    |    4 +-
 .../fdroid/ui}/discover/AppDiscoverItem.kt    |    2 +-
 .../ui}/discover/AppSearchInputField.kt       |    2 +-
 .../org/fdroid/ui}/discover/AppsSearch.kt     |    2 +-
 .../org/fdroid/ui}/discover/Discover.kt       |   16 +-
 .../fdroid/ui}/discover/DiscoverPresenter.kt  |   10 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |   24 +-
 .../kotlin/org/fdroid}/ui/icons/License.kt    |   18 +-
 .../org/fdroid}/ui/icons/PackageVariant.kt    |    2 +-
 .../kotlin/org/fdroid/ui}/lists/AppList.kt    |    2 +-
 .../org/fdroid/ui}/lists/AppListItem.kt       |    2 +-
 .../org/fdroid/ui}/lists/AppListPresenter.kt  |    8 +-
 .../kotlin/org/fdroid/ui}/lists/AppListRow.kt |    4 +-
 .../org/fdroid/ui}/lists/AppListType.kt       |    2 +-
 .../org/fdroid/ui}/lists/AppListViewModel.kt  |   18 +-
 .../kotlin/org/fdroid/ui}/lists/AppsFilter.kt |    2 +-
 .../org/fdroid/ui}/repositories/RepoIcon.kt   |    6 +-
 .../fdroid/ui/repositories/Repositories.kt    |   10 +-
 .../ui}/repositories/RepositoriesList.kt      |    4 +-
 .../ui/repositories/RepositoriesViewModel.kt  |   41 +
 .../fdroid/ui/repositories/RepositoryRow.kt   |    4 +-
 .../fdroid}/ui/utils/FDroidOutlineButton.kt   |    2 +-
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  161 +
 .../kotlin/org/fdroid/ui/utils/UiUtils.kt     |   33 +
 .../org/fdroid/updates/UpdatesManager.kt      |   26 +-
 .../org/fdroid}/updates/UpdatesModule.kt      |    2 +-
 .../fdroid}/utils/CoroutinesScopesModule.kt   |    2 +-
 .../src/main/kotlin/org/fdroid/utils/Utils.kt |   15 +
 .../src/main/res/drawable/ic_launcher.png     |  Bin
 .../src/main/res/drawable/ic_notification.xml |    0
 .../src/main/res/drawable/ic_refresh.xml      |    0
 .../main/res/drawable/ic_repo_app_default.xml |    0
 .../src/main/res/values/colors.xml            |    0
 .../src/main/res/values/strings-next.xml      |    0
 .../src/main/res/values/strings.xml           |    0
 .../src/main/res/values/themes.xml            |    0
 .../ui/main/details/HtmlDescriptionTest.kt    |   29 +
 settings.gradle                               |    2 +-
 92 files changed, 614 insertions(+), 5558 deletions(-)
 delete mode 100644 basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/Icons.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/Names.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/Utils.kt
 delete mode 100644 basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCarousel.kt
 rename {basic => next}/.gitignore (100%)
 rename {basic => next}/build.gradle.kts (97%)
 rename {basic => next}/proguard-rules.pro (100%)
 rename {basic => next}/src/main/AndroidManifest.xml (77%)
 rename {basic => next}/src/main/assets/default_repos.json (100%)
 rename {basic => next}/src/main/assets/logback.xml (100%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/App.kt (87%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/MainActivity.kt (94%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/NotificationManager.kt (98%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/db/DatabaseModule.kt (95%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/db/InitialData.kt (95%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/download/DownloadModule.kt (79%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/download/DownloaderFactoryImpl.kt (98%)
 rename basic/src/main/java/org/fdroid/basic/ui/icons/ApplicationIconFetcher.kt => next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt (91%)
 rename {basic/src/main/java => next/src/main/kotlin}/org/fdroid/fdroid/Compat.kt (100%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid/fdroid}/ui/theme/Color.kt (100%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid/fdroid}/ui/theme/Theme.kt (100%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/install/SessionInstallManager.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/repo/RepoUpdateManager.kt (98%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/repo/RepoUpdateWorker.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/repo/RepositoryModule.kt (96%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/About.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/BottomBar.kt (94%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/Main.kt (79%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/MainOverflowMenu.kt (96%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/ui/Navigation.kt (58%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/Settings.kt (96%)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/apps/AppUpdateItem.kt
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/apps/InstalledAppRow.kt (93%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/apps/MyApps.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/apps/MyAppsPresenter.kt (95%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/apps/MyAppsViewModel.kt (85%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/apps/UpdatableAppRow.kt (95%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/ui/categories/CategoryCard.kt (79%)
 rename basic/src/main/java/org/fdroid/basic/ui/categories/Category.kt => next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt (98%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/ui/categories/CategoryList.kt (78%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/AntiFeatures.kt (96%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/AppDetails.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/AppDetailsHeader.kt (95%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid/ui}/details/AppDetailsItem.kt (59%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/AppDetailsLink.kt (96%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/AppDetailsMenu.kt (96%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/AppDetailsTopAppBar.kt (94%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid/ui}/details/AppDetailsViewModel.kt (91%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/AppDetailsWarnings.kt (91%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid/ui}/details/DetailsPresenter.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/ExpandableSection.kt (98%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/RepoChooser.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/details/Versions.kt (96%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/discover/AppCarousel.kt (98%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/discover/AppDiscoverItem.kt (84%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/discover/AppSearchInputField.kt (98%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/discover/AppsSearch.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/discover/Discover.kt (95%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/discover/DiscoverPresenter.kt (86%)
 rename basic/src/main/java/org/fdroid/basic/MainViewModel.kt => next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt (78%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/ui/icons/License.kt (86%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/ui/icons/PackageVariant.kt (99%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/lists/AppList.kt (99%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/lists/AppListItem.kt (85%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/lists/AppListPresenter.kt (90%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/lists/AppListRow.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/lists/AppListType.kt (94%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/lists/AppListViewModel.kt (94%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/lists/AppsFilter.kt (99%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/repositories/RepoIcon.kt (83%)
 rename basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryList.kt => next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt (95%)
 rename {basic/src/main/java/org/fdroid/basic/ui/main => next/src/main/kotlin/org/fdroid/ui}/repositories/RepositoriesList.kt (96%)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
 rename basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt => next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt (95%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/ui/utils/FDroidOutlineButton.kt (97%)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
 rename basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt => next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt (68%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/updates/UpdatesModule.kt (97%)
 rename {basic/src/main/java/org/fdroid/basic => next/src/main/kotlin/org/fdroid}/utils/CoroutinesScopesModule.kt (95%)
 create mode 100644 next/src/main/kotlin/org/fdroid/utils/Utils.kt
 rename {basic => next}/src/main/res/drawable/ic_launcher.png (100%)
 rename {basic => next}/src/main/res/drawable/ic_notification.xml (100%)
 rename {basic => next}/src/main/res/drawable/ic_refresh.xml (100%)
 rename {basic => next}/src/main/res/drawable/ic_repo_app_default.xml (100%)
 rename {basic => next}/src/main/res/values/colors.xml (100%)
 rename {basic => next}/src/main/res/values/strings-next.xml (100%)
 rename {basic => next}/src/main/res/values/strings.xml (100%)
 rename {basic => next}/src/main/res/values/themes.xml (100%)
 create mode 100644 next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt

diff --git a/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt b/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt
deleted file mode 100644
index d4281b787..000000000
--- a/basic/src/main/java/org/fdroid/basic/repo/RepositoryManager.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.fdroid.basic.repo
-
-import android.content.Context
-import androidx.core.os.LocaleListCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import org.fdroid.basic.ui.main.repositories.Repository
-import org.fdroid.basic.utils.IoDispatcher
-import org.fdroid.index.RepoManager
-import org.fdroid.repo.AddRepoError
-import org.fdroid.repo.Added
-import org.fdroid.repo.FetchResult
-import org.fdroid.repo.Fetching
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton // TODO maybe more like a ViewModel name clash with RepoManager
-class RepositoryManager @Inject constructor(
-    @ApplicationContext private val context: Context,
-    @IoDispatcher private val coroutineScope: CoroutineScope,
-    private val repoManager: RepoManager,
-) {
-
-    val repos: Flow<List<Repository>> = repoManager.repositoriesState.map { repos ->
-        repos.map {
-            Repository(
-                repoId = it.repoId,
-                address = it.address,
-                timestamp = it.timestamp,
-                lastUpdated = it.lastUpdated,
-                weight = it.weight,
-                enabled = it.enabled,
-                name = it.getName(LocaleListCompat.getDefault()) ?: "Unknown Repo",
-            )
-        }
-    }
-
-    private val _visibleRepository = MutableStateFlow<Repository?>(null)
-    val visibleRepository = _visibleRepository.asStateFlow()
-
-    fun setVisibleRepository(repository: Repository?) {
-        _visibleRepository.value = repository
-    }
-
-    fun getRepository(repoId: Long) = repoManager.getRepository(repoId)
-
-    fun addRepo() {
-        // just temp code to get repo into DB
-        repoManager.fetchRepositoryPreview("https://f-droid.org/repo")
-        coroutineScope.launch {
-            var hasAdded = false
-            repoManager.addRepoState.collect {
-                if (it is Fetching) {
-                    if (!hasAdded && it.fetchResult is FetchResult.IsNewRepository) {
-                        hasAdded = true
-                        repoManager.addFetchedRepository()
-                    }
-                } else if (it is Added ) {
-                    delay(1000) // wait for repo available in DB
-                    RepoUpdateWorker.updateNow(context,it.repo.repoId)
-                    cancel()
-                } else if (it is AddRepoError) {
-                    cancel()
-                }
-            }
-        }
-    }
-
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Icons.kt b/basic/src/main/java/org/fdroid/basic/ui/Icons.kt
deleted file mode 100644
index 0172cb0ed..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/Icons.kt
+++ /dev/null
@@ -1,572 +0,0 @@
-package org.fdroid.basic.ui
-
-object Icons {
-
-    val randomIcon: String get() {
-        val url = "https://f-droid.org/repo${icons.random()}"
-        // workaround for low resolution F-Droid images
-        return if (url.startsWith("https://f-droid.org/repo/icons/")) {
-            url.replace("https://f-droid.org/repo/icons/", "https://f-droid.org/repo/icons-640/")
-        } else {
-            url
-        }
-    }
-
-    val icons = listOf(
-        "/org.mian.gitnex/en-US/icon_EFgjn4gHRyqqXYqpnqHKUCSQXnd_FYoonxHcgHAZ5MM=.png",
-        "/icons/org.michaelevans.nightmodeenabler.1.png",
-        "/icons/org.microg.nlp.20187.png",
-        "/icons/org.microg.nlp.backend.apple.20043.png",
-        "/icons/org.microg.nlp.backend.nominatim.20042.png",
-        "/org.midorinext.android/en-US/icon_kZSJKKmAKJcrPxhKc-_9v_47I2lFzAnzOUzykKr6iIE=.png",
-        "/org.mindshub.insigno/en-US/icon_7fHy1gcVADMUln5Gm-6Wa37Oo84DLMlNe0-E95MEPtc=.png",
-        "/icons/org.mmk2410.cyngn.theme.fira.1.png",
-        "/org.moire.opensudoku/en-US/icon_bsqk6CwD3zJMF59UMK0v4STUwLUbabQG2iWXX2ZF6ds=.png",
-        "/org.moire.ultrasonic/en-US/icon_n8q1j9UmN_uZnoMyUaZnthdHNjsMfej1Rw8RgQadTOI=.png",
-        "/icons/org.moparisthebest.appbak.2.png",
-        "/icons/org.moparisthebest.pageplus.8.png",
-        "/icons/org.mosad.seil0.projectlaogai.6000.png",
-        "/org.mosad.teapod/en-US/icon_Wl8y-j3hY10RDMOT5pB_krgDEGdpzVUaBeTCX9sxEZ0=.png",
-        "/icons/org.mosspaper.6.png",
-        "/icons/org.mozc.android.inputmethod.japanese.6028153.png",
-        "/icons/org.mumod.android.168.png",
-        "/icons/org.mupen64plusae.v3.alpha.246.png",
-        "/org.musicbrainz.picard.barcodescanner/en-US/icon_Tl2aDd5KG1Um3leOs6B7HJjh3Zp871Zejf4aiSlQKYs=.png",
-        "/icons/org.musicpd.73.png",
-        "/icons/org.mustard.android.150.png",
-        "/icons/org.mysociety.FixMyStreet.39.png",
-        "/icons/org.mythdroid.63.png",
-        "/icons/org.n52.sosmobileclient.12.png",
-        "/icons/org.nathan.jf.build.prop.editor.4.png",
-        "/org.navitproject.navit/en-US/icon_t_B5zAoIfBrdggxqEbQGby-9umill0AwcPKhTftgLMg=.png",
-        "/icons/org.ncrmnt.nettts.3.png",
-        "/icons/org.ndeftools.boilerplate.3.png",
-        "/icons/org.nerdcircus.android.klaxon.27.png",
-        "/org.nhcham.hamfisted/en-US/icon_lPNeJeUutxq4rOuVeL2lJ3ReTTKvR1u-TbIKJbn6FUo=.png",
-        "/icons/org.nick.cryptfs.passwdmanager.1260.png",
-        "/icons/org.nick.wwwjdic.2370.png",
-        "/icons/org.ninthfloor.copperpdf.5.png",
-        "/org.nitri.opentopo/en-US/icon_dS97YMa6ybea-zBC9xt-tvfinvcPUAncx2HUmXvdk-Q=.png",
-        "/org.noise_planet.noisecapture/en-US/icon_OdhPdETkaa0-uA_xBZXYEATi80Ce9xhBC6BiTbVdX_Q=.png",
-        "/org.notabug.lifeuser.moviedb/en-US/icon_eunZ1NUNBbRUE1N-8J6ecZ3UGpUYzaL_iA8IWdgFHfs=.png",
-        "/icons/org.ntpsync.12.png",
-        "/org.nuclearfog.twidda/en-US/icon_Rbpfog3-aKuGprlwLY6jjM6sStGxOwP2Wqev3uDnwck=.png",
-        "/icons/org.numixproject.iconsubmit.1.png",
-        "/org.nuntius35.wrongpinshutdown/en-US/icon_vHkJzA2f01BgPUhVKZQRDtykJcHCl0quayxknpKhBpA=.png",
-        "/icons/org.nv95.openmanga.51331.png",
-        "/icons/org.ocsinventoryng.android.agent.24.png",
-        "/icons/org.odk.collect.android.1023.png",
-        "/icons/org.og8.a1tox.1.png",
-        "/icons/org.okfn.pod.13.png",
-        "/icons/org.olpc_france.sugarizer.17000.png",
-        "/org.onionshare.android.fdroid/en-US/icon_70KfzrV3wIfrF_Ki-wNUcEvmMggzX_TLp6mqqQMC-lI=.png",
-        "/icons/org.opengappsdownloader.12.png",
-        "/icons/org.opengemara.shiurim.4.png",
-        "/icons/org.opengpx.192.png",
-        "/org.openhab.habdroid/en-US/icon_MbJ4aGShNFnfKlhvFAVK16j1qoM_JBPo0xjNuwSsP_g=.png",
-        "/org.openhab.habdroid.beta/en-US/icon_MbJ4aGShNFnfKlhvFAVK16j1qoM_JBPo0xjNuwSsP_g=.png",
-        "/icons/org.openintents.about.8.png",
-        "/icons/org.openintents.filemanager.40.png",
-        "/icons/org.openintents.flashlight.10015.png",
-        "/icons/org.openintents.notepad.10084.png",
-        "/icons/org.openintents.safe.30.png",
-        "/icons/org.openintents.shopping.100221.png",
-        "/org.openttd.fdroid/en-US/icon_ymrS616qpAn2i33fU14so-yR6oBfVl87tgmI5wtA5gA=.png",
-        "/icons/org.osmocom.tacdatabaseclient.1.png",
-        "/org.ostrya.presencepublisher/en-US/icon_nSKxAlLAD-o4d62aQcn-c3WnMk9CrRPUYEiv8TI9WtM=.png",
-        "/org.oxycblt.auxio/en-US/icon_jdRok4xNvWOD-mGXxk051-Y1DqArTANlpnrn5cmCk9k=.png",
-        "/org.pacien.tincapp/en-US/icon_y4WBHAwFCDYJwJHIQDLaDKUviLlMCQ7pV1Soca-NKhM=.png",
-        "/org.pareudepararme.pareu_de_pararme_map/en-US/icon_eIVMjJ6uX6N7AhAnt0qXvD7KQtdC6jzXvaESRBckrtw=.png",
-        "/icons/org.passwordmaker.android.11.png",
-        "/icons/org.paulmach.textedit.15.png",
-        "/icons/org.peterbaldwin.client.android.vlcremote.58.png",
-        "/org.pgnapps.pk2/en-US/icon_FByroU6m8XaSFxXZNi_nsb2vRi0fTrhf1G0GlKe4_4g=.png",
-        "/org.piepmeyer.gauguin/en-US/icon_Pp0IthYj4RE6O_3BQcd_ApZWV8iNei9l_LspIKJIoak=.png",
-        "/org.piwigo.android/en-US/icon_oJO6Zpp4v2TBVS6BPWw76DfDTUECAFVnRWXzSOBVVi8=.png",
-        "/org.pixeldroid.app/en-US/icon_0fVnr5IwyZsIR2qOnAM_0mrPAtWa5UgOPlHlOA0locw=.png",
-        "/icons/org.pixmob.freemobile.netstat.63.png",
-        "/icons/org.pocketworkstation.pckeyboard.1041001.png",
-        "/icons/org.poirsouille.tinc_gui.15.png",
-        "/icons/org.poopeeland.tinytinyfeed.24.png",
-        "/org.poul.bits.android/en-US/icon_jjQ-5YrrcZkBRLaUUPr1L8wH4S8984OVNwrtch60MGY=.png",
-        "/icons/org.ppsspp.ppsspp.11103.png",
-        "/org.primftpd/en-US/icon_1OgKmaQ-xwDUi_MyHyhcwmXKVRJOhbCjTkSaU3a2S-k=.png",
-        "/org.principate.matthew.dealing_sheet/en-US/icon_aGybJoDXpzPRWI4bglKMDawJG4V7PREk3ywIGtu1c2w=.png",
-        "/org.privacyhelper/en-US/icon_edTwvy92ACwEeTekGnyHyqrbLYC5CUt_mdXawXPWrrQ=.png",
-        "/org.privacymatters.safespace/en-US/icon_PE26zYSBlKPklqpmkuQdvBI0veNcd7WxFYKOP3b3Os8=.png",
-        "/icons/org.projectvoodoo.otarootkeeper.10.png",
-        "/icons/org.projectvoodoo.screentestpatterns.11.png",
-        "/icons/org.projectvoodoo.simplecarrieriqdetector.16.png",
-        "/org.proninyaroslav.blink_comparison/en-US/icon_YKBmFzZFOxejk81uJ8HdA2KnMBgGsBF4Nd8WBDjrF6s=.png",
-        "/org.proninyaroslav.libretorrent/en-US/icon_dPU2aB1n6sbQiEF2K88eVegKSG2gT4D8W3LUenntoCQ=.png",
-        "/org.proninyaroslav.opencomicvine/en-US/icon_vMjZCYH05R_qzEmhUzSiq-l8-BegKJYYlKqrmH1LuAM=.png",
-        "/icons/org.pulpdust.lesserpad.42.png",
-        "/org.purple.smoke/en-US/icon_df-D2zJ1SdpIJ0eMUkiBQYvRQZkeRgp3fXI9LpS6ERY=.png",
-        "/org.purple.smokestack/en-US/icon_YZf8y44Wnd6ro8GeQD5Mhde0C0oWj9pyYyzWdGIDEkg=.png",
-        "/org.purplei2p.i2pd/en-US/icon_s8LzOD_2B2FH6LSuaQfSFbLiiF-Hams5GCRkChgpWeo=.png",
-        "/icons/org.pyload.android.client.21.png",
-        "/icons/org.pyneo.maps.10010.png",
-        "/icons/org.qii.weiciyuan.25.png",
-        "/org.qosp.notes/en-US/icon_e0aR--5sHsUBUwSmwHvgKJpmA8DBXQYltHVwBiBwg40=.png",
-        "/org.quantumbadger.redreader/en-US/icon_eI9VPkT0LK1Y9Uw3AfEoMXYcnFFGgiLeUSGONrclQ_Q=.png",
-        "/org.quentin_bettoum.librememorygame/en-US/icon_wz0PzyUmK3iZv72NHyzQGxhVJO_b3H3xVxqIb9XgDyQ=.png",
-        "/icons/org.quovadit.apps.andof.21.png",
-        "/org.radar.app/en-US/icon_ho-tDJr8jkTUNFIlp3RxSxrM6sOgS1N7xBqj_H9bc6g=.png",
-        "/icons/org.recentwidget.6.png",
-        "/icons/org.redcross.openmapkit.23.png",
-        "/org.revengate.revengate/en-US/icon_CruDJivFsI1rehfykeQz_f6xP4wjEgzaKW6uTaLxYB8=.png",
-        "/org.runnerup.free/en-US/icon_kN3i52l3-KVxE-yMinNc6g8JQTsMQeRFjWA2fW3M1uE=.png",
-        "/icons/org.safecoin.safeprice.1.png",
-        "/icons/org.safermobile.intheclear.1.png",
-        "/icons/org.sagemath.droid.8.png",
-        "/icons/org.saiditnet.redreader.87.png",
-        "/org.sajeg.fallingblocks/en-US/icon_mrzO0eqK8wNo5D_jBeWYvIaII-QqYrxMH85L7j_OLhg=.png",
-        "/org.samo_lego.canta/en-US/icon_Le6UT5Ar_Guj_DTgy5cT_Y9pKR9WdkPN3FCYwKtiq84=.png",
-        "/icons/org.sasehash.burgerwp.122.png",
-        "/org.satdump.SatDump/en-US/icon_wRxam0hxvU7_T7ZU4WWY2OKcE3H_HBSPY1TCYpNzyco=.png",
-        "/icons/org.savapage.android.print.1.png",
-        "/icons/org.schabi.etherwake.3.png",
-        "/icons/org.schabi.jedentageinset.30.png",
-        "/icons/org.schabi.kiba.2.png",
-        "/org.schabi.newpipe/en-US/icon_OHy4y1W-fJCNhHHOBCM9V_cxZNJJgbcNkB-x7UDTY9Q=.png",
-        "/icons/org.schabi.newpipelegacy.120.png",
-        "/org.schabi.nxbookmarks/en-US/icon_Iaz_MHkpacJKSeJn-qXdKNm1TCo693M96MDf6__K-Wk=.png",
-        "/icons/org.schabi.stethox.2.png",
-        "/icons/org.schabi.svgredirect.1.png",
-        "/icons/org.schabi.terminightor.12.png",
-        "/icons/org.scid.android.55.png",
-        "/org.scotthamilton.trollslate/en-US/icon_69XzV_OxWA15TsSztNzybIrgzbfGjADgEfUWWgWkUHo=.png",
-        "/icons/org.scoutant.blokish.22.png",
-        "/icons/org.scoutant.cc.1.png",
-        "/icons/org.scummvm.scummvm.6.png",
-        "/icons/org.seamapdroid.32.png",
-        "/org.secuso.privacyfriendly2048/en-US/icon__EtkwPp725lQQYnzjkzDUiOqD2X5nnY1CiZSIYN9TVU=.png",
-        "/org.secuso.privacyfriendlyactivitytracker/en-US/icon_ZNYfUCGDhxZXrvJKw1gCPAtSr9OBTiyYpuzJz3Z6otI=.png",
-        "/org.secuso.privacyfriendlybackup/en-US/icon_1mFluy26WuCj3h2577MVTiMRVz1X_fhv8JDOzeQ8jms=.png",
-        "/org.secuso.privacyfriendlyboardgameclock/en-US/icon_85kgnYhCkoI8M9KHgmITVp0DBkgsYUQtfcTS4PFQpMI=.png",
-        "/org.secuso.privacyfriendlycircuittraining/en-US/icon_LMNXB8N38b4etgSAyIvu85YPSTlj_f5lrwzWirnn1mo=.png",
-        "/org.secuso.privacyfriendlydicer/en-US/icon_si6lBVbpTWi7-Skao29BKAay4d1RvmynmiHj27XnfN4=.png",
-        "/org.secuso.privacyfriendlyfinancemanager/en-US/icon_8l8ArpmWWeXATWp6_iCOOLbPGaHRwl_Ftz9bIxLKZWA=.png",
-        "/org.secuso.privacyfriendlyfoodtracker/en-US/icon_Y9YeMADds1HM1kaY9XPpPjQaHo_fIIoTdOoCabIpRTY=.png",
-        "/org.secuso.privacyfriendlyintervaltimer/en-US/icon_2ObHBYqG7uKblJ82emTKmnhyAn6aAKHBwhXo50jHo94=.png",
-        "/org.secuso.privacyfriendlyludo/en-US/icon_DZst6xmtt-VLyQO18rwuhvxU74PFijCI_sQ03zAjSjg=.png",
-        "/org.secuso.privacyfriendlymemory/en-US/icon_gDvQsQ2aVYwaLf5RRQjp58Uu9jddoZ5o9uujFdK2kxE=.png",
-        "/org.secuso.privacyfriendlyminesweeper/en-US/icon_jIalmOtqbC87iVjx8tVJRSj7x6IFbX7ztThFtEfgWtk=.png",
-        "/org.secuso.privacyfriendlynotes/en-US/icon_g7vncjz9GT3SusxSxaAoB0jKcQuT2b2M6JldwE5v8mY=.png",
-        "/org.secuso.privacyfriendlypaindiary/en-US/icon_qm9CNXzW2hXQBsJYab5ZaaZMFdAv9BmwtU8jVxm4gag=.png",
-        "/org.secuso.privacyfriendlypasswordgenerator/en-US/icon_JlKkSB1sa7J7SmAI44lSMEecSlIB0X2TFlyZdDSZkzg=.png",
-        "/org.secuso.privacyfriendlypausinghealthily/en-US/icon_n5P5tbx3Tbo5rHZ7PesdIJsCi9zLSzAb8wWaRWaHOXg=.png",
-        "/org.secuso.privacyfriendlypin/en-US/icon_dDxJ0-8NgBBCEI41sRT9FfWKdhj8N3oT6DSi2M_uBN0=.png",
-        "/org.secuso.privacyfriendlyrecknoningskills/en-US/icon_biDKy0cVkrA6ylSthJKrtrKKM15UXHiQ1ACvDnMuhlE=.png",
-        "/icons/org.secuso.privacyfriendlyruler.3.png",
-        "/org.secuso.privacyfriendlysketching/en-US/icon_jssyjt-vLtlrgFx-SlE1gtZBK4bgU2EGprPJ14OxJiA=.png",
-        "/org.secuso.privacyfriendlysolitaire/en-US/icon_uQoi8ZlLu7r8O1i6XuLC7u3ma-_PeW6PwcktLWhbn2A=.png",
-        "/org.secuso.privacyfriendlysudoku/en-US/icon_oWx09GXf5s9FvhdDzVWZseAKTf-e7f-sn0MS7J-H4Ug=.png",
-        "/org.secuso.privacyfriendlytapemeasure/en-US/icon_RZ97oIy6nfyTclzuOQjIN4vkJxFEkON-IPLmSRYxkEo=.png",
-        "/org.secuso.privacyfriendlytodolist/en-US/icon_muCAiEnC-seBQpNk-apzYHYW9pgIECNn46gYuorR2ZM=.png",
-        "/org.secuso.privacyfriendlyyahtzeedicer/en-US/icon_FJba_abIkbvk7WTqDKLrgak4UWtcNHKsG8JUwB_qJ84=.png",
-        "/icons/org.segin.bfinterpreter.9.png",
-        "/icons/org.segin.ttleditor.19.png",
-        "/org.sensorkraken/en-US/icon_6y_M-7WiwspkLKUiZF4Tn2Op7gXt7UMrl8kW26p7N7c=.png",
-        "/org.sensors2.osc/en-US/icon_WX26DXa6dd22B7bO3XoTXwEBV7VY9KIBw7HOhMJS-Ws=.png",
-        "/org.sensors2.pd/en-US/icon_ojebh1OXB8-hS-Tm6Ogv2rWIMSZvxJmcRm_Zu3-dPDw=.png",
-        "/icons/org.servDroid.web.1000300.png",
-        "/icons/org.servalproject.2371.png",
-        "/org.sge.haltestellenanzeige/en-US/icon_dc8pRwxBBUijqVPp0l4MsAHiN4VVTinq5BU5mkuBDjE=.png",
-        "/org.shirakumo.ocelot/en-US/icon_lv-eZxwo4zxB7w_tk5gQrZUiGkQBpqQVVKyXLwg5Bcw=.png",
-        "/icons/org.shortcuts.2.png",
-        "/icons/org.sickstache.43.png",
-        "/org.simlar/en-US/icon_63ytugLFwg3DfPkXdjAPLsky5zmWzBxVu12oNUDVlag=.png",
-        "/org.sirekanyan.outline/en-US/icon_hoykFBZXZ41mHn1wliA9Id0NXIjqIJckPA6iGa0CUMc=.png",
-        "/org.sirekanyan.warmongr/en-US/icon_subDorrw5YUZqmV9pQzXa_gkxVF4ftt1v8dvXicq_r0=.png",
-        "/icons/org.smblott.intentradio.21.png",
-        "/org.smssecure.smssecure/en-US/icon_-oSFodWAvrEIq_o_0fs8IVHbVDbzfWAeJhAT_6oZ6zA=.png",
-        "/icons/org.softcatala.traductor.39.png",
-        "/icons/org.softeg.slartus.forpdaplus.678.png",
-        "/icons/org.sorz.lab.tinykeepass.14.png",
-        "/icons/org.sparkleshare.android.1.png",
-        "/org.stingle.photos/en-US/icon_o5hnpF5dc8w-wI9RotZmpXfYM9YNZfDYbmW3PxBnvQg=.png",
-        "/icons/org.strawberryforum.argentum.3.png",
-        "/icons/org.strawberryforum.pollywog.2.png",
-        "/org.strongswan.android/en-US/icon_-z1nByYuxaNTKXtj8zgWexwX5uSRPfc4eChKZA9WSVU=.png",
-        "/org.studip.unofficial_app/en-US/icon_QPTYaOjNzuooSmrbBOKPoLbPUmE3Mxr-CtZSA9uN_9I=.png",
-        "/org.stypox.dicio/en-US/icon_T01bGmCQCqqiZnutxO3xn-klGaJmoX_bp0PpNk-d_RM=.png",
-        "/org.stypox.tridenta/en-US/icon_rQ2-S0bsL8BZclD6fmdqTQw4_308SMKHy6Ec_O0ElAI=.png",
-        "/icons/org.subsurface.8.png",
-        "/icons/org.sudowars.2.png",
-        "/org.sufficientlysecure.keychain/en-US/icon_7CVWLf-lztDVEl2HY_TnF0d98nwq__xr05Yu8lLZoV4=.png",
-        "/icons/org.sufficientlysecure.localcalendar.10.png",
-        "/icons/org.sufficientlysecure.termbot.10905217.png",
-        "/icons/org.sufficientlysecure.viewer.2827.png",
-        "/icons/org.sufficientlysecure.viewer.fontpack.2300.png",
-        "/icons/org.sugr.gearshift.88.png",
-        "/icons/org.surrel.facebooknotifications.13.png",
-        "/icons/org.surrel.messengerbypasser.2.png",
-        "/icons/org.synergy.2.png",
-        "/icons/org.systemcall.scores.2.png",
-        "/icons/org.t2.synconwifi.3.png",
-        "/org.talkingpanda.osram_remote/en-US/icon_0humjzaEE0brFeRs89e3N3bm_YmYFOP5chl_pkReQ4k=.png",
-        "/icons/org.tamanegi.atmosphere.9.png",
-        "/icons/org.tamanegi.wallpaper.multipicture.dnt.48.png",
-        "/org.tasks/en-US/icon_YftLJ2dGZxgevP1f0n9c9X9HZKYmyz06c370Udel8Tk=.png",
-        "/icons/org.tbrk.mnemododo.23.png",
-        "/org.telegram.messenger/en-US/icon_yf3k2arrpvOWv5oUZ3p1Eri1ThBaYEhH0lEWqjiyFO4=.png",
-        "/org.tengel.planisphere/en-US/icon_9Ilzys_XhHiXB1AkvEf4l8XXhglFndfZIuDrlEfI3Bo=.png",
-        "/org.tengel.timescale/en-US/icon_CjYNl5NZP4MP_nIml9ZkY0KyTBo_L1Q4Tlz8J8ud2ZY=.png",
-        "/org.tessoft.qonvert/en-US/icon_FwaLwlZgpBHWG7SrttK5-UgwPyAFErb7jHG9LgB4500=.png",
-        "/org.tether.tether/en-US/icon_8JBV0Zc57RF45NeIOsjRkf2ui7ZKklBgG3Ue30aMj_s=.png",
-        "/icons/org.thecongers.mtpms.4.png",
-        "/icons/org.thialfihar.android.apg.11199.png",
-        "/icons/org.thiolliere.youtubestream.3.png",
-        "/icons/org.tigase.messenger.phone.pro.90.png",
-        "/icons/org.tilelessmap.app.4.png",
-        "/icons/org.tint.10.png",
-        "/icons/org.tint.adblock.3.png",
-        "/icons/org.tmurakam.presentationtimer.3.png",
-        "/icons/org.tof.17.png",
-        "/icons/org.tomdroid.14.png",
-        "/org.torproject.torservices/en-US/icon_NTqDkUSRsPZf24fX_eEmLwJ79JTaOUF6zg24wpCglj8=.png",
-        "/org.totschnig.myexpenses/en-US/icon_zWawBtP0U6S03MdPDF6m-Zh9Tbt6MmuSM-w68Ug-58o=.png",
-        "/icons/org.totschnig.sendwithftp.10.png",
-        "/org.traffxml.roadeagle/en-US/icon_PnzF4fDLMt1nogtfj_Y1P2R5TCbiPVZxw1znF-2V4Lo=.png",
-        "/icons/org.transdroid.lite.239.png",
-        "/icons/org.tryton.client.6.png",
-        "/icons/org.tunesremote.253.png",
-        "/icons/org.tvheadend.tvhguide.21.png",
-        "/org.twistedappdeveloper.statocovid19italia/en-US/icon_sDi92MRcvDEI0gGRidLh-DPaZxl26P396Y1qXikEroo=.png",
-        "/icons/org.uaraven.e.16.png",
-        "/org.unifiedpush.distributor.nextpush/en-US/icon_0n89cTApPXFOx2mP_c447S2kjcSYnyy_A8qZe0BQWhA=.png",
-        "/icons/org.us.andriod.4.png",
-        "/icons/org.valos.isolmoa.2.png",
-        "/org.vi_server.androidudpbus/en-US/icon_iTWudSqf3cQTjU3byy47yXnZ2R4_MN9Z7iayz9bhWo4=.png",
-        "/icons/org.vi_server.red_screen.2.png",
-        "/org.videolan.vlc/en-US/icon_yAfSvPRJukZzMMfUzvbYqwaD1XmHXNtiPBtuPVHW-6s=.png",
-        "/icons/org.voidptr.swpieview.15.png",
-        "/icons/org.vono.narau.6.png",
-        "/icons/org.wahtod.wififixer.1165.png",
-        "/icons/org.weilbach.splitbills.22.png",
-        "/org.wentura.getflow/en-US/icon_3fBq70zaUDwNhW6kMUp7xWKPjRl2Kg6WTa_O-WYB3DQ=.png",
-        "/icons/org.whitequark.sipcaller.1.png",
-        "/icons/org.wikimedia.commons.wikimedia.1.png",
-        "/org.wikipedia/en-US/icon_5SFC_iUU0JlFAg2ABkkUprx0FZE65k9xWEBEt6i8VOU=.png",
-        "/icons/org.wiktionary.1.png",
-        "/org.woheller69.TimeLapseCam/en-US/icon_riipT3bsfS8vKFDKhrgTDTEtkOILua-sig0Fp9J02bA=.png",
-        "/org.woheller69.arity/en-US/icon_gMHvE2YJt_aAZ0GSqTNZj1CttAGxHWIC1SGqOAjbvmc=.png",
-        "/org.woheller69.audio_analyzer_for_android/en-US/icon_69h0hh9-RSrBkOK1H9avcrClGYxS-jXwwEYX_umaAsg=.png",
-        "/org.woheller69.audiometry/en-US/icon_GNCuSdLBqwEzqKqbFFA7V07B5K4c6dm-lv7Wt9-wUeo=.png",
-        "/org.woheller69.browser/en-US/icon_APRdxKz4agebNIDq8VYaZeylyACvbq1yk0IRDL1-ziw=.png",
-        "/org.woheller69.dumpseeker/en-US/icon_LCe4lpWXVWsCVPyJ8ToaMkKwXrYUGZo7jGlcLaTGskc=.png",
-        "/org.woheller69.eggtimer/en-US/icon_--_cKNCtw9Dl2-kv8iAoG2iqmgPEny3tf2uAUfq8M3c=.png",
-        "/org.woheller69.gpscockpit/en-US/icon_ALj88xlFpbeVbsnBSx953lcWsRd5OBSy-F-YvwVcu58=.png",
-        "/org.woheller69.gptassist/en-US/icon_K3SmX4z6CrgPDrCUtL_XECtz-g8Oo8xkVZhqeUkeEQM=.png",
-        "/org.woheller69.hugassist/en-US/icon_XiohgFiEg50jmpJfFnFHNeXd-hoVedy_ICEhlDOcPew=.png",
-        "/org.woheller69.lavatories/en-US/icon_Ivd-E0kQp51JAAR2ldnvcDqlhOA8D50kun4q1qC3-g8=.png",
-        "/org.woheller69.level/en-US/icon_qdaodZGMhv0yefCJPnfxpKoIR9zwO8iO_jasafDMBXM=.png",
-        "/org.woheller69.omweather/en-US/icon_E3rAVMKaoXV3S6EdjZbr8Ah3yVuGV4teI7GOx4SRxl4=.png",
-        "/org.woheller69.solxpect/en-US/icon_AEie4rFo-7kCxa6d7pg7iTz33NKFfaYg9L7Nl8JqN-s=.png",
-        "/org.woheller69.spritpreise/en-US/icon_b-CXsG_A_mrbNXO3cWAMnjLeat7ak9zqp-eIfv4O4qY=.png",
-        "/org.woheller69.weather/en-US/icon_0HGIX6c4w38A-r1z-Fnix1SPqQ7b4hN0j614YKJga7s=.png",
-        "/icons/org.wroot.android.goldeneye.1.png",
-        "/icons/org.xapek.andiodine.6.png",
-        "/icons/org.xbmc.android.remote.1009.png",
-        "/org.xbmc.kore/en-US/icon_yHTeBW4jt4FZGjqI-4yUMsn7sdJniQRXICkoM3qGFXA=.png",
-        "/icons/org.xcsoar.162.png",
-        "/org.xphnx.ameixa/en-US/icon_CQLCGleZNBzDPRNp1ADs121TecVHFmUbe-Au-4qXF08=.png",
-        "/icons/org.xphnx.ameixamonochrome.4100.png",
-        "/icons/org.xphnx.iconsubmit.9.png",
-        "/icons/org.xposeddownloader.12.png",
-        "/org.y20k.escapepod/en-US/icon_xK1u54mnPFLYtmXZHy_WpIrcn0GKWco0XxicFSjDu0U=.png",
-        "/org.y20k.trackbook/en-US/icon_f6AHUlGQuywiZCtyEb_HWQ_QgqstO17v5l3X4gkHTV0=.png",
-        "/org.y20k.transistor/en-US/icon_XnM_HqswaEhC6q8FE0MZj_v9uWdubb9cv_3kbE4T25M=.png",
-        "/icons/org.yaaic.13.png",
-        "/icons/org.yabause.android.1.png",
-        "/org.yausername.dvd/en-US/icon_5_ZYnb12dZebI7p8dgLN15vaqPNuWkKtNd1ct9zF4Xc=.png",
-        "/icons/org.yaxim.androidclient.53.png",
-        "/icons/org.yuttadhammo.tipitaka.59.png",
-        "/icons/org.zakky.memopad.3.png",
-        "/icons/org.zamedev.gloomydungeons1hardcore.opensource.1807020000.png",
-        "/icons/org.zamedev.gloomydungeons2.opensource.1602221800.png",
-        "/icons/org.zephyrsoft.checknetwork.5.png",
-        "/org.zephyrsoft.sdbviewer/en-US/icon_TzJ8NMdZCjvEiKZMVa-LcMAYS--01q693CcAHJsiU9M=.png",
-        "/org.zephyrsoft.trackworktime/en-US/icon_RhdooqTkZmgVE7y9XYPJ4J2LdF-J0oEsEZ9IAZ9K8GQ=.png",
-        "/oss.krtirtho.spotube/en-US/icon_NoulGcYaWOAMoUDo5jVCaPiSQztIr-9GbQEyE3Mu2Ro=.png",
-        "/page.codeberg.marshreaper.fruitygame/en-US/icon_Co1D6xWLCepsgPDGDmjCiQVctCUVILrUg9IP2bvFb8A=.png",
-        "/pan.alexander.tordnscrypt.stable/en-US/icon_de8pORbxQtizOAeyqadO017HBVe3r3LnAYr7XlT5D-s=.png",
-        "/pc.javier.actualizadoropendns/en-US/icon_soaT2WQO3A3ISsmaW_iRgHIvxnGGuXXzTejcJSazmUY=.png",
-        "/pc.javier.seguime/en-US/icon_GxcGCqaSFdVKYdyqy9XJSTITpxXmBvgJUlyguF7KLqs=.png",
-        "/pcmagas.vodafone_fu_h300s/en-US/icon_Dwcy3ucAejdLzo4FZoi9X0EGv3GBN-qKWVuk5iT1F_Q=.png",
-        "/icons/peanutencryption.peanutencryption.4.png",
-        "/phone.vishnu.dialogmusicplayer/en-US/icon_kkSAAI7ch6xixEOv1FNRm3DSUqBPDKnsXzyXOinbCIc=.png",
-        "/icons/pk.contender.earmouse.30.png",
-        "/pl.ascendit.onetimealarm/en-US/icon_DNW3hpAiYOrONr8KTwxPSbPweuipnIGcTZ7pgLlSwaY=.png",
-        "/pl.edu.pjwstk.s999844.shoppinglist/en-US/icon_VvhYJgKrC6jZRc-HCh7kepFtxgFqOuVeWLvLa85IUlw=.png",
-        "/icons/pl.hypeapp.endoscope.5.png",
-        "/icons/pl.kuben.progressapp.8.png",
-        "/icons/pl.narfsoftware.thermometer.29.png",
-        "/icons/pl.net.szafraniec.NFCKey.24.png",
-        "/icons/pl.net.szafraniec.NFCTagmaker.23.png",
-        "/icons/pl.nkg.geokrety.47.png",
-        "/icons/pl.sanszo.pcis.2.png",
-        "/player.efis.data.ant.spl/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
-        "/player.efis.data.eur.rus/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
-        "/player.efis.data.pan.arg/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
-        "/player.efis.data.sah.jap/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
-        "/player.efis.data.usa.can/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
-        "/player.efis.data.zar.aus/en-US/icon_hOaPiXSCx_zn4jdT7yl3f_olrLChqxOKlTAoT0-yNyo=.png",
-        "/player.efis.pfd/en-US/icon_e0F0p5ehhoYamO8DBo_YgFby-CaPv2z3pvjbVaXJ92w=.png",
-        "/player.phonograph.plus/en-US/icon_ncl9cm4Mr4U0edpzvu_8H--zCPmHTHhroPKmj3ABwA4=.png",
-        "/posidon.launcher/en-US/icon_9quSno5bEyYxaSjfiVAhqNhzOB2eFp_93tUftzq_DvE=.png",
-        "/icons/press.condense.www.18.png",
-        "/icons/priv.twoerner.brightnesswidget.7.png",
-        "/priv.wh201906.serialtest/en-US/icon_iyx3srfqep5gfJ3RkBMqClPCKaywkhf-qeViFlq1KWs=.png",
-        "/icons/pro.dbro.bart.11.png",
-        "/pro.kherel.selfprivacy/en-US/icon_KqV8lYNuMMaJAAUrk8cnGSeuE-7m0fwgrQiiM8fLCqM=.png",
-        "/pro.oblivioncoding.fluffy_board/en-US/icon__says5HSPCdUhTP2i2HBBs6__4_CNNEPo8pIkY-34CE=.png",
-        "/icons/pro.oneredpixel.l9droid.4.png",
-        "/pro.rudloff.lineageos_updater_shortcut/en-US/icon_1fFeLEI5fDNAhNRha6oVFDifNMbwFNGynF09aqLDhy4=.png",
-        "/pro.rudloff.muzei.commons/en-US/icon_thAGRiF5zJ7WnMYzq8utEzg9Qy-oTadk9TlDAQhns7Q=.png",
-        "/pro.rudloff.openvegemap/en-US/icon_ouU525xbUpBNmikHWHZID7IlNwF61o-BFd8MebA7lVA=.png",
-        "/icons/pro.rudloff.papercraft.2.png",
-        "/pro.rudloff.search_to_browser/en-US/icon_CV0GdYMSKeobnLWydiKODiza14HurG_b3vGGWKcWBbk=.png",
-        "/icons/protect.babymonitor.3.png",
-        "/icons/protect.babysleepsounds.15.png",
-        "/icons/protect.budgetwatch.29.png",
-        "/protect.card_locker/en-US/icon_O8PYOX9-Kshl8NYoqJs4JLPqQNDQECeVsbYen01Bcso=.png",
-        "/icons/protect.gift_card_guard.6.png",
-        "/icons/protect.rentalcalc.6.png",
-        "/protect.videoeditor/en-US/icon_tXO43YnYtOc6a6fq5cXrOSdyH0J0H-gTBUN1SSpWNMQ=.png",
-        "/icons/pt.ipleiria.mymusicqoe.12.png",
-        "/icons/pt.isec.tp.am.4.png",
-        "/icons/pt.joaomneto.titancompanion.67.png",
-        "/icons/pw.thedrhax.mosmetro.77.png",
-        "/icons/quickly.quit.7.png",
-        "/icons/raele.concurseiro.1.png",
-        "/icons/raffarti.simpleadvancedmetronome.2.png",
-        "/rasel.lunar.launcher/en-US/icon_Cl7GhsnEgPHJBS9Sb8g8CHC9u6K8LL5uJ8PLWXCtGFk=.png",
-        "/re.indigo.epistolaire/en-US/icon_bNoF8LYjcQsfyOOrDIMjjDq42IgO2ZABzc72WHL2eP4=.png",
-        "/icons/re.jcg.playmusicexporter.110.png",
-        "/icons/remuco.client.android.1.png",
-        "/icons/rino.org.tethercompanion.2.png",
-        "/rkr.simplekeyboard.inputmethod/en-US/icon_T5pp0k_s8W4dOKUnC7tidpw27SzS0186ruJ782IwcPc=.png",
-        "/icons/ro.ciubex.dscautorename.103.png",
-        "/ro.hume.cosmin.retrostack/en-US/icon_S10IYv5dT34sGelvD0PVh2Jeycb2T8jxnG7nUEUmww4=.png",
-        "/ro.radioromaniaactualitati.podcasts/en-US/icon_B3bfursDI8_7dCn-Ns00WNO7PSCJkyF9MpIgE21tXMw=.png",
-        "/icons/ro.ui.pttdroid.5.png",
-        "/rocks.mm_dev.BendyStraw/en-US/icon_bT7aA98uz_5LmgcdUvcXW8136dc57ZMUV2J8-lOr2Jw=.png",
-        "/rocks.mucke/en-US/icon_fBslLOCIT8IlqNAry8i_amW-Ze8gAUFf8TWGhhI4F0A=.png",
-        "/rocks.poopjournal.flashy/en-US/icon_7aJTA0zPg6Ky_2u6MyMygQ6-_-njnIkWmdtE8UMgHZE=.png",
-        "/rocks.poopjournal.todont/en-US/icon_tmmZ0IcmHScWU3xCVVsLldkcq_1vPp6p0SuSGqsyGEA=.png",
-        "/rocks.poopjournal.vacationdays/en-US/icon_liF7CZ4SLT5y6gMBrx9WSvQOa61AT7IDwLTIlEKEvNQ=.png",
-        "/rocks.tbog.livewallpaperit/en-US/icon_lX5Y_qC10u1s6Ahmt0JQ44-bX7NBMjg54gpIDGvpwrA=.png",
-        "/rocks.tbog.tblauncher/en-US/icon_BdwL31sD_dI5SryWmB-wi8Znh5nJbjHImIy7DE06o08=.png",
-        "/icons/rodrigodavy.com.github.pixelartist.4.png",
-        "/rs.ltt.android/en-US/icon_Z_RsaXt3HHZzoTMzGelLteXy8K_Mej2CRUCuDtSbwf4=.png",
-        "/icons/rs.pedjaapps.alogcatroot.app.20140922.png",
-        "/ru.aleshin.timeplanner/en-US/icon_v2rLqxxbVIMbyGhzX7WatwBprSEAeHc_OIsCBzP8TM0=.png",
-        "/ru.evgeniy.dpitunnel/en-US/icon_d5-PnxU_nkt7Rlu6zdHav6bjjYeHmjKz9R9Fp_9frWs=.png",
-        "/ru.evgeniy.dpitunnelcli/en-US/icon_EPi620MBaJ1K9r6d4FH9qUR_Ia3NwXarMNlKaDJJsss=.png",
-        "/icons/ru.exlmoto.snood21.3.png",
-        "/icons/ru.gelin.android.browser.open.8.png",
-        "/icons/ru.gelin.android.sendtosd.41.png",
-        "/icons/ru.gelin.android.weather.notification.60.png",
-        "/icons/ru.gelin.android.weather.notification.skin.biggertext.18.png",
-        "/icons/ru.gelin.android.weather.notification.skin.blacktext.18.png",
-        "/icons/ru.gelin.android.weather.notification.skin.blacktextplus.18.png",
-        "/icons/ru.gelin.android.weather.notification.skin.whitetext.18.png",
-        "/icons/ru.gelin.android.weather.notification.skin.whitetextplus.18.png",
-        "/icons/ru.glesik.wifireminders.1340.png",
-        "/icons/ru.henridellal.dialer.15.png",
-        "/icons/ru.henridellal.emerald.43.png",
-        "/icons/ru.henridellal.fsassist.5.png",
-        "/icons/ru.henridellal.patolli.2.png",
-        "/icons/ru.hugeping.reinstead.7.png",
-        "/icons/ru.hyst329.openfool.30.png",
-        "/icons/ru.ifproject.android.afr.14.png",
-        "/ru.ikkui.achie/en-US/icon_gcqikwwx81QCZtQK8vb1dxqD-AVPtiX6Xzk1zoSbWSc=.png",
-        "/icons/ru.moscow.tuzlukov.sergey.weatherlog.3.png",
-        "/ru.natsuru.websdr/en-US/icon_m9jGEc6rsXzPQst0a5Rx8uf_dL-0I54VMOHCYJ2DZg8=.png",
-        "/icons/ru.neverdark.silentnight.8.png",
-        "/ru.nsu.bobrofon.easysshfs/en-US/icon_kq1Pf3Pki_NY4H4eu2bOC4cHKTzQtAj4xGFtEA3QEqU=.png",
-        "/icons/ru.o2genum.coregame.3.png",
-        "/ru.playsoftware.j2meloader/en-US/icon_VBtFNFUO_uu2EMB_OWeXxZz-2YLvrJy5ckTyDGS8FzA=.png",
-        "/ru.sash0k.bluetooth_terminal/en-US/icon_65cv-qFnip_FEXomLF4Oz9LllmQX_rzRFI-Gq9yuJpE=.png",
-        "/ru.seva.finder/en-US/icon_pNl-Jc-Eu0ycOM1aZr6ayzKmdFUi3UYGRfn-OLePpWM=.png",
-        "/icons/ru.subprogram.paranoidsmsblocker.6.png",
-        "/ru.tech.imageresizershrinker/en-US/icon_4pqg53lbewU2xudArqoc_0jFIIdDl9Gmce6Ec6LXQ6Y=.png",
-        "/icons/ru.ttyh.neko259.notey.6.png",
-        "/icons/ru.valle.btc.260.png",
-        "/ru.yanus171.feedexfork/en-US/icon_gZUP1wHq66VuzccM-dA4F_m3EBSYZCFmzskbmrf15ao=.png",
-        "/ru.yourok.torrserve/en-US/icon_U0kfrQasC_UXU_rCfT3EEAo8jN4n_zHwbF72XO1C3cE=.png",
-        "/icons/ru.zxalexis.ugaday.15.png",
-        "/icons/ru0xdc.rtkgps.1.png",
-        "/icons/ryey.camcov.9.png",
-        "/icons/ryey.colorsniffer.5.png",
-        "/icons/ryey.easer.128.png",
-        "/icons/ryey.flock.8.png",
-        "/s1m.savertuner/en-US/icon_GSE6KthrO2cL8VGLKZ3YHC4O68LJt07DsGFk71nyHgo=.png",
-        "/icons/saschpe.contactevents.160179.png",
-        "/icons/saschpe.poker.170127.png",
-        "/icons/science.itaintrocket.pomfshare.3.png",
-        "/icons/screen.dimmer.pixelfilter.24.png",
-        "/icons/se.anyro.nfc_reader.15.png",
-        "/se.arctosoft.vault/en-US/icon_O-U3JRoNgZ4gL272ZdZJ---yZfQ32Lwn4ZoOxhl_Lz0=.png",
-        "/icons/se.danielj.geometridestroyer.2.png",
-        "/icons/se.embargo.retroboy.44.png",
-        "/icons/se.erikofsweden.findmyphone.13.png",
-        "/icons/se.johanhil.clipboard.2.png",
-        "/se.lublin.mumla/en-US/icon_TxKqlJbEjKCNiQjiDMsn8eCAHhULl3PFRA66uJ1DgnA=.png",
-        "/icons/se.norenh.rkfread.4.png",
-        "/icons/se.traffar.dot_race.4.png",
-        "/icons/se.tube42.drum.android.34.png",
-        "/icons/se.tube42.kidsmem.android.17.png",
-        "/icons/se.tube42.p9.android.11.png",
-        "/icons/seanfoy.wherering.99.png",
-        "/icons/search.searx.2.png",
-        "/sh.ftp.rocketninelabs.meditationassistant.opensource/en-US/icon_Q4W1bwqqvfns4pz1lvtszKuYqBC4BewcHdu5SqfaobE=.png",
-        "/sh.ikl.liteshort/en-US/icon_mQPvN8duq1wtOg5-zqhG4ybBglJ7HAVAF4_TaRecsxU=.png",
-        "/icons/si.modrajagoda.didi.1.png",
-        "/si.palcka.tarok/en-US/icon_gM8-nW79C-Mj8YfxesrE92Ssrv7SBZXQDTXADR-ZlDE=.png",
-        "/icons/siir.es.adbWireless.12.png",
-        "/simbio.se.nheengare/en-US/icon_IQq2A3LXhptZrhCHvoJBKFsrvt7ipOWYMOzhLLdghfg=.png",
-        "/site.leos.apps.lespas/en-US/icon_gqN3X7rJ2uGFNx-UqHpgpPUREQFmOnpIFAs7UZ9Yq04=.png",
-        "/site.leos.setter/en-US/icon__3FXP1CM3G4DB-4Pop3Si6k3KXs4g6tEgBAhq6QLa8g=.png",
-        "/sithakuru.sinhala.keyboard/en-US/icon_ndvPk26fyUi0MZDYDczwAksLoWt2wED8zvz7A1gg3BU=.png",
-        "/icons/sk.halmi.fbeditplus.13.png",
-        "/icons/sk.madzik.android.logcatudp.5.png",
-        "/icons/sk.vx.connectbot.30.png",
-        "/slowscript.warpinator/en-US/icon_qQAphVhOW0ygYnP4F_rZSO1B3XrrKsUMNAVoKrALnkg=.png",
-        "/software.mdev.bookstracker/en-US/icon_Dcan1mwK_h5oLOey3VD6W39KRruYK838rKYVV_RvE_Y=.png",
-        "/icons/sonoroxadc.garethmurfin.co.uk.4.png",
-        "/icons/sony.hidden.servicemenu.2.png",
-        "/souch.smp/en-US/icon_blS_BHptxEOYX2kZQB0mh-BCS0LML0Nx92HhLA4ZCTw=.png",
-        "/icons/souch.smsbypass.9.png",
-        "/icons/space.bm835.pb.2.png",
-        "/icons/space.kraut.schluessel.3.png",
-        "/icons/space.neothefox.laytray.10.png",
-        "/space.rocketnine.xenia/en-US/icon_iB6mMI7zT8Z3_07guTf8252-lZoNvqm7KNQCMstP-Ug=.png",
-        "/icons/st.wow.git.hrm.3.png",
-        "/starcom.snd/en-US/icon_rEQq5teFqHNbcL7PM9PB6yB4jTRLUX58bOxWzHlN4Ds=.png",
-        "/icons/steele.gerry.dotty.2.png",
-        "/icons/sterrenburg.github.flutterhole.641.png",
-        "/icons/streetwalrus.usbmountr.8.png",
-        "/su.sadrobot.yashlang/en-US/icon_2J4-LzC3BDXgoE8svgWwVvQnbiIgoC7-Ntj4pz5LVME=.png",
-        "/su.xash.husky/en-US/icon__8Cvub58cJLcRFEuTxGYqAB0xJh5UDEHVn19hJiHERU=.png",
-        "/icons/subins2000.manglish.7.png",
-        "/icons/subreddit.android.appstore.9200.png",
-        "/icons/sun.bob.leela.2.png",
-        "/icons/superfreeze.tool.android.1000.png",
-        "/icons/superustats.tool.android.12.png",
-        "/sushi.hardcore.droidfs/en-US/icon_6N05in6K4NA2BFj5YcninogjocC2UFhHa3u0FmUuB2I=.png",
-        "/icons/systems.byteswap.aiproute.1.png",
-        "/systems.now8.app/en-US/icon_l9yA_loM7DbfLhW6rdr2jFQTn1MTbDqPDq-d0wdWm5E=.png",
-        "/systems.sieber.fsclock/en-US/icon_Kv7VY4CM1jrXAKhsqF80pXZ2zTrshs_qWFer6dZFNPs=.png",
-        "/icons/szelok.app.twister.1.png",
-        "/t20kdc.offlinepuzzlesolver/en-US/icon_ICB4PsFIfcUSTuGEX8w7x7iKjld_QAutBYALvENZhIA=.png",
-        "/icons/taco.apkmirror.11.png",
-        "/taco.scoop/en-US/icon_nzoWyX4GIu-sRf6VEuiwr1wmxCJIiv_5U-ea8SK7CmI=.png",
-        "/icons/team.swing.pendulums.4.png",
-        "/icons/teaonly.droideye.12.png",
-        "/tech.bogomolov.incomingsmsgateway/en-US/icon_4zKtRhP3AJT6NI6eqA_iK6jYPLKtAix4znG9hLnGrJs=.png",
-        "/tech.platypush.platypush/en-US/icon_yxImraRM6cv5VAIIGImTFkyF7EFlM6T7spXIj2RGaCU=.png",
-        "/icons/tech.ula.7438725.png",
-        "/tech.waelk.radioactive.metronome/en-US/icon_FsiNQ4o0RBTTIqZ2u_ec-ZV_W2C16c5Jr8KYOS17m5U=.png",
-        "/icons/telegra.ph.18.png",
-        "/icons/theakki.synctool.100.png",
-        "/theredspy15.ltecleanerfoss/en-US/icon_JiGGIl8oic65fOBtg69mQvtzAWwjaFcTOIf1yLuvAKg=.png",
-        "/threads.server/en-US/icon_mapvuLLVytxl_Xu5BKNoixGrO4iCSBGo7YiCLLzYst4=.png",
-        "/threads.thor/en-US/icon_h529wR-N5X9khCqHqY3bSG-AQel7uSZNzBmL9YUQ0ws=.png",
-        "/timur.webcall.callee/en-US/icon_ibxAPC5TqyL3RFWM6SwH9ScQ7ynVIcl2rBsepiUD7wE=.png",
-        "/timur.webrtc.check/en-US/icon_nqVT_xFrjp8tpTCiRvjM3vZUUM4i-BP5ND0u5es-fNM=.png",
-        "/icons/tk.al54.dev.badpixels.4.png",
-        "/icons/tk.elevenk.dailybread.5.png",
-        "/tk.giesecke.disaster_radio/en-US/icon_S0Ue3R1hm43S3zdRqugj4UajW3UW_dqbisqbJRDg9uE=.png",
-        "/icons/tk.giesecke.painlessmesh.14.png",
-        "/icons/tk.giesecke.phoenix.3.png",
-        "/tk.hack5.treblecheck/en-US/icon_xGJi_cbbDsCLPe4tRV2rD2oOCL3t0Ak12Z8D2WChkRM=.png",
-        "/icons/tk.jordynsmediagroup.simpleirc.fdroid.19.png",
-        "/icons/tk.superl2.xwifi.3.png",
-        "/icons/tkj.android.homecontrol.mythmote.3014.png",
-        "/icons/tmendes.com.analyticalbalancedroid.3.png",
-        "/tmendes.com.waterydroid/en-US/icon_c-aUiGov7NIsjpx8Jb2evkLS9TPbpoH_X4S40d4wi0M=.png",
-        "/tn.creativeteam.newyoutubelistingapp/en-US/icon_JU-xUr3BpL97EdDssij796cdThwA2A5mfXXaRJKuWd0=.png",
-        "/icons/tomer.com.alwaysonamoledplugin.3.png",
-        "/icons/tool.fff.profilepicturegenerator.17.png",
-        "/top.donmor.tiddloid/en-US/icon_gN5QC6EGpv1ClyDuv4iIaurP8hv1ME5FJ1WKJbXgg-w=.png",
-        "/town.robin.toadua/en-US/icon_Fby3LR7ssfdyE7wqCKyP0HK76ZdPHN6XD-MhMwvwl2k=.png",
-        "/icons/trikita.obsqr.16.png",
-        "/icons/trikita.slide.4.png",
-        "/icons/trikita.talalarmo.19.png",
-        "/icons/tritop.android.SLWTrafficMeterWidget.2.png",
-        "/icons/tritop.androidSLWCpuWidget.6.png",
-        "/troop.com.freedcam/en-US/icon_lQfkt8nwjdbqCGAYArqGNHzE10B0BllmKDNMZrxVu9Y=.png",
-        "/truewatcher.tower/en-US/icon_71IS-OznC8AdEJtKqSLCNrpk3AqhpdVZ7XX55zoYQCw=.png",
-        "/tube.chikichiki.sako/en-US/icon_34jeIlmHVdJTOYk6CK4RaUXJ4NTWwyoRsCFfrYpAsvw=.png",
-        "/icons/tv.piratemedia.lightcontroler.161.png",
-        "/icons/tw.com.daxia.virtualsoftkeys.10.png",
-        "/icons/tw.qtlin.mac.airunlocker.1.png",
-        "/icons/tyagi.shubham.customsearch.1.png",
-        "/ua.bossly.tools.translit/en-US/icon_Z6_Fp0IO6kRy2G62fCHjsUMRsuz9iQlXedglUrn0oRI=.png",
-        "/ua.com.radiokot.lnaddr2invoice/en-US/icon_E8f0ItDFeKIKF5NdNl9VCqEzaonb8g2REw7i9G8sAD4=.png",
-        "/ua.com.radiokot.photoprism/en-US/icon_W_5TnleHSiMH-MyytjFp3GcUAbzrps9k-6bgbWwryW8=.png",
-        "/ua.syt0r.kanji.fdroid/en-US/icon_WOSc49VcLgMELOmUR06ULIlzfKwH2sOslgW-JZ7UgoI=.png",
-        "/icons/uk.ac.cam.cl.dtg.android.barcodebox.4.png",
-        "/icons/uk.ac.ed.inf.mandelbrotmaps.2.png",
-        "/icons/uk.ac.swansea.eduroamcat.59.png",
-        "/icons/uk.co.ashtonbrsc.android.intentintercept.224.png",
-        "/icons/uk.co.bitethebullet.android.token.6.png",
-        "/uk.co.busydoingnothing.anagrams/en-US/icon_Q7bOEPl-HXkXJuhAIKtwTCbkV19AA9lCsANrzfp_C_M=.png",
-        "/icons/uk.co.busydoingnothing.catverbs.5.png",
-        "/icons/uk.co.danieljarvis.android.flashback.16.png",
-        "/icons/uk.co.jarofgreen.JustADamnCompass.2.png",
-        "/icons/uk.co.keepawayfromfire.screens.8.png",
-        "/uk.co.richyhbm.monochromatic/en-US/icon_4CQcSo8ZaBqMku-lZDgkALKa2f4C3obIl5SkgwJG13Y=.png",
-        "/icons/uk.co.yahoo.p1rpp.calendartrigger.8.png",
-        "/uk.co.yahoo.p1rpp.secondsclock/en-US/icon_P6l-ExK2htLLffu0bW4H36jDxdOwBsBqQMhHmfAGArk=.png",
-        "/uk.openvk.android.legacy/en-US/icon_0u5-xTfu181pFkvmkqz_qJJzvtbgwu3v9zBoXjhj1AU=.png",
-        "/uk.org.boddie.android.weatherforecast/en-US/icon_3Q4g4RjCgQCr9AaLImtJ-wW5leAAhFDDqRao2cBDUHM=.png",
-        "/icons/uk.org.crimetalk.3.png",
-        "/uk.org.ngo.squeezer/en-US/icon_aV_5RzYdJ8B3aNOFEkDGCgT2rySswXrmsjrCl-Bc_ek=.png",
-        "/icons/unisiegen.photographers.activity.11.png",
-        "/icons/urbanstew.RehearsalAssistant.26.png",
-        "/icons/us.achromaticmetaphor.agram.21.png",
-        "/icons/us.achromaticmetaphor.imcktg.12.png",
-        "/icons/us.bravender.android.dongsa.8.png",
-        "/icons/us.feras.mdv.demo.2.png",
-        "/icons/us.koller.cameraroll.36.png",
-        "/icons/us.lindanrandy.cidrcalculator.125.png",
-        "/icons/us.shandian.giga.8.png",
-        "/us.spotco.ir_remote/en-US/icon_YTFyFmRDXZA-QmXW5Ztuau27oW_k1gX4VDI1Ayjsf1o=.png",
-        "/us.spotco.malwarescanner/en-US/icon_CwoXahI8sykVdZhPCngZXFau7kqvs2UPdnN8pp8pkmk=.png",
-        "/us.spotco.maps/en-US/icon_J86ytM4svDAKfKcRdXEhBjgd9VVtuUdM9GqEARTNseA=.png",
-        "/uscartools.USTravelConverter/en-US/icon_jXEOPMpTXJW05TyNrLuqVPnEeG4fMxSfU9aKOrl2S4k=.png",
-        "/icons/ut.ewh.audiometrytest.14.png",
-        "/v4lpt.vpt.pwg/en-US/icon_zNhsX0Hxb2T_cdJMt42yWcAB2O0IhzLxXWLYm5IDluI=.png",
-        "/vegabobo.dsusideloader/en-US/icon_rJljVEuF2qXiKxKffaI3tPPOdx1pbI3MDWQAr2eEL8M=.png",
-        "/icons/vnd.blueararat.kaleidoscope6.21.png",
-        "/icons/wb.receiptspro.82.png",
-        "/website.leifs.delta.foss/en-US/icon_TIvE5SwAV7-DtiN6GSUekYW2AKQS6K7lvtqwNqvsdsE=.png",
-        "/icons/wiseguys.radar.12.png",
-        "/ws.xsoh.etar/en-US/icon_MV5P0hb85YWVJIfobFH46J3yDwLvde2IRXbFLfH133s=.png",
-        "/wsdfhjxc.taponium/en-US/icon_JpvdnanU1Ero9sh9zAk5zs_4TVlbzsACAiuuXoScC3k=.png",
-        "/wtf.nbd.obw/en-US/icon_4rGInMh-wTaGNTghffm0ME4voG8o2miEmzeN0p_5AN4=.png",
-        "/wtf.technodisaster.tldr/en-US/icon_ZCJI1-QvZOV5cwB-eC7YMbe8PdMKMOWFoJ-eX_T9H-I=.png",
-        "/icons/x1125io.initdlight.2.png",
-        "/x653.all_in_gold/en-US/icon_0Zb7ymS3RKTpeGpzp5BwMf8dSYwP72raEfqSnKtBNfQ=.png",
-        "/x653.bullseye/en-US/icon_TcCEiqkjAtuAa98rx88GTO6cYzL2k14VK9HQzM2Tbu8=.png",
-        "/xdsopl.robot36/en-US/icon_xMvFGWXViBKRkGWHtzJGjA42fUyci7QijuziV0-LTrI=.png",
-        "/xyz.apiote.bimba.czwek/en-US/icon_FDJ5OEjVG8QC2w1VqOh8oryRHRpqC3B4Ddmk3n-elGM=.png",
-        "/xyz.crucitti.friendalert/en-US/icon_-d01wWj8k202nIbtgepr6qrA3AImbsVUD0j6XMhaeg8=.png",
-        "/xyz.deepdaikon.quinb/en-US/icon_PI7HCSDkOiTInZY8Q7nTJZvTvZU3tb5mrPdBtu4y3c4=.png",
-        "/xyz.deepdaikon.xeonjia/en-US/icon_1bqqbKPRcCv_2pm6z8W2kKzjDnmSBDCiDNEY5krl_og=.png",
-        "/xyz.deepdaikon.zoysii/en-US/icon_Q0smhUDLZZW0E-4TQqHLiGZnhH23LsXkX8OR859beQA=.png",
-        "/icons/xyz.iridiumion.plucklockex.4.png",
-        "/xyz.zedler.patrick.doodle/en-US/icon_3fyxhfUcYbfcC1TSiXFYxqp_6lMGkjjNdLyRUkZ3FaE=.png",
-        "/xyz.zedler.patrick.grocy/en-US/icon_GAoo5LLMVaGqL5SyqnJP5MwL0C8_G7MsoWGipBgFCBw=.png",
-        "/icons/ymakei.vegetarian_journal.1.png",
-        "/icons/z4pp3r.flashlightwidget.1.png",
-        "/icons/za.co.lukestonehm.logicaldefence.22.png",
-        "/icons/za.co.neilson.alarm.4.png",
-        "/icons/zame.GloomyDungeons.opensource.game.1807020000.png",
-        "/icons/zen.meditation.android.1644109.png",
-    )
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Names.kt b/basic/src/main/java/org/fdroid/basic/ui/Names.kt
deleted file mode 100644
index 8252113a6..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/Names.kt
+++ /dev/null
@@ -1,4302 +0,0 @@
-package org.fdroid.basic.ui
-
-object Names {
-
-    val randomName: String get() = names.random()
-    val names = listOf(
-        "Anstop",
-        "PipePipe",
-        "A2DP Volume",
-        "Com-Phone Story Maker",
-        "Lightning",
-        "BitAC - Bitcoin Address Checker",
-        "Text Launcher",
-        "Polaris",
-        "Chubby Click - Metronome",
-        "SUSI.AI",
-        "Moon Phase",
-        "Export Contacts",
-        "Import Contacts",
-        "DNG Processor",
-        "Rootless Pixel Launcher",
-        "AndroDNS",
-        "androidVNC",
-        "PrBoom For Android",
-        "FakeStandby",
-        "eBooks",
-        "ANONguard",
-        "Acrylic Paint",
-        "Immich",
-        "Crescent Cash",
-        "Forkyz",
-        "Forkyz Scanner",
-        "TubeAcad",
-        "Mobilizon",
-        "UntrackMe",
-        "UntrackMe Lite",
-        "OpenMultiMaps",
-        "TubeLab",
-        "Halma",
-        "HK Transport",
-        "Intra",
-        "Ladefuchs",
-        "LibreNews",
-        "BitBanana",
-        "mLauncher",
-        "Alibi",
-        "Locus",
-        "Olauncher",
-        "Olauncher Clutter Free",
-        "OpenConnect",
-        "Organic Maps: Hike, Bike, Drive Offline",
-        "Pachli",
-        "Prav",
-        "Stoic Reading",
-        "Stoic Reading",
-        "Seeneva: smart comic reader",
-        "Shosetsu",
-        "Inure App Manager (Trial)",
-        "Food-E",
-        "Vibe You",
-        "TICE – Secure GPS Location Sharing with Friends",
-        "Jargons Colombia",
-        "UpVPN - Serverless VPN",
-        "uNote",
-        "Voyager for Lemmy",
-        "Weather Overview",
-        "Baby Care Timer",
-        "Notify Lite",
-        "Simple ToDo",
-        "ShareToBrowser",
-        "Loud Bang",
-        "Mi Manga Nu",
-        "Lato",
-        "Arity",
-        "Asgardius S3 Manager",
-        "Asgardius S3 Music",
-        "CAdroid",
-        "DAVx⁵",
-        "Device Locator",
-        "GfxTablet",
-        "ICSx⁵",
-        "NoPhoneSpam",
-        "Kolab Client",
-        "NÖ Finderlein",
-        "AmSprung",
-        "A Whip",
-        "RxDroid",
-        "Grazer Linuxtage Schedule",
-        "Octal Sun Time",
-        "Cyrillic to Latin",
-        "Plug Off Airplane",
-        "jtx Board journals|notes|tasks",
-        "LibreOffice & OpenOffice document reader | ODF",
-        "تودویر",
-        "NASA Images",
-        "Rocket Guardian",
-        "Starun",
-        "X Server",
-        "Reddinator",
-        "Metrodroid",
-        "Funkwhale for Android",
-        "OMGSoundboard",
-        "Android Resources",
-        "USB Device Info",
-        "Apk Extractor",
-        "Notepad",
-        "Droid Dicom Viewer",
-        "MobileInpact",
-        "APKShare",
-        "DNSSetter",
-        "WiFiKeyShare",
-        "Better Internet Tiles",
-        "NanoLedger",
-        "FOSDEM Companion",
-        "Webthingify",
-        "NI",
-        "UCLL Student",
-        "VPN Hotspot",
-        "Random App",
-        "Shutdown",
-        "FTP Server (Free)",
-        "Manille",
-        "Hydra",
-        "Wi-Fi Privacy Police",
-        "Weather Forecast USA",
-        "YAAB",
-        "Ad-silence",
-        "Mint Task",
-        "Mint Calculator",
-        "Reader for Selfoss",
-        "NATO Alphabet Memorizer",
-        "Petals",
-        "Food Restrictions",
-        "Daily Pill — Medication Reminder",
-        "The Knights of Alentejo",
-        "Retro Breaker",
-        "BRouter",
-        "Ridmik Dictionary",
-        "SMS Filter",
-        "Overchan (fork)",
-        "fWallet",
-        "Gardine",
-        "Bodha Converter",
-        "HashPass",
-        "Port Knocker",
-        "Paseo",
-        "Location Share",
-        "Disable Battery Warnings",
-        "Flat Connectivity Icons",
-        "Heart Observe",
-        "MidniteSolar Classic Monitor",
-        "Kaku",
-        "Time Cop",
-        "Everyone's Timetable",
-        "Hangar",
-        "Lift",
-        "Peace of Mind+",
-        "Entrust IdentityGuard Unblocker",
-        "Delist",
-        "Virtuosity",
-        "French Calendar",
-        "Network Monitor",
-        "Poet Assistant",
-        "Scrum Chatter",
-        "Nounours and friends",
-        "deedum",
-        "Bites",
-        "Trolly",
-        "CineCat",
-        "MinCal Widget",
-        "Florae",
-        "NyaaPantsu",
-        "Calliope mini",
-        "Urecord",
-        "Cool Mic",
-        "BVD",
-        "Chaldea",
-        "Rainwave",
-        "#FFF Info",
-        "FreezeYou!",
-        "Guerrilla Mail",
-        "Ad-Free",
-        "Water Me - Plant Watering Reminder",
-        "AAT Another Activity Tracker",
-        "ApnSwitch",
-        "Vanilla Music",
-        "Headphone detector for Vanilla Music",
-        "Battery Circle",
-        "GSAK for Locus",
-        "TD",
-        "World Clock & Weather",
-        "LetterBox",
-        "Lawnchair",
-        "Drupal Editor",
-        "ETH & UZH canteens Zürich",
-        "Cowsay",
-        "MyHackerspace",
-        "Deine Rechte",
-        "TopoSuite",
-        "eyeCam",
-        "Calendar Color",
-        "Velocity Calculator",
-        "Bible Verse App",
-        "Anuto TD",
-        "OsciPrime",
-        "Bluemoon",
-        "ProtonVPN - Secure and Free VPN",
-        "HTTP Request Shortcuts",
-        "Status Bar Speedometer",
-        "Battery Level",
-        "Location Cache Map",
-        "Kanji draw",
-        "Spartathlon",
-        "Notely",
-        "Threema Libre",
-        "Markdown Widget",
-        "FluffyChat",
-        "Rocket.Chat",
-        "SimpleX Chat",
-        "PilferShush Jammer",
-        "FakeTraveler",
-        "UART Smartwatch",
-        "Fun Phone Puppet",
-        "HaveRadiosion",
-        "Image SMS",
-        "Notify2Jabber",
-        "Rick App",
-        "Retro Text Editor",
-        "YidKey KD",
-        "Overload",
-        "Valetudo Companion",
-        "Tarnhelm",
-        "News",
-        "AELF - Bible and day's reading",
-        "Material Flashlight",
-        "LocalMonero: buy XMR privately",
-        "Icicle for Freenet",
-        "Clima",
-        "Just Search",
-        "Voucher Vault",
-        "Retro Music",
-        "Graph 89",
-        "Dart Checker",
-        "Neural Network Simulator",
-        "Permissions",
-        "EVE Mining Calc",
-        "Nihonoari: Hiragana & Katakana",
-        "Share via HTTP",
-        "Graded - Grade tracker",
-        "ImapNotes2",
-        "koyu.space",
-        "Simple Weather",
-        "My Notes - Take notes anywhere",
-        "NoSurf for reddit",
-        "Port Authority",
-        "HomeBot",
-        "Root Verifier",
-        "Smart Edge",
-        "Fit Notifications",
-        "Flashlight",
-        "LibChecker",
-        "AcDisplay",
-        "Jelly Clock",
-        "Activity Manager",
-        "TasClock",
-        "Simple Scrobbler",
-        "Addi",
-        "AddisMapTransit",
-        "kboard",
-        "AdGuard Content Blocker",
-        "Ricochlime",
-        "Saber",
-        "Man Man",
-        "Launch App Ops",
-        "SAI",
-        "Thud",
-        "Deku SMS",
-        "Nock Nock",
-        "Burger Party",
-        "Cat Avatar Generator",
-        "Pixel Wheels",
-        "Solar Compass",
-        "AgoraDesk: buy BTC anonymously",
-        "Ahorcado",
-        "SimpleTextCrypt",
-        "Hail",
-        "ShareX",
-        "NoFb Event Scraper",
-        "Spark 360",
-        "MouseRemote",
-        "TouchDroid",
-        "Critical Velocity",
-        "Hourglass",
-        "JustChess",
-        "Just Craigslist",
-        "Just Notes",
-        "Ril Control",
-        "Ship Captain and Crew",
-        "Cooky",
-        "Wassword - Wonderful Password Generator",
-        "Papuh",
-        "BlueChat",
-        "LoopBoard",
-        "Matrix Calc",
-        "Asqare",
-        "Timeriffic",
-        "LeafPic Revived",
-        "Verbiste Android",
-        "Alovoa Lite",
-        "Alovoa",
-        "SatPredict",
-        "Post Writer",
-        "VTU CS Lab Manual",
-        "Unalix",
-        "Amaze",
-        "Amaze File Utilities",
-        "BookList",
-        "WallFlow",
-        "WallFlow Plus",
-        "ClearClipboard",
-        "KryptEY",
-        "TPT Helper",
-        "LinkHub",
-        "Harmony Music",
-        "Hypnotoad Live Wallpaper",
-        "Apollo",
-        "ADBKeyBoard",
-        "Geto",
-        "GPSTest",
-        "KeePassDroid",
-        "Launcher3",
-        "Music",
-        "Quake",
-        "ShellMS",
-        "TalkBack",
-        "To Do List",
-        "GameBoid",
-        "GBCoid",
-        "Nesoid",
-        "Working Time Alert",
-        "Androzic",
-        "Tram Hunter",
-        "la/u/ncher",
-        "Alarm Klock",
-        "QDict",
-        "PasteBin",
-        "Mahjongg Builder",
-        "Keikai Launcher",
-        "Power Ampache",
-        "Warpclock",
-        "Pixiv for Muzei 3",
-        "AnySoftKeyboard: SSH",
-        "Afrikaans for AnySoftKeyboard",
-        "Basque for AnySoftKeyboard",
-        "Brazilian Portuguese for AnySoftKeyboard",
-        "Catalan for AnySoftKeyboard",
-        "Danish for AnySoftKeyboard",
-        "Dutch for AnySoftKeyboard",
-        "AnySoftKeyboard: Esperanto",
-        "French for AnySoftKeyboard",
-        "AnySoftKeyboard: French",
-        "AnySoftKeyboard: Galician",
-        "AnySoftKeyboard: Georgian",
-        "German for AnySoftKeyboard",
-        "Greek for AnySoftKeyboard",
-        "Hebrew for AnySoftKeyboard",
-        "Hungarian for AnySoftKeyboard",
-        "AnySoftKeyboard: Icelandic",
-        "Indonesian for AnySoftKeyboard",
-        "Italian for AnySoftKeyboard",
-        "Latvian for AnySoftKeyboard",
-        "AnySoftKeyboard: Macedonian",
-        "AnySoftKeyboard: Malayalam",
-        "AnySoftKeyboard: NEO2",
-        "Norwegian for AnySoftKeyboard",
-        "AnySoftKeyboard: Polish",
-        "Turkish for AnySoftKeyboard",
-        "AnySoftKeyboard: Pali",
-        "AnySoftKeyboard: Persian",
-        "AnySoftKeyboard: Portuguese",
-        "Russian for AnySoftKeyboard",
-        "AnySoftKeyboard: Slovene",
-        "Spanish for AnySoftKeyboard",
-        "AnySoftKeyboard: Swedish",
-        "AnySoftKeyboard: Tatar",
-        "AnySoftKeyboard: Ukrainian",
-        "AnySoftKeyboard: Classic PC Theme",
-        "APK Explorer & Editor",
-        "Contact Diary",
-        "Zensuren",
-        "Missed Notifications Reminder",
-        "Sudoku Free",
-        "Contact Owner",
-        "neutriNote CE",
-        "Goodtime - Minimalist Pomodoro Timer",
-        "USB HID Terminal",
-        "Diceware Password Generator",
-        "Japanese Traditional Time",
-        "SafeDot",
-        "Pro Expense - Daily Finance Tracker",
-        "Seismo Wallpaper",
-        "Metronome",
-        "Vault",
-        "MuPDF mini",
-        "MuPDF viewer",
-        "NoLauncher",
-        "Réseau Discord Artivain",
-        "AnagramSolver",
-        "GymWen",
-        "Mebis (Unofficial)",
-        "QuickTiles",
-        "Timetable",
-        "Train Schedule",
-        "BBS",
-        "Better Wifi on/off",
-        "WonderDroid X",
-        "RPN",
-        "Barcode Scanner",
-        "atop",
-        "HIIT",
-        "TEdit ",
-        "Music Player Lite",
-        "Corona Stats",
-        "Aurora Store",
-        "Fall",
-        "krassesSpiel",
-        "World Scribe",
-        "AniHyou - AniList client",
-        "Delta Chat",
-        "Bagatur Chess Engine",
-        "BaldPhone",
-        "BoB",
-        "Coin Flip",
-        "Coin Flip Addon",
-        "DioLite",
-        "Aegis Authenticator",
-        "Offline Cook Book",
-        "ChineseTtsTflite",
-        "OpenLauncher",
-        "PxerStudio",
-        "Let Me Downgrade",
-        "MACsposed",
-        "Practice Suite",
-        "Change Detection",
-        "SDK Monitor",
-        "Clock",
-        "Simple Alarm Clock",
-        "BiglyBT, Torrent Downloader",
-        "Scarlet FDroid",
-        "Share to Pinboard",
-        "Cryptix",
-        "Hayago",
-        "Squircle CE - Code Editor",
-        "Remindly",
-        "TSViewer",
-        "Recurrence",
-        "blippex",
-        "Email Popup",
-        "Just Another Workout Timer",
-        "NS-USBloader",
-        "Money Tracker",
-        "Crates.io unofficial",
-        "Anagram Solver",
-        "Clock You",
-        "Connect You",
-        "Record You",
-        "Translate You",
-        "Trivia You",
-        "Wall You",
-        "BoardGameGeek",
-        "How far do you swim",
-        "Compass",
-        "Metronome",
-        "Shift",
-        "Piraten Karte",
-        "Contact Widget",
-        "Here GPS Location",
-        "PuppyFrame",
-        "Roaming Info",
-        "Simple Crypto Widget",
-        "Simple Ethereum Widget",
-        "Simple Litecoin Widget",
-        "URLazy",
-        "Performance Control",
-        "Instant Sound Effects",
-        "SoundBored",
-        "Color Clock",
-        "NFCMessageBoard",
-        "Deep Scratch",
-        "Just Sit",
-        "AirPush Detector",
-        "Just (Video) Player",
-        "Space Trader",
-        "Simple Bitcoin Wallet",
-        "falling for reddit",
-        "Photo Editor",
-        "Smart AutoClicker",
-        "CPU Spy",
-        "Mavinote",
-        "Quick Settings",
-        "Persian Calendar",
-        "OmniROM Changelog",
-        "Flowit",
-        "LaaNo",
-        "ToneDef",
-        "Mill",
-        "Call recorder for Android",
-        "Call recorder for Android",
-        "RustDesk",
-        "Simple Deadlines",
-        "PX:VW - converter",
-        "Rivia",
-        "Clip Stack",
-        "Extended emulator of МК 61/54",
-        "FFShare",
-        "Rethink: DNS + Firewall",
-        "Salat Times",
-        "Audio Notes",
-        "LRC Editor",
-        "Library",
-        " Just 24 Hours",
-        "Blazed Cloud",
-        "炒饭超Fun",
-        "ChemistryLab",
-        "Clock",
-        "Cheogram",
-        "Nekome",
-        "Pushie",
-        "Chess Clock",
-        "Simple Chess Clock",
-        "Koler",
-        "Tallyphant",
-        "Little Sir Echo",
-        "CityZen",
-        "Movian Remote",
-        "PlayMusic Widget (sample)",
-        "Easy Noise",
-        "SoundAura",
-        "MultiVNC",
-        "DeadPixel",
-        "FareBot",
-        "DeadHash",
-        "Inventory",
-        "WeeklyBudget",
-        "Peercoin Wallet",
-        "CoinTrend: Private Crypto Tracker",
-        "Torch",
-        "Fertility Test Analyzer App: Ovulation & Pregnancy",
-        "Color Namer",
-        "LabCoat",
-        "CommonsLab",
-        "arXiv mobile",
-        "Khan Academy viewer",
-        "InstaLate",
-        "Diconfinement",
-        "Controlloid",
-        "SmartCookieWeb",
-        "Beauty Clock",
-        "[ROOT] Night Light (KCAL)",
-        "Bible Notify",
-        "Go to Sleep",
-        "Candle",
-        "Stealth",
-        "SyncOrg",
-        "Countdown for DashClock",
-        "IITC Mobile",
-        "YubiClip XOR",
-        "LMS",
-        "Dungeon Crawl: Stone Soup for Android",
-        "Munch",
-        "SubHub",
-        "Vigilante",
-        "WifiAutOff",
-        "StoneAge",
-        "File Manager",
-        "FlashDim - Dim your flashlight",
-        "Pazzword - Password Evaluator",
-        "PINcredible - Secure PIN vault",
-        "PalmCalc",
-        "Bangumi",
-        "SshDaemon",
-        "psychphinder",
-        "TuCanMobile",
-        "Equipe RSS",
-        "TTS Util",
-        "Weather Radar",
-        "Mobile Pauker ++",
-        "Sound Recorder",
-        "Muspy for Android",
-        "Tinfoil for Facebook",
-        "NClientV2",
-        "OpenCalc",
-        "Darkness Map",
-        "Hammer [ALPHA]",
-        "BatteryBot",
-        "BatteryBot Pro",
-        "Databag",
-        "MH4U Database",
-        "Monster Hunter 3U Database",
-        "AdminControl",
-        "Cooper",
-        "Decred Address Scanner",
-        "Easter Eggs",
-        "Scrunch",
-        "Blood pressure monitor",
-        "Thumb-Key",
-        "Tempus Romanum",
-        "Knot",
-        "MotionEye Client for Android",
-        "Nomad - Hubzilla for Android ",
-        "PlanetCon",
-        "Caramelos",
-        "MorphClock",
-        "Bookland",
-        "Full colemak",
-        "OpenShift",
-        "Tessercube",
-        "Audio Recorder",
-        "Shaarlier",
-        "Wa-Tor",
-        "Open WiFi Cleaner",
-        "Chip8",
-        "Gelli",
-        "Frost",
-        "OpenAPK",
-        "MobileWebCam",
-        "Simple Explorer",
-        "Arcticons",
-        "Arcticons Day & Night",
-        "Arcticons Black",
-        "Arcticons Material You",
-        "OverFlow",
-        "Torch",
-        "Secrecy",
-        "OpenPods",
-        "SINE Isochronic Entrainer",
-        "Clock31",
-        "DozeOff",
-        " LibreSpeed",
-        "Gallery",
-        "NextDNS Manager",
-        "BART Runner",
-        "AsciiCam",
-        "Vector Pinball",
-        "CamTimer",
-        "Cards With Cats",
-        "Dodge",
-        "Kumquats",
-        "Egyptian Mouse Pounce ",
-        "Vector Camera",
-        "iFixit",
-        "Logcat Reader",
-        "ColorBlendr [Root]",
-        "USB-Dataloggerreader",
-        "drip. menstrual cycle and fertility tracking",
-        "RingyDingyDingy",
-        "DriSMo",
-        "Data Monitor",
-        "Tux Rider",
-        "Avare FOSS",
-        "DuckDuckGo Privacy Browser",
-        "Dashclock: Last Caller",
-        "Toggle Headset 2",
-        "Anonymous Messenger",
-        "Home Launcher",
-        "HeaterRC",
-        "Toe",
-        "BARIA",
-        "F2L",
-        "G2L",
-        "Marble One",
-        "Quoter",
-        "Transparent Widget",
-        "Fast N Fitness",
-        "Micopi+",
-        "TripleCamel",
-        "Diccionario Chileno",
-        "EHHelper",
-        "BmiCalc",
-        "Red Dot",
-        "Fire Strike Retro",
-        "PodListen",
-        "Candle",
-        "Keep Screen On",
-        "BootBoi",
-        "Theia Icon Theme",
-        "Shorey",
-        "Tron Wallet",
-        "Elfeed Mobile",
-        "Sayboard",
-        "Autostarts - Block apps from starting automaticall",
-        "Current Wallpaper",
-        "UUID 0xFD6F Scanner",
-        "PCAPdroid",
-        "Clean Status Bar",
-        "Deadlines",
-        "Its Dicey!",
-        "Simple Accounting",
-        "Simple Cleanup",
-        "TicTacToe Game",
-        "Dots & Squares",
-        "HexColorTime Wallpaper",
-        "Feeel - home workouts",
-        "Om",
-        "Parlera — word guessing game",
-        "Simply Solid",
-        "Battery Live",
-        "Storage & USB",
-        "Colorpicker",
-        "ImgurViewer",
-        "OS Monitor",
-        "AppAlarm Pro",
-        "Kinoko[Manga Reader]",
-        "Bangle.js Gadgetbridge",
-        "FileManagerSphere",
-        "EteSync Notes - End-to-end Encrypted Notes",
-        "EteSync - Secure Data Sync",
-        "Open Aviation Map",
-        "Euro konverter",
-        "Mileage",
-        "Eve-control",
-        "Eventyay Attendee App",
-        "Eventyay Organizer App",
-        "AutoAnswer",
-        "Evil Insult Generator",
-        "TTime",
-        "LCARS Wallpapers",
-        "Month Calendar Widget",
-        "Any Cut",
-        "QR & Barcode Scanner",
-        "Book Listing App",
-        "DeepL",
-        "Dozenal Clock",
-        "DozenCalc",
-        "ServeIt",
-        "Cardboard Museum",
-        "Librery",
-        "NextCompanion",
-        "DownloadFilesWeb",
-        "Kotlin Quiz",
-        "NASA APOD for Muzei",
-        "OpenPass",
-        "Poleidoscope",
-        "RegisCat",
-        "Analytical Translator",
-        "Siete y media",
-        "DékaDico",
-        "MiniDlnaOmatic",
-        "Freifunk Auto Connect",
-        "Trigger",
-        "Exif Thumbnail Adder",
-        "Eddy Malou",
-        "LogFox",
-        "Dokuwiki Android",
-        "Torchlight",
-        "Prestissimo",
-        "Diaguard: Diabetes Diary",
-        "Notepad",
-        "SecondScreen",
-        "Taskbar",
-        "FastHub-Libre",
-        "RGB Tool",
-        "Fedi Photo",
-        "FediPhoto-Lineage",
-        "Converter NOW: Unit Converter",
-        "MSnake",
-        "Launcher",
-        "Signal From Mars",
-        "Energize",
-        "Subz",
-        "Broccoli: The Green Recipe App",
-        "Front Camera",
-        "Flipper Mobile App",
-        "Githo",
-        "DetoxDroid: Digital Detoxing as Your New Default",
-        "DankChat",
-        "Snapdrop & PairDrop for Android",
-        "Librera Reader",
-        "Form-N-Fun",
-        "Suntimes Calendars",
-        "Suntimes",
-        "Acode editor - Android code editor",
-        "Gao&Blaze",
-        "AndrOBD GpsProvider",
-        "AndrOBD MQTTPublisher",
-        "AndrOBD SensorProvider",
-        "AndrOBD",
-        "StageFever",
-        "Hydrate",
-        "Brainf",
-        "EweSticker",
-        "FHCode",
-        "aFreeRDP",
-        "Anime Release Notifier",
-        "Monkeyboard Keystone Radio",
-        "FrostWire",
-        "Cuscon",
-        "Cache Cleaner",
-        "Periodic Table",
-        "Quran For My Android",
-        "K-9 Mail",
-        "Diolinux",
-        "Aurora",
-        "My Location Widget",
-        "Reservator",
-        "Fancy Places",
-        "Tap 'n' Turn",
-        "Covid19 Stats",
-        "ReLaunchX",
-        "gaika",
-        "Aeon's End",
-        "SimpleAppDowngrader [ROOT]",
-        "MHWorld Database",
-        "AVNC",
-        "arXiv eXplorer - Mobile App for arXiv.org",
-        "GCstar scanner",
-        "GCstar Viewer",
-        "QuickLyric",
-        "Geekttrss",
-        "MTG Familiar",
-        "TrebleShot",
-        "ActivityForceNewTask",
-        "Identiconizer!",
-        "OctoDroid",
-        "Your very own Sun!",
-        "Ghost Commander",
-        "MHGU Database",
-        "Aria2Android",
-        "Aria2App",
-        "DNS Hero",
-        "Zandy",
-        "Sudaku - Make your rules to solve sudoku",
-        "Taswast",
-        "Cricket's Alarm",
-        "Andlytics",
-        "QRCode & Barcode scanner",
-        "zbarcamdemo",
-        "Xtra",
-        "Noice: Natural calming noise",
-        "10-bit Clock Widget",
-        "Audio Recorder",
-        "Binaural Beats",
-        "Book Reader",
-        "Call Recorder",
-        "Darkness Immunity",
-        "Files",
-        "Hourly Reminder",
-        "Media Merger",
-        "SMS Gate",
-        "ToneGenerator.class",
-        "Torrent Client",
-        "Cache Cleaner",
-        "Syncthing-Fork",
-        "CEToolbox",
-        "BMI Calculator",
-        "Share my number",
-        "Dark Mode Live Wallpaper",
-        "Screenshot Tile (NoRoot)",
-        "WallpaperExport",
-        "Cythara",
-        "Hangman",
-        "AndTTT",
-        "dandelion*",
-        "Isotopes",
-        "Oinkoin",
-        "Notification Cron",
-        "ExprEval",
-        "Gotify",
-        "Botifier",
-        "Fiddle Assistant",
-        "croc",
-        "Quote Unquote",
-        "Greater Sudbury Transit",
-        "KurobaEx",
-        "Rsync Server",
-        "LibreRandonaut",
-        "LibreTube",
-        "Linwood Dev-Doctor",
-        "Unchained",
-        "aRevelation",
-        "Al-Azan - Prayer Times",
-        "GitHub",
-        "Instant Readme Demo",
-        "tagdrop",
-        "twitlatte - SNS client for Twitter and Mastodon",
-        "Android version",
-        "Coffee",
-        "Mute reminder",
-        "NFC Reader",
-        "Prepaid Balance",
-        "Stopwatch",
-        "Tabletop Tools",
-        "Hanuman Chalisa",
-        "Short URL Evaluator",
-        "IPCam Demo",
-        "ControlDLNA",
-        "RHVoice - a free and open source speech synthesize",
-        "OneTimePass",
-        "Hey! Meditation",
-        "PalmCalc 2019+",
-        "Android OBD-II Reader",
-        "Light Android Launcher",
-        "Stocks Widget",
-        "Calendar Notifications",
-        "RedPanal",
-        "T4 Launcher",
-        "GetBack GPS",
-        "CryptoTerminal",
-        "PayNoWay",
-        "Shadowsocks",
-        "V2ray Plugin",
-        "Shadowsocks",
-        "Coordinate Joker",
-        "Wirebug",
-        "Endless Sky",
-        "Smart Remote Control",
-        "SMS Import / Export",
-        "TTL Manager",
-        "Scoreboard",
-        "Nextcloud Yaga",
-        "1x1 clock",
-        "FillUp",
-        "Call Counter",
-        "Flashy Alarm",
-        "Virtual Host",
-        "QRStream",
-        "Dumbphone Assistant",
-        "SMS Scheduler",
-        "WorkoutLog",
-        "Minidoro",
-        "Apple Flinger",
-        "Dib2Calc",
-        "SDRemount",
-        "Sun Time",
-        "NiDeau",
-        "GitFox",
-        "Mobile Paper Wallet",
-        "SWJournal",
-        "GL TRON",
-        "BeepMe",
-        "Passy - cross-platform password manager",
-        "NightLight light",
-        "Pocket Gopher",
-        "Scribbler",
-        "WhatsDeleted",
-        "SilverDict",
-        "RSSAid",
-        "SD Scanner",
-        "Temp. monitor",
-        "Simple Reflected Light Meter",
-        "midistrum",
-        "Musify",
-        "STweaks",
-        "Guessaday",
-        "熊愛學臺語",
-        "Type and Speak",
-        "TalkBack (deprecated)",
-        "DiskUsage",
-        "UnifiedNlp (no GAPPS) (legacy)",
-        "TalkBack",
-        "Android Samba Client",
-        "Sky Map",
-        "Apps2Org",
-        "Apps Organizer",
-        "Eyes-Free Shell",
-        "Barcode Scanner",
-        "Ermete SMS",
-        "ChartDroid Core",
-        "DroidWall",
-        "eSpeak TTS",
-        "GogoDroid",
-        "GTalkSMS",
-        "Network Log",
-        "OpenWnn Legacy",
-        "注音倉頡輸入法",
-        "AusweisApp",
-        "Andor's Trail",
-        "GPSTether",
-        "Presentation",
-        "GraphHopper Maps",
-        "Gravity Force",
-        "ABCore",
-        "Green",
-        "Toronto Transit",
-        "Sound Toggle",
-        "Grocery manager",
-        "MobilePrint",
-        "Secure photo viewer",
-        "AppLocker",
-        "Remote Numpad",
-        "Hacker Live Wallpaper",
-        "Open Flood",
-        "Notify",
-        "PolyCal",
-        "Tinte Webcoms",
-        "free2pass",
-        "ReLaunch",
-        "Pulse Music",
-        "World Weather",
-        "Media Button Router",
-        "ListMaker",
-        "D00R",
-        "Headi - Your headache diary",
-        "openScale",
-        "openWorkout",
-        "Heb12 Bible",
-        "Multi Sms",
-        "Nextcloud Passwords",
-        "Bluez IME",
-        "BluezIME HID Enabler",
-        "RUTMath",
-        "Pomodoro",
-        "Hash Droid",
-        "HoloKenMod",
-        "HoloPlay",
-        "Easy-phone",
-        "Sophia keyboard",
-        "hwloc lstopo",
-        "FBReader TTS+ Plugin",
-        "Libre Camera",
-        "Android Explorer",
-        "Streak Alarm for Snapchat (Streak Reminder)",
-        "Footguy",
-        "Hide \"running in the background\" Notification",
-        "Resume Builder",
-        "ArkTap",
-        "Notable Plus",
-        "IceCondor",
-        "AnkiDroid",
-        "igo",
-        "OpenMoneyBox",
-        "PirateDice",
-        "Binaural Beats Therapy",
-        "Lyrics Grabbr",
-        "Improvement Roll",
-        "No meu Bairro!",
-        "Calculator-inator",
-        "IndiePass",
-        "Infomaniak kDrive",
-        "Infomaniak Mail",
-        "Infomaniak kMeet",
-        "Infomaniak kSync",
-        "OSRS Helper",
-        "Mongo Explorer",
-        "Linux Command Library",
-        "CallerID",
-        "FIND3 Scanner",
-        "MicDroid",
-        "Browser Intercept - Share URL",
-        "Ambient Weather DashClock Extension",
-        "Invoice Ninja",
-        "World Clock",
-        "AndroidCPG",
-        "Tri Rose",
-        "Quasseldroid",
-        "PlainApp: File & Web Access",
-        "SMS Ping",
-        "AndroidIDE",
-        "KPassNotes",
-        "Send to Computer",
-        "Vectorify da home!",
-        "Music Player GO",
-        "Xda Feed Reader",
-        "IYPS",
-        "Planetario",
-        "Car Cast",
-        "Motion Eye",
-        "Hearing Saver",
-        "Android SDK Search",
-        "Status",
-        "Auto Auto-Rotate",
-        "Drowser",
-        "Scrambled Exif",
-        "WaveUp",
-        "WaveUp Tasker Plugin",
-        "Smoke Reducer",
-        "Diccionario castellano",
-        "Beta Updater for WhatsApp",
-        "Minutes Checker for Virgin Mobile",
-        "mGerrit",
-        "920 Editor",
-        "Gears",
-        "Balance the Ball",
-        "PasswdSafe",
-        "JellyRevenge",
-        "Block6",
-        "Automation",
-        "Bacon  - Bluetooth Controller",
-        "Sushi - Personal Finance",
-        "Jerboa for Lemmy",
-        "Bucket - Overlay Manager",
-        "Lighthouse Power Management",
-        "Show Youtube Dislikes",
-        "Quake2",
-        "Chapel Hill Transit",
-        "Hacki for Hacker News",
-        "Share To Computer",
-        "Brethap",
-        "AnkiEditor",
-        "Unlauncher",
-        "JLyr Lyrics",
-        "Temaki",
-        "Chibe",
-        "Point & Hit",
-        "Red Moon",
-        "JfCupsPrintService",
-        "Juggling Lab",
-        "Fritter",
-        "KanaDrill",
-        "Cmus Remote",
-        "NiceFeed",
-        "ScreenInfo",
-        "JRPN 16c",
-        "Private DNS Quick Tile",
-        "OSS Tracker",
-        "Identify Dog Breeds",
-        "Identify Dog Breeds Pro",
-        "YARC",
-        "JumpGo",
-        "ArchWiki Viewer",
-        "Attendance Viewer",
-        "CaptivePortalLogin",
-        "Arso Vreme",
-        "PocketMaps",
-        "Seal",
-        "Apod Classic",
-        "Apod MD",
-        "HeartRateMonitor",
-        "LibreSudoku",
-        "Iconeration",
-        "GLXY",
-        "Go To Sleep",
-        "RaumBaller",
-        "Blacklist Blocker",
-        "Archlinux Forums",
-        "Holywarsoo",
-        "Vanilla Tag Editor",
-        "Cover Fetcher",
-        "Vanilla Lyrics Search",
-        "Vanilla Metadata Fetch",
-        "Catapult",
-        "idTech4A++",
-        "Sobriety",
-        "Money Logs",
-        "Nanji clock widget",
-        "NuSimi",
-        "Tusky",
-        "CPU Info",
-        "Notification Notes",
-        "EncPassChanger",
-        "Discuz Hub",
-        "Charmap",
-        "Sapio",
-        "VolumeLockr",
-        "Mindful Notifier",
-        "Paper",
-        "BeeCount",
-        "Stopwatch",
-        "Virus Attack",
-        "Hypezig",
-        "WECHANGE",
-        "Klock",
-        "HypnoTwister",
-        "OBS Blade",
-        "Superuser",
-        "XClipper - Smart Clipboard manager for Android",
-        "Pomodoro Tasks",
-        "Ohms Now!",
-        "WaterTracker",
-        "KeePassDX",
-        "Keyboard Switcher",
-        "kure Music Player",
-        "TAG Notepad",
-        "Trail Sense",
-        "MoClock",
-        "WalletCount",
-        "Silverfish",
-        "Lavabit Encrypted Proxy",
-        "Kanji draw",
-        "Destiny",
-        "TiltMazes",
-        "Fourth Tools",
-        "Kitchen Timer",
-        "Ubuntu Countdown Widget",
-        "Multitouch Test",
-        "LessPass",
-        "qBittorrent Client Pro",
-        "OpenMW",
-        "Libre Weather",
-        "QuickSnap",
-        "BLW - Bitcoin Lightning Wallet",
-        "LightPlan - Reminder & Planner",
-        "Simple MP (Simple Music Player)",
-        "Qwotable",
-        "Limbo x86 PC Emulator",
-        "Moonlight Game Streaming",
-        "RaspFinder",
-        "Changjie Input Method",
-        "Linux Counter Updater",
-        "Listen1",
-        "OpenStud for InfoStud",
-        "pyLauncher",
-        "Equate",
-        "Lliga Intermunicipal",
-        "Stately for NationStates",
-        "log28",
-        "1List - Simple Lists for TODO, Shopping, Movies...",
-        "Travis Jr.",
-        "Droid-ify",
-        "Reminders",
-        "oRing - Reminder",
-        "Limpazap",
-        "16-bit Clock Widget",
-        "Decimal Time Clock Widget",
-        "Unix Time Clock Widget",
-        "BiliYou",
-        "SauceNAO",
-        "TimeTable",
-        "Screen Notifications",
-        "Brailliac: Braille Keyboard",
-        "Vibrator",
-        "AiCamera",
-        "Turtl",
-        "Plain UPnP - UPnP / DLNA server and browser",
-        "M3U",
-        "Neo Backup",
-        "Der Die Das",
-        "Neo Store",
-        "Plant Sense",
-        "Agit",
-        "Orgro",
-        "Timed Shutdown [No Root]",
-        "Applications Info",
-        "Sudoku Generator",
-        "Alldebrid",
-        "Another notes app",
-        "MGit",
-        "Spell4Wiki",
-        "Website Monitor",
-        "CurrentWidget",
-        "RF Analyzer",
-        "HN",
-        "Hibi 「日々」",
-        "LifeCounter",
-        "Simply Pace",
-        "Simple Dilbert",
-        "RacketGhost",
-        "A Time Tracker",
-        "LG Touch LED",
-        "Little Music Player",
-        "Little File Explorer",
-        "Tiny Music Player",
-        "EBT New Note",
-        "Turbo Editor",
-        "Massive",
-        "MobileOrg",
-        "Dialer for Pebble",
-        "MaterialOS",
-        "Save Locally: Share2Storage",
-        "Vidya Music: Aersia VIP Player",
-        "Metric Time",
-        "ADB Manager",
-        "BoltOn",
-        "Outfield",
-        "DPixel",
-        "Loaned",
-        "Mattermost Beta",
-        "Miracast Shortcut",
-        "RoomMates",
-        "QueueToDo",
-        "Rubbish Calc",
-        "SandwichRoulette",
-        "Music",
-        "SimpleTextEditor",
-        "SimpMusic",
-        "The Squirrel's Maze 2D",
-        "WorkTimer",
-        "pOT-Droid",
-        "LifeDots - Diary in 8 dimensions",
-        "Eshotroid",
-        "Memetro",
-        "Conscrypt Provider",
-        "GPSLogger",
-        "Sheepy Horn",
-        "AnySoftKeyboard",
-        "AnySoftKeyboard: Finnish",
-        "blocker",
-        "Chiaki",
-        "Meteocool - Rain radar",
-        "ShowsRage",
-        "My Brain",
-        "Green Pass PDF Wallet",
-        "File Manager Pro",
-        "MidiSheetMusic",
-        "Padland",
-        "Text Torch",
-        "Tinfoil for Twitter",
-        "Destination Sol",
-        "Birday - Birthday Manager",
-        "Randomix - Decision Maker",
-        "Minimalistic Price Converter",
-        "Angel Player Live Wallpaper",
-        "Black★Rock Shooter: Animated Wallpaper",
-        "Flame Haze Shana Animated Wallpaper",
-        "Epoch Launcher",
-        "My Location",
-        "Noor-Ul-Huda نور الهدى",
-        "Permission Manager X",
-        "Dashchan",
-        "Mitzuli",
-        "DroidSat",
-        "microMathematics Plus",
-        "Enhanced Music Controller Lite",
-        "ProximitySensorFix",
-        "Hertz contact",
-        "Breathly",
-        "Bummerlzähler",
-        "Sokoban",
-        "MobiPerf",
-        "Fast Brightness Control Widget",
-        "QKSMS",
-        "Drinkable",
-        "Sequence Hunt",
-        "Money Manager Ex",
-        "Circo",
-        "Swiftnotes",
-        "TapUnlock",
-        "Mountie",
-        "Plumble",
-        "SELinuxModeChanger",
-        "Gasflow",
-        "Microchip",
-        "Hex Launcher",
-        "Audile",
-        "TTL Changer",
-        "TouchDetector",
-        "Comfort Reader",
-        "Lane's Lexicon",
-        "Sensors Sandbox",
-        "Metronome",
-        "Pitch Pipe",
-        "LexinProject",
-        "TextWarrior",
-        "Auto Off Bluetooth",
-        "Clean Timer",
-        "Disable Manager",
-        "S Tools+",
-        "MPDroid",
-        "nanoConverter",
-        "Cuppa - Tea Timer",
-        "Wine cellar",
-        "UML Class Editor",
-        "ChronoSnap",
-        "Color Picker",
-        "Dice Gainz",
-        "packlist",
-        "Get Off Your Phone",
-        "TIC-80",
-        "Galbijjim Searcher",
-        "Noiz2",
-        "Settings Database Provider",
-        "Calculator",
-        "NewsBlur",
-        "Open Manager",
-        "Nextcloud Dev",
-        "Nextcloud",
-        "Nextcloud Talk",
-        "Nextcloud Cookbook",
-        "NextGIS Mobile",
-        "Kernel Adiutor",
-        "Time Clock",
-        "PianOli",
-        "VlcFreemote",
-        "OneTwo",
-        "Nighthawk Wallet",
-        "Flashify",
-        "Lobsters App",
-        "Dagger: Dota 2 Stats",
-        "Chinese French Dictionary",
-        "Hosts Editor",
-        "Demo Musix",
-        "GuessThatPokemon",
-        "MyMood",
-        "OpenBooksDownloader",
-        "Task Manager",
-        "WikiAnime",
-        "Papanikolis Submarine",
-        "Split It Easy",
-        "Privacy Indicators",
-        "DoliDroid",
-        "StorageTrac",
-        "GymRoutines",
-        "Splitfit",
-        "App Tracker",
-        "Chord Reader",
-        "Japanese Name Converter",
-        "KeepScore",
-        "CatLog",
-        "Deep Links for LabCoat",
-        "Feeder",
-        "NoNonsense Notes",
-        "WaniDoku",
-        "The Kana Quiz",
-        "Note Crypt Pro",
-        "Noto",
-        "Budget",
-        "Null launcher",
-        "S2TDroid Pro",
-        "Number Guesser",
-        "Nunti",
-        "Ensichat",
-        "Syncthing",
-        "Move Certs!",
-        "Custom Uploader",
-        "Meditation",
-        "ADBungFu",
-        "apps_Packages Info - Updated ApplicationsInfos (² ",
-        "Chairlock",
-        "ClassyShark3xodus - Scan apps for warnings",
-        "jQuarks viewer",
-        "kDI Device Info system permission",
-        "NeoLinker",
-        "Fon",
-        "Insular",
-        "ForgetMeNot",
-        "Odysee",
-        "Olam",
-        "Holo Counter",
-        "Sutrans Plus",
-        "Cofi - Brew Timer",
-        "Notally | Minimalist Notes",
-        "Battery Notification",
-        "QuickWeather",
-        "Record Time Droid",
-        "Kung Foo Barracuda",
-        "OpenAthena™ for Android",
-        "OpenCamera Sensors",
-        "nds4droid",
-        "Open Ear",
-        "Spelling Wizard",
-        "Open Stable Diffusion",
-        "Orgzly",
-        "Orgzly Revived",
-        "MoneyWallet",
-        "AMPlayer",
-        "ScreenCam",
-        "SQLiteViewer",
-        "Trime",
-        "OpenOtago",
-        "Ellaism Wallet",
-        "WairToNow - Aviation Navigation",
-        "ownCloud",
-        "Packet Sender",
-        "NZ Tides",
-        "Secret Space Encryptor (SSE)",
-        "ParanoidWallpapers",
-        "Watomatic - Auto Reply For WhatsApp",
-        "PassCard",
-        "Yatoo",
-        "BackgroundRestrictor",
-        "Wormhole",
-        "Next Actualités informatiques",
-        "Flashlight Tiramisu",
-        "Twire",
-        "Pix-EzViewer",
-        "Visualizer",
-        "Constellations",
-        "ReGeX",
-        "Clock+",
-        "Hoplite Polytonic Greek Keyboard",
-        "EasySync",
-        "PSIAndroid",
-        "Dark theme",
-        "Unit Converter Ultimate",
-        "Nonocross",
-        "Punchline Bingo",
-        "SMS Forward",
-        "Wrong Pin Shutdown",
-        "Pi Locker",
-        "Voice Notify",
-        "PinDroid",
-        "TPB Proxy",
-        "Frost for Facebook",
-        "Stickeroid",
-        "Pixiv for Muzei",
-        "Pjuu",
-        "Planes Android",
-        "SAnd",
-        "Dicer",
-        "Nitter for Android",
-        "MatLog Libre",
-        "Todo Agenda for Android 4 - 7.0",
-        "PocketPlan",
-        "Podverse",
-        "VotAR",
-        "Mirror",
-        "NextcloudServices",
-        "Polipoid",
-        "Polite Droid",
-        "Simple Rss",
-        "Gugal",
-        "Attestation de déplacement",
-        "Vinyl Music Player",
-        "Nyan",
-        "HAMtrainer",
-        "AudioAnchor",
-        "Read4SpeechExperiments",
-        "Arduino Uno Communicator",
-        "Enhancement",
-        "Practice Hub",
-        "Birthday Buddy",
-        "My App List",
-        "URL to PDF Converter",
-        "Volume Control",
-        "PurpleDock",
-        "DebtCalc",
-        "Precio Luz",
-        "Pagan Music Sequencer",
-        "Quest Player",
-        "AudioMeter",
-        "Booky McBookface eReader",
-        "Computational Demonology",
-        "Doda The Exploda",
-        "Seafood Berserker!",
-        "LaunchTime Homescreen",
-        "PhoneFoneFun",
-        "Primary",
-        "FlashCards",
-        "Paperless Share",
-        "Passky",
-        "radio reddit",
-        "Radio Študent",
-        "Earth View for Muzei",
-        "Simple Material Notes",
-        "Tiny Travel Tracker",
-        "Adaptive Brightness Tile",
-        "Arch packages",
-        "AURdroid",
-        "Power Button Tile",
-        "DroidBeard",
-        "Simple Time Tracker",
-        "Readrops",
-        "Ghost Log",
-        "Calculate",
-        "Helsinki Timetables",
-        "Episodes",
-        "Twik",
-        "TV KILL",
-        "eSpeak",
-        "Driibo",
-        "ScriptManager",
-        "Materials Live Wallpaper",
-        "Text Fairy",
-        "Repay",
-        "Replica Island",
-        "RetroArch",
-        "LASKmobile",
-        "LASKmobile",
-        "Migraine Tracker",
-        "Catan Dice Game",
-        "Birthdroid",
-        "Ringdroid",
-        "Pixelesque",
-        "RMaps",
-        "Open Pros & Cons",
-        "ToberQuizz",
-        "arXiv Papers",
-        "Boxcars",
-        "PaddleTennis",
-        "Hydra Slayer",
-        "HyperRogue",
-        "SpotIt",
-        "Information about NCBS",
-        "Filester",
-        "Sound Manager",
-        "Look4Sat: Satellite tracker",
-        "Minimal",
-        "PhotoPhase",
-        "Rview",
-        "Unitto — calculator and unit converter",
-        "Screen Shift",
-        "Batch Uninstaller",
-        "Bop-MusicPlayer",
-        "Priority Alerts",
-        "Veterondo",
-        "Hex",
-        "Repeat Me",
-        "Track & Graph",
-        "Beacon Locator",
-        "MTA Fare Buster",
-        "Mobilne Bezpieczeństwo",
-        "Bushido Blocks",
-        "SanskritBasicsLetters",
-        "Memory",
-        "Markdownr",
-        "Clash of Balls",
-        "BetterUntis",
-        "Word of the day - Learn a new word every day",
-        "AOKP.co",
-        "Search Light",
-        "ScraperClub",
-        "SDCard StoryTeller",
-        "Slim Launcher - Fewer distractions, more life",
-        "Seafile",
-        "Tttris",
-        "KeepingTracks",
-        "Earth Live Wallpaper",
-        "Earth Live Wallpaper: Map Pack",
-        "Secure File Manager Beta",
-        "QR Scanner (PFA)",
-        "Torchlight (Privacy Friendly)",
-        "WREK Online",
-        "Smart Gadget",
-        "Sentien Launcher",
-        "An Light | Flashlight",
-        "Aster Launcher",
-        "DesktopLabel",
-        "Disabler",
-        "Baby Books",
-        "Baby Dots",
-        "Baby Phone",
-        "Beat Feet",
-        "Lexica",
-        "Mobile MSJ",
-        "Super Retro Mega Wars",
-        "Enthusiast Tea Timer",
-        "Pitcha",
-        "Unreal Tracker",
-        "Community compass",
-        "SpotiFlyer",
-        "SecDroid",
-        "BlackHole",
-        "Gore Companion",
-        "Shattered Pixel Dungeon",
-        "SDAI",
-        "Lyrically",
-        "Show Me Hills",
-        "DroidZebra",
-        "DOI to SciHub",
-        "WorldMap",
-        "INSTEAD",
-        "Ball2Box",
-        "Pocket Broomball",
-        "Yoke",
-        "GuitarFretboardTrainer",
-        "Simple Decred Widget",
-        "Simple App Launcher",
-        "Simple Calculator",
-        "Simple Calendar Pro",
-        "Simple Camera",
-        "Simple Clock",
-        "Simple Contacts Pro",
-        "Simple Dialer",
-        "Simple Draw Pro",
-        "Simple File Manager Pro",
-        "Simple Flashlight",
-        "Simple Keyboard",
-        "Simple Launcher",
-        "Simple Music Player",
-        "Simple Notes Pro",
-        "Simple SMS Messenger",
-        "Simple Thank You",
-        "Simple Voice Recorder",
-        "SimplyTranslate Mobile",
-        "NFCard",
-        "Sismics Reader",
-        "Battery Charge Limit",
-        "TIDY Text-to-Image Discovery",
-        "SleepTimer",
-        "Ohm Calc",
-        "Deckerino",
-        "BusyBox Installer",
-        "SmartPack-Kernel Manager",
-        "Kernel Profiler",
-        "Package Manager",
-        "Script Manager",
-        "Smart Flasher",
-        "Ham",
-        "Greentooth",
-        "Pretty Good Music Player",
-        "Pretty Good Music Player Launcher Mode",
-        "WADBS",
-        "Hot Death",
-        "Plutus - Investment Tracker",
-        "Amdroid",
-        "EDS Lite",
-        "Blue Mono Sound",
-        "Mounts2SD",
-        "Coin Collection",
-        "Carnet",
-        "FON Access",
-        "Rotation Manager",
-        "Clock Live Wallpaper",
-        "Standard Notes",
-        "TNEF Extractor",
-        "GreenStash",
-        "Myne: Ebook Downloader",
-        "Network Tools Library",
-        "Tsacdop - Podcast Player",
-        "Non Stop Balloons Shooter",
-        "Privacy Browser",
-        "Privacy Cell",
-        "Notesnook - Private notes app",
-        "XMouse",
-        "flickit",
-        "Strobe Light",
-        "Mastercom workbook",
-        "Styrkur",
-        "Subtracks",
-        "De-Bloater",
-        "sNotz",
-        "The Translator",
-        "KindMind",
-        "Super Productivity",
-        "ForceDoze",
-        "Léon – The URL Cleaner",
-        "QRAlarm",
-        "Every Locale",
-        "Swiss Chess Tournament",
-        "Lemuroid",
-        "Alt Launcher",
-        "Download Navi",
-        "Tailscale",
-        "Calculator Notification",
-        "Logcat",
-        "e-Passport Reader",
-        "HackDash",
-        "Open Link With...",
-        "Timesheet",
-        "RoboZZle Droid",
-        "Auto-Away",
-        "Androidomatic Keyer",
-        "Fish",
-        "Share to Clipboard",
-        "Terminal Emulator",
-        "Termux",
-        "Termux:API",
-        "Termux:Boot",
-        "Nix-on-Droid",
-        "Termux:Styling",
-        "Termux:Tasker",
-        "Termux:Widget",
-        "Termux:Float",
-        "Pattern HDPI Wallpapers",
-        "Tasky",
-        "ED_Tool",
-        "Evergreen Wishlist",
-        "Car Bus Interface",
-        "PixaPencil",
-        "FakeGapps",
-        "Yokatta",
-        "SUD💜KU",
-        "CBTAndroid",
-        "TimeLapse",
-        "OpenHub",
-        "ThreeDLite",
-        "URforms Database",
-        "UserHash",
-        "k3pler",
-        "Notification Analyser",
-        "Badreads",
-        "Gizmooi",
-        "Pong Time",
-        "OpenSound",
-        "PreviewMaker",
-        "Personal Log",
-        "Phase10Counter",
-        "Open FNDDS Viewer",
-        "crushr",
-        "Stripepaper",
-        "Balanduino",
-        "TkTon Wallet",
-        "Rage Maker",
-        "BirthDayDroid",
-        "DadosD",
-        "Cryptocam - encrypting camera app",
-        "SpMp",
-        "Month Calendar Widget",
-        "BatteryFu",
-        "GApps Browser",
-        "WebApps",
-        "Web Media Share",
-        "Open Note Scanner",
-        "Notepad",
-        "TimerDroid",
-        "KitchenOwl",
-        "Always On AMOLED",
-        "DBZ Battery Widget",
-        "Quick Draw Everywhere",
-        "More for GO",
-        "Magisk",
-        "Torrents-csv-android",
-        "SysLog",
-        "HoloKen",
-        "BookWorm",
-        "Shortyz",
-        "24game",
-        "Game of Life",
-        "Gomoku",
-        "Oware",
-        "Pentago",
-        "Ça reste ouvert",
-        "Adnihilation",
-        "Simple Clipboard Editor",
-        "Average data usage widget",
-        "isUserAMonkey & isUserAGoat [curiosity]",
-        "Custom Riddle Generator [small, no ads]",
-        "URLCheck",
-        "Safe Notes - Encrypted Notepad",
-        "Androsens 2",
-        "send2car",
-        "DbCleaner for Whatsapp",
-        "Particle Physics Simulator",
-        "Save to Nextcloud Bookmarks",
-        "Aggregator",
-        "Yahtzee",
-        "Tunerly",
-        "TunesViewer",
-        "Mightier Amp",
-        "TurtlePlayer",
-        "baresip",
-        "baresip+",
-        "Watt",
-        "Twidere X",
-        "App Locker",
-        "SealNote",
-        "xvii messenger for vk",
-        "Twisted Home Manager",
-        "Secur: Cross-platform 2FA client",
-        "Weechat-Android",
-        "2048",
-        "CineLog",
-        "NetInfo Widget",
-        "Flavordex Tasting Journal",
-        "Elementary: Periodic Table",
-        "DashNotifier",
-        "Unciv",
-        "Finamp",
-        "UnitsTool",
-        "Network Scanner",
-        "Truly Creative live wallpaper",
-        "AutoNotify",
-        "Password Hash",
-        "DontKillMyApp ✌️ Make apps work",
-        "Ichaival",
-        "pMetro",
-        "Search Based Launcher",
-        "Duorem",
-        "OASVN Pro",
-        "Heart rate",
-        "Can I Drive",
-        "Password Generator",
-        "Password Master",
-        "Vedroid Events",
-        "Bitcoinium Prime",
-        "Velas Wallet",
-        "Dir",
-        "minedmonero",
-        "Discreet Launcher",
-        "VES - Image and Photo Compare",
-        "SimpleRT",
-        "EnRecipes",
-        "Amethyst",
-        "Cams",
-        "Deep Rock Galactic Assistant",
-        "BeHe Pro",
-        "BeHe Keyboard",
-        "Vlille Checker",
-        "Daily Diary",
-        "WiFiKeyboard",
-        "Qz",
-        "SatStat",
-        "Voltage Drop Calculator",
-        "WiFiAnalyzer",
-        "Smart Card Emulator",
-        "Smart Card Reader",
-        "Geoperion",
-        "Vuze Remote",
-        "LocDemo",
-        "OpenWLANMap",
-        "OpenWLANMini",
-        "WiFi Widget",
-        "CIFS Documents Provider",
-        "Waistline",
-        "Mysplash",
-        "Remembeer",
-        "Pixel Dungeon",
-        "toodoo",
-        "SimpleMarkdown",
-        "GTFSOffline",
-        "ElloShare",
-        "Taipei Youbike Offline",
-        "DefCol",
-        "Private Lock",
-        "BookmarkOS",
-        "Ogame on Android",
-        "Habits",
-        "Simple Random Stock",
-        "LinConnect",
-        "Countdown Timer",
-        "Windscribe",
-        "Simpill",
-        "Wire • Secure Messenger",
-        "Bhagavad Gita",
-        "ZipXtract",
-        "TourCount",
-        "TransektCount",
-        "Shopping List",
-        "AwesomeWallpaper",
-        "CallerDetails",
-        "Democracy Droid",
-        "Devinettes",
-        "Fissure",
-        "Quran 16 Line - Quran Revision Helper",
-        "Quill",
-        "Atomize",
-        "xBrowserSync",
-        "Xabber",
-        "Xabber Classic",
-        "Port Knocker",
-        "Droid Draw",
-        "DataBackup",
-        "ChocoUI (XDA colors)",
-        "Liquid Wars OS",
-        "Mauth",
-        "Calculator",
-        "Minecraft Clock",
-        "To Do",
-        "Timidity AE",
-        "XRCB",
-        "Notification Dictionary",
-        "Simple Money Tracker",
-        "YacGuide",
-        "YacGuide Dev",
-        "DroidRec",
-        "YASFA",
-        "DO Swimmer",
-        "KeyPass",
-        "YubiClip",
-        "Yubico Authenticator",
-        "YubiTOTP",
-        "Pocket Talk",
-        "Pyroman: Jaws of Fire",
-        "WG Tunnel",
-        "Maniana",
-        "Hdhomerun Signal Meter",
-        "SMS Backup+",
-        "MediLog",
-        "开屏跳过",
-        "zSMTH",
-        "SuperImage",
-        "InnerTune",
-        "aagtl",
-        "AVIF Viewer",
-        "MetalabDoorWidget",
-        "TRIfA",
-        "ZANavi",
-        "BMI Calculator",
-        "Zorin Connect",
-        "Zulip",
-        "AppOpsX",
-        "Fairphone Checkup",
-        "Fairphone Clock Widget",
-        "Fairphone 2 Launcher",
-        "Fairphone 1 Launcher",
-        "My Contacts",
-        "Internet Radio",
-        "License",
-        "Buran",
-        "Mines3D",
-        "UK COVID-19 Venue Check-in",
-        "Sanity",
-        "Blackjack",
-        "Meme Creator",
-        "Squeez",
-        "Minesweeper",
-        "Smart Dock",
-        "APV PDF Viewer",
-        "PdDroid Party",
-        "Jami",
-        "SD Contacts",
-        "Limitless grid",
-        "Blurred Lines",
-        "NetSwitch",
-        "SnooperStopper",
-        "NorthDog Audio Compass",
-        "Chess Walk",
-        "Kaku",
-        "OpenCanteen",
-        "ALSA Mixer WebUI",
-        "Počasí v krajích",
-        "CTU Menza",
-        "Forecastie",
-        "WebTube",
-        "hJOP Driver",
-        "DPC",
-        "Czech Diacritic Keyboard",
-        "Better Schedule (Bakaláři)",
-        "Meshenger",
-        "Prepay Credit",
-        "Flexible Wallpaper",
-        "Compass",
-        "Dasher",
-        "BlackSCREENremote",
-        "Aalener Optik-Formelrechner",
-        "VergissNix",
-        "XOverrideHeadphoneJackDetection",
-        "YubNub Command Line",
-        "Anton Widget",
-        "Bewegungsmelder",
-        "Periodical",
-        "Flindex",
-        "sudokunst",
-        "Paperless Mobile",
-        "Easy Open Link",
-        "Mirakel-Dashclock",
-        "Mirakel",
-        "FP1-EPO-Autoupdate",
-        "Snapcast - multi-room audio in perfect sync",
-        "Railway station photos",
-        "DashClock: Sunrise",
-        "GC-Tools",
-        "FOSS Browser",
-        "FOSS Moodle",
-        "Quit Smoking",
-        "Blue Minimal",
-        "FOSS Weather",
-        "Screenshot Assistant",
-        "Score sheets",
-        "Library App VideLibri",
-        "Best-Before",
-        "LibreTranslator",
-        "Weather",
-        "Bibel-Kapitel-Losung",
-        "Binary Kitchen Doorlock",
-        "BitShares Wallet",
-        "VDR-Manager",
-        "Vespucci",
-        "OpenVPN for Android",
-        "PiGrid Companion",
-        "Child Resus Calc",
-        "HydroMemo",
-        "Barcode Buddy",
-        "LfDI BW",
-        "c3nav",
-        "card10 Companion",
-        "Chip Defense",
-        "Regex Crossword",
-        "meteroid",
-        "Zapp",
-        "Flux News",
-        "K-9 Mail DashClock Extension",
-        "Crypto Prices",
-        "Schule",
-        "Barcodegen",
-        "Voucher Calc",
-        "MensaPlan",
-        "Ning",
-        "FreeShisen",
-        "Headphone indicator",
-        "Was geht App?",
-        "LDAP Sync",
-        "AntennaPod",
-        "OpenWebWeaver",
-        "Congress Fahrplan",
-        "DEMOCRACY",
-        "OpenTracks",
-        "DetermApp",
-        "Slider",
-        "Muzei - Bing Image of the Day",
-        "PaperLaunch: Side launcher",
-        "Another-RSS",
-        "OpenWort",
-        "ReoTwé Twitter Client",
-        "Stop-o-Moto",
-        "TOTALOG",
-        "MicroPinner",
-        "Pizza Cost",
-        "TSCH_BYL",
-        "CALCVAC-VACLINE",
-        "Xearth",
-        "Birthday Countdown",
-        "FutharkBoard",
-        "GM Dice",
-        "RasPi Check",
-        "Unofficial Golem.de Reader",
-        "Keypad-Mapper 3",
-        "Fahrraddiebstahlwarnung",
-        "Word Value",
-        "ccgt",
-        "SpacePeng!",
-        "CMIS Browser",
-        "foodsharing",
-        "FragDenStaat",
-        "Hamburger ",
-        "Who Has My Stuff?",
-        "Freifunk-Karte",
-        "Forro Lyrics",
-        "Web Opac",
-        "App Bundle Reporter",
-        "BlitzMail",
-        "Transportr - Public Transit",
-        "DAPNET",
-        "GeoNotes",
-        "AndroFish",
-        "Really Basic Vocab",
-        "Studiportal",
-        "LnkShortener",
-        "Meeting Cost Clock",
-        "Dew Point",
-        "Digitales Klassenzimmer",
-        "Funktrainer",
-        "Contact Book",
-        "MapEver",
-        "IdiomReplaceX Browser App",
-        "aRevelation",
-        "GuessIron",
-        "Pedometer",
-        "/system/app mover",
-        "WiFi Automatic",
-        "NC Passwords",
-        "Break.Down.Timer",
-        "Everyday Tasks",
-        "ANOTHERpass",
-        "ParkenDD",
-        "NotificationLog",
-        "TU Darmstadt Moodle Wrapper",
-        "XMPP Admin",
-        "Voicesmith",
-        "A Photo Manager",
-        "CalEF (Calendar Entry Formatter)",
-        "Calendar ICS adapter",
-        "Camera Folder",
-        "Content Provider Helper",
-        "Show Articles in Map",
-        "Intent Intercept",
-        "Location Map Viewer",
-        "LLCrop (loss less)",
-        "ToGoZip ('==> Zip')",
-        "k4android",
-        "FeinstaubWidget",
-        "Imagepipe",
-        "Tiny Weather Forecast Germany",
-        "MoTAC",
-        "Hashr",
-        "Tricky Tripper",
-        "Camera Date Folders",
-        "Classical Music Scanner",
-        "Classical Music Tagger",
-        "Opus 1 Music Player",
-        "SAF Media Scanner",
-        "Unpopular Music Player",
-        "ANNO 1404 - Calculator",
-        "DictionaryForMIDs",
-        "Dogecoin Wallet",
-        "sesam",
-        "Nachtlager Downloader",
-        "pixelflood",
-        "Run Userinit",
-        "Cherry",
-        "Kimai TimeTracker",
-        "Ask me anything meaningful",
-        "Nextcloud News",
-        "Nextcloud Cookbook",
-        "Gcam Services Provider (Basic)",
-        "Balance",
-        "debDroid",
-        "SlideItLoud",
-        "SyncWifi",
-        "Throughput",
-        "Binary Eye",
-        "Decisions",
-        "Pie Launcher",
-        "Screen Time",
-        "Shader Editor",
-        "Wave Lines Live Wallpaper",
-        "FFUpdater",
-        "PrivacyBlur",
-        "Mooltifill",
-        "WikiAndPad",
-        "Contact Merger",
-        "Soundboard",
-        "MetaGer Search",
-        "DeuFeiTage",
-        "Nextcloud Cookbook",
-        "Kvaesitso",
-        "Metronome",
-        "Tuner",
-        "monocles browser",
-        "monocles chat",
-        "mail",
-        "monocles social",
-        "monocles translator",
-        "Mondstern Acrylic Icons",
-        "MOROway App",
-        "National Geographic for Muzei",
-        "TonUINO NFC Tools",
-        "Block Puzzle Stone Wars",
-        "WTF‽ (The MirOS Project)",
-        "User-controlled decryption operations",
-        "ArcheryStats",
-        "mTUO",
-        "ImapNotes3",
-        "Senior Launcher",
-        "p!n",
-        "FOSS Warn",
-        "BikeComputer",
-        "Find My Device (FMD)",
-        "ShiftCal",
-        "Droidentify",
-        "Drudgery",
-        "Geo Bookmark",
-        "List My Apps",
-        "Photo Bookmark",
-        "Pocket Bandit",
-        "Remote Keyboard",
-        "Sensor Readout",
-        "Text Fiction",
-        "BatteryCalibration",
-        "OpenUntis",
-        "Voice Audiobook Player",
-        "PC_DIMMER",
-        "piggybudget",
-        "BG2BangleJS",
-        "Exalted Dicer",
-        "Spickerrr 2.1",
-        "blabber.im",
-        "OneShot",
-        "Clementine Remote",
-        "Dynamic Night Light",
-        "trale",
-        "FTPClient",
-        "GameDealz",
-        "8-Bit Wonders",
-        "Activity Diary",
-        "QuickDic",
-        "Flashlight",
-        "Bierverkostung",
-        "Simple Contacts Pro SE",
-        "CovPass",
-        "CovPassCheck",
-        "PartyGames",
-        "Xposed Installer",
-        "Child Monitor",
-        "phyphox",
-        "Currencies: Exchange Rate Calculator",
-        "The Verge wallpapers for Muzei",
-        "Freebloks",
-        "Offi",
-        "Bitcoin Wallet",
-        "Bitcoin Wallet [testnet3]",
-        "Schlikk Calls",
-        "AirGuard - AirTag protection",
-        "Selfnet WIFI-Setup",
-        "Blockly for senseBox",
-        "Frog Password Generator",
-        "Feudal Tactics",
-        "Slight backup",
-        "Sigfood",
-        "Bluetooth LE Spam",
-        "SimpleStatsWidget",
-        "FingerList",
-        "Open Training",
-        "Tickmate",
-        "Trains Locations",
-        "DarkCroc Theme",
-        "Default Dark Theme",
-        "SchildiChat",
-        "GSMmap",
-        "SnoopSnitch",
-        "Falling Blocks",
-        "Dots'n'Boxes",
-        "Rule of Three",
-        "Critical Maps",
-        "F-Droid Build Status",
-        "OSM Dashboard for OpenTracks",
-        "OSM Dashboard Offline for OpenTracks",
-        "SudoQ",
-        "MIFARE Classic Tool",
-        "Activity Launcher",
-        "Activity Launcher fork",
-        "SecScanQR",
-        "FitoTrack",
-        "Flang",
-        "Easy Xkcd",
-        "taz",
-        "Minos",
-        "brainjogging",
-        "taz.app klassisch",
-        "LMd",
-        "Liedgutverzeichnis",
-        "ntodotxt",
-        "Simple Brick Games",
-        "Simple Search",
-        "Simple Solitaire Collection",
-        "TSVNC",
-        "OpenStop",
-        "HardWhere",
-        "iTLogger",
-        "Tuta Mail",
-        "Clipboard Beam",
-        "Portal Timer",
-        "OpenMensa",
-        "DeltaCamera",
-        "EnigmAndroid",
-        "Varengold activeTAN",
-        "Neo2 External Keyboard",
-        "Single-Feed",
-        "HABPanelViewer",
-        "aCalDAV",
-        "BonjourBrowser",
-        "Luftlinie",
-        "Street­Complete",
-        "SCEE",
-        "wger Workout Manager",
-        "Friendica",
-        "LDAP Sync",
-        "WiVeWa",
-        "Welefon",
-        "moreDays",
-        "YAACC",
-        "Mensa-Guthaben",
-        "ROT13 Translator",
-        "Aves Libre",
-        "Amarok",
-        "AuthPass - KeePass compatible Password Manager",
-        "Next Player",
-        "WordBook: Your Personal Dictionary",
-        "Lentil Translate",
-        "qBitController",
-        "Did I Take My Meds?",
-        "Open Chaos Chess",
-        "OpenBike",
-        "Noise Cancelling",
-        "Speaker",
-        "Burning-Series",
-        "Eat Poop You Cat",
-        "Moloko",
-        "LaMetric Notify+",
-        "You Have Mail",
-        "Photok",
-        "Linwood Butterfly",
-        "Linwood Butterfly",
-        "Linwood Flow",
-        " 1010! Klooni",
-        "Minesweeper - Antimine",
-        "Sharik - file sharing via WI-FI",
-        "LibrePass",
-        "Kotori",
-        "Password Store",
-        "Jiten Japanese Dictionary",
-        "Jiten Japanese Dictionary [Online]",
-        "Sokoban(g)",
-        "Android 2 Linux Notifications",
-        "FlorisBoard",
-        "RPNcalc",
-        "Interval Timer",
-        "AFWall+",
-        "Tehro: Tehran Metro",
-        "qBittorrent Manager",
-        "ParkenUlm",
-        "Lucia App",
-        "aSQLiteManager",
-        "oandbackup",
-        "My Leaf",
-        "Encrypt Text",
-        "Floating Image",
-        "Pijaret",
-        "personalDNSfilter",
-        "Clear List",
-        "Pulsar",
-        "Wattz",
-        "Expression Evaluator",
-        "Yet Another Call Blocker",
-        "BOINC",
-        "SafeSlinger Exchange for Security Developers",
-        "PocketSphinx Demo",
-        "MMSKeeper",
-        "OpenTimer",
-        "Flask",
-        "DroidAtomix",
-        "USA COVID-19 Tracker",
-        "Kõnele",
-        "Simple Loan Calculator",
-        "OCReader",
-        "QuiteSleep",
-        "Morse Trainer",
-        "CosyDVR",
-        "T16Fling",
-        "WD Notes",
-        "Workout Time!",
-        "Calendula",
-        "Passman",
-        "JioFi Battery Notifier",
-        "EZ Wifi Notification",
-        "MasterMindy",
-        "twitter2nitter",
-        "Paperless",
-        "HeartBeat",
-        "F-Droid Classic",
-        "CAPod - Companion for AirPods",
-        "DartsTrainer",
-        "EtchDroid USB writer",
-        "fb-client",
-        "JSlab",
-        "AnaCam",
-        "Angulo",
-        "BlackJack Trainer",
-        "Shopt",
-        "Momkin",
-        "SmsMatrix",
-        "Impeller",
-        "FairEmail",
-        "FineGeotag",
-        "NetGuard",
-        "SliderSynth",
-        "BeamControl for Smart Interface",
-        "GeoPaparazzi",
-        "SMASH — Smart Mobile App for Surveyor's Happiness",
-        "Meerkat Challenge",
-        "Tachiyomi",
-        "PlusMinusTimesDivide",
-        "Nani?",
-        "Digits",
-        "Echo",
-        "Yggdrasil",
-        "Polar Clock",
-        "pretixdroid",
-        "pretixPRINT",
-        "pretixSCAN",
-        "Lampshade",
-        "Coloring Book",
-        "12345 - Learn Counting",
-        "Bhagavad Gita",
-        "Learning Memory",
-        "Fruit Radar",
-        "GetMiTokens",
-        "NoAd Battery Calibrator [ROOT]",
-        "DSA Assistent",
-        "Screeps",
-        "OpenSyncedLists",
-        "Conversations",
-        "SIP Switch",
-        "CDLC Player",
-        "Eternity",
-        "Altcoin Prices",
-        "Brainstonz for Android",
-        "Colors Overflow",
-        "Complica4",
-        "Dice Overflow",
-        "Fish Rings for Android",
-        "Free Klondike",
-        "House of Cards",
-        "Hungarian Rings for Android",
-        "Ithaka Board Game",
-        "Kechi",
-        "No Thanks!",
-        "Politrics",
-        "Scribe4",
-        "Svarka Odds Calculator",
-        "Tri Peaks Solitaire for Android",
-        "Tuty Fruty Slot for Android",
-        "Vitosha Blackjack",
-        "VitoshaPokerOdds",
-        "VitoshaDM",
-        "WorkTime",
-        "StoryGame",
-        "HUD",
-        "Tournant",
-        "InitialVolume",
-        "AnLinux",
-        "Anemo",
-        "BLE Radar",
-        "Faenza ADW Theme",
-        "LinCal",
-        "SimpleReminder",
-        "WarmShowers",
-        "Flier",
-        "Peppy Flowers",
-        "Yin Yang",
-        "Vädret",
-        "Helsinki Testbed Viewer 2.0",
-        "RepWifi",
-        "opsu!",
-        "Seasonal Foods Calendar",
-        "Speedmeter",
-        "SpiritF",
-        "Helio",
-        "Libre Droid",
-        "Föhnix",
-        "NLWeer",
-        "Bliss Launcher",
-        "Xia Express",
-        "AndroidRun",
-        "Std Atmosphere",
-        "Bépo clavier externe",
-        "Tableau de bord Rolling",
-        "BwareArea",
-        "nitroxCalc",
-        "FreshRSS",
-        "Inflation Calculator",
-        "Paris Transport Traffic",
-        "CovidAt",
-        "Goguma",
-        "BikeSharingHub",
-        "Commons",
-        "wallabag",
-        "TousAntiCovid",
-        "Fedilab",
-        "OpenDNS Updater",
-        "Direct Dictaphone",
-        "BabyName",
-        "RiverFerry",
-        "SimpleProtocolPlayer NG",
-        "Flash Alert - Call and Message",
-        "IPCalc Android",
-        "Rights alert",
-        "ApkTrack",
-        "Eve-control",
-        "WhatExp",
-        "TaigIME",
-        "Drinks",
-        "Napply",
-        "Don du Sang",
-        "Goblim",
-        "PeerTube Live",
-        "Dinomail",
-        "KISS Launcher",
-        "DashClock Birthday Extension",
-        "Odeon",
-        "PasseGares",
-        "Souvenirs",
-        "Bide et Musique",
-        "Fujiten",
-        "Kingdomino Score",
-        "Onyx",
-        "Score Tarot",
-        "HexViewer",
-        "WikipOff",
-        "Sweet IPFS",
-        "PhotoBackup",
-        "Oburo.O",
-        "Preferences Manager",
-        "Secret Codes",
-        "Sleep Timer",
-        "Trouve ton campus",
-        "SynCarnet",
-        "Camera Color Picker",
-        "SimpleThermometer",
-        "KeepOn - Keep your screen on smartly!",
-        "PariDroid",
-        "Nextcloud SMS",
-        "OOS Firmware Extractor",
-        "Stanley",
-        "Ted",
-        "Focal",
-        "DragonGoApp",
-        "MouseApp",
-        "scrabble",
-        "Transports Bordeaux",
-        "Transports Rennes",
-        "Netcfg Widget",
-        "SkyTube Legacy",
-        "SkyTube",
-        "Hikar",
-        "OpenTrail",
-        "Pi-hole Droid",
-        "TestApp",
-        "Galnet Dictionary",
-        "SinGal Dictionary",
-        "Geddit",
-        "Floating Stickies",
-        "Passera",
-        "Dimmer",
-        "Kinolog",
-        "DSub",
-        "Sensor Server",
-        "Easy Weather",
-        "Memento",
-        "Piclice",
-        "campfire",
-        "ESBDirect",
-        "dawdle",
-        "usageDirect",
-        "Museum of a broken API",
-        "Tea Timer",
-        "NGA客户端开源版",
-        "Mealient",
-        "Scuttloid",
-        "Mach3Pendant",
-        "Step and Height Counter",
-        "CrocodileNote",
-        "Voice Mail Player",
-        "Skewy - anti eavesdropping",
-        "Dash Wallet",
-        "Groestlcoin Wallet",
-        "Groestlcoin Wallet TestNet",
-        "Behat Reporter",
-        "Local NLP Backend",
-        "words.hk 粵典",
-        "Calculator",
-        "Stratum 0 Widget",
-        "addy.io (formerly AnonAddy)",
-        "Enchanted Fortress",
-        "HSTempo",
-        "tTorrent search",
-        "plees-tracker",
-        "ADSdroid",
-        "UVC Camera / Usb Camera custom",
-        "myLock utilities",
-        "AmbitSync",
-        "DEfO ECH Apps",
-        "Ceno Browser: Share the Web",
-        "V2EX",
-        "NFSee - NFC Card Helper",
-        "Quicksy",
-        "清心天气",
-        "J 拼图",
-        "Status: Crypto Wallet, Messenger, Ethereum Browser",
-        "Element - Secure Messenger",
-        "\$HELL",
-        "Subtle News",
-        "Carts Bus Boarding",
-        "raag",
-        "Kandroid",
-        "Android Permissions",
-        "Torchie",
-        "aksharam",
-        "Shellshock Vulnerability Scan",
-        "Tanks of Freedom",
-        "Diode",
-        "Lock Pattern Generator",
-        "aShell",
-        "IzzyOnDroid",
-        "Remote Droid",
-        "8Vim Keyboard",
-        "Atomic",
-        "Kill Camera",
-        "My Wifi Passwords",
-        "SNotepad",
-        "ScreenStream",
-        "LaiCare",
-        "Checkey",
-        "Gilga",
-        "PixelKnot: Hidden Messages",
-        "Ripple: respond when panicking",
-        "Network Discovery",
-        "Thugaim",
-        "Bits & Bäume 2022 Schedule",
-        "Camp 2023",
-        "CLT 2023 Schedule",
-        "37C3 Schedule",
-        "Datenspuren 2023",
-        "DebConf Schedule",
-        "DiVOC Schedule",
-        "FOSDEM 2023 Schedule",
-        "FOSS4G 2023",
-        "GPN 2023",
-        "HOPE 2022",
-        "LibreOffice 2022 Schedule",
-        "MRMCD 2023 Schedule",
-        "PyConZA 2021",
-        "JEV 2022 Schedule",
-        "Night Screen",
-        "EinkBro",
-        "10,000 sentences",
-        "nusic",
-        "MergedWiFiNLP",
-        "SuperGenPass",
-        "robotfindskitten",
-        "24h Analog Clock",
-        "Units",
-        "cone",
-        "Hauk",
-        "Tower Collector",
-        "Every Door",
-        "Caffeine Tile",
-        "Mindustry",
-        "Pitch pipe",
-        "dahliaOS Calculator",
-        "Fabularium",
-        "Tensor",
-        "ente Authenticator",
-        "ente - encrypted photo storage",
-        "Mighty Knight",
-        "Always On Clock",
-        "Traintime PDA",
-        "CUPS Printing",
-        "Chiver",
-        "Yggdrasil",
-        "DanXi",
-        "DataStopwatch",
-        "Open Video Editor",
-        "Clipboard Cleaner",
-        "TimeR Machine",
-        "AAAAXY",
-        "aaaaa",
-        "Ching Machine",
-        "AlwaysOn | Always On Display",
-        "Battery Tool | Hibernate Unused Apps",
-        "Home App | For Philips Hue, Arduino & more",
-        "Pods Companion For AirPods",
-        "Power App | Simple Power Menu [Root only]",
-        "Slideshow Wallpaper",
-        "PDF Reader",
-        "Git Quick Reference",
-        "React",
-        "Folderlogs",
-        "Watermarking",
-        "Table Habit",
-        "PinPoi",
-        "MemeTastic",
-        "HashEasily",
-        "Materialistic",
-        "Hop'Edia",
-        "Installalogs",
-        "IsMyWebsiteUp",
-        "Copy SMS Code - OTP Helper",
-        "Minilens",
-        "Stringlate",
-        "Lona",
-        "Juvavum",
-        "Audio Share",
-        "Ninja",
-        "App Manager - Android package manager",
-        "Metro - A music player for Android",
-        "Captive Portal Controller",
-        "SetEdit - Settings Database Editor",
-        "UnApkm - Convert APKM to APKS",
-        "Everest",
-        "DNS man",
-        "Otobi Keyboard",
-        "FreePaint",
-        "GitTouch",
-        "JS-Dict",
-        "AeonDroid",
-        "eXch.",
-        "ScrollSocket",
-        "SyncPlayer",
-        "gpsdRelay",
-        "Quillpad",
-        "RandomFileMaker",
-        "Open FlashLight",
-        "SaveAsTxt",
-        "Key Mapper",
-        "Key Mapper GUI Keyboard",
-        "Silinote",
-        "Last Launcher",
-        "Night Mode",
-        "OCR",
-        "Open In WhatsApp",
-        "AppLock",
-        "Quick Calculation",
-        "FastLyrics",
-        "Cards Score Keeper",
-        "GPSd Forwarder",
-        "Nori",
-        "APN Settings",
-        "LibreTrivia",
-        "V2compose",
-        "Elements",
-        "BLE Peripheral Simulator",
-        "SerialPipe",
-        "Tri-Valley Buses",
-        "Wulkanowy",
-        "RCX - Rclone for Android",
-        "Dooz",
-        "freeDictionaryApp",
-        "Stroke Input Method (筆畫輸入法)",
-        "ADBio",
-        "AquaDroid",
-        "Symphony",
-        "Planet Rider",
-        "Taskkeeper",
-        "Cryptographic ID",
-        "Vibrato",
-        "ListenTogether",
-        "Marxist Tamil",
-        "Anecdote",
-        "ntfy - PUT/POST to your phone",
-        "Home Assistant",
-        "Who Here",
-        "Unstoppable Wallet",
-        "Pirate Solitaire",
-        "Prayer Book",
-        "Keep Alive",
-        "Anki Image Occlusion",
-        "kubenav",
-        "WhatsApp Web To Go - Mobile Client for WhatsApp We",
-        "LBRY F-Droid",
-        "LibreHealth Essential Care For Every Baby",
-        "LibreHealth Cost Of Care Explorer",
-        "Literal",
-        "HACS",
-        "Aruba Networks Login",
-        "Revolution IRC",
-        "Anchr for Android",
-        "PrivacyBreacher",
-        "Inner Breeze",
-        "AnXray",
-        "SagerNet",
-        "Brook Plugin - SagerNet",
-        "Hysteria Plugin - SagerNet",
-        "Mieru Plugin - SagerNet",
-        "NaïveProxy Plugin - SagerNet",
-        "Ping Tunnel Plugin - SagerNet",
-        "Trojan-Go Plugin - SagerNet",
-        "TUIC Plugin - SagerNet",
-        "NeuroLab",
-        "Oversec",
-        "PSLab Android App",
-        "Sideload Helper by Rebble",
-        "QuickShot: Share Screenshot",
-        "SimpleLogin | Anti-spam",
-        "MyHackerspace (New)",
-        "TimeLimit.io",
-        "Open TimeLimit",
-        "SMS Spammer",
-        "treehouses remote",
-        "VirtualXposed",
-        "Vertretungsplan.io - free substitution plan App",
-        "Defendo",
-        "K2",
-        "2 Player Battle",
-        "Trans",
-        "Turo",
-        "Conceal",
-        "Edifier RC10D1",
-        "Edifier RC10E",
-        "Edifier RC18A",
-        "Er ríkið opið?",
-        "JAWS",
-        "mpv-android",
-        "OMW",
-        "OMW Nightly",
-        "VCMI",
-        "Hue Widgets",
-        "Battle for Wesnoth",
-        "HostIsDown",
-        "EPUB3 Reader",
-        "Mercurygram",
-        "hippopotamos",
-        "Nextcloud Maps Geobookmarks",
-        "Ojo RTSP IP Camera viewer",
-        "HalfDot for Umami",
-        "Diab",
-        "Dudo",
-        "TriesteinBus",
-        "crond",
-        "RiMusic",
-        "Omni Notes",
-        "DashClock: Battery",
-        "GreenAddress.It",
-        "ePUBator",
-        "Greyscale",
-        "LinuxDayOSM",
-        "DualSim Reminder",
-        "Nextcloud Deck",
-        "Nextcloud Tables",
-        "Nextcloud Notes",
-        "BusTO",
-        "Chord Shift",
-        "MineSweeper",
-        "Lock Screen",
-        "PAFCalc",
-        "SlimSocial for Facebook",
-        "SlimSocial for Twitter",
-        "No-frills CPU Control CLASSIC",
-        "Mercury-SSH",
-        "ViMusic",
-        "Lyrics 2",
-        "The Italian Said",
-        "Aard 2",
-        "MoneyBalance",
-        "Terminal Emulator for Android",
-        "Droid Examiner",
-        "Musical Notes",
-        "Save For Offline",
-        "wX",
-        "Just Player",
-        "Just Player Plugin: Ampache",
-        "Just Player Plugin: Podcast",
-        "OpenWnn",
-        "Whale shark and sardines",
-        "UnicodePad",
-        "miniNoteViewer",
-        "Android USB Serial Monitor Lite",
-        "SyncMemories",
-        "OpenRedmine",
-        "Neko Project II for Android",
-        "aGrep",
-        "NDKmol",
-        "NFC Drivers License Reader",
-        "CPU Stats",
-        "DataStats",
-        "MaximaOnAndroid",
-        "Diary",
-        "MagiaDNI",
-        "JSettlers",
-        "Java installer",
-        "Timetable",
-        "Unexpected Keyboard",
-        "Jupiter Broadcasting",
-        "Chess",
-        "Yucata Envoy",
-        "Diktofon",
-        "Sithakuru",
-        "Simply Do",
-        "AN2Linux",
-        "DejaVu Fonts",
-        "Elpe Efpe",
-        "SidePanel",
-        "MultiPing",
-        "CryptoPass",
-        "Fun With Kanji",
-        "link eye",
-        "Ionic Notes",
-        "Taskwarrior",
-        "PhotoChiotte",
-        "Signature Spoofing Checker",
-        "andFHEM",
-        "LibreTasks",
-        "Fate Sheets",
-        "Phone Saver",
-        "Slideshow",
-        "TaiwanEbookSearcher",
-        "News Reader",
-        "aTox",
-        "CanZE",
-        "KFZ-Kennzeichen",
-        "LukeLauncher",
-        "Flash Deck",
-        "Medic Log",
-        "News Provider",
-        "Personal Stuff",
-        "Get ID",
-        "Volume Control",
-        "Rtl-sdr driver",
-        "Advanced Charging Controller (ACCA) ",
-        "EasyLight",
-        "music-cyclon",
-        "WoT Tank Quiz",
-        "Eylca",
-        "Bulkshare 2",
-        "GrowTracker",
-        "Gradr",
-        "Love Game",
-        "Read You",
-        "Canada Weather & Radar",
-        "Barinsta",
-        "Foreground",
-        "Fake Contacts",
-        "Easy Diary",
-        "ARChon Packager",
-        "Slide",
-        "LISTEN.moe",
-        "FallASleep - Device sleep timer",
-        "Catima — Loyalty Card Wallet",
-        "Raise To Answer",
-        "Share To InputStick",
-        "HDA URL",
-        "MBE Style",
-        "Knock on Ports",
-        "Toffeed",
-        "SimpleDo",
-        "Alarmio",
-        "BoogDroid",
-        "WhatsApp Twitch Stickers",
-        "CollinsDictionary",
-        "Car Report",
-        "Linkbox",
-        "Aodify",
-        "Clipeus",
-        "Duress",
-        "Red",
-        "Sentry",
-        "Silence",
-        "Vibe",
-        "Volta",
-        "Wasted",
-        "WyFy",
-        "DashClock: DashCricket",
-        "Open Golf",
-        "MoeMemos",
-        "FeedWatcher",
-        "FilmChecker",
-        "Party UP!",
-        "Superuser",
-        "AutoDark",
-        "Easy Watermark",
-        "NoWhatOpen",
-        "WATransmitter",
-        "AirMessage",
-        "Dawn for Reddit",
-        "timeto.me",
-        "RootlessJamesDSP",
-        "TripSit",
-        "Counter",
-        "PulseAudio Rtp Receiver",
-        "Fast Shopping",
-        "Writeily Pro",
-        "Coma Phone",
-        "MaterialFBook",
-        "Material Files",
-        "Select Text to Search",
-        "Untracker",
-        "WhereYouGo",
-        "Irregular Expressions",
-        "mpv remote",
-        "Miru",
-        "Speech Trainer",
-        "Sam Remote",
-        "Chalachithram",
-        "Semitone",
-        "Boilr",
-        "NSTools",
-        "Trekarta",
-        "Wehe",
-        "PerApp",
-        "Send Reduced",
-        "AutoDND",
-        "URLSanitizer",
-        "Unvcode",
-        "MIDICtrl",
-        "Matsuri",
-        "RoundR",
-        "SamLib Инфо",
-        "HgLauncher",
-        "Pedometer",
-        "Simon Tatham's Puzzles",
-        "TKCompanionApp",
-        "✉➡🌍 Acastus-Photon",
-        "Lithuanian Layouts - Ext. Keyboards",
-        "n-Puzzle",
-        "Save on Device",
-        "Bulgarian Phonetic Layout - Ext. Keyboards",
-        "Get Foreground Activity",
-        "IsPhoneEncrypted",
-        "Lock",
-        "ShoLi",
-        "Citybike Stations Vienna",
-        "Siteswap Generator",
-        "Puzzle Grid",
-        "Techahashi",
-        "Nekogram X",
-        "RvClock",
-        "Silectric",
-        "Netclip",
-        "ACV",
-        "OsmGpxUploader",
-        "Box Stacker",
-        "Rabbit Escape",
-        "Meritous",
-        "andLess",
-        "lWS",
-        "lWS QR",
-        "Open Markdown Notes (OMN)",
-        "AndBible: Bible Study",
-        "CKPool Watcher",
-        "Microphone",
-        "Bluetooth Viewer (LITE)",
-        "Pineapple Lock Screen (OSS)",
-        "OpenFixMap",
-        "MathDoku",
-        "TeaCup",
-        "droidVNC-NG",
-        "Speed of Sound",
-        "Joplin",
-        "Tonality",
-        "CycleStreets",
-        "Debatekeeper",
-        "ReGalAndroid",
-        "My Banq",
-        "Heriswap",
-        "Recursive Runner",
-        "Url forwarder",
-        "Device Connect",
-        "Trycorder",
-        "DebianDroid",
-        "e1547 - e621 browser",
-        "Muzei Ghibli",
-        "MoneyBuster",
-        "PhoneTrack",
-        "spaRSS",
-        "SMS Popup",
-        "μlogger",
-        "Learn Music Notes",
-        "Pilldroid",
-        "Flym",
-        "Giggity",
-        "GCompris",
-        "Abstract Art",
-        "AF Weather Widget",
-        "WPGen",
-        "AiCiA",
-        "nicoWnnG",
-        "dandelior*",
-        "Markor",
-        "Public IP",
-        "Anode",
-        "Lexic",
-        "I2P",
-        "Keep it up",
-        "BipolAlarm",
-        "Inbox Pager",
-        "DotDash Keyboard",
-        "IVPN - Secure VPN for Privacy",
-        "Apollo Trivia",
-        "NetCounter",
-        "Scrobble Droid",
-        "NWS Weather Alerts Widget",
-        "Comics Reader",
-        "ForRunners",
-        "Smarter Wi-Fi Manager",
-        "TrackerControl",
-        "VoIP.ms SMS",
-        "MoLe",
-        "KeePass NFC",
-        "WIFI_EAP_SIM_Conf",
-        "DashClock: Civilization V Quotes",
-        "DieDroid",
-        "Inetify",
-        "sg for SteamGifts",
-        "Spydroid",
-        "When Ze Bus",
-        "Compass",
-        "File Explorer",
-        "Sound Recorder",
-        "Minetest",
-        "MoasdaWiki App",
-        "VIMTouch",
-        "Mullvad VPN: privacy is a universal right",
-        "My Position",
-        "Blue Line Console",
-        "Blue Square Speedometer",
-        "PageTurner",
-        "Price Per Unit",
-        "NitroShare",
-        "Audinaut",
-        "Freedoom",
-        "DashClock Widget",
-        "Muzei",
-        "OpenArchive",
-        "OSChina",
-        "OsmAnd~",
-        "OsmAnd Contour lines",
-        "OSMTracker",
-        "Easy Dice",
-        "Summation",
-        "OSMfocus Reborn",
-        "Omnomagon",
-        "fooCam beta",
-        "Marine Compass",
-        "Chroma Doze",
-        "ykDroid",
-        "RadioDroid",
-        "Noteless",
-        "GIF Live Wallpaper",
-        "dreamDroid",
-        "Cigaló",
-        "Null Black Wallpaper",
-        "andRoc",
-        "Easy Repost and Downloader for Instagram",
-        "Thorium a PeerTube client",
-        "DuOTP",
-        "DeskCon",
-        "Forage",
-        "Battery Dog",
-        "Hotspot Login",
-        "Gort",
-        "Etheric Synthesizer",
-        "Halachic Prayer Times",
-        "Fulguris Web Browser",
-        "WebSearch",
-        "AndSys ~ Apps",
-        "Dib2Qm",
-        "Kid3",
-        "Open Camera",
-        "SolitaireCG",
-        "Subsonic",
-        "Wifi Remote Play",
-        "X11-Basic",
-        "AppList",
-        "Contacts",
-        "Contacts Import",
-        "StarGW Weight",
-        "Karma Firewall",
-        "STARGW FX",
-        "STK Addon Viewer",
-        "iTracing2",
-        "Syncthing Lite",
-        "PluckLock",
-        "Barnacle Wifi Tether",
-        "Taler Cashier",
-        "GNU Taler Point-of-Sale",
-        "Taler Wallet",
-        "HandyNotes",
-        "AndroSS",
-        "Andhrystone",
-        "Postcode",
-        "NoUSSD",
-        "Authorizer",
-        "USB Gadget Tool",
-        "萊姆輸入法",
-        "YtAlarm",
-        "Shelter",
-        "KouChat",
-        "Zade's wallpaper",
-        "Corporate Addressbook",
-        "EVMap - EV chargers",
-        "QuickMSG",
-        "WiGLE WiFi Wardriving FOSS",
-        "Quizz'n World Capitals",
-        "Timer +X",
-        "EngineDataLogger-Dashboard",
-        "Salasana",
-        "UpgradeAll",
-        "Router Keygen YoloSec",
-        "Misbothering SMS Receiver",
-        "Locker",
-        "Session F-Droid",
-        "Mysterium Dark — Next Gen VPN",
-        "UBIC Wallet",
-        "Launch on Boot",
-        "Frex",
-        "Pepper&Carrot Reader",
-        "Ministocks",
-        "DroidShows",
-        "SleepyWifi",
-        "eduVPN",
-        "36C3 Wifi Setup",
-        "Brony Live Wallpaper",
-        "RainTime",
-        "Weather Widget",
-        "Fintunes",
-        "Simpletask",
-        "Simpletask Nextcloud",
-        "Simpletask (WebDAV)",
-        "Kandroid (fork)",
-        "BookWyrm",
-        "TodoTree",
-        "Simple C25K",
-        "Glider for Hacker News",
-        "NoteBuddy",
-        "Exercise Reminders",
-        "InventoryGUI Mobile",
-        "Gadgetbridge",
-        "TpmsMonitor",
-        "BlitzTypeKeyboard",
-        "Based Cooking",
-        "WiFi Warning",
-        "Foxy Droid",
-        "Overchan",
-        "ObjViewer",
-        "TriPeaks",
-        "T-UI",
-        "Quick Dice Roller",
-        "SSTV Encoder ",
-        "Giant Stopwatch",
-        "OPMT",
-        "Xournal++",
-        "Webmon",
-        "Permissions Manager",
-        "OpenContacts",
-        "OpenBeautyFacts",
-        "OpenFoodFacts",
-        "OrbitalLiveWallpaper",
-        "AdAway",
-        "Adblock Plus",
-        "ADW.Launcher",
-        "AFH Downloader",
-        "Tux Math",
-        "Flight Mode",
-        "Akvo RSR Up",
-        "Always On Display Toggle",
-        "OUI Lookup and Database",
-        "Scanner For Zotero",
-        "MATHTools",
-        "Syncopoli",
-        "Son of Hunky Punk",
-        "3D Model Viewer",
-        "Battery Widget",
-        "Wi-Fi Widget",
-        "ArchNews",
-        "AndroidPN Client",
-        "Permission Friendly Apps",
-        "Coloring for Kids",
-        "Tux Memory",
-        "Puzzle",
-        "Slow It!",
-        "AndStatus",
-        "2048 Open Fun Game",
-        "Todo Agenda",
-        "AnotherMonitor",
-        "Effects Pro",
-        "Ardroid",
-        "Rocks 'n' Diamonds",
-        "Block'Buster",
-        "Monly",
-        "Inventum",
-        "Good Weather",
-        "Derandom",
-        "AsteroidOS Sync",
-        "rust-keylock-android",
-        "Character Recognition",
-        "aTalk",
-        "Casio G-Shock Smart Sync",
-        "Remote Video Camera",
-        "MyOwnNotes",
-        "Snow",
-        "Fake Dawn",
-        "Buddha Quotes",
-        "LG",
-        "BasketBuild Downloader",
-        "MrWhite",
-        "Bomber",
-        "Droidgain",
-        "Simple Sudoku Game",
-        "Berlin-Vegan",
-        "Bibledit",
-        "Bienvenido a Internet",
-        "Accordion",
-        "Buses",
-        "Crossword",
-        "Currency",
-        "Diary",
-        "Editor",
-        "Gridle",
-        "Gurgle",
-        "Melodeon",
-        "Notes",
-        "Print",
-        "Oscilloscope",
-        "Shorty",
-        "Signal Generator",
-        "WordleSolver",
-        "Specie",
-        "Tuner",
-        "gophercle",
-        "launch",
-        "Seshat",
-        "Birthday Adapter",
-        "WiFiScanner",
-        "Mirror Mirror",
-        "Haircomb",
-        "Blitzortung Lightning Monitor",
-        "Blockinger",
-        "BobBall",
-        "BombusMod",
-        "BluePass",
-        "SoundWaves",
-        "Open Explorer Beta",
-        "Briar",
-        "Box, Box!",
-        "BlueGps",
-        "UsbGps4Droid",
-        "BTC Map",
-        "c-beam",
-        "Squawker",
-        "Mygeo",
-        "Calyx VPN",
-        "Pocket Paint",
-        "BinderFuzzy - Pentest Android Services",
-        "StartFlagExploit",
-        "Say My Texts",
-        "ToDo List Widget",
-        "Tacere",
-        "CameraFileCopy",
-        "Fwknop2",
-        "Rotation Lock + Landscape",
-        "Donate your voice: CV Project",
-        "ElegiLegi",
-        "ConnectBot",
-        "Mytronome",
-        "Cool Reader",
-        "Cool Reader",
-        "Cosmic IDE",
-        "NOVA Video Player",
-        "Mars Live Wallpaper",
-        "Wi-Fi Matic",
-        "sbautologin",
-        "mOTP",
-        "Cryptomator",
-        "Cuberite",
-        "Great Freedom",
-        "CyanogenMod Installer",
-        "WhereAreTheEyes",
-        "OkcAgent",
-        "Heading Calculator",
-        "DecSync CC",
-        "Flym DecSync",
-        "spaRSS DecSync",
-        "Trireme for Deluge",
-        "CCDroid",
-        "LogMeIn",
-        "Word Power Made Easy",
-        "Dungeon Crawl Stone Soup",
-        "Add to calendar",
-        "Ruslin",
-        "Disroot app",
-        "Rumble",
-        "DIYgenomics",
-        "Mule on Android",
-        "OpenTasks",
-        "Dialer2",
-        "Docspell Share",
-        "LibreOffice Viewer",
-        "Dolphin Emulator",
-        "Domodroid",
-        "Timer",
-        "Battery Widget",
-        "/d/gapps",
-        "DroidTR IME",
-        "Termbin",
-        "DroidUPnP",
-        "Markers",
-        "OpenBoard",
-        "Hall Monitor",
-        "dynalogin",
-        "CalorieScope ",
-        "Compass Keyboard",
-        "Petronius",
-        "Debian Kit",
-        "Web2PDF",
-        "SimpleEmail",
-        "SQRL Login",
-        "Easy Ear Trainer for Chord Progressions",
-        "EasyRPG Player",
-        "Debitum",
-        "Drawterm",
-        "Flip a coin",
-        "Where am I?",
-        "CrossWords",
-        "Android XMRig Miner",
-        "Shaman",
-        "INSTEAD",
-        "UniPatcher",
-        "Encointer Wallet",
-        "EP Mobile",
-        "MorbidMeter",
-        "Tremotesf",
-        "Piano",
-        "ESUP-NFC-TAG-DROID",
-        "Exodus",
-        "Balance",
-        "eLiquid Calculator",
-        "Masterwork Tools: Pathfinder Open Reference",
-        "Rosary",
-        "IITC-CE Mobile",
-        "FasterGPS",
-        "Fcitx5 for Android",
-        "Fcitx5 for Android (Anthy Plugin)",
-        "Fcitx5 for Android (Chewing Plugin)",
-        "Fcitx5 for Android (Clipboard Filter Plugin)",
-        "Fcitx5 for Android (Hangul Plugin)",
-        "Fcitx5 for Android (Jyutping Plugin)",
-        "Fcitx5 for Android (RIME Plugin)",
-        "Fcitx5 for Android (Sayura Plugin)",
-        "Fcitx5 for Android (Unikey Plugin)",
-        "F-Droid Basic",
-        "F-Droid",
-        "F-Droid Privileged Extension",
-        "F-Droid Privileged Extension OTA",
-        "F-Droid Nearby",
-        "FreeOTP",
-        "Déjà Vu - A local RF based back end for the µg Pro",
-        "LocalGsmNlpBackend",
-        "Symphony",
-        "LocalWifiNlpBackend",
-        "FLARE",
-        "Clover",
-        "Inventory",
-        "Flyve MDM Agent",
-        "Forkgram",
-        "Badge Magic",
-        "Fossify Calendar",
-        "Fossify File Manager",
-        "Fossify Gallery",
-        "Fossify Phone",
-        "Tiny Tiny RSS",
-        "FreedomBox",
-        "freeminer",
-        "Freenet mobile",
-        "EasyRSS",
-        "FrOSCon",
-        "Vernet - Network Analyzer",
-        "SimpleSSHD",
-        "M.A.L.P.",
-        "Odyssey Music Player",
-        "Network Tester",
-        "G-Droid",
-        "CalDAV Sync Adapter",
-        "FBReader Calibre connector",
-        "FBReader TTS plugin",
-        "FBReader",
-        "Libre Ipsum",
-        "GSMLocationNlpBackend",
-        "Guileless Bopomofo Keyboard",
-        "AnimeOne",
-        "Hexiano",
-        "OSMBugs ",
-        "GLPI Agent",
-        "Glucosio",
-        "Gmote",
-        "Emacs",
-        "Godot Editor 3",
-        "Godot Editor 4",
-        "Exceer",
-        "Wiki Unblocked",
-        "Colour Clock",
-        "Concentric Clock",
-        "Ansible Sempahore Client",
-        "Chord Reader",
-        "floccus bookmark sync",
-        "ONScripter",
-        "Sumatora",
-        "Gravity Defied",
-        "ChessWatch",
-        "Xmp Mod Player",
-        "TuxGuitar",
-        "Tricorder",
-        "AnySoftKeyboard: Czech",
-        "AnySoftKeyboard: Lithuanian",
-        "Georgian Fonts Installer",
-        "HIIT Timer",
-        "The Light",
-        "The Life",
-        "RingCode",
-        "ChordReader 2",
-        "Nuntius",
-        "LeafPic",
-        "SexyTopo",
-        "Tella",
-        "Mather",
-        "IETF 113",
-        "openmentoring-mobile",
-        "Calculate!",
-        "Face Slim",
-        "Libero Vocab",
-        "Yivi",
-        "Tibetan Pad",
-        "Tibetan Keyboard",
-        "Loop Habit Tracker",
-        "Point.im",
-        "Daedalus",
-        "DNS66",
-        "Episodes",
-        "ShoppingList",
-        "Shop With Mom",
-        "Jellyfin for Android TV",
-        "Jellyfin - your media in your hands!",
-        "Dalvik Explorer",
-        "Penroser",
-        "Frozen Bubble",
-        "NXT Remote Control",
-        "Bats! HIIT",
-        "Make Some Noise",
-        "Jitsi Meet",
-        "Notification Plus",
-        "Mastodon",
-        "Moshidon",
-        "OpenRecipes",
-        "Forecast widgets",
-        "CameraAlign",
-        "ShellsMP",
-        "WiFi Walkie Talkie",
-        "aLogcat",
-        "DroidLife",
-        "httpmon",
-        "XScreenSaver",
-        "Kakugo",
-        "DoF Calculator",
-        "HeatCalc",
-        "ND Filter",
-        "BetterCounter",
-        "KDE Connect",
-        "KTrip",
-        "Ministro",
-        "Keyoxide",
-        "Kiwix",
-        "Spider",
-        "Kotatsu",
-        "Kontalk Messenger",
-        "Kolab Notes",
-        "KOReader",
-        "NetworkMapper",
-        "Krita",
-        "HA Bluetooth Proxy",
-        "Kwaak3",
-        "Fortunes",
-        "Tap the black tiles",
-        "NC Bookmark Viewer",
-        "PGPAuth",
-        "AnyMemo",
-        "FreeOTP+",
-        "P2Play",
-        "Libreflix",
-        "Impress Remote",
-        "lichess",
-        "AJShA Android Java Shell App",
-        "BLExplorer",
-        "ΞtheRemotΞ",
-        "FAST App Search Tool",
-        "FASTer App Search Tool",
-        "Gobandroid",
-        "gobandroid ai gnugo",
-        "IPFSDroid",
-        "Material Tea Timer",
-        "PassAndroid",
-        "Satoshi Proof",
-        "Survival Manual",
-        "Vaporizer Control Crafty",
-        "glmark2",
-        "Linphone - open source SIP client",
-        "Li-Ri",
-        "LocalSend",
-        "Moving Polygons",
-        "FreeCell4",
-        "LBalance",
-        "PySolFC",
-        "Lumicall",
-        "Puma",
-        "Unicode Map",
-        "Learn reading (in french)",
-        "WiFi ACE",
-        "GLImageViewer",
-        "Twidere",
-        "Twidere Extension: TwitLonger",
-        "MaterialOS",
-        "2050",
-        "ProgressBars",
-        "过早客",
-        "LeMondeRssReader",
-        "Soft Sound",
-        "Senreta Vortaro",
-        "ZephyrLogger",
-        "MusicBrainz",
-        "Auto Airplane Mode",
-        "GitNex for Forgejo and Gitea",
-        "Night Mode Enabler",
-        "UnifiedNlp (GAPPS)",
-        "Apple UnifiedNlp Backend",
-        "MozillaNlpBackend",
-        "NominatimNlpBackend",
-        "Midori",
-        "Insigno",
-        "Fira Font",
-        "Open Sudoku",
-        "Ultrasonic",
-        "AppBak",
-        "Page Plus Balance",
-        "ProjectLaogai ",
-        "Teapod",
-        "Moss",
-        "Mozc for Android",
-        "Fennec F-Droid",
-        "DAAP",
-        "Mustard {MOD}",
-        "Mupen64Plus AE",
-        "Picard Barcode Scanner",
-        "MPD",
-        "Mustard",
-        "FixMyStreet",
-        "MythDroid",
-        "MobileSWC",
-        "build.prop Editor",
-        "Navit",
-        "NetTTS",
-        "NDEF Tools for Android",
-        "Klaxon",
-        "Hamfisted",
-        "Cryptfs Password",
-        "WWWJDIC for Android",
-        "CuprumPDF",
-        "OpenTopoMap Viewer",
-        "NoiseCapture",
-        "Movie DB",
-        "NTPSync",
-        "Shitter",
-        "Icon Request for Numix",
-        "Wrong PIN Shutdown",
-        "Daily Dozen",
-        "OpenManga",
-        "OCS-NG Agent",
-        "ODK Collect",
-        "1toX",
-        "Ogre Sample Browser",
-        "Product Open Data",
-        "PipePanic",
-        "Sugarizer",
-        "OnionShare",
-        "OpenGApps Downloader",
-        "Shiurim",
-        "OpenGPX",
-        "openHAB",
-        "openHAB Beta",
-        "OI About",
-        "OI File Manager",
-        "OI Flashlight",
-        "OI Notepad",
-        "OI Safe",
-        "OI Shopping list",
-        "OONI Probe",
-        "Open Pet Food Facts",
-        "OpenTTD",
-        "Open Map",
-        "TAC Database Client",
-        "Presence Publisher",
-        "Outline",
-        "Auxio",
-        "Tinc App",
-        "MedicLog",
-        "Pareu de Parar-me",
-        "PasswordMaker Pro",
-        "Text Edit",
-        "Remote for VLC",
-        "DroidFish",
-        "Pekka Kana 2",
-        "JaMuz",
-        "Gauguin",
-        "Cow's Revenge",
-        "TowerJumper",
-        "Piwigo",
-        "PixelDroid",
-        "Free Mobile Netstat",
-        "Hacker's Keyboard",
-        "Tinc",
-        "Tiny Tiny Feed",
-        "POuL BITS",
-        "PPSSPP",
-        "primitive ftpd",
-        "Dealing Sheet",
-        "Privacy Helper",
-        "Safe Space",
-        "MAXS Main",
-        "MAXS Module AlarmSet",
-        "MAXS Module Bluetooth",
-        "MAXS Module BluetoothAdmin",
-        "MAXS Module Clipboard",
-        "MAXS Module ContactsRead",
-        "MAXS Module FileRead",
-        "MAXS Module FileWrite",
-        "MAXS Module LocationFine",
-        "MAXS Module Misc",
-        "MAXS Module NFC",
-        "MAXS Module Notification",
-        "MAXS Module PhonestateRead",
-        "MAXS Module Ringermode",
-        "MAXS Module Shell",
-        "MAXS Module SmsNotify",
-        "MAXS Module SmsRead",
-        "MAXS Module SmsSend",
-        "MAXS Module SmsWrite",
-        "MAXS Module WifiAccess",
-        "MAXS Module WifiChange",
-        "MAXS Transport XMPP",
-        "Voodoo OTA RootKeeper",
-        "Voodoo Screen Test Patterns",
-        "Voodoo CarrierIQ Detector",
-        "Blink Comparison",
-        "LibreTorrent",
-        "LibreTrack",
-        "OpenComicVine",
-        "Lesser Pad",
-        "Smoke",
-        "SmokeStack",
-        "i2pd",
-        "pyLoad",
-        "Tabulae",
-        "四次元",
-        "Quillnote",
-        "RedReader",
-        "Libre Memory Game",
-        "Simple Counter",
-        "anDOF",
-        "Radar App",
-        "Recent Contacts Widget",
-        "OpenMapKit",
-        "Revengate",
-        "RunnerUp",
-        "SafePrice",
-        "InTheClear",
-        "Sage",
-        "SaidIt",
-        "Falling Blocks",
-        "Canta",
-        "Live Burger Wallpaper",
-        "SatDump",
-        "SavaPage Print Service",
-        "Etherwake",
-        "Jeden Tag ein Set",
-        "KIBA",
-        "NewPipe",
-        "NewPipe Legacy",
-        "Nextcloud Bookmarks",
-        "Stethox",
-        "SVG redirect",
-        "Terminightor",
-        "Scid on the go",
-        "Trollslate",
-        "Blokish",
-        "Chinese Checkers",
-        "RPN",
-        "ScummVM",
-        "SeaMapDroid",
-        "2048 (Privacy Friendly)",
-        "Pedometer (PFA)",
-        "Backup (Privacy Friendly)",
-        "Boardgame Clock (Privacy Friendly)",
-        "Circuit Training (PFA)",
-        "Checkers (Privacy Friendly)",
-        "Dicer (Privacy Friendly)",
-        "Finance Manager (PFA)",
-        "Food-Tracker (PFA)",
-        "Interval Timer (Privacy Friendly)",
-        "Ludo (Privacy Friendly)",
-        "Memo Game (Privacy Friendly)",
-        "Minesweeper (Privacy Friendly)",
-        "Notes (PFA)",
-        "Pain Diary (PFA)",
-        "Password Generator (PFA)",
-        "Pausing Healthily (Privacy Friendly)",
-        "PIN Mnemonic (Privacy Friendly)",
-        "Reckoning Skills (Privacy Friendly)",
-        "Ruler",
-        "Sketching (PFA)",
-        "Solitaire (Privacy Friendly)",
-        "Sudoku (Privacy Friendly)",
-        "Tape Measure (Privacy Friendly)",
-        "Todo List (PFA)",
-        "Dice Game (Privacy Friendly)",
-        "BF Interpreter",
-        "TTL Editor",
-        "Sensorkraken",
-        "Sensors2OSC",
-        "Sensors2Pd",
-        "ServDroid",
-        "Serval Mesh",
-        "Haltestellenanzeige (Display Monitor)",
-        "Ocelot",
-        "Shortcuts for Calendar/Contacts",
-        "SickStache",
-        "Simlar - secure calls",
-        "Sipdroid",
-        "Outline Keeper",
-        "Warmongr",
-        "IntentRadio",
-        "Indic Keyboard",
-        "Silence",
-        "Snikket",
-        "Traductor Softcatalà",
-        "ForPDA",
-        "Calculator++",
-        "TinyKeePass",
-        "SparkleShare",
-        "Stingle Photos",
-        "AG Store",
-        "Pollywog",
-        "strongSwan VPN Client",
-        "unofficial Stud.IP-app",
-        "Dicio assistant",
-        "Tridenta",
-        "Subsurface",
-        "Sudowars",
-        "Calendar Import-Export",
-        "OpenKeychain: Easy PGP",
-        "Offline Calendar",
-        "TermBot",
-        "Document Viewer",
-        "Document Viewer Font Pack",
-        "Gear Shift",
-        "SuperTuxKart",
-        "Notifications for Facebook",
-        "Messenger bypasser",
-        "Starke Verben",
-        "Synergy",
-        "Card Game Scores",
-        "SyncOnWifi",
-        "Osram Remote",
-        "AtmosphereLogger",
-        "Multipicture Wallpaper",
-        "Tasks.org: Open-source To-Do Lists & Reminders",
-        "Mnemododo",
-        "Telegram FOSS",
-        "Planisphere",
-        "Geological Time Scale",
-        "Qonvert",
-        "Syphon",
-        "mTPMS",
-        "APG",
-        "YouTube Stream",
-        "Your local weather",
-        "Stork IM",
-        "Tileless Map",
-        "Tint Browser",
-        "Tint Browser Adblock Addon",
-        "boQwI'",
-        "Presentation Timer",
-        "Taps Of Fire",
-        "Tomdroid",
-        "TorServices (alpha)",
-        "My Expenses",
-        "OCR (Tesseract)",
-        "Send With FTP",
-        "Traccar Client",
-        "RoadEagle",
-        "Transdroid",
-        "Transdrone",
-        "Transdroid Torrent Search",
-        "Tryton",
-        "TTRSS-Reader",
-        "TunesRemote+",
-        "Tux Paint",
-        "TVHGuide",
-        "COVID-19 italian monitoring",
-        "E numbers",
-        "NextPush",
-        "NoProvider2Push",
-        "UP-Example",
-        "Prism",
-        "Isolmoa",
-        "UDP Bus",
-        "RedScreenActivity",
-        "VLC",
-        "SwpieView",
-        "JKU App",
-        "Narau",
-        "Wifi Fixer",
-        "WallETH",
-        "SplitBills",
-        "GetFlow",
-        "SIP Caller",
-        "CommonsLab",
-        "Wikipedia",
-        "Wiktionary",
-        "windvolt Germany",
-        "ObscuraCam: The Privacy Camera",
-        "TimeLapseCam",
-        "ArityCalc",
-        "Audio Spectrum Analyzer",
-        "hEARtest",
-        "FREE Browser",
-        "DumpSeeker",
-        "Smart EggTimer",
-        "GPS Cockpit",
-        "gptAssist",
-        "huggingAssist",
-        "LavSeeker",
-        "Bubble",
-        "omWeather",
-        "solXpect",
-        "Gas Prices",
-        "RadarWeather",
-        "GoldenEye",
-        "AndIodine",
-        "XBMC Remote",
-        "Kodi",
-        "Kore",
-        "XCSoar",
-        "Ameixa",
-        "Ameixa Monochrome",
-        "Turtl",
-        "Xposed Downloader",
-        "Escapepod - Podcast Player",
-        "Trackbook - Movement Recorder",
-        "Transistor - Simple Radio App",
-        "Yaaic",
-        "Yabause",
-        "dvd",
-        "yaxim",
-        "Bodhi Timer",
-        "Android Tipitaka",
-        "MemoPad",
-        "Gloomy Dungeons 3D - Hardcore",
-        "Gloomy Dungeons 2",
-        "Check Network",
-        "SDB Viewer",
-        "Track Work Time",
-        "Migraine Log",
-        "Spotube",
-        "Fruity Game",
-        "InviZible Pro: increase your security, protect you",
-        "Actualizador ODNS",
-        "Seguime",
-        "Recover VOIP settings from H300s",
-        "Peanut Encryption",
-        "Fast Draw",
-        "DialogMusicPlayer",
-        "Earmouse",
-        "OneTimeAlarm",
-        "ShoppingList",
-        "Endoscope",
-        "Progress Tracker",
-        "Network",
-        "Thermometer Extended",
-        "NFC Key",
-        "NFC Tag maker",
-        "GeoKrety Logger",
-        "Poland can into Space",
-        "Kwik (ant.spl)",
-        "Kwik (eur.rus)",
-        "Kwik (pan.arg)",
-        "Kwik (sah.jap)",
-        "Kwik (usa.can)",
-        "Kwik (zar.aus)",
-        "Kwik EFIS",
-        "Phonograph Plus",
-        "posidon launcher",
-        "News",
-        "Brightness Widget",
-        "SerialTest",
-        "Shopping List (Privacy Friendly)",
-        "Open BART",
-        "SelfPrivacy",
-        "Fluffyboard",
-        "L9Droid",
-        "LineageOS updater shortcut",
-        "Wikimedia Commons for Muzei",
-        "OpenVegeMap",
-        "PaperCraft",
-        "Search to browser",
-        "Protect Baby Monitor",
-        "Baby Sleep Sounds",
-        "Budget Watch",
-        "Loyalty Card Keychain",
-        "Gift Card Guard",
-        "Rental Calc",
-        "Video Transcoder",
-        "MyMusicQoE",
-        "Free Fall",
-        "Titan Companion",
-        "Moscow Wi-Fi autologin",
-        "Tip Calculator",
-        "Quickly quit",
-        "Concurseiro",
-        "SimpleAdvancedMetronome",
-        "Palette-Cycle",
-        "Lunar Launcher",
-        "Epistolaire",
-        "Play Music Exporter",
-        "Remuco",
-        "Tether companion",
-        "Simple Keyboard",
-        "DSC Auto Rename",
-        "Retro Stack",
-        "FonBot",
-        "FiSSH",
-        "Radio Romania",
-        "pttdroid",
-        "BendyStraw",
-        "mucke - Music Player",
-        "Flashy",
-        "Morse",
-        "To Don't",
-        "Vacation Days",
-        "LiveWallpaperIt - Muzei plugin for Reddit",
-        "TinyBit Launcher",
-        "Pixel Artist",
-        "Ltt.rs",
-        "aLogcat ROOT",
-        "TimePlanner",
-        "DPI Tunnel",
-        "DPI Tunnel v2",
-        "Snooder 21",
-        "Open in browser",
-        "Send to SD card",
-        "Weather notification",
-        "Weather Skin: Bigger Text",
-        "Weather Skin: Black",
-        "Weather Skin: Black Text Plus",
-        "Weather Skin: White",
-        "Weather Skin: White Text Plus",
-        "Wi-Fi Reminders",
-        "Emerald Dialer",
-        "Emerald Launcher",
-        "FS Assistant",
-        "Patolli",
-        "RE:INSTEAD",
-        "OpenFool",
-        "AFReplacer",
-        "Achie",
-        "BusyBox",
-        "WeatherLog",
-        "WebSDR client",
-        "Silent Night",
-        "EasySSHFS",
-        "Core",
-        "J2ME Loader",
-        "Updater for Spotify",
-        "Bluetooth terminal",
-        "Finder",
-        "Paranoid Sms Blocker",
-        "Image Toolbox (Resizer)",
-        "Notey",
-        "Paper Wallet",
-        "Handy Reading",
-        "TorrServe",
-        "Guess",
-        "RtkGps",
-        "CamCov",
-        "ColorSniffer",
-        "Easer",
-        "Easer (beta)",
-        "FLock",
-        "SaverTuner",
-        "Birthday Calendar",
-        "Planning Poker",
-        "Pomfshare",
-        "Pixel Filter",
-        "NFC Reader",
-        "Valv",
-        "Crazyflie Client",
-        "Geometri Destroyer",
-        "Retroboy",
-        "FindMyPhone",
-        "Copy to Clipboard",
-        "Bitmask",
-        "Riseup VPN",
-        "Mumla",
-        "Manyverse",
-        "RKFRead",
-        "Riksdagskollen",
-        "Gerberoid",
-        "Dot-Race",
-        "Drum On!",
-        "Candy Memory",
-        "9P",
-        "WhereRing",
-        "Search searx",
-        "Meditation Assistant",
-        "liteshort",
-        "Did I?",
-        "Tarock Palčka",
-        "adbWireless",
-        "Nheengaré",
-        "Simple Reboot",
-        "Les Pas - Photo Album for Nextcloud",
-        "Setter - A multi-purpose search app for Android",
-        "Pixiv Func",
-        "Sithakuru",
-        "Frozen Bubble LevelEditor plus",
-        "Logcat to UDP",
-        "VX ConnectBot",
-        "Warpinator for Android (unofficial)",
-        "Openreads",
-        "Sonorox",
-        "Service Menu",
-        "SicMu Player",
-        "Battery level",
-        "Power Button",
-        "Krautschlüssel",
-        "LayTray",
-        "Xenia",
-        "Hrm",
-        "WebRadio",
-        "Dotty",
-        "flutterhole",
-        "USB Mountr",
-        "YaShlang",
-        "Husky",
-        "Manglish",
-        "/r/Android App store",
-        "Puff",
-        "SuperFreezZ App stopper",
-        "SuperUStats Usage stats viewer",
-        "DroidFS",
-        "PDF Converter",
-        "AIProute",
-        "now8: public transport",
-        "Clock Screensaver",
-        "Twister",
-        "Offline Puzzle Solver",
-        "APKMirror",
-        "Scoop",
-        "Pendulums",
-        "Wifi Camera",
-        "SMS to URL Forwarder",
-        "Platypush",
-        "Plexus",
-        "UserLAnd",
-        "Metronome",
-        "Teleposter",
-        "SyncTool",
-        "LTE Cleaner",
-        "IPFS Lite",
-        "Thor - IPFS Lite",
-        "WebCall",
-        "WebRTCCheck",
-        "Bad Pixel Detector",
-        "DailybRead",
-        "DisasterRadio",
-        "painlessMesh",
-        "Phoenix",
-        "Treble Info",
-        "Simple IRC",
-        "Wifi QR Code Creator",
-        "mythmote",
-        "Food Scale Droid",
-        "WateryDroid",
-        "Youtube Video Listing App (By The Creative Team)",
-        "Always On AMOLED Plugin",
-        "FfF Profile picture generator",
-        "Tiddloid",
-        "拷贝漫画",
-        "open2share",
-        "Toadua",
-        "Simple sms remote",
-        "Obsqr",
-        "Slide",
-        "Talalarmo",
-        "SLW Traffic Meter Widget",
-        "SLW Cpu Widget",
-        "FreeDcam",
-        "tower",
-        "Chiki Chiki Tube",
-        "Light Controller",
-        "VirtualSoftKeys",
-        "AirUnlock",
-        "Custom Search",
-        "uaTranslit",
-        "Lightning Address to Invoice",
-        "Gallery for PhotoPrism",
-        "Mitch",
-        "Try LBRY",
-        "Kanji Dojo",
-        "Barcode Box 2",
-        "Mandelbrot Maps",
-        "eduroamCAT",
-        "Intent Intercept",
-        "Auth Token",
-        "Grabagram",
-        "Catverbs",
-        "PReVo",
-        "Flashback",
-        "Just A Damn Compass",
-        "Screens",
-        "Monochromatic",
-        "Calendar Trigger",
-        "SecondsClock",
-        "OpenVK Legacy",
-        "Weather Forecast",
-        "CrimeTalk",
-        "Squeezer",
-        "InfiniList",
-        "Photographer's Notebook",
-        "Orion Viewer - Pdf & Djvu",
-        "yaft",
-        "Rehearsal Assistant",
-        "agram",
-        "IMCKTG",
-        "Dongsa",
-        "MarkdownView Demo",
-        "Camera Roll",
-        "CIDR Calculator",
-        "GigaGet",
-        "Extirpater",
-        "Mull",
-        "IR Remote",
-        "Hypatia",
-        "GMaps WV",
-        "MotionLock",
-        "US Travel Converter",
-        "Audiometry Made Easy",
-        "Valentin's PowerTools #002 - Passwords to remember",
-        "DSU Sideloader",
-        "Kaleidoscope",
-        "VocableTrainer",
-        "Geometric Weather",
-        "Smart Receipts",
-        "Delta Icon Pack",
-        "WiseRadar",
-        "Etar - OpenSource Calendar",
-        "Taponium",
-        "RoMote",
-        "Open Bitcoin Wallet",
-        "tldr man-pages",
-        "Init.d Light",
-        "All In Gold",
-        "Bullseye",
-        "Robot36 - SSTV Image Decoder",
-        "Aniki",
-        "Bimba",
-        "Friend Alert",
-        "Quinb: 4 players reaction game",
-        "Xeonjia: Ice Adventures",
-        "Zoysii - Logic game",
-        "Firefly III Mobile",
-        "PluckLockEx",
-        "SaveTo.Downloader",
-        "SaveTo…",
-        "LibreBible",
-        "Doodle: Live Wallpapers",
-        "Grocy: Self-hosted Grocery Management",
-        "Газета VEGETARIAN",
-        "Flashlight Widget",
-        "Logical Defence",
-        "Alarm Clock",
-        "Gloomy Dungeons",
-        "Zen",
-    )
-
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Utils.kt b/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
deleted file mode 100644
index 109c68aa2..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/Utils.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.fdroid.basic.ui
-
-import android.content.Context
-import android.content.Intent
-import android.text.format.DateUtils
-import android.util.Log
-import androidx.compose.ui.platform.UriHandler
-import org.fdroid.index.v2.PackageManifest
-import org.fdroid.index.v2.PackageVersion
-import org.fdroid.index.v2.SignerV2
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-import java.util.concurrent.TimeUnit
-
-fun Context.startActivitySafe(i: Intent?) {
-    if (i == null) return
-    try {
-        startActivity(i)
-    } catch (e: Exception) {
-        Log.e("Context", "Error opening $i ", e)
-    }
-}
-
-fun UriHandler.openUriSafe(uri: String) {
-    try {
-        openUri(uri)
-    } catch (e: Exception) {
-        Log.e("UriHandler", "Error opening $uri ", e)
-    }
-}
-
-fun getPreviewVersion(versionName: String, size: Long? = null) = object : PackageVersion {
-    override val versionCode: Long = 23
-    override val versionName: String = versionName
-    override val added: Long = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(3)
-    override val size: Long? = size
-    override val signer: SignerV2? = null
-    override val releaseChannels: List<String>? = null
-    override val packageManifest: PackageManifest = object : PackageManifest {
-        override val minSdkVersion: Int? = null
-        override val maxSdkVersion: Int? = null
-        override val featureNames: List<String>? = null
-        override val nativecode: List<String>? = null
-        override val targetSdkVersion: Int? = null
-    }
-    override val hasKnownVulnerability: Boolean = false
-}
-
-fun Long.asRelativeTimeString(): String {
-    return DateUtils.getRelativeTimeSpanString(
-        this,
-        System.currentTimeMillis(),
-        DateUtils.MINUTE_IN_MILLIS,
-        DateUtils.FORMAT_ABBREV_ALL
-    ).toString()
-}
-
-@OptIn(ExperimentalStdlibApi::class)
-fun sha256(bytes: ByteArray): String {
-    val messageDigest: MessageDigest = try {
-        MessageDigest.getInstance("SHA-256")
-    } catch (e: NoSuchAlgorithmException) {
-        throw AssertionError(e)
-    }
-    messageDigest.update(bytes)
-    return messageDigest.digest().toHexString()
-}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCarousel.kt
deleted file mode 100644
index 037301601..000000000
--- a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCarousel.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.fdroid.basic.ui.categories
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement.spacedBy
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
-import androidx.compose.material3.carousel.rememberCarouselState
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment.Companion.CenterVertically
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import org.fdroid.basic.MainViewModel
-import org.fdroid.fdroid.ui.theme.FDroidContent
-
-@Composable
-fun CategoryCarousel(
-    onTitleTap: () -> Unit,
-    onCategoryTap: (String) -> Unit,
-    modifier: Modifier = Modifier,
-    viewModel: MainViewModel = hiltViewModel(),
-) {
-    val categories = viewModel.categories.collectAsStateWithLifecycle(null).value
-    CategoryCarousel(categories ?: emptyList(), modifier, onTitleTap, onCategoryTap)
-}
-
-@Composable
-@OptIn(ExperimentalMaterial3Api::class)
-fun CategoryCarousel(
-    categories: List<Category>,
-    modifier: Modifier = Modifier,
-    onTitleTap: () -> Unit,
-    onCategoryTap: (String) -> Unit,
-) {
-    val carouselState = rememberCarouselState { categories.size }
-    Column(modifier = modifier) {
-        Row(
-            verticalAlignment = CenterVertically,
-            modifier = Modifier
-                .fillMaxWidth()
-                .clickable(onClick = onTitleTap)
-                .padding(horizontal = 16.dp, vertical = 8.dp),
-        ) {
-            Text(
-                text = "Categories",
-                style = MaterialTheme.typography.headlineSmall,
-            )
-            Icon(
-                imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
-                contentDescription = null,
-            )
-        }
-        HorizontalUncontainedCarousel(
-            state = carouselState,
-            itemWidth = 80.dp,
-            itemSpacing = 8.dp,
-            contentPadding = PaddingValues(horizontal = 16.dp),
-        ) { index ->
-            CategoryBox(categories[index], onCategoryTap)
-        }
-    }
-}
-
-@Composable
-fun CategoryBox(category: Category, onCategoryTap: (String) -> Unit) {
-    Column(
-        verticalArrangement = spacedBy(8.dp),
-        modifier = Modifier
-            .padding(8.dp)
-            .clickable { onCategoryTap(category.name) },
-    ) {
-        Image(
-            imageVector = category.imageVector,
-            contentDescription = null,
-            contentScale = ContentScale.Fit,
-            modifier = Modifier
-                .clip(MaterialTheme.shapes.medium)
-                .size(76.dp),
-        )
-        Text(
-            text = category.name,
-            style = MaterialTheme.typography.bodySmall,
-            minLines = 2,
-            maxLines = 2,
-        )
-    }
-}
-
-@Preview
-@Composable
-fun CategoryCarouselPreview() {
-    val categories = listOf(
-        Category("App Store & Updater", "App Store & Updater"),
-        Category("Browser", "Browser"),
-        Category("Calendar & Agenda", "Calendar & Agenda"),
-        Category("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
-        Category("Connectivity", "Connectivity"),
-        Category("Development", "Development"),
-    )
-    FDroidContent {
-        CategoryCarousel(categories, onTitleTap = {}) {}
-    }
-}
diff --git a/basic/.gitignore b/next/.gitignore
similarity index 100%
rename from basic/.gitignore
rename to next/.gitignore
diff --git a/basic/build.gradle.kts b/next/build.gradle.kts
similarity index 97%
rename from basic/build.gradle.kts
rename to next/build.gradle.kts
index a23d5748a..0cd860d60 100644
--- a/basic/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 android {
-    namespace = "org.fdroid.basic"
+    namespace = "org.fdroid.next"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
@@ -92,6 +92,7 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
 
     testImplementation(libs.junit)
+    testImplementation(kotlin("test"))
 
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/basic/proguard-rules.pro b/next/proguard-rules.pro
similarity index 100%
rename from basic/proguard-rules.pro
rename to next/proguard-rules.pro
diff --git a/basic/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
similarity index 77%
rename from basic/src/main/AndroidManifest.xml
rename to next/src/main/AndroidManifest.xml
index f779415c6..e08ae85af 100644
--- a/basic/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -10,16 +10,17 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <application
-        android:name=".App"
+        android:name="org.fdroid.App"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.Fdroidclient">
         <activity
-            android:name=".MainActivity"
+            android:name="org.fdroid.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.Fdroidclient">
+            <!-- TODO app details intents -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -27,6 +28,11 @@
             </intent-filter>
         </activity>
 
+        <!-- needed for declaring foregroundServiceType for WorkManager -->
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
         <!-- disable WorkManager initialization, needed for Hilt -->
         <provider
             android:name="androidx.startup.InitializationProvider"
diff --git a/basic/src/main/assets/default_repos.json b/next/src/main/assets/default_repos.json
similarity index 100%
rename from basic/src/main/assets/default_repos.json
rename to next/src/main/assets/default_repos.json
diff --git a/basic/src/main/assets/logback.xml b/next/src/main/assets/logback.xml
similarity index 100%
rename from basic/src/main/assets/logback.xml
rename to next/src/main/assets/logback.xml
diff --git a/basic/src/main/java/org/fdroid/basic/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
similarity index 87%
rename from basic/src/main/java/org/fdroid/basic/App.kt
rename to next/src/main/kotlin/org/fdroid/App.kt
index 4af5014d5..bfbaf377f 100644
--- a/basic/src/main/java/org/fdroid/basic/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic
+package org.fdroid
 
 import android.app.Application
 import android.content.Context
@@ -14,11 +14,12 @@ import coil3.request.Options
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.HiltAndroidApp
-import org.fdroid.basic.repo.RepoUpdateWorker
-import org.fdroid.basic.ui.icons.ApplicationIconFetcher
-import org.fdroid.basic.ui.icons.PackageName
 import org.fdroid.download.DownloadRequest
 import org.fdroid.download.coil.DownloadRequestFetcher
+import org.fdroid.next.BuildConfig
+import org.fdroid.repo.RepoUpdateWorker
+import org.fdroid.download.LocalIconFetcher
+import org.fdroid.download.PackageName
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -37,7 +38,7 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
 
     override fun onCreate() {
         super.onCreate()
-        RepoUpdateWorker.scheduleOrCancel(applicationContext)
+        RepoUpdateWorker.Companion.scheduleOrCancel(applicationContext)
     }
 
     override fun newImageLoader(context: Context): ImageLoader {
@@ -60,7 +61,7 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
                     override fun key(data: PackageName, options: Options): String = data.packageName
                 }
                 add(packageNameKeyer)
-                add(ApplicationIconFetcher.Factory(this@App.applicationContext, downloadRequestFetcherFactory))
+                add(LocalIconFetcher.Factory(this@App.applicationContext, downloadRequestFetcherFactory))
             }
             .memoryCache {
                 MemoryCache.Builder()
diff --git a/basic/src/main/java/org/fdroid/basic/MainActivity.kt b/next/src/main/kotlin/org/fdroid/MainActivity.kt
similarity index 94%
rename from basic/src/main/java/org/fdroid/basic/MainActivity.kt
rename to next/src/main/kotlin/org/fdroid/MainActivity.kt
index 5646e71c5..e44d6a099 100644
--- a/basic/src/main/java/org/fdroid/basic/MainActivity.kt
+++ b/next/src/main/kotlin/org/fdroid/MainActivity.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic
+package org.fdroid
 
 import android.Manifest.permission.POST_NOTIFICATIONS
 import android.content.pm.PackageManager.PERMISSION_GRANTED
@@ -10,7 +10,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.core.content.ContextCompat
 import dagger.hilt.android.AndroidEntryPoint
-import org.fdroid.basic.ui.main.Main
+import org.fdroid.ui.Main
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
diff --git a/basic/src/main/java/org/fdroid/basic/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/NotificationManager.kt
rename to next/src/main/kotlin/org/fdroid/NotificationManager.kt
index de24c8dfb..73cbb851d 100644
--- a/basic/src/main/java/org/fdroid/basic/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic
+package org.fdroid
 
 import android.Manifest.permission.POST_NOTIFICATIONS
 import android.content.Context
@@ -11,6 +11,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.NotificationManagerCompat.IMPORTANCE_LOW
 import androidx.core.content.ContextCompat.checkSelfPermission
 import dagger.hilt.android.qualifiers.ApplicationContext
+import org.fdroid.next.R
 import javax.inject.Inject
 
 const val NOTIFICATION_ID_REPO_UPDATE: Int = 0
diff --git a/basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt b/next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt
rename to next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
index 9dee871b3..3b44a33fd 100644
--- a/basic/src/main/java/org/fdroid/basic/db/DatabaseModule.kt
+++ b/next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.db
+package org.fdroid.db
 
 import android.content.Context
 import dagger.Module
diff --git a/basic/src/main/java/org/fdroid/basic/db/InitialData.kt b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/db/InitialData.kt
rename to next/src/main/kotlin/org/fdroid/db/InitialData.kt
index 11795a20d..331f57b83 100644
--- a/basic/src/main/java/org/fdroid/basic/db/InitialData.kt
+++ b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
@@ -1,11 +1,11 @@
-package org.fdroid.basic.db
+package org.fdroid.db
 
 import android.content.Context
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
-import org.fdroid.basic.repo.RepoUpdateWorker
+import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.FDroidFixture
 import org.fdroid.database.InitialRepository
@@ -15,7 +15,7 @@ import java.io.File
 class InitialData(val context: Context) : FDroidFixture {
     override fun prePopulateDb(db: FDroidDatabase) {
         addPreloadedRepositories(db, context.packageName)
-        RepoUpdateWorker.updateNow(context)
+        RepoUpdateWorker.Companion.updateNow(context)
     }
 
     @OptIn(ExperimentalSerializationApi::class)
diff --git a/basic/src/main/java/org/fdroid/basic/download/DownloadModule.kt b/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
similarity index 79%
rename from basic/src/main/java/org/fdroid/basic/download/DownloadModule.kt
rename to next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
index 6aacdcb1a..43c24b733 100644
--- a/basic/src/main/java/org/fdroid/basic/download/DownloadModule.kt
+++ b/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
@@ -1,12 +1,10 @@
-package org.fdroid.basic.download
+package org.fdroid.download
 
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.fdroid.basic.BuildConfig
-import org.fdroid.download.DownloaderFactory
-import org.fdroid.download.HttpManager
+import org.fdroid.next.BuildConfig
 import javax.inject.Singleton
 
 @Module
diff --git a/basic/src/main/java/org/fdroid/basic/download/DownloaderFactoryImpl.kt b/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/download/DownloaderFactoryImpl.kt
rename to next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
index cadc85d94..b7f3ffbfc 100644
--- a/basic/src/main/java/org/fdroid/basic/download/DownloaderFactoryImpl.kt
+++ b/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.download
+package org.fdroid.download
 
 import android.net.Uri
 import org.fdroid.IndexFile
diff --git a/basic/src/main/java/org/fdroid/basic/ui/icons/ApplicationIconFetcher.kt b/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
similarity index 91%
rename from basic/src/main/java/org/fdroid/basic/ui/icons/ApplicationIconFetcher.kt
rename to next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
index be7d717d2..ec30fe5b6 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/icons/ApplicationIconFetcher.kt
+++ b/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.icons
+package org.fdroid.download
 
 import android.content.Context
 import android.content.pm.PackageManager
@@ -9,14 +9,14 @@ import coil3.decode.DataSource
 import coil3.fetch.FetchResult
 import coil3.fetch.Fetcher
 import coil3.fetch.ImageFetchResult
+import coil3.request.Options
 import mu.KotlinLogging
-import org.fdroid.download.DownloadRequest
 import org.fdroid.download.coil.DownloadRequestFetcher
 import javax.inject.Inject
 
 data class PackageName(val packageName: String, val iconDownloadRequest: DownloadRequest?)
 
-class ApplicationIconFetcher(
+class LocalIconFetcher(
     private val packageManager: PackageManager,
     private val data: PackageName,
     private val downloadRequestFetcher: Fetcher?,
@@ -52,9 +52,9 @@ class ApplicationIconFetcher(
     ) : Fetcher.Factory<PackageName> {
         override fun create(
             data: PackageName,
-            options: coil3.request.Options,
+            options: Options,
             imageLoader: ImageLoader,
-        ): Fetcher? = ApplicationIconFetcher(
+        ): Fetcher? = LocalIconFetcher(
             packageManager = context.packageManager,
             data = data,
             downloadRequestFetcher = data.iconDownloadRequest?.let {
diff --git a/basic/src/main/java/org/fdroid/fdroid/Compat.kt b/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
similarity index 100%
rename from basic/src/main/java/org/fdroid/fdroid/Compat.kt
rename to next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
diff --git a/basic/src/main/java/org/fdroid/basic/ui/theme/Color.kt b/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Color.kt
similarity index 100%
rename from basic/src/main/java/org/fdroid/basic/ui/theme/Color.kt
rename to next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Color.kt
diff --git a/basic/src/main/java/org/fdroid/basic/ui/theme/Theme.kt b/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Theme.kt
similarity index 100%
rename from basic/src/main/java/org/fdroid/basic/ui/theme/Theme.kt
rename to next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Theme.kt
diff --git a/basic/src/main/java/org/fdroid/basic/install/SessionInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/install/SessionInstallManager.kt
rename to next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
index 3293bb217..ff418468d 100644
--- a/basic/src/main/java/org/fdroid/basic/install/SessionInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.install
+package org.fdroid.install
 
 import android.os.Build.VERSION.SDK_INT
 
diff --git a/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/repo/RepoUpdateManager.kt
rename to next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index b320d0a91..e9d97a596 100644
--- a/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.repo
+package org.fdroid.repo
 
 import android.content.Context
 import android.text.format.Formatter
@@ -10,8 +10,8 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import org.fdroid.CompatibilityChecker
 import org.fdroid.CompatibilityCheckerImpl
-import org.fdroid.basic.NotificationManager
-import org.fdroid.basic.R
+import org.fdroid.NotificationManager
+import org.fdroid.next.R
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.download.DownloaderFactory
diff --git a/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/repo/RepoUpdateWorker.kt
rename to next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
index e31b4a3b5..cfa26f388 100644
--- a/basic/src/main/java/org/fdroid/basic/repo/RepoUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.repo
+package org.fdroid.repo
 
 import android.content.Context
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
@@ -22,8 +22,8 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import org.fdroid.basic.NOTIFICATION_ID_REPO_UPDATE
-import org.fdroid.basic.NotificationManager
+import org.fdroid.NOTIFICATION_ID_REPO_UPDATE
+import org.fdroid.NotificationManager
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeUnit.MINUTES
 
diff --git a/basic/src/main/java/org/fdroid/basic/repo/RepositoryModule.kt b/next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
similarity index 96%
rename from basic/src/main/java/org/fdroid/basic/repo/RepositoryModule.kt
rename to next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
index d109b2573..57cce1808 100644
--- a/basic/src/main/java/org/fdroid/basic/repo/RepositoryModule.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.repo
+package org.fdroid.repo
 
 import android.content.Context
 import dagger.Module
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/ui/main/About.kt
rename to next/src/main/kotlin/org/fdroid/ui/About.kt
index 60ee5fc20..234d60558 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main
+package org.fdroid.ui
 
 import android.content.res.Configuration
 import androidx.compose.foundation.Image
@@ -31,10 +31,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.BuildConfig.VERSION_NAME
-import org.fdroid.basic.R
-import org.fdroid.basic.ui.openUriSafe
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.BuildConfig.VERSION_NAME
+import org.fdroid.next.R
+import org.fdroid.ui.utils.openUriSafe
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt b/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
similarity index 94%
rename from basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt
rename to next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
index 97f2576b8..5a501a0bf 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/BottomBar.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main
+package org.fdroid.ui
 
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
@@ -12,8 +12,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.navigation3.runtime.NavKey
-import org.fdroid.basic.ui.BottomNavDestinations
-import org.fdroid.basic.ui.NavigationKey
 
 @Composable
 fun BottomBar(numUpdates: Int, currentNavKey: NavKey, onNav: (NavigationKey) -> Unit) {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
similarity index 79%
rename from basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
rename to next/src/main/kotlin/org/fdroid/ui/Main.kt
index b2a54517e..b9641222d 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -1,13 +1,9 @@
-package org.fdroid.basic.ui.main
+package org.fdroid.ui
 
-import androidx.annotation.StringRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.safeDrawingPadding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Info
-import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
@@ -19,10 +15,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
@@ -30,48 +26,23 @@ import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
 import androidx.navigation3.scene.rememberSceneSetupNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
-import org.fdroid.basic.MainViewModel
-import org.fdroid.basic.R
-import org.fdroid.basic.details.AppDetailsViewModel
-import org.fdroid.basic.ui.NavigationKey
-import org.fdroid.basic.ui.icons.PackageVariant
-import org.fdroid.basic.ui.main.apps.MyApps
-import org.fdroid.basic.ui.main.apps.MyAppsViewModel
-import org.fdroid.basic.ui.main.details.AppDetails
-import org.fdroid.basic.ui.main.discover.Discover
-import org.fdroid.basic.ui.main.lists.AppList
-import org.fdroid.basic.ui.main.lists.AppListInfo
-import org.fdroid.basic.ui.main.lists.AppListViewModel
-import org.fdroid.basic.ui.main.repositories.RepositoryList
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
-
-sealed class NavDestinations(
-    val id: NavigationKey,
-    @StringRes val label: Int,
-    val icon: ImageVector,
-) {
-    object Repos :
-        NavDestinations(NavigationKey.Repos, R.string.app_details_repositories, PackageVariant)
-
-    object Settings :
-        NavDestinations(NavigationKey.Settings, R.string.menu_settings, Icons.Filled.Settings)
-
-    object About : NavDestinations(NavigationKey.About, R.string.about, Icons.Filled.Info)
-}
-
-val topBarMenuItems = listOf(
-    NavDestinations.Repos,
-    NavDestinations.Settings,
-)
-
-val moreMenuItems = listOf(
-    NavDestinations.About,
-)
+import org.fdroid.ui.apps.MyApps
+import org.fdroid.ui.apps.MyAppsViewModel
+import org.fdroid.ui.details.AppDetails
+import org.fdroid.ui.details.AppDetailsViewModel
+import org.fdroid.ui.discover.Discover
+import org.fdroid.ui.discover.DiscoverViewModel
+import org.fdroid.ui.lists.AppList
+import org.fdroid.ui.lists.AppListInfo
+import org.fdroid.ui.lists.AppListViewModel
+import org.fdroid.ui.repositories.Repositories
+import org.fdroid.ui.repositories.RepositoriesViewModel
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
-fun Main(viewModel: MainViewModel = hiltViewModel()) {
+fun Main() {
     val backStack = rememberNavBackStack<NavigationKey>(NavigationKey.Discover)
     // Override the defaults so that there isn't a horizontal space between the panes.
     val windowAdaptiveInfo = currentWindowAdaptiveInfo()
@@ -93,7 +64,7 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
             entryDecorators = listOf(
                 rememberSceneSetupNavEntryDecorator(),
                 rememberSavedStateNavEntryDecorator(),
-//                rememberViewModelStoreNavEntryDecorator(),
+                rememberViewModelStoreNavEntryDecorator(),
             ),
             entryProvider = entryProvider {
                 entry<NavigationKey.Discover>(
@@ -101,8 +72,8 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                         Text("No app selected")
                     },
                 ) {
-                    val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
-                    val numUpdates = myAppsViewModel.numUpdates.collectAsStateWithLifecycle(0).value
+                    val viewModel = hiltViewModel<DiscoverViewModel>()
+                    val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
                     Discover(
                         discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
                         onListTap = {
@@ -195,18 +166,18 @@ fun Main(viewModel: MainViewModel = hiltViewModel()) {
                         Text(text = "No repository selected")
                     },
                 ) {
-                    val repositoryManager = viewModel.repositoryManager
-                    val repos = repositoryManager.repos.collectAsStateWithLifecycle(null).value
+                    val viewModel = hiltViewModel<RepositoriesViewModel>()
+                    val repos = viewModel.repos.collectAsStateWithLifecycle(null).value
                     val visibleRepository =
-                        repositoryManager.visibleRepository.collectAsStateWithLifecycle().value
-                    RepositoryList(
+                        viewModel.visibleRepository.collectAsStateWithLifecycle().value
+                    Repositories(
                         repositories = repos,
                         currentRepository = visibleRepository,
                         onRepositorySelected = {
-                            repositoryManager.setVisibleRepository(it)
+                            viewModel.setVisibleRepository(it)
                             backStack.add(NavigationKey.RepoDetails(it.repoId))
                         },
-                        onAddRepo = repositoryManager::addRepo,
+                        onAddRepo = { },
                     ) {
                         backStack.removeLastOrNull()
                     }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt b/next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt
similarity index 96%
rename from basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt
rename to next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt
index 73c33e0a5..5d561ce6a 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/MainOverflowMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main
+package org.fdroid.ui
 
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
diff --git a/basic/src/main/java/org/fdroid/basic/ui/Navigation.kt b/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
similarity index 58%
rename from basic/src/main/java/org/fdroid/basic/ui/Navigation.kt
rename to next/src/main/kotlin/org/fdroid/ui/Navigation.kt
index 226e0beb1..c3a0848a8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/Navigation.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
@@ -1,14 +1,17 @@
-package org.fdroid.basic.ui
+package org.fdroid.ui
 
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Apps
 import androidx.compose.material.icons.filled.Explore
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.Settings
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation3.runtime.NavKey
 import kotlinx.serialization.Serializable
-import org.fdroid.basic.R
-import org.fdroid.basic.ui.main.lists.AppListType
+import org.fdroid.next.R
+import org.fdroid.ui.icons.PackageVariant
+import org.fdroid.ui.lists.AppListType
 
 sealed interface NavigationKey : NavKey {
 
@@ -46,3 +49,26 @@ enum class BottomNavDestinations(
     DISCOVER(NavigationKey.Discover, R.string.discover, Icons.Filled.Explore),
     MY_APPS(NavigationKey.MyApps, R.string.apps_my, Icons.Filled.Apps),
 }
+
+sealed class NavDestinations(
+    val id: NavigationKey,
+    @StringRes val label: Int,
+    val icon: ImageVector,
+) {
+    object Repos :
+        NavDestinations(NavigationKey.Repos, R.string.app_details_repositories, PackageVariant)
+
+    object Settings :
+        NavDestinations(NavigationKey.Settings, R.string.menu_settings, Icons.Filled.Settings)
+
+    object About : NavDestinations(NavigationKey.About, R.string.about, Icons.Filled.Info)
+}
+
+val topBarMenuItems = listOf(
+    NavDestinations.Repos,
+    NavDestinations.Settings,
+)
+
+val moreMenuItems = listOf(
+    NavDestinations.About,
+)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/Settings.kt
similarity index 96%
rename from basic/src/main/java/org/fdroid/basic/ui/main/Settings.kt
rename to next/src/main/kotlin/org/fdroid/ui/Settings.kt
index 932a377a2..333e90f1b 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Settings.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main
+package org.fdroid.ui
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
@@ -15,8 +15,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/AppUpdateItem.kt b/next/src/main/kotlin/org/fdroid/ui/apps/AppUpdateItem.kt
new file mode 100644
index 000000000..1a528fc25
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/AppUpdateItem.kt
@@ -0,0 +1,13 @@
+package org.fdroid.ui.apps
+
+import org.fdroid.download.DownloadRequest
+import org.fdroid.index.v2.PackageVersion
+
+data class AppUpdateItem(
+    val packageName: String,
+    val name: String,
+    val installedVersionName: String,
+    val update: PackageVersion,
+    val whatsNew: String?,
+    val iconDownloadRequest: DownloadRequest? = null,
+)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
similarity index 93%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
rename to next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
index 77e33a784..60911e390 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/InstalledAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.ui.apps
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.size
@@ -13,10 +13,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import org.fdroid.basic.R
-import org.fdroid.basic.ui.Names
-import org.fdroid.basic.ui.icons.PackageName
+import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.ui.utils.Names
 
 @Composable
 fun InstalledAppRow(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
rename to next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index cef2935e3..6c4a3e3d8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -1,5 +1,6 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.ui.apps
 
+import androidx.annotation.RestrictTo
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@@ -42,14 +43,13 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.navigation3.runtime.NavKey
-import org.fdroid.basic.R
-import org.fdroid.basic.manager.AppUpdateItem
-import org.fdroid.basic.ui.Names
-import org.fdroid.basic.ui.NavigationKey
-import org.fdroid.basic.ui.getPreviewVersion
-import org.fdroid.basic.ui.main.BottomBar
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.ui.utils.Names
+import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.utils.getPreviewVersion
+import org.fdroid.ui.BottomBar
 import java.util.concurrent.TimeUnit.DAYS
 
 @Composable
@@ -176,7 +176,7 @@ fun MyApps(
                         onClick = { onAppItemClick(app.packageName) }
                     )
                 }
-                val modifier = Modifier
+                val modifier = Modifier.Companion
                     .animateItem()
                     .then(interactionModifier)
                 UpdatableAppRow(app, isSelected, modifier)
@@ -237,6 +237,7 @@ fun MyAppsLoadingPreview() {
 
 @Preview
 @Composable
+@RestrictTo(RestrictTo.Scope.TESTS)
 fun MyAppsPreview() {
     FDroidContent {
         val app1 = AppUpdateItem(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt
rename to next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index a8a6eeb59..840108ff8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -1,9 +1,8 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.ui.apps
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.StateFlow
-import org.fdroid.basic.manager.AppUpdateItem
 import org.fdroid.database.AppListSortOrder
 import java.text.Collator
 import java.util.Locale
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
similarity index 85%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt
rename to next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index c358fab86..c4273594f 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.ui.apps
 
 import android.app.Application
 import androidx.core.os.LocaleListCompat
@@ -14,13 +14,13 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import org.fdroid.basic.download.getDownloadRequest
-import org.fdroid.basic.manager.MyAppsManager
-import org.fdroid.basic.repo.RepositoryManager
 import org.fdroid.database.AppListItem
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.DownloadRequest
+import org.fdroid.download.getDownloadRequest
+import org.fdroid.index.RepoManager
+import org.fdroid.updates.UpdatesManager
 import javax.inject.Inject
 
 data class InstalledAppItem(
@@ -36,12 +36,12 @@ class MyAppsViewModel @Inject constructor(
     app: Application,
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
-    private val myAppsManager: MyAppsManager,
-    private val repositoryManager: RepositoryManager,
+    private val updatesManager: UpdatesManager,
+    private val repoManager: RepoManager,
 ) : AndroidViewModel(app) {
 
-    val updates = myAppsManager.updates
-    val numUpdates = myAppsManager.numUpdates
+    val updates = updatesManager.updates
+    val numUpdates = updatesManager.numUpdates
     private val installedApps = MutableStateFlow<List<InstalledAppItem>?>(null)
     private var installedAppsLiveData =
         db.getAppDao().getInstalledAppListItems(application.packageManager)
@@ -55,7 +55,7 @@ class MyAppsViewModel @Inject constructor(
                 name = app.name ?: "Unknown app",
                 installedVersionName = app.installedVersionName ?: "???",
                 lastUpdated = app.lastUpdated,
-                iconDownloadRequest = repositoryManager.getRepository(app.repoId)?.let { repo ->
+                iconDownloadRequest = repoManager.getRepository(app.repoId)?.let { repo ->
                     app.getIcon(localeList)?.getDownloadRequest(repo)
                 },
             )
@@ -82,7 +82,7 @@ class MyAppsViewModel @Inject constructor(
     }
 
     fun refresh() {
-        myAppsManager.loadUpdates()
+        updatesManager.loadUpdates()
 
         // need to get new liveData from the DB, so it re-queries installed packages
         installedAppsLiveData.removeObserver(installedAppsObserver)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
rename to next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index f4311d4ad..aa5da1622 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.apps
+package org.fdroid.ui.apps
 
 import android.text.format.Formatter
 import androidx.compose.animation.AnimatedVisibility
@@ -30,11 +30,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import org.fdroid.basic.R
-import org.fdroid.basic.manager.AppUpdateItem
-import org.fdroid.basic.ui.getPreviewVersion
-import org.fdroid.basic.ui.icons.PackageName
+import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.ui.utils.getPreviewVersion
 
 @Composable
 fun UpdatableAppRow(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt
similarity index 79%
rename from basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt
rename to next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt
index 57cd212ec..8404cae29 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryCard.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.categories
+package org.fdroid.ui.categories
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.padding
@@ -12,25 +12,25 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.ui.NavigationKey
-import org.fdroid.basic.ui.main.lists.AppListType
+import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.lists.AppListType
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
 fun CategoryCard(
-    category: Category,
+    categoryItem: CategoryItem,
     onNav: (NavigationKey) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     AssistChip(
         onClick = {
-            val type = AppListType.Category(category.name, category.id)
+            val type = AppListType.Category(categoryItem.name, categoryItem.id)
             val navKey = NavigationKey.AppList(type)
             onNav(navKey)
         },
         leadingIcon = {
             Image(
-                imageVector = category.imageVector,
+                imageVector = categoryItem.imageVector,
                 contentDescription = null,
                 contentScale = ContentScale.None,
                 colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
@@ -39,7 +39,7 @@ fun CategoryCard(
         },
         label = {
             Text(
-                category.name,
+                categoryItem.name,
                 maxLines = 2,
                 style = MaterialTheme.typography.bodySmall,
                 overflow = TextOverflow.Ellipsis,
@@ -53,6 +53,6 @@ fun CategoryCard(
 @Composable
 fun CategoryCardPreview() {
     FDroidContent {
-        CategoryCard(Category("VPN & Proxy", "VPN & Proxy"), {})
+        CategoryCard(CategoryItem("VPN & Proxy", "VPN & Proxy"), {})
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/categories/Category.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/ui/categories/Category.kt
rename to next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
index 38e1f352a..86f67f68e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/categories/Category.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.categories
+package org.fdroid.ui.categories
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.Icons.AutoMirrored
@@ -62,7 +62,7 @@ import androidx.compose.material.icons.filled.Wallpaper
 import androidx.compose.material.icons.filled.WbSunny
 import androidx.compose.ui.graphics.vector.ImageVector
 
-data class Category(val id: String, val name: String) {
+data class CategoryItem(val id: String, val name: String) {
     val imageVector: ImageVector
         get() = when (id) {
             "App Store & Updater" -> Icons.Default.Storefront
diff --git a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
similarity index 78%
rename from basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
rename to next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index d776149cb..2800b4d61 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.categories
+package org.fdroid.ui.categories
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -16,13 +16,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
-import org.fdroid.basic.R
+import org.fdroid.next.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import kotlin.math.max
 
 @Composable
 fun CategoryList(
-    categories: List<Category>?,
+    categories: List<CategoryItem>?,
     onNav: (NavKey) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -56,13 +56,13 @@ fun CategoryList(
 fun CategoryListPreview() {
     FDroidContent {
         val categories = listOf(
-            Category("App Store & Updater", "App Store & Updater"),
-            Category("Browser", "Browser"),
-            Category("Calendar & Agenda", "Calendar & Agenda"),
-            Category("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
-            Category("Connectivity", "Connectivity"),
-            Category("Development", "Development"),
-            Category("doesn't exist", "Foo bar"),
+            CategoryItem("App Store & Updater", "App Store & Updater"),
+            CategoryItem("Browser", "Browser"),
+            CategoryItem("Calendar & Agenda", "Calendar & Agenda"),
+            CategoryItem("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
+            CategoryItem("Connectivity", "Connectivity"),
+            CategoryItem("Development", "Development"),
+            CategoryItem("doesn't exist", "Foo bar"),
         )
         CategoryList(categories, {})
     }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AntiFeatures.kt b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
similarity index 96%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/AntiFeatures.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
index 136688995..bd4abfe50 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AntiFeatures.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -22,9 +22,8 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.details.testApp
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.testApp
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index 8750f1edf..550831540 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalSharedTransitionApi
@@ -66,14 +66,13 @@ import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
 import coil3.compose.AsyncImage
 import org.fdroid.LocaleChooser.getBestLocale
-import org.fdroid.basic.R
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.details.testApp
-import org.fdroid.basic.ui.Names.names
-import org.fdroid.basic.ui.NavigationKey
-import org.fdroid.basic.ui.icons.License
-import org.fdroid.basic.ui.main.lists.AppListType
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.ui.utils.Names
+import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.icons.License
+import org.fdroid.ui.lists.AppListType
+import org.fdroid.ui.utils.testApp
 
 @Composable
 @OptIn(
@@ -196,7 +195,7 @@ fun AppDetails(
                         .height(240.dp)
                         .padding(vertical = 8.dp)
                 ) { index ->
-                    names
+                    Names.names
                     AsyncImage(
                         model = item.phoneScreenshots[index],
                         contentDescription = "",
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 1e10a782b..abbc8de11 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import android.text.format.Formatter
 import androidx.compose.foundation.layout.Arrangement.spacedBy
@@ -39,13 +39,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import org.fdroid.basic.R
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.details.MainButtonState
-import org.fdroid.basic.details.testApp
-import org.fdroid.basic.ui.asRelativeTimeString
-import org.fdroid.basic.ui.startActivitySafe
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.ui.utils.asRelativeTimeString
+import org.fdroid.ui.utils.startActivitySafe
+import org.fdroid.ui.utils.testApp
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
diff --git a/basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
similarity index 59%
rename from basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index b0865296e..0f5903267 100644
--- a/basic/src/main/java/org/fdroid/basic/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -1,36 +1,19 @@
-package org.fdroid.basic.details
+package org.fdroid.ui.details
 
 import android.content.Intent
 import android.os.Build.VERSION.SDK_INT
-import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
+import androidx.annotation.VisibleForTesting
 import androidx.core.os.LocaleListCompat
-import org.fdroid.basic.download.getDownloadRequest
-import org.fdroid.basic.install.SessionInstallManager
 import org.fdroid.database.App
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppPrefs
 import org.fdroid.database.AppVersion
 import org.fdroid.database.Repository
 import org.fdroid.download.DownloadRequest
+import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RELEASE_CHANNEL_BETA
-import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
-import org.fdroid.index.v2.SignerV2
-import java.util.concurrent.TimeUnit.DAYS
-
-enum class MainButtonState {
-    NONE, INSTALL, UPDATE
-}
-
-class AppDetailsActions(
-    val allowBetaVersions: () -> Unit,
-    val ignoreAllUpdates: (() -> Unit)? = null,
-    val ignoreThisUpdate: (() -> Unit)? = null,
-    val shareApk: (() -> Unit)? = null,
-    val uninstallApp: (() -> Unit)? = null,
-    val launchIntent: Intent? = null,
-    val shareIntent: Intent? = null,
-)
+import org.fdroid.install.SessionInstallManager
 
 data class AppDetailsItem(
     val app: AppMetadata,
@@ -99,12 +82,7 @@ data class AppDetailsItem(
         repositories = repositories,
         name = dbApp.name ?: "Unknown App",
         summary = dbApp.summary,
-        description = dbApp.getDescription(localeList)
-            ?.replace(" (https://\\S+) ".toRegex()) {
-                val url = it.groups[1]?.value ?: it.value
-                "<a href=\"$url\">$url</a>"
-            }
-            ?.replace("\n", "<br>"),
+        description = getHtmlDescription(dbApp.getDescription(localeList)),
         icon = dbApp.getIcon(localeList)?.getDownloadRequest(repository),
         featureGraphic = dbApp.getFeatureGraphic(localeList)?.getDownloadRequest(repository),
         phoneScreenshots = dbApp.getPhoneScreenshots(localeList).mapNotNull {
@@ -194,6 +172,27 @@ data class AppDetailsItem(
     val bitcoinUri = app.bitcoin?.let { "bitcoin:$it" }
 }
 
+class AppDetailsActions(
+    val allowBetaVersions: () -> Unit,
+    val ignoreAllUpdates: (() -> Unit)? = null,
+    val ignoreThisUpdate: (() -> Unit)? = null,
+    val shareApk: (() -> Unit)? = null,
+    val uninstallApp: (() -> Unit)? = null,
+    val launchIntent: Intent? = null,
+    val shareIntent: Intent? = null,
+)
+
+enum class MainButtonState {
+    NONE, INSTALL, UPDATE
+}
+
+data class AntiFeature(
+    val id: String,
+    val icon: DownloadRequest? = null,
+    val name: String = id,
+    val reason: String? = null,
+)
+
 private fun AppVersion?.getAntiFeatures(
     repository: Repository,
     localeList: LocaleListCompat,
@@ -209,112 +208,12 @@ private fun AppVersion?.getAntiFeatures(
     }
 }
 
-data class AntiFeature(
-    val id: String,
-    val icon: DownloadRequest? = null,
-    val name: String = id,
-    val reason: String? = null,
-)
-
-// TODO exclude from release builds, @Preview only?
-val testVersion1 = object : PackageVersion {
-    override val versionCode: Long = 42
-    override val versionName: String = "42.23.0-alpha1337-33d2252b90"
-    override val added: Long = System.currentTimeMillis() - DAYS.toMillis(4)
-    override val size: Long? = 1024 * 1024 * 42
-    override val signer: SignerV2? = SignerV2(
-        listOf("271721a9cddc96660336c19a39ae3cca4375072c80d3c8170860c333d2252b90")
-    )
-    override val releaseChannels: List<String>? = null
-    override val packageManifest: PackageManifest = object : PackageManifest {
-        override val minSdkVersion: Int? = null
-        override val maxSdkVersion: Int? = null
-        override val featureNames: List<String>? = null
-        override val nativecode: List<String>? = listOf("amd64", "x86")
-        override val targetSdkVersion: Int? = 13
-    }
-    override val hasKnownVulnerability: Boolean = false
+@VisibleForTesting
+internal fun getHtmlDescription(description: String?): String? {
+    return description?.replace("(\\s)(https://\\S+[^\\s.])([\\s\\n.])".toRegex()) {
+        val prefix = it.groups[1]?.value ?: it.value
+        val url = it.groups[2]?.value ?: it.value
+        val suffix = it.groups[3]?.value ?: it.value
+        "$prefix<a href=\"$url\">$url</a>$suffix"
+    }?.replace("\n", "<br>\n")
 }
-val testVersion2 = object : PackageVersion {
-    override val versionCode: Long = 23
-    override val versionName: String = "23.42.0"
-    override val added: Long = System.currentTimeMillis() - DAYS.toMillis(4)
-    override val size: Long? = 1024 * 1024 * 23
-    override val signer: SignerV2? = SignerV2(
-        listOf("271721a9cddc96660336c19a39ae3cca4375072c80d3c8170860c333d2252b90")
-    )
-    override val releaseChannels: List<String>? = null
-    override val packageManifest: PackageManifest = object : PackageManifest {
-        override val minSdkVersion: Int? = null
-        override val maxSdkVersion: Int? = null
-        override val featureNames: List<String>? = null
-        override val nativecode: List<String>? = null
-        override val targetSdkVersion: Int? = 13
-    }
-    override val hasKnownVulnerability: Boolean = false
-}
-val testApp = AppDetailsItem(
-    app = AppMetadata(
-        repoId = 1,
-        packageName = "org.schabi.newpipe",
-        added = 1441756800000,
-        lastUpdated = 1747214796000,
-        webSite = "https://newpipe.net",
-        changelog = "https://github.com/TeamNewPipe/NewPipe/releases",
-        license = "GPL-3.0-or-later",
-        sourceCode = "https://github.com/TeamNewPipe/NewPipe",
-        issueTracker = "https://github.com/TeamNewPipe/NewPipe/issues",
-        translation = "https://hosted.weblate.org/projects/newpipe/",
-        preferredSigner = "cb84069bd68116bafae5ee4ee5b08a567aa6d898404e7cb12f9e756df5cf5cab",
-        video = null,
-        authorName = "Team NewPipe",
-        authorEmail = "team@newpipe.net",
-        authorWebSite = "https://newpipe.net",
-        authorPhone = "123456",
-        donate = listOf("https://newpipe.net/donate"),
-        liberapayID = null,
-        liberapay = "TeamNewPipe",
-        openCollective = "TeamNewPipe",
-        bitcoin = "TeamNewPipe",
-        litecoin = "TeamNewPipe",
-        flattrID = null,
-        categories = listOf("Internet", "Multimedia"),
-        isCompatible = true,
-    ),
-    actions = AppDetailsActions({}, {}, {}, {}, {}, Intent(), Intent()),
-    appPrefs = AppPrefs("org.schabi.newpipe"),
-    name = "New Pipe",
-    summary = "Lightweight YouTube frontend",
-    description = "NewPipe does not use any Google framework libraries, or the YouTube API. " +
-        "It only parses the website in order to gain the information it needs. " +
-        "Therefore this app can be used on devices without Google Services installed. " +
-        "Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.\n\n" +
-        LoremIpsum(128).values.joinToString(" "),
-    antiFeatures = listOf(
-        AntiFeature(
-            id = "NonFreeNet",
-            icon = null,
-            name = "This app promotes or depends entirely on a non-free network service",
-            reason = "Depends on Youtube for videos.",
-        ),
-        AntiFeature(
-            id = "FooBar",
-            icon = null,
-            name = "This app promotes or depends entirely on a non-free network service",
-            reason = "Depends on Youtube for videos.",
-        ),
-    ),
-    whatsNew = "This release fixes YouTube only providing a 360p stream.\n\n" +
-        "Note that the solution employed in this version is likely temporary, " +
-        "and in the long run the SABR video protocol needs to be implemented, " +
-        "but TeamNewPipe members are currently busy so any help would be greatly appreciated! " +
-        "https://github.com/TeamNewPipe/NewPipe/issues/12248",
-    authorHasMoreThanOneApp = true,
-    versions = listOf(
-        testVersion1,
-        testVersion2,
-    ),
-    installedVersion = testVersion2,
-    suggestedVersion = testVersion1,
-    possibleUpdate = testVersion1,
-)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
similarity index 96%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
index 07f55e505..1cce4f9dc 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsLink.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import android.content.ClipData
 import androidx.compose.foundation.combinedClickable
@@ -20,7 +20,7 @@ import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
-import org.fdroid.basic.ui.openUriSafe
+import org.fdroid.ui.utils.openUriSafe
 
 @Composable
 fun AppDetailsLink(icon: ImageVector, title: String, url: String, modifier: Modifier = Modifier) {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
similarity index 96%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
index 912a1d5c0..33a9cb6de 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import androidx.compose.material.icons.Icons
@@ -14,10 +14,9 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import org.fdroid.basic.R
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.details.testApp
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.ui.utils.testApp
 
 @Composable
 fun AppDetailsMenu(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
similarity index 94%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
index 7b9d9b595..755757fe7 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsTopAppBar.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -21,9 +21,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import org.fdroid.basic.R
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.ui.startActivitySafe
+import org.fdroid.next.R
+import org.fdroid.ui.utils.startActivitySafe
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/basic/src/main/java/org/fdroid/basic/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
similarity index 91%
rename from basic/src/main/java/org/fdroid/basic/details/AppDetailsViewModel.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index ee6237c44..1f5383842 100644
--- a/basic/src/main/java/org/fdroid/basic/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.details
+package org.fdroid.ui.details
 
 import android.app.Application
 import android.content.Intent
@@ -16,11 +16,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import org.fdroid.UpdateChecker
-import org.fdroid.basic.manager.MyAppsManager
-import org.fdroid.basic.utils.IoDispatcher
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.RepoManager
+import org.fdroid.updates.UpdatesManager
+import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 
 @HiltViewModel
@@ -30,7 +30,7 @@ class AppDetailsViewModel @Inject constructor(
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
     private val updateChecker: UpdateChecker,
-    private val myAppsManager: MyAppsManager,
+    private val updatesManager: UpdatesManager,
 ) : AndroidViewModel(app) {
     private val packageInfoFlow = MutableStateFlow<AppInfo?>(null)
 
@@ -69,7 +69,7 @@ class AppDetailsViewModel @Inject constructor(
         val appPrefs = appDetails.value?.appPrefs ?: return
         scope.launch {
             db.getAppPrefsDao().update(appPrefs.toggleReleaseChannel(RELEASE_CHANNEL_BETA))
-            myAppsManager.loadUpdates()
+            updatesManager.loadUpdates()
         }
     }
 
@@ -78,7 +78,7 @@ class AppDetailsViewModel @Inject constructor(
         val appPrefs = appDetails.value?.appPrefs ?: return
         scope.launch {
             db.getAppPrefsDao().update(appPrefs.toggleIgnoreAllUpdates())
-            myAppsManager.loadUpdates()
+            updatesManager.loadUpdates()
         }
     }
 
@@ -88,7 +88,7 @@ class AppDetailsViewModel @Inject constructor(
         val versionCode = appDetails.value?.possibleUpdate?.versionCode ?: return
         scope.launch {
             db.getAppPrefsDao().update(appPrefs.toggleIgnoreVersionCodeUpdate(versionCode))
-            myAppsManager.loadUpdates()
+            updatesManager.loadUpdates()
         }
     }
 }
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsWarnings.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
similarity index 91%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsWarnings.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
index 13f1ee049..4b92b1200 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/AppDetailsWarnings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
@@ -1,8 +1,9 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.WarningAmber
@@ -17,9 +18,8 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.details.testApp
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.testApp
 
 @Composable
 fun AppDetailsWarnings(
@@ -29,7 +29,7 @@ fun AppDetailsWarnings(
         colors = CardDefaults.elevatedCardColors(
             containerColor = MaterialTheme.colorScheme.errorContainer,
         ),
-        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
     ) {
         Column {
             if (item.noCompatibleVersions) Row(
diff --git a/basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 46ad81710..d0cf20c1e 100644
--- a/basic/src/main/java/org/fdroid/basic/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.details
+package org.fdroid.ui.details
 
 import android.content.Intent
 import android.util.Log
@@ -11,9 +11,10 @@ import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.asFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.UpdateChecker
-import org.fdroid.basic.ui.sha256
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
+import org.fdroid.utils.sha256
 
 private const val TAG = "DetailsPresenter"
 
@@ -127,7 +128,7 @@ fun DetailsPresenter(
 }
 
 private fun getShareIntent(
-    repo: org.fdroid.database.Repository,
+    repo: Repository,
     packageName: String,
     appName: String,
 ): Intent? {
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt b/next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt
index cbba3c3e9..a94a155d8 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/ExpandableSection.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.clickable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
index af388df32..6899a86b1 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/RepoChooser.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import android.content.res.Configuration
 import androidx.compose.foundation.clickable
@@ -31,12 +31,12 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
-import org.fdroid.basic.R
-import org.fdroid.basic.ui.main.repositories.RepoIcon
-import org.fdroid.basic.ui.utils.FDroidOutlineButton
 import org.fdroid.database.Repository
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.IndexFormatVersion.TWO
+import org.fdroid.next.R
+import org.fdroid.ui.repositories.RepoIcon
+import org.fdroid.ui.utils.FDroidOutlineButton
 
 @Composable
 fun RepoChooser(
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
similarity index 96%
rename from basic/src/main/java/org/fdroid/basic/ui/main/details/Versions.kt
rename to next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index dad25959f..3bc17e3d4 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.details
+package org.fdroid.ui.details
 
 import android.text.format.Formatter
 import androidx.compose.animation.AnimatedVisibility
@@ -30,13 +30,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.basic.R
-import org.fdroid.basic.details.AppDetailsItem
-import org.fdroid.basic.details.testApp
-import org.fdroid.basic.ui.asRelativeTimeString
-import org.fdroid.basic.ui.utils.FDroidOutlineButton
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.v2.PackageVersion
+import org.fdroid.next.R
+import org.fdroid.ui.utils.asRelativeTimeString
+import org.fdroid.ui.utils.testApp
+import org.fdroid.ui.utils.FDroidOutlineButton
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
rename to next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
index bd150bfd3..b6a1c007b 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppCarousel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.ui.discover
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -28,7 +28,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import org.fdroid.basic.ui.Names
+import org.fdroid.ui.utils.Names
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppDiscoverItem.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
similarity index 84%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/AppDiscoverItem.kt
rename to next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
index 5f74d209b..550662e0a 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppDiscoverItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.ui.discover
 
 import org.fdroid.download.DownloadRequest
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppSearchInputField.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
similarity index 98%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/AppSearchInputField.kt
rename to next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
index e6add1e46..92626170c 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppSearchInputField.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.ui.discover
 
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
rename to next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 72dd13253..a92b04fdb 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.ui.discover
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.text.input.rememberTextFieldState
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
rename to next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
index 062a7a563..31e138a10 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.ui.discover
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
@@ -38,13 +38,13 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
-import org.fdroid.basic.R
-import org.fdroid.basic.ui.NavigationKey
-import org.fdroid.basic.ui.categories.CategoryList
-import org.fdroid.basic.ui.main.BottomBar
-import org.fdroid.basic.ui.main.MainOverFlowMenu
-import org.fdroid.basic.ui.main.lists.AppListType
-import org.fdroid.basic.ui.main.topBarMenuItems
+import org.fdroid.next.R
+import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.categories.CategoryList
+import org.fdroid.ui.BottomBar
+import org.fdroid.ui.MainOverFlowMenu
+import org.fdroid.ui.lists.AppListType
+import org.fdroid.ui.topBarMenuItems
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
similarity index 86%
rename from basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt
rename to next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 68baf2038..69b1407cf 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -1,15 +1,15 @@
-package org.fdroid.basic.ui.main.discover
+package org.fdroid.ui.discover
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
-import org.fdroid.basic.ui.categories.Category
-import org.fdroid.basic.ui.main.repositories.Repository
+import org.fdroid.database.Repository
+import org.fdroid.ui.categories.CategoryItem
 
 @Composable
 fun DiscoverPresenter(
     appsFlow: Flow<List<AppDiscoverItem>>,
-    categoriesFlow: Flow<List<Category>>,
+    categoriesFlow: Flow<List<CategoryItem>>,
     repositoriesFlow: Flow<List<Repository>>,
 ): DiscoverModel {
     val apps = appsFlow.collectAsState(null).value
@@ -42,5 +42,5 @@ object NoEnabledReposDiscoverModel : DiscoverModel()
 data class LoadedDiscoverModel(
     val newApps: List<AppDiscoverItem>,
     val recentlyUpdatedApps: List<AppDiscoverItem>,
-    val categories: List<Category>?,
+    val categories: List<CategoryItem>?,
 ) : DiscoverModel()
diff --git a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
similarity index 78%
rename from basic/src/main/java/org/fdroid/basic/MainViewModel.kt
rename to next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 7ab516b5e..abb1c02da 100644
--- a/basic/src/main/java/org/fdroid/basic/MainViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic
+package org.fdroid.ui.discover
 
 import android.app.Application
 import androidx.core.os.LocaleListCompat
@@ -13,30 +13,30 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
-import org.fdroid.basic.download.getDownloadRequest
-import org.fdroid.basic.repo.RepositoryManager
-import org.fdroid.basic.ui.categories.Category
-import org.fdroid.basic.ui.main.discover.AppDiscoverItem
-import org.fdroid.basic.ui.main.discover.DiscoverModel
-import org.fdroid.basic.ui.main.discover.DiscoverPresenter
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.download.getDownloadRequest
+import org.fdroid.index.RepoManager
+import org.fdroid.ui.categories.CategoryItem
+import org.fdroid.updates.UpdatesManager
 import java.text.Collator
 import java.util.Locale
 import javax.inject.Inject
 
 @HiltViewModel
-class MainViewModel @Inject constructor(
+class DiscoverViewModel @Inject constructor(
     app: Application,
     savedStateHandle: SavedStateHandle,
     db: FDroidDatabase,
-    val repositoryManager: RepositoryManager,
+    updatesManager: UpdatesManager,
+    private val repoManager: RepoManager,
 ) : AndroidViewModel(app) {
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
+    val numUpdates = updatesManager.numUpdates
     val apps = db.getAppDao().getAppOverviewItems().asFlow().map { list ->
         list.mapNotNull {
-            val repository = repositoryManager.getRepository(it.repoId)
+            val repository = repoManager.getRepository(it.repoId)
                 ?: return@mapNotNull null
             AppDiscoverItem(
                 packageName = it.packageName,
@@ -51,7 +51,7 @@ class MainViewModel @Inject constructor(
     val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
         val collator = Collator.getInstance(Locale.getDefault())
         categories.map { category ->
-            Category(
+            CategoryItem(
                 id = category.id,
                 name = category.getName(localeList) ?: "Unknown Category",
             )
@@ -63,7 +63,7 @@ class MainViewModel @Inject constructor(
         DiscoverPresenter(
             appsFlow = apps,
             categoriesFlow = categories,
-            repositoriesFlow = repositoryManager.repos,
+            repositoriesFlow = repoManager.repositoriesState,
         )
     }
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/icons/License.kt b/next/src/main/kotlin/org/fdroid/ui/icons/License.kt
similarity index 86%
rename from basic/src/main/java/org/fdroid/basic/ui/icons/License.kt
rename to next/src/main/kotlin/org/fdroid/ui/icons/License.kt
index bea3b8ac3..d0ef4086a 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/icons/License.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/icons/License.kt
@@ -1,5 +1,10 @@
-package org.fdroid.basic.ui.icons
+package org.fdroid.ui.icons
 
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.PathFillType
 import androidx.compose.ui.graphics.SolidColor
@@ -7,7 +12,9 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
 
 val License: ImageVector
     get() {
@@ -84,3 +91,12 @@ val License: ImageVector
 
 private var _License: ImageVector? = null
 
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        Box(modifier = Modifier.padding(12.dp)) {
+            Image(imageVector = License, contentDescription = "")
+        }
+    }
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/icons/PackageVariant.kt b/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
similarity index 99%
rename from basic/src/main/java/org/fdroid/basic/ui/icons/PackageVariant.kt
rename to next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
index d05c34437..d867fa5d0 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/icons/PackageVariant.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.icons
+package org.fdroid.ui.icons
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
similarity index 99%
rename from basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
rename to next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 4fc8d42e8..dfe781f37 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.lists
+package org.fdroid.ui.lists
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListItem.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
similarity index 85%
rename from basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListItem.kt
rename to next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
index 0ec0f2e56..b6bdd117d 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.lists
+package org.fdroid.ui.lists
 
 import org.fdroid.download.DownloadRequest
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
similarity index 90%
rename from basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListPresenter.kt
rename to next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
index f41c3f9db..c0e224037 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
@@ -1,11 +1,11 @@
-package org.fdroid.basic.ui.main.lists
+package org.fdroid.ui.lists
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
-import org.fdroid.basic.ui.categories.Category
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.ui.categories.CategoryItem
 import java.util.Locale
 
 @Composable
@@ -14,7 +14,7 @@ fun AppListPresenter(
     appsFlow: StateFlow<List<AppListItem>?>,
     areFiltersShownFlow: StateFlow<Boolean>,
     sortByFlow: StateFlow<AppListSortOrder>,
-    allCategoriesFlow: Flow<List<Category>>,
+    allCategoriesFlow: Flow<List<CategoryItem>>,
     addedCategoriesFlow: StateFlow<List<String>>,
 ): AppListModel {
     val apps = appsFlow.collectAsState(null).value
@@ -45,6 +45,6 @@ data class AppListModel(
     val apps: List<AppListItem>?,
     val areFiltersShown: Boolean,
     val sortBy: AppListSortOrder,
-    val allCategories: List<Category>?,
+    val allCategories: List<CategoryItem>?,
     val addedCategories: List<String>,
 )
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListRow.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListRow.kt
rename to next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
index af0d8c0ad..6e8aa6906 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.lists
+package org.fdroid.ui.lists
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import androidx.compose.foundation.layout.Column
@@ -14,7 +14,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import org.fdroid.basic.R
+import org.fdroid.next.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
 @Composable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListType.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
similarity index 94%
rename from basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListType.kt
rename to next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
index 941c7f8ff..87121d790 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListType.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.lists
+package org.fdroid.ui.lists
 
 import kotlinx.serialization.Serializable
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
similarity index 94%
rename from basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListViewModel.kt
rename to next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index e0998a15d..2ece65d0e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.lists
+package org.fdroid.ui.lists
 
 import android.app.Application
 import androidx.annotation.UiThread
@@ -21,13 +21,13 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import mu.KotlinLogging
-import org.fdroid.basic.R
-import org.fdroid.basic.download.getDownloadRequest
-import org.fdroid.basic.repo.RepositoryManager
-import org.fdroid.basic.ui.categories.Category
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppOverviewItem
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.download.getDownloadRequest
+import org.fdroid.index.RepoManager
+import org.fdroid.next.R
+import org.fdroid.ui.categories.CategoryItem
 import java.text.Collator
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -38,7 +38,7 @@ class AppListViewModel @Inject constructor(
     app: Application,
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
-    private val repositoryManager: RepositoryManager,
+    private val repoManager: RepoManager,
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger { }
@@ -50,7 +50,7 @@ class AppListViewModel @Inject constructor(
     private val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
         val collator = Collator.getInstance(Locale.getDefault())
         categories.map { category ->
-            Category(
+            CategoryItem(
                 id = category.id,
                 name = category.getName(localeList) ?: "Unknown Category",
             )
@@ -186,7 +186,7 @@ class AppListViewModel @Inject constructor(
 
     fun onAppOverviewItems(items: List<AppOverviewItem>) {
         apps.value = items.mapNotNull {
-            val repository = repositoryManager.getRepository(it.repoId)
+            val repository = repoManager.getRepository(it.repoId)
                 ?: return@mapNotNull null
             AppListItem(
                 packageName = it.packageName,
@@ -200,7 +200,7 @@ class AppListViewModel @Inject constructor(
 
     private fun onAppListItems(items: List<org.fdroid.database.AppListItem>) {
         apps.value = items.mapNotNull {
-            val repository = repositoryManager.getRepository(it.repoId)
+            val repository = repoManager.getRepository(it.repoId)
                 ?: return@mapNotNull null
             AppListItem(
                 packageName = it.packageName,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
similarity index 99%
rename from basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
rename to next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index 208e0725a..dbe160558 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.lists
+package org.fdroid.ui.lists
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Arrangement.spacedBy
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepoIcon.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
similarity index 83%
rename from basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepoIcon.kt
rename to next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
index 4121266c7..3b23e689d 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepoIcon.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
@@ -1,12 +1,12 @@
-package org.fdroid.basic.ui.main.repositories
+package org.fdroid.ui.repositories
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.core.os.LocaleListCompat
 import coil3.compose.AsyncImage
-import org.fdroid.basic.R
-import org.fdroid.basic.download.getDownloadRequest
+import org.fdroid.next.R
+import org.fdroid.download.getDownloadRequest
 import org.fdroid.database.Repository
 
 @Composable
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryList.kt
rename to next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index a0d37bbc6..8daa25097 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.repositories
+package org.fdroid.ui.repositories
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
@@ -27,15 +27,15 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
 import kotlinx.parcelize.Parcelize
-import org.fdroid.basic.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
 
 @Composable
 @OptIn(
     ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class,
     ExperimentalMaterial3ExpressiveApi::class
 )
-fun RepositoryList(
+fun Repositories(
     repositories: List<Repository>?,
     currentRepository: Repository?,
     onRepositorySelected: (Repository) -> Unit,
@@ -92,7 +92,7 @@ fun RepositoryList(
 @Composable
 fun RepositoriesScaffoldLoadingPreview() {
     FDroidContent {
-        RepositoryList(null, null, {}, {}) { }
+        Repositories(null, null, {}, {}) { }
     }
 }
 
@@ -123,7 +123,7 @@ fun RepositoriesScaffoldPreview() {
                 name = "My second repository",
             ),
         )
-        RepositoryList(repos, repos[0], {}, {}) { }
+        Repositories(repos, repos[0], {}, {}) { }
     }
 }
 
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
similarity index 96%
rename from basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesList.kt
rename to next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
index 097cc9c92..18929ab1e 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoriesList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.repositories
+package org.fdroid.ui.repositories
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement.spacedBy
@@ -44,7 +44,7 @@ fun RepositoriesList(
                     onClick = { onRepositorySelected(repoItem) }
                 )
             }
-            RepositoryItem(
+            RepositoryRow(
                 repoItem = repoItem,
                 isSelected = isSelected,
                 localeList = localeList,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
new file mode 100644
index 000000000..dc86fd06d
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -0,0 +1,41 @@
+package org.fdroid.ui.repositories
+
+import android.app.Application
+import androidx.core.os.LocaleListCompat
+import androidx.lifecycle.AndroidViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
+import org.fdroid.index.RepoManager
+import javax.inject.Inject
+
+@HiltViewModel
+class RepositoriesViewModel @Inject constructor(
+    app: Application,
+    private val repoManager: RepoManager,
+) : AndroidViewModel(app) {
+
+    val repos: Flow<List<Repository>> = repoManager.repositoriesState.map { repos ->
+        repos.map {
+            Repository(
+                repoId = it.repoId,
+                address = it.address,
+                timestamp = it.timestamp,
+                lastUpdated = it.lastUpdated,
+                weight = it.weight,
+                enabled = it.enabled,
+                name = it.getName(LocaleListCompat.getDefault()) ?: "Unknown Repo",
+            )
+        }
+    }
+
+    private val _visibleRepository = MutableStateFlow<Repository?>(null)
+    val visibleRepository = _visibleRepository.asStateFlow()
+
+    fun setVisibleRepository(repository: Repository?) {
+        _visibleRepository.value = repository
+    }
+
+}
diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt
rename to next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
index 9222476e1..065e5609a 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/main/repositories/RepositoryItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.main.repositories
+package org.fdroid.ui.repositories
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Android
@@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.core.os.LocaleListCompat
 
 @Composable
-fun RepositoryItem(
+fun RepositoryRow(
     repoItem: Repository,
     isSelected: Boolean,
     localeList: LocaleListCompat,
diff --git a/basic/src/main/java/org/fdroid/basic/ui/utils/FDroidOutlineButton.kt b/next/src/main/kotlin/org/fdroid/ui/utils/FDroidOutlineButton.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/ui/utils/FDroidOutlineButton.kt
rename to next/src/main/kotlin/org/fdroid/ui/utils/FDroidOutlineButton.kt
index 8ac2ea8fa..a4bfdf8b3 100644
--- a/basic/src/main/java/org/fdroid/basic/ui/utils/FDroidOutlineButton.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/FDroidOutlineButton.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.ui.utils
+package org.fdroid.ui.utils
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.heightIn
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
new file mode 100644
index 000000000..4fffd31a9
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -0,0 +1,161 @@
+package org.fdroid.ui.utils
+
+import android.content.Intent
+import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
+import org.fdroid.database.AppMetadata
+import org.fdroid.database.AppPrefs
+import org.fdroid.index.v2.PackageManifest
+import org.fdroid.index.v2.PackageVersion
+import org.fdroid.index.v2.SignerV2
+import org.fdroid.ui.details.AntiFeature
+import org.fdroid.ui.details.AppDetailsActions
+import org.fdroid.ui.details.AppDetailsItem
+import java.util.concurrent.TimeUnit.DAYS
+
+object Names {
+    val randomName: String get() = names.random()
+    val names = listOf(
+        "Anstop",
+        "PipePipe",
+        "A2DP Volume",
+        "Com-Phone Story Maker",
+        "Lightning",
+        "BitAC - Bitcoin Address Checker",
+        "Text Launcher",
+        "Polaris",
+        "Chubby Click - Metronome",
+        "SUSI.AI",
+        "Moon Phase",
+        "Export Contacts",
+        "Import Contacts",
+        "DNG Processor",
+        "Rootless Pixel Launcher",
+        "AndroDNS",
+        "androidVNC",
+        "PrBoom For Android",
+        "FakeStandby",
+        "eBooks",
+        "ANONguard",
+        "Acrylic Paint",
+        "Immich",
+    )
+}
+
+val testVersion1 = object : PackageVersion {
+    override val versionCode: Long = 42
+    override val versionName: String = "42.23.0-alpha1337-33d2252b90"
+    override val added: Long = System.currentTimeMillis() - DAYS.toMillis(4)
+    override val size: Long? = 1024 * 1024 * 42
+    override val signer: SignerV2? = SignerV2(
+        listOf("271721a9cddc96660336c19a39ae3cca4375072c80d3c8170860c333d2252b90")
+    )
+    override val releaseChannels: List<String>? = null
+    override val packageManifest: PackageManifest = object : PackageManifest {
+        override val minSdkVersion: Int? = null
+        override val maxSdkVersion: Int? = null
+        override val featureNames: List<String>? = null
+        override val nativecode: List<String>? = listOf("amd64", "x86")
+        override val targetSdkVersion: Int? = 13
+    }
+    override val hasKnownVulnerability: Boolean = false
+}
+val testVersion2 = object : PackageVersion {
+    override val versionCode: Long = 23
+    override val versionName: String = "23.42.0"
+    override val added: Long = System.currentTimeMillis() - DAYS.toMillis(4)
+    override val size: Long? = 1024 * 1024 * 23
+    override val signer: SignerV2? = SignerV2(
+        listOf("271721a9cddc96660336c19a39ae3cca4375072c80d3c8170860c333d2252b90")
+    )
+    override val releaseChannels: List<String>? = null
+    override val packageManifest: PackageManifest = object : PackageManifest {
+        override val minSdkVersion: Int? = null
+        override val maxSdkVersion: Int? = null
+        override val featureNames: List<String>? = null
+        override val nativecode: List<String>? = null
+        override val targetSdkVersion: Int? = 13
+    }
+    override val hasKnownVulnerability: Boolean = false
+}
+val testApp = AppDetailsItem(
+    app = AppMetadata(
+        repoId = 1,
+        packageName = "org.schabi.newpipe",
+        added = 1441756800000,
+        lastUpdated = 1747214796000,
+        webSite = "https://newpipe.net",
+        changelog = "https://github.com/TeamNewPipe/NewPipe/releases",
+        license = "GPL-3.0-or-later",
+        sourceCode = "https://github.com/TeamNewPipe/NewPipe",
+        issueTracker = "https://github.com/TeamNewPipe/NewPipe/issues",
+        translation = "https://hosted.weblate.org/projects/newpipe/",
+        preferredSigner = "cb84069bd68116bafae5ee4ee5b08a567aa6d898404e7cb12f9e756df5cf5cab",
+        video = null,
+        authorName = "Team NewPipe",
+        authorEmail = "team@newpipe.net",
+        authorWebSite = "https://newpipe.net",
+        authorPhone = "123456",
+        donate = listOf("https://newpipe.net/donate"),
+        liberapayID = null,
+        liberapay = "TeamNewPipe",
+        openCollective = "TeamNewPipe",
+        bitcoin = "TeamNewPipe",
+        litecoin = "TeamNewPipe",
+        flattrID = null,
+        categories = listOf("Internet", "Multimedia"),
+        isCompatible = true,
+    ),
+    actions = AppDetailsActions({}, {}, {}, {}, {}, Intent(), Intent()),
+    appPrefs = AppPrefs("org.schabi.newpipe"),
+    name = "New Pipe",
+    summary = "Lightweight YouTube frontend",
+    description = "NewPipe does not use any Google framework libraries, or the YouTube API. " +
+        "It only parses the website in order to gain the information it needs. " +
+        "Therefore this app can be used on devices without Google Services installed. " +
+        "Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.\n\n" +
+        LoremIpsum(128).values.joinToString(" "),
+    antiFeatures = listOf(
+        AntiFeature(
+            id = "NonFreeNet",
+            icon = null,
+            name = "This app promotes or depends entirely on a non-free network service",
+            reason = "Depends on Youtube for videos.",
+        ),
+        AntiFeature(
+            id = "FooBar",
+            icon = null,
+            name = "This app promotes or depends entirely on a non-free network service",
+            reason = "Depends on Youtube for videos.",
+        ),
+    ),
+    whatsNew = "This release fixes YouTube only providing a 360p stream.\n\n" +
+        "Note that the solution employed in this version is likely temporary, " +
+        "and in the long run the SABR video protocol needs to be implemented, " +
+        "but TeamNewPipe members are currently busy so any help would be greatly appreciated! " +
+        "https://github.com/TeamNewPipe/NewPipe/issues/12248",
+    authorHasMoreThanOneApp = true,
+    versions = listOf(
+        testVersion1,
+        testVersion2,
+    ),
+    installedVersion = testVersion2,
+    suggestedVersion = testVersion1,
+    possibleUpdate = testVersion1,
+)
+
+fun getPreviewVersion(versionName: String, size: Long? = null) = object : PackageVersion {
+    override val versionCode: Long = 23
+    override val versionName: String = versionName
+    override val added: Long = System.currentTimeMillis() - DAYS.toMillis(3)
+    override val size: Long? = size
+    override val signer: SignerV2? = null
+    override val releaseChannels: List<String>? = null
+    override val packageManifest: PackageManifest = object : PackageManifest {
+        override val minSdkVersion: Int? = null
+        override val maxSdkVersion: Int? = null
+        override val featureNames: List<String>? = null
+        override val nativecode: List<String>? = null
+        override val targetSdkVersion: Int? = null
+    }
+    override val hasKnownVulnerability: Boolean = false
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
new file mode 100644
index 000000000..c06393b7d
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
@@ -0,0 +1,33 @@
+package org.fdroid.ui.utils
+
+import android.content.Context
+import android.content.Intent
+import android.text.format.DateUtils
+import android.util.Log
+import androidx.compose.ui.platform.UriHandler
+
+fun Context.startActivitySafe(i: Intent?) {
+    if (i == null) return
+    try {
+        startActivity(i)
+    } catch (e: Exception) {
+        Log.e("Context", "Error opening $i ", e)
+    }
+}
+
+fun UriHandler.openUriSafe(uri: String) {
+    try {
+        openUri(uri)
+    } catch (e: Exception) {
+        Log.e("UriHandler", "Error opening $uri ", e)
+    }
+}
+
+fun Long.asRelativeTimeString(): String {
+    return DateUtils.getRelativeTimeSpanString(
+        this,
+        System.currentTimeMillis(),
+        DateUtils.MINUTE_IN_MILLIS,
+        DateUtils.FORMAT_ABBREV_ALL
+    ).toString()
+}
diff --git a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
similarity index 68%
rename from basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
rename to next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 02cb7c615..55ff83855 100644
--- a/basic/src/main/java/org/fdroid/basic/manager/MyAppsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -1,33 +1,23 @@
-package org.fdroid.basic.manager
+package org.fdroid.updates
 
 import androidx.core.os.LocaleListCompat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import org.fdroid.basic.download.getDownloadRequest
-import org.fdroid.basic.repo.RepositoryManager
-import org.fdroid.basic.utils.IoDispatcher
 import org.fdroid.database.DbUpdateChecker
-import org.fdroid.download.DownloadRequest
-import org.fdroid.index.v2.PackageVersion
+import org.fdroid.download.getDownloadRequest
+import org.fdroid.index.RepoManager
+import org.fdroid.ui.apps.AppUpdateItem
+import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 import javax.inject.Singleton
 
-data class AppUpdateItem(
-    val packageName: String,
-    val name: String,
-    val installedVersionName: String,
-    val update: PackageVersion,
-    val whatsNew: String?,
-    val iconDownloadRequest: DownloadRequest? = null,
-)
-
 @Singleton
-class MyAppsManager @Inject constructor(
+class UpdatesManager @Inject constructor(
     private val dbUpdateChecker: DbUpdateChecker,
     @IoDispatcher private val coroutineScope: CoroutineScope,
-    private val repositoryManager: RepositoryManager,
+    private val repoManager: RepoManager,
 ) {
     private val _updates = MutableStateFlow<List<AppUpdateItem>?>(null)
     val updates = _updates.asStateFlow()
@@ -48,7 +38,7 @@ class MyAppsManager @Inject constructor(
                 installedVersionName = update.installedVersionName,
                 update = update.update,
                 whatsNew = update.update.getWhatsNew(localeList),
-                iconDownloadRequest = repositoryManager.getRepository(update.repoId)?.let { repo ->
+                iconDownloadRequest = repoManager.getRepository(update.repoId)?.let { repo ->
                     update.getIcon(localeList)?.getDownloadRequest(repo)
                 },
             )
diff --git a/basic/src/main/java/org/fdroid/basic/updates/UpdatesModule.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
similarity index 97%
rename from basic/src/main/java/org/fdroid/basic/updates/UpdatesModule.kt
rename to next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
index f458cd5fe..e95adbaf9 100644
--- a/basic/src/main/java/org/fdroid/basic/updates/UpdatesModule.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.updates
+package org.fdroid.updates
 
 import android.content.Context
 import dagger.Module
diff --git a/basic/src/main/java/org/fdroid/basic/utils/CoroutinesScopesModule.kt b/next/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt
similarity index 95%
rename from basic/src/main/java/org/fdroid/basic/utils/CoroutinesScopesModule.kt
rename to next/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt
index 3d63a427f..b56785fa5 100644
--- a/basic/src/main/java/org/fdroid/basic/utils/CoroutinesScopesModule.kt
+++ b/next/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt
@@ -1,4 +1,4 @@
-package org.fdroid.basic.utils
+package org.fdroid.utils
 
 import dagger.Module
 import dagger.Provides
diff --git a/next/src/main/kotlin/org/fdroid/utils/Utils.kt b/next/src/main/kotlin/org/fdroid/utils/Utils.kt
new file mode 100644
index 000000000..2862da6bd
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/utils/Utils.kt
@@ -0,0 +1,15 @@
+package org.fdroid.utils
+
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+
+@OptIn(ExperimentalStdlibApi::class)
+fun sha256(bytes: ByteArray): String {
+    val messageDigest: MessageDigest = try {
+        MessageDigest.getInstance("SHA-256")
+    } catch (e: NoSuchAlgorithmException) {
+        throw AssertionError(e)
+    }
+    messageDigest.update(bytes)
+    return messageDigest.digest().toHexString()
+}
diff --git a/basic/src/main/res/drawable/ic_launcher.png b/next/src/main/res/drawable/ic_launcher.png
similarity index 100%
rename from basic/src/main/res/drawable/ic_launcher.png
rename to next/src/main/res/drawable/ic_launcher.png
diff --git a/basic/src/main/res/drawable/ic_notification.xml b/next/src/main/res/drawable/ic_notification.xml
similarity index 100%
rename from basic/src/main/res/drawable/ic_notification.xml
rename to next/src/main/res/drawable/ic_notification.xml
diff --git a/basic/src/main/res/drawable/ic_refresh.xml b/next/src/main/res/drawable/ic_refresh.xml
similarity index 100%
rename from basic/src/main/res/drawable/ic_refresh.xml
rename to next/src/main/res/drawable/ic_refresh.xml
diff --git a/basic/src/main/res/drawable/ic_repo_app_default.xml b/next/src/main/res/drawable/ic_repo_app_default.xml
similarity index 100%
rename from basic/src/main/res/drawable/ic_repo_app_default.xml
rename to next/src/main/res/drawable/ic_repo_app_default.xml
diff --git a/basic/src/main/res/values/colors.xml b/next/src/main/res/values/colors.xml
similarity index 100%
rename from basic/src/main/res/values/colors.xml
rename to next/src/main/res/values/colors.xml
diff --git a/basic/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
similarity index 100%
rename from basic/src/main/res/values/strings-next.xml
rename to next/src/main/res/values/strings-next.xml
diff --git a/basic/src/main/res/values/strings.xml b/next/src/main/res/values/strings.xml
similarity index 100%
rename from basic/src/main/res/values/strings.xml
rename to next/src/main/res/values/strings.xml
diff --git a/basic/src/main/res/values/themes.xml b/next/src/main/res/values/themes.xml
similarity index 100%
rename from basic/src/main/res/values/themes.xml
rename to next/src/main/res/values/themes.xml
diff --git a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
new file mode 100644
index 000000000..fc88ee6b1
--- /dev/null
+++ b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
@@ -0,0 +1,29 @@
+package org.fdroid.ui.main.details
+
+import org.fdroid.ui.details.getHtmlDescription
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class HtmlDescriptionTest {
+    @Test
+    fun testLinks() {
+        val description = """
+2. If you have experience with Java and the Android SDK, then we look forward to your contributions! More info: https://mediawiki.org/wiki/Wikimedia_Apps/Team/Android/App_hacking
+
+3. Explanation of permissions needed by the app: https://mediawiki.org/wiki/Wikimedia_Apps/Android_FAQ#Security_and_Permissions
+        """
+        val expectedDescription = """<br>
+2. If you have experience with Java and the Android SDK, then we look forward to your contributions! More info: <a href="https://mediawiki.org/wiki/Wikimedia_Apps/Team/Android/App_hacking">https://mediawiki.org/wiki/Wikimedia_Apps/Team/Android/App_hacking</a><br>
+<br>
+3. Explanation of permissions needed by the app: <a href="https://mediawiki.org/wiki/Wikimedia_Apps/Android_FAQ#Security_and_Permissions">https://mediawiki.org/wiki/Wikimedia_Apps/Android_FAQ#Security_and_Permissions</a><br>
+        """
+        assertEquals(expectedDescription, getHtmlDescription(description))
+    }
+
+    @Test
+    fun testLinkWithDotAtTheEnd() {
+        val description = """please visit our website: https://wikimediafoundation.org/."""
+        val expectedDescription = """please visit our website: <a href="https://wikimediafoundation.org/">https://wikimediafoundation.org/</a>."""
+        assertEquals(expectedDescription, getHtmlDescription(description))
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index b728621ec..c7a2ed7ce 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,4 +13,4 @@ include ':libs:download'
 include ':libs:index'
 include ':libs:database'
 
-include ':basic'
+include ':next'

From 5d6b0181a43f977f215ab794632802d47db05e84 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 23 Jul 2025 14:26:21 -0300
Subject: [PATCH 032/180] Add a shimmer effect to AsyncImages while loading

---
 .../org/fdroid/ui/apps/InstalledAppRow.kt     |   4 +-
 .../org/fdroid/ui/apps/UpdatableAppRow.kt     |   4 +-
 .../org/fdroid/ui/details/AntiFeatures.kt     |  24 ++--
 .../org/fdroid/ui/details/AppDetails.kt       |   7 +-
 .../org/fdroid/ui/details/AppDetailsHeader.kt |   3 +-
 .../org/fdroid/ui/discover/AppCarousel.kt     |  29 ++---
 .../kotlin/org/fdroid/ui/lists/AppListRow.kt  |   6 +-
 .../org/fdroid/ui/repositories/RepoIcon.kt    |   9 +-
 .../org/fdroid/ui/utils/AsyncShimmerImage.kt  | 117 ++++++++++++++++++
 9 files changed, 152 insertions(+), 51 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
index 60911e390..681560d27 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
@@ -12,10 +12,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
 import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
+import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.Names
 
 @Composable
@@ -27,7 +27,7 @@ fun InstalledAppRow(
     Column(modifier = modifier) {
         ListItem(
             leadingContent = {
-                AsyncImage(
+                AsyncShimmerImage(
                     model = PackageName(app.packageName, app.iconDownloadRequest),
                     error = painterResource(R.drawable.ic_repo_app_default),
                     contentDescription = null,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index aa5da1622..bd8abf8d4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -29,10 +29,10 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
 import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
+import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.getPreviewVersion
 
 @Composable
@@ -52,7 +52,7 @@ fun UpdatableAppRow(
                         contentDescription = null, modifier = Modifier.size(24.dp),
                     )
                 }) {
-                    AsyncImage(
+                    AsyncShimmerImage(
                         model = PackageName(app.packageName, app.iconDownloadRequest),
                         error = painterResource(R.drawable.ic_repo_app_default),
                         contentDescription = null,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
index bd4abfe50..c63eb9717 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
@@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.CrisisAlert
 import androidx.compose.material.icons.filled.WarningAmber
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ElevatedCard
@@ -21,8 +21,8 @@ import androidx.compose.ui.graphics.ColorFilter.Companion.tint
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.testApp
 
 @Composable
@@ -34,7 +34,9 @@ fun AntiFeatures(
         colors = CardDefaults.elevatedCardColors(
             containerColor = MaterialTheme.colorScheme.inverseSurface,
         ),
-        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 8.dp),
     ) {
         ExpandableSection(
             icon = rememberVectorPainter(Icons.Default.WarningAmber),
@@ -45,15 +47,13 @@ fun AntiFeatures(
                 item.antiFeatures?.forEach { antiFeature ->
                     ListItem(
                         leadingContent = {
-                            antiFeature.icon?.let { icon ->
-                                AsyncImage(
-                                    model = icon,
-                                    contentDescription = "",
-                                    colorFilter = tint(MaterialTheme.colorScheme.inverseOnSurface),
-                                    error = rememberVectorPainter(Icons.Default.Error),
-                                    modifier = Modifier.size(32.dp),
-                                )
-                            }
+                            AsyncShimmerImage(
+                                model = antiFeature.icon,
+                                contentDescription = "",
+                                colorFilter = tint(MaterialTheme.colorScheme.inverseOnSurface),
+                                error = rememberVectorPainter(Icons.Default.CrisisAlert),
+                                modifier = Modifier.size(32.dp),
+                            )
                         },
                         headlineContent = {
                             Text(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index 550831540..0d8252d67 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -64,14 +64,13 @@ import androidx.compose.ui.text.withLink
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
-import coil3.compose.AsyncImage
 import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
-import org.fdroid.ui.utils.Names
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.icons.License
 import org.fdroid.ui.lists.AppListType
+import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.testApp
 
 @Composable
@@ -195,14 +194,14 @@ fun AppDetails(
                         .height(240.dp)
                         .padding(vertical = 8.dp)
                 ) { index ->
-                    Names.names
-                    AsyncImage(
+                    AsyncShimmerImage(
                         model = item.phoneScreenshots[index],
                         contentDescription = "",
                         contentScale = ContentScale.Fit,
                         placeholder = rememberVectorPainter(Icons.Default.Image),
                         error = rememberVectorPainter(Icons.Default.Error),
                         modifier = Modifier
+                            .size(120.dp, 240.dp)
                             .clip(MaterialTheme.shapes.medium),
                     )
                 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index abbc8de11..db8d7a1b3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -41,6 +41,7 @@ import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
+import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.startActivitySafe
 import org.fdroid.ui.utils.testApp
@@ -89,7 +90,7 @@ fun AppDetailsHeader(
         horizontalArrangement = spacedBy(8.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        AsyncImage(
+        AsyncShimmerImage(
             model = item.icon,
             contentDescription = "",
             error = painterResource(R.drawable.ic_repo_app_default),
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
index b6a1c007b..a9cf9e804 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
@@ -1,6 +1,5 @@
 package org.fdroid.ui.discover
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
@@ -9,10 +8,8 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredSize
-import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
-import androidx.compose.material.icons.filled.Android
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -23,13 +20,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
-import org.fdroid.ui.utils.Names
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.Names
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -77,24 +73,13 @@ fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
             .padding(8.dp)
             .clickable { onAppTap(app) },
     ) {
-        app.iconDownloadRequest?.let {
-            AsyncImage( // TODO error handling
-                app.iconDownloadRequest,
-                contentDescription = null,
-                contentScale = ContentScale.Fit,
-                modifier = Modifier
-                    .requiredSize(76.dp)
-                    .clip(MaterialTheme.shapes.medium),
-            )
-        } ?: Icon(
-            Icons.Filled.Android,
-            tint = MaterialTheme.colorScheme.secondary,
+        AsyncShimmerImage(
+            model = app.iconDownloadRequest,
             contentDescription = null,
+            contentScale = ContentScale.Fit,
             modifier = Modifier
-                .clip(MaterialTheme.shapes.medium)
-                .size(76.dp)
-                .background(Color.White)
-                .padding(8.dp),
+                .requiredSize(76.dp)
+                .clip(MaterialTheme.shapes.medium),
         )
         Text(
             text = app.name,
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
index 6e8aa6906..b86f28d1c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
@@ -13,9 +13,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import coil3.compose.AsyncImage
-import org.fdroid.next.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.ui.utils.AsyncShimmerImage
 
 @Composable
 fun AppListRow(
@@ -27,7 +27,7 @@ fun AppListRow(
         headlineContent = { Text(item.name) },
         supportingContent = { Text(item.summary) },
         leadingContent = {
-            AsyncImage(
+            AsyncShimmerImage(
                 model = item.iconDownloadRequest,
                 error = painterResource(R.drawable.ic_repo_app_default),
                 contentDescription = null,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
index 3b23e689d..f0cfd9e2d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
@@ -4,18 +4,17 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.core.os.LocaleListCompat
-import coil3.compose.AsyncImage
-import org.fdroid.next.R
-import org.fdroid.download.getDownloadRequest
 import org.fdroid.database.Repository
+import org.fdroid.download.getDownloadRequest
+import org.fdroid.next.R
+import org.fdroid.ui.utils.AsyncShimmerImage
 
 @Composable
 fun RepoIcon(repo: Repository, modifier: Modifier = Modifier) {
-    AsyncImage(
+    AsyncShimmerImage(
         model = repo.getIcon(LocaleListCompat.getDefault())?.getDownloadRequest(repo),
         contentDescription = null,
         error = painterResource(R.drawable.ic_repo_app_default),
-        placeholder = painterResource(R.drawable.ic_repo_app_default),
         modifier = modifier,
     )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt b/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
new file mode 100644
index 000000000..da279d3b4
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
@@ -0,0 +1,117 @@
+package org.fdroid.ui.utils
+
+import androidx.compose.animation.core.FastOutLinearInEasing
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithCache
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import coil3.compose.SubcomposeAsyncImage
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+
+@Composable
+fun AsyncShimmerImage(
+    model: Any?,
+    contentDescription: String?,
+    modifier: Modifier = Modifier,
+    colorFilter: ColorFilter? = null,
+    contentScale: ContentScale = ContentScale.Fit,
+    error: Painter = painterResource(R.drawable.ic_repo_app_default),
+    placeholder: Painter = error,
+) {
+    Box(modifier = modifier) {
+        SubcomposeAsyncImage(
+            model = model,
+            loading = {
+                Image(
+                    painter = placeholder,
+                    contentDescription = contentDescription,
+                    colorFilter = colorFilter,
+                    contentScale = contentScale,
+                    modifier = Modifier
+                        .matchParentSize()
+                        .shimmer(),
+                )
+            },
+            error = {
+                Image(
+                    painter = error,
+                    contentDescription = contentDescription,
+                    colorFilter = colorFilter,
+                    contentScale = contentScale,
+                    modifier = Modifier.matchParentSize(),
+                )
+            },
+            colorFilter = colorFilter,
+            contentScale = contentScale,
+            contentDescription = contentDescription,
+            modifier = Modifier.matchParentSize()
+        )
+    }
+}
+
+@Composable
+@Preview
+private fun Preview() {
+    FDroidContent {
+        Image(
+            painter = painterResource(R.drawable.ic_repo_app_default),
+            contentDescription = null,
+            modifier = Modifier
+                .size(128.dp)
+                .shimmer(),
+        )
+    }
+}
+
+@Composable
+fun Modifier.shimmer(): Modifier {
+    val shimmerColors = listOf(
+        Color.Transparent,
+        MaterialTheme.colorScheme.background.copy(alpha = 0.6f),
+        Color.Transparent
+    )
+    val transition = rememberInfiniteTransition(label = "Shimmer")
+    val translateAnim by transition.animateFloat(
+        initialValue = -400f,
+        targetValue = 1200f,
+        animationSpec = infiniteRepeatable(
+            animation = tween(
+                durationMillis = 2000,
+                easing = FastOutLinearInEasing,
+            )
+        ),
+        label = "Translate"
+    )
+    return this.drawWithCache {
+        val brush = Brush.linearGradient(
+            colors = shimmerColors,
+            start = Offset(translateAnim, 0f),
+            end = Offset(translateAnim + size.width / 1.5f, size.height)
+        )
+        onDrawWithContent {
+            drawContent()
+            drawRect(
+                brush = brush,
+                size = size,
+            )
+        }
+    }
+}

From 189ed0280743cd534171591154f050c30620da3f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 23 Jul 2025 14:48:33 -0300
Subject: [PATCH 033/180] Factor out a BigLoadingIndicator

---
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  | 19 ++-----
 .../org/fdroid/ui/details/AppDetails.kt       |  9 +--
 .../kotlin/org/fdroid/ui/discover/Discover.kt | 15 ++---
 .../kotlin/org/fdroid/ui/lists/AppList.kt     | 56 ++++++++++++++++++-
 .../fdroid/ui/repositories/Repositories.kt    | 33 ++++-------
 .../fdroid/ui/utils/BigLoadingIndicator.kt    | 32 +++++++++++
 6 files changed, 111 insertions(+), 53 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 6c4a3e3d8..4d93e5ef7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -2,11 +2,8 @@ package org.fdroid.ui.apps
 
 import androidx.annotation.RestrictTo
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
@@ -22,7 +19,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.LoadingIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Scaffold
@@ -46,10 +42,11 @@ import androidx.navigation3.runtime.NavKey
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
-import org.fdroid.ui.utils.Names
-import org.fdroid.ui.NavigationKey
-import org.fdroid.ui.utils.getPreviewVersion
 import org.fdroid.ui.BottomBar
+import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.utils.BigLoadingIndicator
+import org.fdroid.ui.utils.Names
+import org.fdroid.ui.utils.getPreviewVersion
 import java.util.concurrent.TimeUnit.DAYS
 
 @Composable
@@ -128,12 +125,8 @@ fun MyApps(
         },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
-        if (updatableApps == null && installedApps == null) Box(
-            contentAlignment = Alignment.Center,
-            modifier = Modifier.fillMaxSize()
-        ) {
-            LoadingIndicator(Modifier.size(128.dp))
-        } else LazyColumn(
+        if (updatableApps == null && installedApps == null) BigLoadingIndicator()
+        else LazyColumn(
             modifier
                 .padding(paddingValues)
                 .then(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index 0d8252d67..c984d13cc 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -71,6 +71,7 @@ import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.icons.License
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.testApp
 
 @Composable
@@ -86,12 +87,8 @@ fun AppDetails(
 ) {
     val topAppBarState = rememberTopAppBarState()
     val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(topAppBarState)
-    if (item == null) Box(
-        contentAlignment = Alignment.Center,
-        modifier = Modifier.fillMaxSize(),
-    ) {
-        LoadingIndicator(Modifier.size(128.dp))
-    } else Scaffold(
+    if (item == null) BigLoadingIndicator()
+    else Scaffold(
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             AppDetailsTopAppBar(item, topAppBarState, scrollBehavior, onBackNav)
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 31e138a10..076ffea0d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -1,13 +1,11 @@
 package org.fdroid.ui.discover
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
@@ -17,7 +15,6 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -29,7 +26,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 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
@@ -38,14 +34,15 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
+import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
-import org.fdroid.ui.NavigationKey
-import org.fdroid.ui.categories.CategoryList
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.MainOverFlowMenu
+import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.categories.CategoryList
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.topBarMenuItems
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.BigLoadingIndicator
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@@ -114,9 +111,7 @@ fun Discover(
                                 .fillMaxWidth()
                         )
                     }
-                    Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
-                        LoadingIndicator(Modifier.size(128.dp))
-                    }
+                    BigLoadingIndicator()
                 }
                 is LoadedDiscoverModel -> {
                     AppsSearch(
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index dfe781f37..c7c2f7e28 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -24,7 +24,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.LoadingIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -37,7 +36,11 @@ import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.database.AppListSortOrder
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.BigLoadingIndicator
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@@ -90,7 +93,7 @@ fun AppList(
                 modifier = Modifier.background(TopAppBarDefaults.topAppBarColors().containerColor),
             )
             val apps = appListInfo.model.apps
-            if (apps == null) LoadingIndicator()
+            if (apps == null) BigLoadingIndicator()
             else LazyColumn(
                 contentPadding = PaddingValues(vertical = 8.dp),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -129,3 +132,52 @@ fun AppList(
         }
     }
 }
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        val model = AppListModel(
+            list = AppListType.New("New"),
+            apps = listOf(
+                AppListItem("1", "This is app 1", "It has summary 2", 0, null),
+                AppListItem("2", "This is app 2", "It has summary 2", 0, null),
+            ),
+            areFiltersShown = true,
+            sortBy = AppListSortOrder.NAME,
+            allCategories = null,
+            addedCategories = emptyList(),
+        )
+        val info = object : AppListInfo {
+            override val model: AppListModel = model
+            override fun toggleFilterVisibility() {}
+            override fun sortBy(sort: AppListSortOrder) {}
+            override fun addCategory(category: String) {}
+            override fun removeCategory(category: String) {}
+        }
+        AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
+    }
+}
+
+@Preview
+@Composable
+private fun PreviewEmpty() {
+    FDroidContent {
+        val model = AppListModel(
+            list = AppListType.New("New"),
+            apps = null,
+            areFiltersShown = true,
+            sortBy = AppListSortOrder.NAME,
+            allCategories = null,
+            addedCategories = emptyList(),
+        )
+        val info = object : AppListInfo {
+            override val model: AppListModel = model
+            override fun toggleFilterVisibility() {}
+            override fun sortBy(sort: AppListSortOrder) {}
+            override fun addCategory(category: String) {}
+            override fun removeCategory(category: String) {}
+        }
+        AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index 8daa25097..fca4c3863 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -3,8 +3,6 @@ package org.fdroid.ui.repositories
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
 import android.os.Parcelable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -14,13 +12,11 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -29,6 +25,7 @@ import androidx.core.os.LocaleListCompat
 import kotlinx.parcelize.Parcelize
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
+import org.fdroid.ui.utils.BigLoadingIndicator
 
 @Composable
 @OptIn(
@@ -64,24 +61,16 @@ fun Repositories(
             }
         }
     ) { paddingValues ->
-        if (repositories == null) {
-            Box(
-                contentAlignment = Alignment.Center,
-                modifier = Modifier.fillMaxSize(),
-            ) {
-                LoadingIndicator(modifier = Modifier.padding(paddingValues))
-            }
-        } else {
-            RepositoriesList(
-                repositories = repositories,
-                currentRepository = currentRepository,
-                onRepositorySelected = {
-                    onRepositorySelected(it)
-                },
-                modifier = Modifier
-                    .padding(paddingValues),
-            )
-        }
+        if (repositories == null) BigLoadingIndicator()
+        else RepositoriesList(
+            repositories = repositories,
+            currentRepository = currentRepository,
+            onRepositorySelected = {
+                onRepositorySelected(it)
+            },
+            modifier = Modifier
+                .padding(paddingValues),
+        )
     }
 }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt b/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
new file mode 100644
index 000000000..e69b53db8
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
@@ -0,0 +1,32 @@
+package org.fdroid.ui.utils
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.LoadingIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun BigLoadingIndicator() {
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = Modifier.fillMaxSize()
+    ) {
+        LoadingIndicator(Modifier.size(128.dp))
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        BigLoadingIndicator()
+    }
+}

From 363b6f240639b78ca7f04b67518cfff8b08df24a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 23 Jul 2025 18:15:37 -0300
Subject: [PATCH 034/180] Handle deep link intents for app details

---
 next/build.gradle.kts                         |  2 +
 next/src/main/AndroidManifest.xml             | 33 ++++++-
 .../main/kotlin/org/fdroid/MainActivity.kt    | 11 ++-
 .../main/kotlin/org/fdroid/ui/IntentRouter.kt | 47 ++++++++++
 next/src/main/kotlin/org/fdroid/ui/Main.kt    | 13 ++-
 .../java/org/fdroid/ui/IntentRouterTest.kt    | 88 +++++++++++++++++++
 6 files changed, 188 insertions(+), 6 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
 create mode 100644 next/src/test/java/org/fdroid/ui/IntentRouterTest.kt

diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 0cd860d60..12ea080d7 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -93,6 +93,8 @@ dependencies {
 
     testImplementation(libs.junit)
     testImplementation(kotlin("test"))
+    testImplementation(libs.robolectric)
+    testImplementation(libs.slf4j.simple)
 
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
index e08ae85af..57f43d9e0 100644
--- a/next/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -19,12 +19,41 @@
         <activity
             android:name="org.fdroid.MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.Fdroidclient">
-            <!-- TODO app details intents -->
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.Fdroidclient"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.APP_MARKET" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SHOW_APP_INFO" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="details"
+                    android:scheme="market" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="f-droid.org" />
+                <data android:host="staging.f-droid.org" />
+                <data android:host="cloudflare.f-droid.org" />
+                <data android:pathPrefix="/packages/" />
+                <data android:pathPattern="/.*/packages/.*" />
             </intent-filter>
         </activity>
 
diff --git a/next/src/main/kotlin/org/fdroid/MainActivity.kt b/next/src/main/kotlin/org/fdroid/MainActivity.kt
index e44d6a099..4d0824204 100644
--- a/next/src/main/kotlin/org/fdroid/MainActivity.kt
+++ b/next/src/main/kotlin/org/fdroid/MainActivity.kt
@@ -21,14 +21,19 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+        setContent {
+            Main {
+                // inform OnNewIntentListeners about the initial intent (otherwise would be missed)
+                if (savedInstanceState == null && intent != null) {
+                    onNewIntent(intent)
+                }
+            }
+        }
         if (SDK_INT >= 33 && ContextCompat.checkSelfPermission(
                 this, POST_NOTIFICATIONS
             ) != PERMISSION_GRANTED
         ) {
             requestPermissionLauncher.launch(POST_NOTIFICATIONS)
         }
-        setContent {
-            Main()
-        }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
new file mode 100644
index 000000000..571635502
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
@@ -0,0 +1,47 @@
+package org.fdroid.ui
+
+import android.content.Intent
+import android.content.Intent.ACTION_MAIN
+import android.content.Intent.ACTION_SHOW_APP_INFO
+import android.content.Intent.EXTRA_PACKAGE_NAME
+import android.os.Build.VERSION.SDK_INT
+import androidx.core.util.Consumer
+import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavKey
+import mu.KotlinLogging
+
+class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Intent> {
+    private val log = KotlinLogging.logger { }
+    private val packageNameRegex = "[A-Za-z\\d_.]+".toRegex()
+
+    override fun accept(value: Intent) {
+        val intent = value
+        log.info { "Incoming intent: $intent" }
+        val uri = intent.data
+        if (ACTION_MAIN == intent.action) {
+            // launcher intent, do nothing
+        } else if (SDK_INT >= 24 && ACTION_SHOW_APP_INFO == intent.action) { // App Details
+            val packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME) ?: return
+            if (packageName.matches(packageNameRegex)) {
+                backStack.add(NavigationKey.AppDetails(packageName))
+            } else {
+                log.warn { "Malformed package name: $packageName"}
+            }
+        } else if (uri != null) {
+            val packagesUrlRegex = "^/([a-z][a-z][a-zA-Z_-]*/)?packages/[A-Za-z\\d_.]+/?$".toRegex()
+            if (uri.scheme == "market" && uri.host == "details") {
+                val packageName = uri.getQueryParameter("id") ?: return
+                if (packageName.matches(packageNameRegex)) {
+                    backStack.add(NavigationKey.AppDetails(packageName))
+                } else {
+                    log.warn { "Malformed package name: $packageName"}
+                }
+            } else if (uri.path?.matches(packagesUrlRegex) == true) {
+                val packageName = uri.lastPathSegment ?: return
+                backStack.add(NavigationKey.AppDetails(packageName))
+            }
+        } else {
+            log.warn { "Unknown intent: $intent - uri: $uri $SDK_INT" }
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index b9641222d..e291d0167 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -1,5 +1,7 @@
 package org.fdroid.ui
 
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.LocalActivity
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
@@ -12,6 +14,7 @@ import androidx.compose.material3.adaptive.layout.calculatePaneScaffoldDirective
 import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
 import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneStrategy
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -42,8 +45,16 @@ import org.fdroid.ui.repositories.RepositoriesViewModel
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
-fun Main() {
+fun Main(onListeningForIntent: () -> Unit = {}) {
     val backStack = rememberNavBackStack<NavigationKey>(NavigationKey.Discover)
+    // set up intent routing by listening to new intents from activity
+    val activity = (LocalActivity.current as ComponentActivity)
+    DisposableEffect(backStack) {
+        val intentListener = IntentRouter(backStack)
+        activity.addOnNewIntentListener(intentListener)
+        onListeningForIntent() // call this to get informed about initial intents we have missed
+        onDispose { activity.removeOnNewIntentListener(intentListener) }
+    }
     // Override the defaults so that there isn't a horizontal space between the panes.
     val windowAdaptiveInfo = currentWindowAdaptiveInfo()
     val directive = remember(windowAdaptiveInfo) {
diff --git a/next/src/test/java/org/fdroid/ui/IntentRouterTest.kt b/next/src/test/java/org/fdroid/ui/IntentRouterTest.kt
new file mode 100644
index 000000000..68a6196f3
--- /dev/null
+++ b/next/src/test/java/org/fdroid/ui/IntentRouterTest.kt
@@ -0,0 +1,88 @@
+package org.fdroid.ui
+
+import android.content.Intent
+import android.content.Intent.ACTION_SHOW_APP_INFO
+import android.content.Intent.ACTION_VIEW
+import android.content.Intent.CATEGORY_BROWSABLE
+import android.content.Intent.EXTRA_PACKAGE_NAME
+import androidx.compose.runtime.mutableStateListOf
+import androidx.core.net.toUri
+import androidx.navigation3.runtime.NavKey
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import kotlin.test.assertEquals
+
+@Config(sdk = [24]) // needed for ACTION_SHOW_APP_INFO
+@RunWith(RobolectricTestRunner::class)
+class IntentRouterTest {
+
+    private val backstack = mutableStateListOf<NavKey>()
+    private val intentRouter = IntentRouter(backstack)
+
+    @Test
+    fun testBrowserUris() {
+        val packageName = "org.fdroid.fdroid"
+        listOf(
+            "https://f-droid.org/packages/$packageName/",
+            "https://f-droid.org/de/packages/$packageName/",
+            "https://f-droid.org/en-US/packages/$packageName",
+            "https://cloudflare.f-droid.org/zh_Hans/packages/$packageName",
+            "market://details?id=$packageName",
+        ).forEach { url ->
+            val i = Intent().apply {
+                action = ACTION_VIEW
+                addCategory(CATEGORY_BROWSABLE)
+                data = url.toUri()
+            }
+            intentRouter.accept(i)
+            assertEquals(1, backstack.size)
+            assertEquals(NavigationKey.AppDetails(packageName), backstack.removeLastOrNull())
+        }
+    }
+
+    @Test
+    fun testMalformedBrowserUris() {
+        val packageName = "fdroid') DROP TABLE apps; --"
+        listOf(
+            "https://f-droid.org/packages/$packageName/",
+            "https://f-droid.org/de/packages/$packageName/",
+            "https://f-droid.org/en-US/packages/$packageName",
+            "https://cloudflare.f-droid.org/zh_Hans/packages/$packageName",
+            "market://details?id=$packageName",
+        ).forEach { url ->
+            val i = Intent().apply {
+                action = ACTION_VIEW
+                addCategory(CATEGORY_BROWSABLE)
+                data = url.toUri()
+            }
+            intentRouter.accept(i)
+            assertEquals(0, backstack.size)
+        }
+    }
+
+    @Test
+    fun testShowAppInfo() {
+        val packageName = "org.fdroid.fdroid"
+        val i = Intent().apply {
+            action = ACTION_SHOW_APP_INFO
+            putExtra(EXTRA_PACKAGE_NAME, packageName)
+        }
+        intentRouter.accept(i)
+        assertEquals(1, backstack.size)
+        assertEquals(NavigationKey.AppDetails(packageName), backstack.removeLastOrNull())
+    }
+
+    @Test
+    fun testShowAppInfoMalformed() {
+        val packageName = "fdroid') DROP TABLE apps; --"
+        val i = Intent().apply {
+            action = ACTION_SHOW_APP_INFO
+            putExtra(EXTRA_PACKAGE_NAME, packageName)
+        }
+        intentRouter.accept(i)
+        assertEquals(0, backstack.size)
+    }
+
+}

From 770a829ddce3aa0cd6aeb1b855854fe505519dc2 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 24 Jul 2025 10:49:32 -0300
Subject: [PATCH 035/180] Fixes for RepositoryList, uses repo icon now

---
 gradle/libs.versions.toml                     |  1 -
 next/build.gradle.kts                         |  1 -
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  4 ++-
 .../fdroid/ui/repositories/Repositories.kt    | 27 ++++++++-----------
 .../ui/repositories/RepositoriesList.kt       | 15 +++++------
 .../ui/repositories/RepositoriesViewModel.kt  | 19 +++++++------
 .../fdroid/ui/repositories/RepositoryRow.kt   | 18 ++++++-------
 7 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e5510c5cd..ed1a2453c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -205,7 +205,6 @@ android-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 jetbrains-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 jetbrains-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-jetbrains-kotlin-parcelize = { id = "kotlin-parcelize" }
 jetbrains-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 jetbrains-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 12ea080d7..f4ad3b295 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
     alias(libs.plugins.android.ksp)
     alias(libs.plugins.android.hilt)
     alias(libs.plugins.jetbrains.kotlin.android)
-    alias(libs.plugins.jetbrains.kotlin.parcelize)
     alias(libs.plugins.jetbrains.kotlin.plugin.serialization)
     alias(libs.plugins.jetbrains.compose.compiler)
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index e291d0167..82595c3ca 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -183,7 +183,9 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                         viewModel.visibleRepository.collectAsStateWithLifecycle().value
                     Repositories(
                         repositories = repos,
-                        currentRepository = visibleRepository,
+                        currentRepositoryId = if (isBigScreen) {
+                            (backStack.last() as? NavigationKey.RepoDetails)?.repoId
+                        } else null,
                         onRepositorySelected = {
                             viewModel.setVisibleRepository(it)
                             backStack.add(NavigationKey.RepoDetails(it.repoId))
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index fca4c3863..abb7179e5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -2,7 +2,6 @@ package org.fdroid.ui.repositories
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
-import android.os.Parcelable
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -21,8 +20,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.os.LocaleListCompat
-import kotlinx.parcelize.Parcelize
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.utils.BigLoadingIndicator
@@ -33,9 +30,9 @@ import org.fdroid.ui.utils.BigLoadingIndicator
     ExperimentalMaterial3ExpressiveApi::class
 )
 fun Repositories(
-    repositories: List<Repository>?,
-    currentRepository: Repository?,
-    onRepositorySelected: (Repository) -> Unit,
+    repositories: List<RepositoryItem>?,
+    currentRepositoryId: Long?,
+    onRepositorySelected: (RepositoryItem) -> Unit,
     onAddRepo: () -> Unit,
     onBackClicked: () -> Unit,
 ) {
@@ -64,7 +61,7 @@ fun Repositories(
         if (repositories == null) BigLoadingIndicator()
         else RepositoriesList(
             repositories = repositories,
-            currentRepository = currentRepository,
+            currentRepositoryId = currentRepositoryId,
             onRepositorySelected = {
                 onRepositorySelected(it)
             },
@@ -93,7 +90,7 @@ fun RepositoriesScaffoldLoadingPreview() {
 fun RepositoriesScaffoldPreview() {
     FDroidContent {
         val repos = listOf(
-            Repository(
+            RepositoryItem(
                 repoId = 1,
                 address = "http://example.org",
                 timestamp = System.currentTimeMillis(),
@@ -102,7 +99,7 @@ fun RepositoriesScaffoldPreview() {
                 enabled = true,
                 name = "My first repository",
             ),
-            Repository(
+            RepositoryItem(
                 repoId = 2,
                 address = "http://example.com",
                 timestamp = System.currentTimeMillis(),
@@ -112,19 +109,17 @@ fun RepositoriesScaffoldPreview() {
                 name = "My second repository",
             ),
         )
-        Repositories(repos, repos[0], {}, {}) { }
+        Repositories(repos, repos[0].repoId, {}, {}) { }
     }
 }
 
-@Parcelize
-data class Repository(
+data class RepositoryItem(
     val repoId: Long,
     val address: String,
+    val name: String,
+    val icon: DownloadRequest? = null,
     val timestamp: Long,
     val lastUpdated: Long?,
     val weight: Int,
     val enabled: Boolean,
-    private val name: String,
-) : Parcelable {
-    fun getName(localeList: LocaleListCompat): String? = name
-}
+)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
index 18929ab1e..6c48a533b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
@@ -13,28 +13,26 @@ import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.core.os.LocaleListCompat
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
 fun RepositoriesList(
-    repositories: List<Repository>,
-    currentRepository: Repository?,
-    onRepositorySelected: (Repository) -> Unit,
+    repositories: List<RepositoryItem>,
+    currentRepositoryId: Long?,
+    onRepositorySelected: (RepositoryItem) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     LazyColumn(
         contentPadding = PaddingValues(vertical = 8.dp),
         verticalArrangement = spacedBy(8.dp),
         modifier = modifier.then(
-            if (currentRepository == null) Modifier
+            if (currentRepositoryId == null) Modifier
             else Modifier.selectableGroup()
         ),
     ) {
-        val localeList = LocaleListCompat.getDefault()
         items(repositories) { repoItem ->
-            val isSelected = currentRepository == repoItem
-            val interactionModifier = if (currentRepository == null) {
+            val isSelected = currentRepositoryId == repoItem.repoId
+            val interactionModifier = if (currentRepositoryId == null) {
                 Modifier.clickable(
                     onClick = { onRepositorySelected(repoItem) }
                 )
@@ -47,7 +45,6 @@ fun RepositoriesList(
             RepositoryRow(
                 repoItem = repoItem,
                 isSelected = isSelected,
-                localeList = localeList,
                 modifier = Modifier
                     .fillMaxWidth()
                     .then(interactionModifier),
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index dc86fd06d..312e9fbe4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -8,34 +8,37 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
+import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
 import javax.inject.Inject
 
 @HiltViewModel
 class RepositoriesViewModel @Inject constructor(
     app: Application,
-    private val repoManager: RepoManager,
+    repoManager: RepoManager,
 ) : AndroidViewModel(app) {
 
-    val repos: Flow<List<Repository>> = repoManager.repositoriesState.map { repos ->
+    private val localeList = LocaleListCompat.getDefault()
+    val repos: Flow<List<RepositoryItem>> = repoManager.repositoriesState.map { repos ->
         repos.map {
-            Repository(
+            RepositoryItem(
                 repoId = it.repoId,
                 address = it.address,
+                name = it.getName(localeList) ?: "Unknown Repo",
+                icon = it.getIcon(localeList)?.getDownloadRequest(it),
                 timestamp = it.timestamp,
                 lastUpdated = it.lastUpdated,
                 weight = it.weight,
                 enabled = it.enabled,
-                name = it.getName(LocaleListCompat.getDefault()) ?: "Unknown Repo",
             )
         }
     }
 
-    private val _visibleRepository = MutableStateFlow<Repository?>(null)
-    val visibleRepository = _visibleRepository.asStateFlow()
+    private val _visibleRepositoryItem = MutableStateFlow<RepositoryItem?>(null)
+    val visibleRepository = _visibleRepositoryItem.asStateFlow()
 
-    fun setVisibleRepository(repository: Repository?) {
-        _visibleRepository.value = repository
+    fun setVisibleRepository(repositoryItem: RepositoryItem?) {
+        _visibleRepositoryItem.value = repositoryItem
     }
 
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
index 065e5609a..08072696b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
@@ -1,8 +1,6 @@
 package org.fdroid.ui.repositories
 
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Android
-import androidx.compose.material3.Icon
+import androidx.compose.foundation.layout.size
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
@@ -11,25 +9,25 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.core.os.LocaleListCompat
+import androidx.compose.ui.unit.dp
+import org.fdroid.ui.utils.AsyncShimmerImage
 
 @Composable
 fun RepositoryRow(
-    repoItem: Repository,
+    repoItem: RepositoryItem,
     isSelected: Boolean,
-    localeList: LocaleListCompat,
     modifier: Modifier = Modifier,
 ) {
     ListItem(
         leadingContent = {
-            Icon(
-                Icons.Filled.Android,
-                tint = MaterialTheme.colorScheme.secondary,
+            AsyncShimmerImage(
+                model = repoItem.icon,
                 contentDescription = null,
+                modifier = Modifier.size(48.dp)
             )
         },
         headlineContent = {
-            Text(repoItem.getName(localeList) ?: "Unknown repo")
+            Text(repoItem.name)
         },
         supportingContent = {
             Text(repoItem.address)

From d35e9489521e0ee1ede67479ad18a03d1bab5836 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 24 Jul 2025 11:42:47 -0300
Subject: [PATCH 036/180] Fix ktlint errors

---
 .editorconfig                                          |  2 +-
 next/build.gradle.kts                                  |  2 +-
 next/src/main/kotlin/org/fdroid/App.kt                 |  6 +++---
 next/src/main/kotlin/org/fdroid/MainActivity.kt        |  5 ++---
 .../org/fdroid/download/DownloaderFactoryImpl.kt       |  7 -------
 next/src/main/kotlin/org/fdroid/fdroid/Compat.kt       |  2 ++
 next/src/main/kotlin/org/fdroid/ui/About.kt            |  2 +-
 next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt     |  4 ++--
 next/src/main/kotlin/org/fdroid/ui/Main.kt             |  2 --
 next/src/main/kotlin/org/fdroid/ui/Navigation.kt       |  6 +++---
 next/src/main/kotlin/org/fdroid/ui/Settings.kt         |  2 +-
 next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt      |  5 +++--
 .../main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt  | 10 ++++++++--
 .../main/kotlin/org/fdroid/ui/details/AppDetails.kt    |  4 ----
 .../kotlin/org/fdroid/ui/details/AppDetailsItem.kt     |  4 +++-
 .../kotlin/org/fdroid/ui/details/DetailsPresenter.kt   |  3 ++-
 .../main/kotlin/org/fdroid/ui/discover/AppsSearch.kt   |  4 +---
 next/src/main/kotlin/org/fdroid/ui/icons/License.kt    |  1 +
 .../main/kotlin/org/fdroid/ui/icons/PackageVariant.kt  |  8 ++++++--
 next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt    |  4 +++-
 .../kotlin/org/fdroid/ui/lists/AppListPresenter.kt     |  2 ++
 .../kotlin/org/fdroid/ui/lists/AppListViewModel.kt     |  4 +++-
 .../fdroid/ui/repositories/RepositoriesViewModel.kt    |  2 +-
 next/src/main/res/values/strings-next.xml              |  7 ++++---
 .../org/fdroid/ui/main/details/HtmlDescriptionTest.kt  |  2 ++
 25 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index dce9126d2..a52bde9ce 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,7 +3,7 @@ root = true
 [*]
 insert_final_newline = true
 
-[*.{kt, kts}]
+[*.{kt,kts}]
 ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 #  Disable wildcard imports entirely
 ij_kotlin_name_count_to_use_star_import = 2147483647
diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index f4ad3b295..81ac95765 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -26,7 +26,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
         debug {
diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index bfbaf377f..f065ba334 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -15,11 +15,11 @@ import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.HiltAndroidApp
 import org.fdroid.download.DownloadRequest
+import org.fdroid.download.LocalIconFetcher
+import org.fdroid.download.PackageName
 import org.fdroid.download.coil.DownloadRequestFetcher
 import org.fdroid.next.BuildConfig
 import org.fdroid.repo.RepoUpdateWorker
-import org.fdroid.download.LocalIconFetcher
-import org.fdroid.download.PackageName
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -61,7 +61,7 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
                     override fun key(data: PackageName, options: Options): String = data.packageName
                 }
                 add(packageNameKeyer)
-                add(LocalIconFetcher.Factory(this@App.applicationContext, downloadRequestFetcherFactory))
+                add(LocalIconFetcher.Factory(context, downloadRequestFetcherFactory))
             }
             .memoryCache {
                 MemoryCache.Builder()
diff --git a/next/src/main/kotlin/org/fdroid/MainActivity.kt b/next/src/main/kotlin/org/fdroid/MainActivity.kt
index 4d0824204..c821e7e10 100644
--- a/next/src/main/kotlin/org/fdroid/MainActivity.kt
+++ b/next/src/main/kotlin/org/fdroid/MainActivity.kt
@@ -29,9 +29,8 @@ class MainActivity : ComponentActivity() {
                 }
             }
         }
-        if (SDK_INT >= 33 && ContextCompat.checkSelfPermission(
-                this, POST_NOTIFICATIONS
-            ) != PERMISSION_GRANTED
+        if (SDK_INT >= 33 &&
+            ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) != PERMISSION_GRANTED
         ) {
             requestPermissionLauncher.launch(POST_NOTIFICATIONS)
         }
diff --git a/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt b/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
index b7f3ffbfc..86453cd9b 100644
--- a/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
+++ b/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
@@ -3,13 +3,6 @@ package org.fdroid.download
 import android.net.Uri
 import org.fdroid.IndexFile
 import org.fdroid.database.Repository
-import org.fdroid.download.DownloadRequest
-import org.fdroid.download.Downloader
-import org.fdroid.download.DownloaderFactory
-import org.fdroid.download.HttpDownloader
-import org.fdroid.download.HttpDownloaderV2
-import org.fdroid.download.HttpManager
-import org.fdroid.download.Mirror
 import org.fdroid.index.IndexFormatVersion
 import java.io.File
 import javax.inject.Inject
diff --git a/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt b/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
index dc4e8d31d..1275413f1 100644
--- a/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
+++ b/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:filename")
+
 package org.fdroid.fdroid
 
 object Preferences {
diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
index 234d60558..fd078a04f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -62,7 +62,7 @@ fun About(onBackClicked: () -> Unit) {
         ) {
             AboutHeader(modifier = Modifier.padding(top = 32.dp))
             Text(
-                text = "F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. This app makes it easy to browse, install, and keep track of updates on your device.",
+                text = stringResource(R.string.about_text),
                 style = MaterialTheme.typography.bodyLarge,
                 modifier = Modifier.padding(top = 24.dp),
             )
diff --git a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
index 571635502..7c8ebfa30 100644
--- a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
@@ -25,7 +25,7 @@ class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Inten
             if (packageName.matches(packageNameRegex)) {
                 backStack.add(NavigationKey.AppDetails(packageName))
             } else {
-                log.warn { "Malformed package name: $packageName"}
+                log.warn { "Malformed package name: $packageName" }
             }
         } else if (uri != null) {
             val packagesUrlRegex = "^/([a-z][a-z][a-zA-Z_-]*/)?packages/[A-Za-z\\d_.]+/?$".toRegex()
@@ -34,7 +34,7 @@ class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Inten
                 if (packageName.matches(packageNameRegex)) {
                     backStack.add(NavigationKey.AppDetails(packageName))
                 } else {
-                    log.warn { "Malformed package name: $packageName"}
+                    log.warn { "Malformed package name: $packageName" }
                 }
             } else if (uri.path?.matches(packagesUrlRegex) == true) {
                 val packageName = uri.lastPathSegment ?: return
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 82595c3ca..f92aa8c5a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -179,8 +179,6 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 ) {
                     val viewModel = hiltViewModel<RepositoriesViewModel>()
                     val repos = viewModel.repos.collectAsStateWithLifecycle(null).value
-                    val visibleRepository =
-                        viewModel.visibleRepository.collectAsStateWithLifecycle().value
                     Repositories(
                         repositories = repos,
                         currentRepositoryId = if (isBigScreen) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/Navigation.kt b/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
index c3a0848a8..d4da1af53 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
@@ -46,8 +46,8 @@ enum class BottomNavDestinations(
     @StringRes val label: Int,
     val icon: ImageVector,
 ) {
-    DISCOVER(NavigationKey.Discover, R.string.discover, Icons.Filled.Explore),
-    MY_APPS(NavigationKey.MyApps, R.string.apps_my, Icons.Filled.Apps),
+    DISCOVER(NavigationKey.Discover, R.string.menu_discover, Icons.Filled.Explore),
+    MY_APPS(NavigationKey.MyApps, R.string.menu_apps_my, Icons.Filled.Apps),
 }
 
 sealed class NavDestinations(
@@ -61,7 +61,7 @@ sealed class NavDestinations(
     object Settings :
         NavDestinations(NavigationKey.Settings, R.string.menu_settings, Icons.Filled.Settings)
 
-    object About : NavDestinations(NavigationKey.About, R.string.about, Icons.Filled.Info)
+    object About : NavDestinations(NavigationKey.About, R.string.menu_about, Icons.Filled.Info)
 }
 
 val topBarMenuItems = listOf(
diff --git a/next/src/main/kotlin/org/fdroid/ui/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/Settings.kt
index 333e90f1b..7cbd22f6e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Settings.kt
@@ -49,6 +49,6 @@ fun Settings(onBackClicked: () -> Unit) {
 @Composable
 fun SettingsPreview() {
     FDroidContent {
-        Settings {  }
+        Settings { }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 4d93e5ef7..20e4664c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -40,6 +40,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.database.AppListSortOrder.LAST_UPDATED
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.BottomBar
@@ -106,12 +107,12 @@ fun MyApps(
                             },
                             trailingIcon = {
                                 RadioButton(
-                                    selected = myAppsModel.sortOrder == AppListSortOrder.LAST_UPDATED,
+                                    selected = myAppsModel.sortOrder == LAST_UPDATED,
                                     onClick = null,
                                 )
                             },
                             onClick = {
-                                onSortChanged(AppListSortOrder.LAST_UPDATED)
+                                onSortChanged(LAST_UPDATED)
                                 sortByMenuExpanded = false
                             },
                         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index 840108ff8..c5336f86a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:filename")
+
 package org.fdroid.ui.apps
 
 import androidx.compose.runtime.Composable
@@ -20,7 +22,9 @@ fun MyAppsPresenter(
     val collator = Collator.getInstance(Locale.getDefault())
     return MyAppsModel(
         appUpdates = when (sortOrder) {
-            AppListSortOrder.NAME -> appUpdates?.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
+            AppListSortOrder.NAME -> appUpdates?.sortedWith { a1, a2 ->
+                collator.compare(a1.name, a2.name)
+            }
             AppListSortOrder.LAST_UPDATED -> appUpdates?.sortedByDescending { it.update.added }
         },
         installedApps = installedApps?.filter {
@@ -28,7 +32,9 @@ fun MyAppsPresenter(
             it.packageName !in packageNames
         }?.let { apps ->
             when (sortOrder) {
-                AppListSortOrder.NAME -> apps.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
+                AppListSortOrder.NAME -> apps.sortedWith { a1, a2 ->
+                    collator.compare(a1.name, a2.name)
+                }
                 AppListSortOrder.LAST_UPDATED -> apps.sortedByDescending { it.lastUpdated }
             }
         },
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index c984d13cc..ff759ce0d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -2,10 +2,8 @@ package org.fdroid.ui.details
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalSharedTransitionApi
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -32,7 +30,6 @@ import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -46,7 +43,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 0f5903267..1909ca3fe 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -183,7 +183,9 @@ class AppDetailsActions(
 )
 
 enum class MainButtonState {
-    NONE, INSTALL, UPDATE
+    NONE,
+    INSTALL,
+    UPDATE,
 }
 
 data class AntiFeature(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index d0cf20c1e..711879244 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -103,7 +103,8 @@ fun DetailsPresenter(
             } else {
                 viewModel::ignoreAllUpdates
             },
-            ignoreThisUpdate = if (installedVersionCode == null || possibleUpdate == null ||
+            ignoreThisUpdate = if (installedVersionCode == null ||
+                possibleUpdate == null ||
                 possibleUpdate.versionCode <= installedVersionCode
             ) {
                 null
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index a92b04fdb..674b2e20a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -35,9 +35,7 @@ fun AppsSearch(
     ExpandedFullScreenSearchBar(
         state = searchBarState,
         inputField = inputField,
-    ) {
-
-    }
+    ) { }
 }
 
 @Preview
diff --git a/next/src/main/kotlin/org/fdroid/ui/icons/License.kt b/next/src/main/kotlin/org/fdroid/ui/icons/License.kt
index d0ef4086a..9df37380c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/icons/License.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/icons/License.kt
@@ -89,6 +89,7 @@ val License: ImageVector
         return _License!!
     }
 
+@Suppress("ktlint:standard:backing-property-naming")
 private var _License: ImageVector? = null
 
 @Preview
diff --git a/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt b/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
index d867fa5d0..a62418010 100644
--- a/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
@@ -23,8 +23,11 @@ val PackageVariant: ImageVector
             return _PackageVariant!!
         }
         _PackageVariant = Builder(
-            name = "packageVariant", defaultWidth = 24.0.dp, defaultHeight
-            = 24.0.dp, viewportWidth = 24.0f, viewportHeight = 24.0f
+            name = "packageVariant",
+            defaultWidth = 24.dp,
+            defaultHeight = 24.dp,
+            viewportWidth = 24f,
+            viewportHeight = 24f,
         ).apply {
             path(
                 fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
@@ -81,6 +84,7 @@ val PackageVariant: ImageVector
         return _PackageVariant!!
     }
 
+@Suppress("ktlint:standard:backing-property-naming")
 private var _PackageVariant: ImageVector? = null
 
 @Preview
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index c7c2f7e28..19779fde6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -69,7 +69,9 @@ fun AppList(
                         val showFilterBadge = addedRepos.isNotEmpty() ||
                             appListInfo.model.addedCategories.isNotEmpty()
                         BadgedBox(badge = {
-                            if (showFilterBadge) Badge(containerColor = MaterialTheme.colorScheme.secondary)
+                            if (showFilterBadge) Badge(
+                                containerColor = MaterialTheme.colorScheme.secondary,
+                            )
                         }) {
                             Icon(
                                 Icons.Filled.FilterList,
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
index c0e224037..0cdf70cad 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:filename")
+
 package org.fdroid.ui.lists
 
 import androidx.compose.runtime.Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 2ece65d0e..02f5953e0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -82,7 +82,9 @@ class AppListViewModel @Inject constructor(
         } else {
             when (items[0]) {
                 is AppOverviewItem -> onAppOverviewItems(items as List<AppOverviewItem>)
-                is org.fdroid.database.AppListItem -> onAppListItems(items as List<org.fdroid.database.AppListItem>)
+                is org.fdroid.database.AppListItem -> {
+                    onAppListItems(items as List<org.fdroid.database.AppListItem>)
+                }
                 else -> error("Unknown item class: ${items[0]?.javaClass?.name}")
             }
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 312e9fbe4..90c367115 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -35,7 +35,7 @@ class RepositoriesViewModel @Inject constructor(
     }
 
     private val _visibleRepositoryItem = MutableStateFlow<RepositoryItem?>(null)
-    val visibleRepository = _visibleRepositoryItem.asStateFlow()
+    val visibleRepositoryItem = _visibleRepositoryItem.asStateFlow()
 
     fun setVisibleRepository(repositoryItem: RepositoryItem?) {
         _visibleRepositoryItem.value = repositoryItem
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 891d1768f..b77606259 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -2,10 +2,11 @@
 <resources>
 
     <string name="app_name">F-Droid Next</string>
+    <string name="about_text">F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. This app makes it easy to browse, install, and keep track of updates on your device.</string>
 
-    <string name="about">About</string>
-    <string name="discover">Discover</string>
-    <string name="apps_my">My apps</string>
+    <string name="menu_about">About</string>
+    <string name="menu_discover">Discover</string>
+    <string name="menu_apps_my">My apps</string>
 
     <string name="app_list_new">New apps</string>
     <string name="app_list_recently_updated">Recently updated</string>
diff --git a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
index fc88ee6b1..81aa63e1d 100644
--- a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
+++ b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
@@ -23,6 +23,8 @@ class HtmlDescriptionTest {
     @Test
     fun testLinkWithDotAtTheEnd() {
         val description = """please visit our website: https://wikimediafoundation.org/."""
+
+        @Suppress("ktlint:standard:max-line-length")
         val expectedDescription = """please visit our website: <a href="https://wikimediafoundation.org/">https://wikimediafoundation.org/</a>."""
         assertEquals(expectedDescription, getHtmlDescription(description))
     }

From 5eb9b3cd789f6fa9e0ba8fc70a98d190384572ba Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 24 Jul 2025 15:59:33 -0300
Subject: [PATCH 037/180] Remove hardcoded strings

---
 next/src/main/kotlin/org/fdroid/ui/About.kt   | 11 +++++---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    | 10 ++++---
 .../src/main/kotlin/org/fdroid/ui/Settings.kt |  5 +++-
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |  8 +++---
 .../org/fdroid/ui/details/AntiFeatures.kt     |  4 ++-
 .../org/fdroid/ui/details/AppDetails.kt       | 16 +++++++-----
 .../org/fdroid/ui/details/AppDetailsHeader.kt |  6 ++---
 .../org/fdroid/ui/details/AppDetailsLink.kt   |  4 ++-
 .../fdroid/ui/details/AppDetailsTopAppBar.kt  |  2 +-
 .../fdroid/ui/details/AppDetailsWarnings.kt   |  6 +++--
 .../kotlin/org/fdroid/ui/details/Versions.kt  | 22 ++++++++++++----
 .../fdroid/ui/discover/AppSearchInputField.kt |  9 +++++--
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  6 ++---
 .../kotlin/org/fdroid/ui/lists/AppList.kt     |  7 ++++-
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  | 19 +++++++++-----
 .../fdroid/ui/repositories/Repositories.kt    | 10 +++++--
 next/src/main/res/values/strings-next.xml     | 26 +++++++++++++++++++
 17 files changed, 124 insertions(+), 47 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
index fd078a04f..777b1e155 100644
--- a/next/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -44,7 +44,10 @@ fun About(onBackClicked: () -> Unit) {
             TopAppBar(
                 navigationIcon = {
                     IconButton(onClick = onBackClicked) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            contentDescription = stringResource(R.string.back),
+                        )
                     }
                 },
                 title = {
@@ -69,12 +72,12 @@ fun About(onBackClicked: () -> Unit) {
             Column(modifier = Modifier.padding(top = 24.dp, bottom = 16.dp)) {
                 val uriHandler = LocalUriHandler.current
                 Text(
-                    text = "Links",
+                    text = stringResource(R.string.links),
                     fontWeight = FontWeight.Bold,
                     style = MaterialTheme.typography.bodyLarge,
                 )
                 Text(
-                    text = "Homepage",
+                    text = stringResource(R.string.menu_website),
                     style = MaterialTheme.typography.bodyLarge,
                     color = MaterialTheme.colorScheme.secondary,
                     modifier = Modifier
@@ -82,7 +85,7 @@ fun About(onBackClicked: () -> Unit) {
                         .clickable { uriHandler.openUriSafe("https://f-droid.org") }
                 )
                 Text(
-                    text = "Gitlab",
+                    text = stringResource(R.string.about_source),
                     style = MaterialTheme.typography.bodyLarge,
                     color = MaterialTheme.colorScheme.secondary,
                     modifier = Modifier
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index f92aa8c5a..159558939 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -18,6 +18,7 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -31,6 +32,7 @@ import androidx.navigation3.ui.NavDisplay
 import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
 import org.fdroid.ui.apps.MyApps
 import org.fdroid.ui.apps.MyAppsViewModel
 import org.fdroid.ui.details.AppDetails
@@ -80,7 +82,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
             entryProvider = entryProvider {
                 entry<NavigationKey.Discover>(
                     metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                        Text("No app selected")
+                        Text(stringResource(R.string.no_app_selected))
                     },
                 ) {
                     val viewModel = hiltViewModel<DiscoverViewModel>()
@@ -101,7 +103,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 }
                 entry<NavigationKey.MyApps>(
                     metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                        Text("No app selected")
+                        Text(stringResource(R.string.no_app_selected))
                     },
                 ) {
                     val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
@@ -139,7 +141,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 }
                 entry<NavigationKey.AppList>(
                     metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                        Text("No app selected")
+                        Text(stringResource(R.string.no_app_selected))
                     },
                 ) {
                     val appListViewModel = hiltViewModel<AppListViewModel>()
@@ -174,7 +176,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 }
                 entry<NavigationKey.Repos>(
                     metadata = ListDetailSceneStrategy.listPane("repos") {
-                        Text(text = "No repository selected")
+                        Text(text = stringResource(R.string.no_repository_selected))
                     },
                 ) {
                     val viewModel = hiltViewModel<RepositoriesViewModel>()
diff --git a/next/src/main/kotlin/org/fdroid/ui/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/Settings.kt
index 7cbd22f6e..77c3d4e67 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Settings.kt
@@ -26,7 +26,10 @@ fun Settings(onBackClicked: () -> Unit) {
             TopAppBar(
                 navigationIcon = {
                     IconButton(onClick = onBackClicked) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            contentDescription = stringResource(R.string.back),
+                        )
                     }
                 },
                 title = {
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 20e4664c4..7a5ca5ac9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -73,7 +73,7 @@ fun MyApps(
         topBar = {
             TopAppBar(
                 title = {
-                    Text("My apps")
+                    Text(stringResource(R.string.menu_apps_my))
                 },
                 actions = {
                     var sortByMenuExpanded by remember { mutableStateOf(false) }
@@ -85,7 +85,7 @@ fun MyApps(
                         onDismissRequest = { sortByMenuExpanded = false },
                     ) {
                         DropdownMenuItem(
-                            text = { Text("Sort by name") },
+                            text = { Text(stringResource(R.string.sort_by_name)) },
                             leadingIcon = {
                                 Icon(Icons.Filled.SortByAlpha, null)
                             },
@@ -101,7 +101,7 @@ fun MyApps(
                             },
                         )
                         DropdownMenuItem(
-                            text = { Text("Sort by latest") },
+                            text = { Text(stringResource(R.string.sort_by_latest)) },
                             leadingIcon = {
                                 Icon(Icons.Filled.AccessTime, null)
                             },
@@ -149,7 +149,7 @@ fun MyApps(
                             onClick = {},
                             modifier = Modifier.padding(end = 16.dp),
                         ) {
-                            Text("Update all")
+                            Text(stringResource(R.string.update_all))
                         }
                     }
                 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
index c63eb9717..014074b19 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
@@ -19,9 +19,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter.Companion.tint
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.testApp
 
@@ -40,7 +42,7 @@ fun AntiFeatures(
     ) {
         ExpandableSection(
             icon = rememberVectorPainter(Icons.Default.WarningAmber),
-            title = "This app has anti-features",
+            title = stringResource(R.string.anti_features_title),
             modifier = Modifier.padding(horizontal = 16.dp),
         ) {
             Column {
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index ff759ce0d..3400c8ca6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -112,7 +112,7 @@ fun AppDetails(
                         .padding(horizontal = 16.dp, vertical = 8.dp),
                 ) {
                     Text(
-                        text = "What's new",
+                        text = stringResource(R.string.whats_new_title),
                         style = MaterialTheme.typography.titleMediumEmphasized,
                         modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
                     )
@@ -160,7 +160,11 @@ fun AppDetails(
                 }
                 TextButton(onClick = { descriptionExpanded = !descriptionExpanded }) {
                     Text(
-                        text = if (descriptionExpanded) "Less" else "More",
+                        text = if (descriptionExpanded) {
+                            stringResource(R.string.less)
+                        } else {
+                            stringResource(R.string.more)
+                        },
                         textAlign = Center,
                         maxLines = if (descriptionExpanded) Int.MAX_VALUE else 3,
                         modifier = Modifier
@@ -207,7 +211,7 @@ fun AppDetails(
                     .padding(horizontal = 16.dp, vertical = 8.dp),
             ) {
                 Text(
-                    text = "Donate",
+                    text = stringResource(R.string.donate_title),
                     style = MaterialTheme.typography.titleMediumEmphasized,
                     modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
                 )
@@ -244,7 +248,7 @@ fun AppDetails(
                 item.bitcoinUri?.let { bitcoinUri ->
                     AppDetailsLink(
                         icon = Icons.Default.CurrencyBitcoin,
-                        title = "Bitcoin",
+                        title = stringResource(R.string.menu_bitcoin),
                         url = bitcoinUri,
                         modifier = modifier
                             .padding(horizontal = 16.dp)
@@ -254,7 +258,7 @@ fun AppDetails(
                 item.litecoinUri?.let { litecoinUri ->
                     AppDetailsLink(
                         icon = Icons.Default.CurrencyBitcoin,
-                        title = "Litecoin",
+                        title = stringResource(R.string.menu_litecoin),
                         url = litecoinUri,
                         modifier = modifier
                             .padding(horizontal = 16.dp)
@@ -327,7 +331,7 @@ fun AppDetails(
             // Developer contact
             if (item.showAuthorContact) ExpandableSection(
                 icon = rememberVectorPainter(Icons.Default.Person),
-                title = "Developer contact",
+                title = stringResource(R.string.developer_contact),
                 modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
             ) {
                 Column(modifier = Modifier.padding(start = 16.dp)) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index db8d7a1b3..36d24b182 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -106,7 +106,7 @@ fun AppDetailsHeader(
             item.app.authorName?.let { authorName ->
                 SelectionContainer {
                     Text(
-                        text = "By $authorName",
+                        text = stringResource(R.string.author_by, authorName),
                         style = MaterialTheme.typography.bodyMedium,
                     )
                 }
@@ -119,9 +119,9 @@ fun AppDetailsHeader(
             SelectionContainer {
                 Text(
                     text = if (size == null) {
-                        "Last updated: $lastUpdated"
+                        stringResource(R.string.last_updated, lastUpdated)
                     } else {
-                        "Last updated: $lastUpdated ($size)"
+                        stringResource(R.string.last_updated_with_size, lastUpdated, size)
                     },
                     style = MaterialTheme.typography.bodyMedium,
                 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
index 1cce4f9dc..08092ca8d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
@@ -18,8 +18,10 @@ import androidx.compose.ui.platform.ClipEntry
 import androidx.compose.ui.platform.LocalClipboard
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
+import org.fdroid.next.R
 import org.fdroid.ui.utils.openUriSafe
 
 @Composable
@@ -43,7 +45,7 @@ fun AppDetailsLink(icon: ImageVector, title: String, url: String, modifier: Modi
                         clipboardManager.setClipEntry(entry)
                     }
                 },
-                onLongClickLabel = "Copy link",
+                onLongClickLabel = stringResource(R.string.copy_link),
             ),
     ) {
         Icon(icon, null)
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
index 755757fe7..ff4fd4910 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
@@ -63,7 +63,7 @@ fun AppDetailsTopAppBar(
             IconButton(onClick = { expanded = !expanded }) {
                 Icon(
                     imageVector = Icons.Filled.MoreVert,
-                    contentDescription = "Localized description",
+                    contentDescription = stringResource(R.string.more),
                 )
             }
             AppDetailsMenu(item, expanded) { expanded = false }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
index 4b92b1200..6a523ad04 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
@@ -16,9 +16,11 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
 import org.fdroid.ui.utils.testApp
 
 @Composable
@@ -39,7 +41,7 @@ fun AppDetailsWarnings(
             ) {
                 Icon(Icons.Default.WarningAmber, "")
                 Text(
-                    "Can not update this app, because no compatible versions available in repository.",
+                    text = stringResource(R.string.app_no_compatible_versions),
                     style = MaterialTheme.typography.bodyLarge,
                 )
             }
@@ -51,7 +53,7 @@ fun AppDetailsWarnings(
             ) {
                 Icon(Icons.Default.WarningAmber, "")
                 Text(
-                    "Auto-update not available, because app targets old version of Android.",
+                    stringResource(R.string.app_no_auto_update),
                     style = MaterialTheme.typography.bodyLarge,
                 )
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index 3bc17e3d4..8378a8ad2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -33,9 +33,9 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.next.R
+import org.fdroid.ui.utils.FDroidOutlineButton
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.testApp
-import org.fdroid.ui.utils.FDroidOutlineButton
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
@@ -101,7 +101,10 @@ fun Version(
                         overflow = TextOverflow.Ellipsis,
                     )
                     Text(
-                        text = "Added " + version.added.asRelativeTimeString(),
+                        text = stringResource(
+                            R.string.added_x_ago,
+                            version.added.asRelativeTimeString(),
+                        ),
                         style = MaterialTheme.typography.bodyMedium,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
@@ -135,7 +138,10 @@ fun Version(
                 Column(modifier = Modifier.weight(1f)) {
                     version.size?.let { size ->
                         Text(
-                            text = "Size: " + Formatter.formatFileSize(LocalContext.current, size),
+                            text = stringResource(
+                                R.string.size_colon,
+                                Formatter.formatFileSize(LocalContext.current, size)
+                            ),
                             style = MaterialTheme.typography.bodySmall,
                             maxLines = 1,
                             overflow = TextOverflow.Ellipsis,
@@ -144,7 +150,10 @@ fun Version(
                     version.packageManifest.nativecode?.let { nativeCode ->
                         if (nativeCode.isNotEmpty()) {
                             Text(
-                                text = "Architectures: " + nativeCode.joinToString(", "),
+                                text = stringResource(
+                                    R.string.architectures_colon,
+                                    nativeCode.joinToString(", ")
+                                ),
                                 style = MaterialTheme.typography.bodySmall,
                                 maxLines = 1,
                                 overflow = TextOverflow.Ellipsis,
@@ -153,7 +162,10 @@ fun Version(
                     }
                     version.signer?.let { signer ->
                         Text(
-                            text = "Signer: " + signer.sha256[0].substring(0..15),
+                            text = stringResource(
+                                R.string.signer_colon,
+                                signer.sha256[0].substring(0..15)
+                            ),
                             style = MaterialTheme.typography.bodySmall,
                             maxLines = 1,
                             overflow = TextOverflow.Ellipsis,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
index 92626170c..ebec0c59f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
@@ -16,7 +16,9 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import kotlinx.coroutines.launch
+import org.fdroid.next.R
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -32,13 +34,16 @@ fun AppSearchInputField(
         onSearch = {
             scope.launch { searchBarState.animateToCollapsed() }
         },
-        placeholder = { Text("Search...") },
+        placeholder = { Text(stringResource(R.string.search_placeholder)) },
         leadingIcon = {
             if (searchBarState.currentValue == SearchBarValue.Expanded) {
                 IconButton(
                     onClick = { scope.launch { searchBarState.animateToCollapsed() } }
                 ) {
-                    Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
+                    Icon(
+                        imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                        contentDescription = stringResource(R.string.back)
+                    )
                 }
             } else {
                 Icon(Icons.Default.Search, contentDescription = null)
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 076ffea0d..03ada10e3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -61,7 +61,7 @@ fun Discover(
         topBar = {
             TopAppBar(
                 title = {
-                    Text("F-Droid")
+                    Text(stringResource(R.string.app_name))
                 },
                 actions = {
                     topBarMenuItems.forEach { dest ->
@@ -104,7 +104,7 @@ fun Discover(
                 is LoadingDiscoverModel -> {
                     AnimatedVisibility(discoverModel.isFirstStart) {
                         Text(
-                            "This is the first start, loading repositories...",
+                            stringResource(R.string.first_start_loading),
                             textAlign = TextAlign.Center,
                             modifier = Modifier
                                 .padding(16.dp)
@@ -147,7 +147,7 @@ fun Discover(
                     }
                 }
                 NoEnabledReposDiscoverModel -> {
-                    Text("No repositories enabled.\nEnable at least one repository to see apps.")
+                    Text(stringResource(R.string.no_repos_enabled))
                 }
             }
             AnimatedVisibility(discoverModel is LoadedDiscoverModel) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 19779fde6..61201d872 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -36,10 +36,12 @@ import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
 import org.fdroid.ui.utils.BigLoadingIndicator
 
 @Composable
@@ -61,7 +63,10 @@ fun AppList(
                 },
                 navigationIcon = {
                     IconButton(onClick = onBackClicked) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            contentDescription = stringResource(R.string.back),
+                        )
                     }
                 },
                 actions = {
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index dbe160558..a99b894e8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -25,8 +25,10 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.next.R
 
 interface AppListInfo {
     val model: AppListModel
@@ -67,8 +69,8 @@ fun ColumnScope.AppsFilter(
                 },
                 label = {
                     val s = when (info.model.sortBy) {
-                        AppListSortOrder.NAME -> "Sort by name"
-                        AppListSortOrder.LAST_UPDATED -> "Sort by latest"
+                        AppListSortOrder.NAME -> stringResource(R.string.sort_by_name)
+                        AppListSortOrder.LAST_UPDATED -> stringResource(R.string.sort_by_latest)
                     }
                     Text(s)
                     DropdownMenu(
@@ -76,7 +78,7 @@ fun ColumnScope.AppsFilter(
                         onDismissRequest = { sortByMenuExpanded = false },
                     ) {
                         DropdownMenuItem(
-                            text = { Text("Sort by name") },
+                            text = { Text(stringResource(R.string.sort_by_name)) },
                             leadingIcon = {
                                 Icon(Icons.Filled.SortByAlpha, null)
                             },
@@ -86,9 +88,12 @@ fun ColumnScope.AppsFilter(
                             },
                         )
                         DropdownMenuItem(
-                            text = { Text("Sort by latest") },
+                            text = { Text(stringResource(R.string.sort_by_latest)) },
                             leadingIcon = {
-                                Icon(Icons.Filled.AccessTime, null)
+                                Icon(
+                                    imageVector = Icons.Filled.AccessTime,
+                                    contentDescription = null,
+                                )
                             },
                             onClick = {
                                 info.sortBy(AppListSortOrder.LAST_UPDATED)
@@ -109,7 +114,7 @@ fun ColumnScope.AppsFilter(
                     )
                 },
                 label = {
-                    Text("Category")
+                    Text(stringResource(R.string.category))
                     DropdownMenu(
                         expanded = categoryMenuExpanded,
                         onDismissRequest = { categoryMenuExpanded = false },
@@ -137,7 +142,7 @@ fun ColumnScope.AppsFilter(
                     )
                 },
                 label = {
-                    Text("Repository")
+                    Text(stringResource(R.string.repo_details))
                     DropdownMenu(
                         expanded = repoMenuExpanded,
                         onDismissRequest = { repoMenuExpanded = false },
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index abb7179e5..be0fb9105 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -41,7 +41,10 @@ fun Repositories(
             TopAppBar(
                 navigationIcon = {
                     IconButton(onClick = onBackClicked) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, "back")
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            contentDescription = stringResource(R.string.back),
+                        )
                     }
                 },
                 title = {
@@ -54,7 +57,10 @@ fun Repositories(
                 onClick = onAddRepo,
                 modifier = Modifier.padding(16.dp)
             ) {
-                Icon(Icons.Default.Add, contentDescription = "Add repo")
+                Icon(
+                    imageVector = Icons.Default.Add,
+                    contentDescription = stringResource(R.string.menu_add_repo),
+                )
             }
         }
     ) { paddingValues ->
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index b77606259..3c174bb0b 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -8,9 +8,35 @@
     <string name="menu_discover">Discover</string>
     <string name="menu_apps_my">My apps</string>
 
+    <string name="first_start_loading">Retrieving apps…\n\nThis may take some time.</string>
+    <string name="no_repos_enabled">No repositories enabled.\nEnable at least one repository to see apps.</string>
+    <string name="no_app_selected">No app selected</string>
+    <string name="no_repository_selected">No repository selected</string>
+
     <string name="app_list_new">New apps</string>
     <string name="app_list_recently_updated">Recently updated</string>
     <string name="app_list_all">All apps</string>
     <string name="app_list_author">Apps by %s</string>
 
+    <string name="search_placeholder">Search…</string>
+    <string name="sort_by_name">Sort by name</string>
+    <string name="sort_by_latest">Sort by latest</string>
+    <string name="category">Category</string>
+
+    <string name="author_by">By %1$s</string>
+    <string name="last_updated">Last updated: %1$s</string>
+    <!-- The placeholder in round brackets will be replaced with the size of the app -->
+    <string name="last_updated_with_size">Last updated: %1$s (%2$s)</string>
+    <string name="whats_new_title">What\'s new</string>
+    <string name="donate_title">Donate</string>
+    <string name="anti_features_title">This app has anti-features</string>
+    <string name="developer_contact">Developer contact</string>
+    <string name="copy_link">Copy link</string>
+    <string name="app_no_compatible_versions">Can not update this app, because no compatible versions available in repository.</string>
+    <string name="app_no_auto_update">Auto-update not available, because app targets old version of Android.</string>
+    <string name="added_x_ago">Added %1$s</string>
+    <string name="size_colon">Size: %1$s</string>
+    <string name="signer_colon">Signer: %1$s</string>
+    <string name="architectures_colon">Architectures: %1$s</string>
+
 </resources>

From e45e81da7f28b0173ee708d897f5ec38e4eb8099 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 24 Jul 2025 16:23:02 -0300
Subject: [PATCH 038/180] Don't add line breaks behind paragraphs and lists

within the app details description
---
 .../org/fdroid/ui/details/AppDetailsItem.kt   | 13 ++++++------
 .../ui/main/details/HtmlDescriptionTest.kt    | 21 +++++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 1909ca3fe..fa8f8cc69 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -212,10 +212,11 @@ private fun AppVersion?.getAntiFeatures(
 
 @VisibleForTesting
 internal fun getHtmlDescription(description: String?): String? {
-    return description?.replace("(\\s)(https://\\S+[^\\s.])([\\s\\n.])".toRegex()) {
-        val prefix = it.groups[1]?.value ?: it.value
-        val url = it.groups[2]?.value ?: it.value
-        val suffix = it.groups[3]?.value ?: it.value
-        "$prefix<a href=\"$url\">$url</a>$suffix"
-    }?.replace("\n", "<br>\n")
+    return description?.replace("</?h[1-6]>".toRegex(), "")
+        ?.replace("(\\s)(https://\\S+[^\\s.])([\\s\\n.])".toRegex()) {
+            val prefix = it.groups[1]?.value ?: it.value
+            val url = it.groups[2]?.value ?: it.value
+            val suffix = it.groups[3]?.value ?: it.value
+            "$prefix<a href=\"$url\">$url</a>$suffix"
+        }?.replace("(?<!</p>|ul>|</li>)\n".toRegex(), "<br>\n")
 }
diff --git a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
index 81aa63e1d..88d3f9c83 100644
--- a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
+++ b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
@@ -4,6 +4,9 @@ import org.fdroid.ui.details.getHtmlDescription
 import org.junit.Test
 import kotlin.test.assertEquals
 
+/**
+ * Tests modifications to app details descriptions done in [getHtmlDescription].
+ */
 class HtmlDescriptionTest {
     @Test
     fun testLinks() {
@@ -28,4 +31,22 @@ class HtmlDescriptionTest {
         val expectedDescription = """please visit our website: <a href="https://wikimediafoundation.org/">https://wikimediafoundation.org/</a>."""
         assertEquals(expectedDescription, getHtmlDescription(description))
     }
+
+    @Test
+    fun testHeadlineRemoval() {
+        val description = """<h1>SimpleX - the first messaging platform that has no user identifiers, not even random numbers!</h1>
+<p><a href="https://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html" target="_blank">Security assessment</a> was done by Trail of Bits in November 2022.</p>
+<p>SimpleX Chat features:</p>
+<ul>
+  <li>end-to-end encrypted messages, with editing, replies and deletion of messages.</li>
+  <li>sending end-to-end encrypted images and files.</li>"""
+
+        val expectedDescription = """SimpleX - the first messaging platform that has no user identifiers, not even random numbers!<br>
+<p><a href="https://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html" target="_blank">Security assessment</a> was done by Trail of Bits in November 2022.</p>
+<p>SimpleX Chat features:</p>
+<ul>
+  <li>end-to-end encrypted messages, with editing, replies and deletion of messages.</li>
+  <li>sending end-to-end encrypted images and files.</li>"""
+        assertEquals(expectedDescription, getHtmlDescription(description))
+    }
 }

From 1339acf5b7e16be433af5d1337e033c76ce77e60 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 25 Jul 2025 17:46:09 -0300
Subject: [PATCH 039/180] Initial implementation of appsearch

---
 build.gradle                                  |   1 +
 gradle/libs.versions.toml                     |   9 +
 next/build.gradle.kts                         |   7 +
 .../org/fdroid/appsearch/AppDocument.kt       |  49 ++++++
 .../org/fdroid/appsearch/AppSearchManager.kt  | 157 ++++++++++++++++++
 .../org/fdroid/repo/RepoUpdateManager.kt      |  30 +++-
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   4 +-
 .../fdroid/ui/details/AppDetailsViewModel.kt  |   2 +
 .../fdroid/ui/discover/AppSearchInputField.kt |  22 ++-
 .../org/fdroid/ui/discover/AppsSearch.kt      |  99 +++++++++--
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  12 +-
 .../fdroid/ui/discover/DiscoverPresenter.kt   |   6 +
 .../fdroid/ui/discover/DiscoverViewModel.kt   |  26 +++
 .../ui/repositories/RepositoriesViewModel.kt  |   5 +
 next/src/main/res/values/strings-next.xml     |   1 +
 15 files changed, 406 insertions(+), 24 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt

diff --git a/build.gradle b/build.gradle
index 38cbe29c8..2a456ed9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,7 @@ plugins {
     alias libs.plugins.android.application apply false
     alias libs.plugins.android.library apply false
     alias libs.plugins.android.ksp apply false
+    alias libs.plugins.android.kapt apply false
     alias libs.plugins.android.hilt apply false
     alias libs.plugins.jetbrains.kotlin.android apply false
     alias libs.plugins.jetbrains.kotlin.multiplatform apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ed1a2453c..edbc0b6eb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,6 +3,7 @@ compileSdk = "36"
 kotlin = "2.2.21"
 androidGradlePlugin = "8.11.1" # 8.12.0 pulls in aapt2 which has issue on buildserver
 androidKspPlugin = "2.2.21-2.0.4" # first version needs to match kotlin version
+androidKaptPlugin = "2.2.0"
 hilt = "2.56.2"
 hiltWork = "1.2.0"
 hiltNavigationCompose = "1.2.0"
@@ -38,6 +39,8 @@ androidxGridlayout = "1.1.0"
 androidxComposeBom = "2025.09.01"
 androidxActivityCompose = "1.11.0"
 accompanistDrawablepainter = "0.37.3"
+appsearch = "1.1.0"
+concurrentFuturesKtx = "1.3.0"
 
 # navigation3
 nav3Core = "1.0.0-alpha10"
@@ -126,6 +129,11 @@ androidx-compose-material3-adaptive-navigation3 = { group = "androidx.compose.ma
 androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
 androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidxHiltCompiler" }
 
+androidx-appsearch = { module = "androidx.appsearch:appsearch", version.ref = "appsearch" }
+androidx-appsearch-compiler = { module = "androidx.appsearch:appsearch-compiler", version.ref = "appsearch" }
+androidx-appsearch-local-storage = { module = "androidx.appsearch:appsearch-local-storage", version.ref = "appsearch" }
+androidx-concurrent-futures-ktx = { module = "androidx.concurrent:concurrent-futures-ktx", version.ref = "concurrentFuturesKtx" }
+
 androidx-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanistDrawablepainter" }
@@ -201,6 +209,7 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-ksp = { id = "com.google.devtools.ksp", version.ref = "androidKspPlugin" }
+android-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "androidKaptPlugin" }
 android-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 jetbrains-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 81ac95765..86a5681b4 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.android.ksp)
+    alias(libs.plugins.android.kapt)
     alias(libs.plugins.android.hilt)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.jetbrains.kotlin.plugin.serialization)
@@ -88,6 +89,12 @@ dependencies {
     ksp(libs.hilt.android.compiler)
     ksp(libs.androidx.hilt.compiler)
 
+    implementation(libs.androidx.appsearch)
+    implementation(libs.androidx.concurrent.futures.ktx)
+    // ksp: https://issuetracker.google.com/issues/234116803
+    kapt(libs.androidx.appsearch.compiler)
+    implementation(libs.androidx.appsearch.local.storage)
+
     debugImplementation(libs.androidx.compose.ui.tooling)
 
     testImplementation(libs.junit)
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt b/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
new file mode 100644
index 000000000..1746b1fae
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
@@ -0,0 +1,49 @@
+package org.fdroid.appsearch
+
+import androidx.appsearch.annotation.Document
+import androidx.appsearch.app.AppSearchSchema.LongPropertyConfig
+import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_NONE
+import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES
+import androidx.appsearch.app.StringSerializer
+import org.fdroid.index.IndexParser
+import org.fdroid.index.v2.FileV2
+
+@Document
+data class AppDocument(
+    @Document.Namespace
+    val namespace: String = "app",
+    @Document.Id
+    val id: String,
+    @Document.CreationTimestampMillis
+    val lastUpdated: Long,
+    @Document.LongProperty(indexingType = LongPropertyConfig.INDEXING_TYPE_RANGE)
+    val repoId: Long,
+
+    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
+    val name: String?,
+    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
+    val summary: String?,
+    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
+    val description: String?,
+    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
+    val packageName: String,
+    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
+    val authorName: String?,
+
+    @Document.StringProperty(
+        indexingType = INDEXING_TYPE_NONE,
+        serializer = FileV2Serializer::class,
+    )
+    val icon: FileV2?,
+)
+
+class FileV2Serializer : StringSerializer<FileV2> {
+    override fun serialize(instance: FileV2): String {
+        return IndexParser.json.encodeToString(instance)
+    }
+
+    @Override
+    override fun deserialize(string: String): FileV2? {
+        return FileV2.deserialize(string)
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt b/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
new file mode 100644
index 000000000..116f429a2
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
@@ -0,0 +1,157 @@
+package org.fdroid.appsearch
+
+import android.annotation.SuppressLint
+import android.content.Context
+import androidx.appsearch.app.AppSearchSession
+import androidx.appsearch.app.PutDocumentsRequest
+import androidx.appsearch.app.SearchSpec
+import androidx.appsearch.app.SetSchemaRequest
+import androidx.appsearch.localstorage.LocalStorage
+import androidx.concurrent.futures.await
+import androidx.core.os.LocaleListCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.awaitCancellation
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import mu.KotlinLogging
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.utils.IoDispatcher
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppSearchManager @Inject constructor(
+    @ApplicationContext val context: Context,
+    @IoDispatcher val scope: CoroutineScope,
+    val db: FDroidDatabase,
+) {
+
+    private val log = KotlinLogging.logger { }
+    private val isInitialized: MutableStateFlow<Boolean> = MutableStateFlow(false)
+    private lateinit var session: AppSearchSession
+
+    init {
+        scope.launch {
+            val session = LocalStorage.createSearchSessionAsync(
+                LocalStorage.SearchContext.Builder(context, "fdroid")
+                    .build()
+            ).await()
+            try {
+                val setSchemaRequest = SetSchemaRequest.Builder()
+                    .setForceOverride(true)
+                    .addDocumentClasses(AppDocument::class.java)
+                    .build()
+                val response = session.setSchemaAsync(setSchemaRequest).await()
+                response.migrationFailures.forEach { failure ->
+                    log.warn { "Migration failure: $failure" }
+                }
+                response.incompatibleTypes.forEach { incompatible ->
+                    log.warn { "Incompatible types: $incompatible" }
+                }
+                response.deletedTypes.forEach { deletedTypes ->
+                    log.warn { "Deleted types: $deletedTypes" }
+                }
+                response.migratedTypes.forEach { migratedTypes ->
+                    log.warn { "Migrated types: $migratedTypes" }
+                }
+                this@AppSearchManager.session = session
+                isInitialized.value = true
+                log.info { "Initialized." }
+                awaitCancellation()
+            } finally {
+                log.info { "Closing session..." }
+                session.close()
+            }
+        }
+    }
+
+    @SuppressLint("RequiresFeature") // we only use local search which supports this
+    suspend fun search(s: String = "F-Droid"): List<AppDocument> {
+        awaitInitialization()
+        val weights = mapOf(
+            "name" to 100.0,
+            "summary" to 50.0,
+            "description" to 10.0,
+            "packageName" to 5.0,
+            "authorName" to 1.0,
+        )
+        // https://developer.android.com/reference/androidx/appsearch/app/SearchSpec.Builder#setRankingStrategy(java.lang.String)
+        val now = System.currentTimeMillis()
+        val weeksOldSpec = "($now - this.creationTimestamp()) / ${1000 * 60 * 60 * 24 * 7}"
+        val searchSpec = SearchSpec.Builder()
+            .setResultCountPerPage(200)
+            .setSnippetCount(0)
+            .setSnippetCountPerProperty(1)
+            .addFilterProperties(
+                AppDocument::class.java,
+                listOf("name", "summary", "description", "packageName", "authorName"),
+            )
+            .setRankingStrategy("this.relevanceScore()*100-$weeksOldSpec")
+            .setPropertyWeightsForDocumentClass(AppDocument::class.java, weights)
+            .build()
+        return session.search(s, searchSpec).use { results ->
+            // we just use a single page for simplicity
+            val resultList = results.nextPageAsync.await()
+            resultList.map { r ->
+                r.getDocument(AppDocument::class.java)
+            }
+        }
+    }
+
+    /**
+     * This removes all documents from the index and re-adds them back based on current DB state.
+     * This is done to ensure that the index is in sync with what the DB has.
+     * Typically, it should be called when
+     * * repos got updated
+     * * repos got disabled (it gets updated when enabled, so that is covered above)
+     * * the preferred repo for an app has changed
+     * * the device locales have changed
+     */
+    // TODO also call this when
+    //  * repos get disabled
+    //  * the preferred repo for an app was changed
+    //  * the device locale was changed
+    fun updateIndex() = scope.launch {
+        awaitInitialization()
+
+        log.debug { "Removing all documents..." }
+        val removeSpec = SearchSpec.Builder().build()
+        session.removeAsync("", removeSpec).await()
+
+        log.debug { "Getting all apps..." }
+        val localeList = LocaleListCompat.getDefault()
+        // TODO check if it makes more sense to do this per-repo
+        val docs = db.getAppDao().getAppSearchItems().map { app ->
+            AppDocument(
+                id = app.packageName,
+                lastUpdated = app.lastUpdated,
+                repoId = app.repoId,
+                name = app.name,
+                summary = app.summary,
+                description = app.getDescription(localeList),
+                packageName = app.packageName,
+                authorName = app.authorName,
+                icon = app.getIcon(localeList),
+            )
+        }
+        log.debug { "Got ${docs.size} apps. Adding to appsearch.." }
+        val putRequest = PutDocumentsRequest.Builder()
+            .addDocuments(docs)
+            .build()
+        val result = session.putAsync(putRequest).await()
+        if (!result.isSuccess) log.error {
+            "Error putting documents: $result"
+        }
+        log.info { "Added ${result.successes.size} apps. Flushing to disk..." }
+        session.requestFlushAsync()
+    }
+
+    private suspend fun awaitInitialization() {
+        if (!isInitialized.value) {
+            isInitialized.first { it }
+        }
+    }
+
+}
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index e9d97a596..cdc8d1548 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.map
 import org.fdroid.CompatibilityChecker
 import org.fdroid.CompatibilityCheckerImpl
 import org.fdroid.NotificationManager
-import org.fdroid.next.R
+import org.fdroid.appsearch.AppSearchManager
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.download.DownloaderFactory
@@ -20,6 +20,8 @@ import org.fdroid.index.IndexUpdateResult
 import org.fdroid.index.RepoManager
 import org.fdroid.index.RepoUpdater
 import org.fdroid.index.v1.IndexV1Updater
+import org.fdroid.next.R
+import org.fdroid.updates.UpdatesManager
 import java.io.File
 import javax.inject.Inject
 
@@ -29,6 +31,7 @@ class RepoUpdateManager(
     private val context: Context,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
+    private val updatesManager: UpdatesManager,
     private val downloaderFactory: DownloaderFactory,
     private val notificationManager: NotificationManager,
     private val compatibilityChecker: CompatibilityChecker = CompatibilityCheckerImpl(
@@ -98,6 +101,7 @@ class RepoUpdateManager(
             listener = indexUpdateListener,
         )
     } else null,
+    private val appSearchManager: AppSearchManager,
 ) {
 
     @Inject
@@ -105,9 +109,19 @@ class RepoUpdateManager(
         @ApplicationContext context: Context,
         db: FDroidDatabase,
         repositoryManager: RepoManager,
+        updatesManager: UpdatesManager,
         downloaderFactory: DownloaderFactory,
         notificationManager: NotificationManager,
-    ) : this(context, db, repoManager = repositoryManager, downloaderFactory, notificationManager)
+        appSearchManager: AppSearchManager,
+    ) : this(
+        context = context,
+        db = db,
+        repoManager = repositoryManager,
+        updatesManager = updatesManager,
+        downloaderFactory = downloaderFactory,
+        notificationManager = notificationManager,
+        appSearchManager = appSearchManager,
+    )
 
     private val isUpdateNotificationEnabled = true
     private val _isUpdating = MutableStateFlow(false)
@@ -162,7 +176,8 @@ class RepoUpdateManager(
             // TODO fdroidPrefs.lastUpdateCheck = System.currentTimeMillis()
             if (repoErrors.isNotEmpty()) showRepoErrors(repoErrors)
             if (reposUpdated) {
-                // TODO appUpdateStatusManager.checkForUpdates(true)
+                updatesManager.loadUpdates()
+                appSearchManager.updateIndex()
             }
         } finally {
             notificationManager.cancelUpdateRepoNotification()
@@ -177,7 +192,7 @@ class RepoUpdateManager(
         }
         val repo = repoManager.getRepository(repoId) ?: return IndexUpdateResult.NotFound
         _isUpdating.value = true
-        try {
+        return try {
             // show notification
             if (isUpdateNotificationEnabled) {
                 val msg = context.getString(R.string.status_connecting_to_repo, repo.address)
@@ -185,7 +200,12 @@ class RepoUpdateManager(
             }
 
             // indexV1Updater only gets used directly if forceIndexV1 was true
-            return indexV1Updater?.update(repo) ?: repoUpdater.update(repo)
+            val result = indexV1Updater?.update(repo) ?: repoUpdater.update(repo)
+            if (result is IndexUpdateResult.Processed) {
+                updatesManager.loadUpdates()
+                appSearchManager.updateIndex()
+            }
+            result
         } finally {
             notificationManager.cancelUpdateRepoNotification()
             _isUpdating.value = false
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 159558939..25baf6a12 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -98,6 +98,8 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                         onNav = { backStack.add(it) },
                         numUpdates = numUpdates,
                         isBigScreen = isBigScreen,
+                        onSearch = viewModel::search,
+                        onSearchCleared = viewModel::onSearchCleared,
                         modifier = Modifier,
                     )
                 }
@@ -190,7 +192,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                             viewModel.setVisibleRepository(it)
                             backStack.add(NavigationKey.RepoDetails(it.repoId))
                         },
-                        onAddRepo = { },
+                        onAddRepo = viewModel::addRepo,
                     ) {
                         backStack.removeLastOrNull()
                     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 1f5383842..15e400c2e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -91,6 +91,8 @@ class AppDetailsViewModel @Inject constructor(
             updatesManager.loadUpdates()
         }
     }
+
+    // TODO update app search when preferred repo changes
 }
 
 class AppInfo(
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
index ebec0c59f..246014fd3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
@@ -1,7 +1,6 @@
 package org.fdroid.ui.discover
 
 import androidx.compose.foundation.text.input.TextFieldState
-import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Clear
@@ -14,25 +13,40 @@ import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.launch
 import org.fdroid.next.R
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class)
 fun AppSearchInputField(
     searchBarState: SearchBarState,
     textFieldState: TextFieldState,
+    onSearch: suspend (String) -> Unit,
+    onSearchCleared: () -> Unit,
 ) {
     val scope = rememberCoroutineScope()
+    // set-up search as you type
+    LaunchedEffect(Unit) {
+        snapshotFlow { textFieldState.text }
+            .debounce(500)
+            .collectLatest {
+                if (it.length > 2) onSearch(textFieldState.text.toString())
+            }
+    }
     SearchBarDefaults.InputField(
         modifier = Modifier,
         searchBarState = searchBarState,
         textFieldState = textFieldState,
         onSearch = {
-            scope.launch { searchBarState.animateToCollapsed() }
+            scope.launch { onSearch(it) }
         },
         placeholder = { Text(stringResource(R.string.search_placeholder)) },
         leadingIcon = {
@@ -51,7 +65,7 @@ fun AppSearchInputField(
         },
         trailingIcon = {
             if (textFieldState.text.isNotEmpty()) {
-                IconButton(onClick = { textFieldState.setTextAndPlaceCursorAtEnd("") }) {
+                IconButton(onClick = onSearchCleared) {
                     Icon(
                         Icons.Filled.Clear,
                         contentDescription = null,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 674b2e20a..5e38447c5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -1,49 +1,122 @@
 package org.fdroid.ui.discover
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.ExpandedFullScreenSearchBar
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
+import androidx.compose.material3.Text
 import androidx.compose.material3.TopSearchBar
 import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.ui.lists.AppListItem
+import org.fdroid.ui.lists.AppListRow
+import org.fdroid.ui.utils.BigLoadingIndicator
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppsSearch(
     searchBarState: SearchBarState,
+    searchResults: List<AppListItem>?,
+    onSearch: suspend (String) -> Unit,
+    onItemSelected: (AppListItem) -> Unit,
+    onSearchCleared: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val textFieldState = rememberTextFieldState()
-    val inputField = @Composable {
-        AppSearchInputField(
-            searchBarState = searchBarState,
-            textFieldState = textFieldState,
-        )
-    }
     TopSearchBar(
         state = searchBarState,
         windowInsets = WindowInsets(),
-        inputField = inputField,
+        inputField = {
+            // InputField is different from ExpandedFullScreenSearchBar to separate textFieldState
+            SearchBarDefaults.InputField(
+                searchBarState = searchBarState,
+                textFieldState = rememberTextFieldState(),
+                placeholder = { Text(stringResource(R.string.search_placeholder)) },
+                leadingIcon = {
+                    Icon(imageVector = Icons.Default.Search, contentDescription = null)
+                },
+                onSearch = { },
+            )
+        },
         modifier = modifier,
     )
+    val textFieldState = rememberTextFieldState()
     ExpandedFullScreenSearchBar(
         state = searchBarState,
-        inputField = inputField,
-    ) { }
+        inputField = {
+            AppSearchInputField(
+                searchBarState = searchBarState,
+                textFieldState = textFieldState,
+                onSearch = onSearch,
+                onSearchCleared = {
+                    textFieldState.setTextAndPlaceCursorAtEnd("")
+                    onSearchCleared()
+                },
+            )
+        },
+    ) {
+        if (searchResults == null) {
+            if (textFieldState.text.length >= 3) BigLoadingIndicator()
+        } else if (searchResults.isEmpty()) {
+            Text(
+                text = stringResource(R.string.search_no_results),
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .padding(16.dp)
+                    .fillMaxWidth()
+            )
+        } else {
+            LazyColumn(modifier = Modifier.fillMaxSize()) {
+                items(searchResults, key = { it.packageName }) { item ->
+                    AppListRow(item, false, modifier.clickable {
+                        onItemSelected(item)
+                    })
+                }
+            }
+        }
+    }
 }
 
 @Preview
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-fun AppsSearchPreview() {
+private fun AppsSearchLoadingPreview() {
     FDroidContent {
-        val state = rememberSearchBarState(SearchBarValue.Expanded)
-        AppsSearch(state)
+        Box(Modifier.fillMaxSize()) {
+            val state = rememberSearchBarState(SearchBarValue.Expanded)
+            AppsSearch(state, null, {}, {}, {})
+        }
+    }
+}
+
+@Preview
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+private fun AppsSearchEmptyPreview() {
+    FDroidContent {
+        Box(Modifier.fillMaxSize()) {
+            val state = rememberSearchBarState(SearchBarValue.Expanded)
+            AppsSearch(state, emptyList(), {}, {}, {})
+        }
     }
 }
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 03ada10e3..42b01ebf9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -50,10 +50,12 @@ fun Discover(
     discoverModel: DiscoverModel,
     numUpdates: Int,
     isBigScreen: Boolean,
-    modifier: Modifier = Modifier,
+    onSearch: suspend (String) -> Unit,
+    onSearchCleared: () -> Unit,
     onListTap: (AppListType) -> Unit,
     onAppTap: (AppDiscoverItem) -> Unit,
     onNav: (NavKey) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val searchBarState = rememberSearchBarState()
     val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
@@ -116,6 +118,12 @@ fun Discover(
                 is LoadedDiscoverModel -> {
                     AppsSearch(
                         searchBarState = searchBarState,
+                        searchResults = discoverModel.searchResults,
+                        onSearch = onSearch,
+                        onItemSelected = {
+                            onNav(NavigationKey.AppDetails(it.packageName))
+                        },
+                        onSearchCleared = onSearchCleared,
                         modifier = Modifier.padding(top = 8.dp),
                     )
                     val listNew = AppListType.New(stringResource(R.string.app_list_new))
@@ -170,6 +178,8 @@ fun LoadingDiscoverPreview() {
             onListTap = {},
             onAppTap = {},
             onNav = {},
+            onSearch = {},
+            onSearchCleared = {},
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 69b1407cf..9096ddd85 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -3,17 +3,21 @@ package org.fdroid.ui.discover
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import org.fdroid.database.Repository
 import org.fdroid.ui.categories.CategoryItem
+import org.fdroid.ui.lists.AppListItem
 
 @Composable
 fun DiscoverPresenter(
     appsFlow: Flow<List<AppDiscoverItem>>,
     categoriesFlow: Flow<List<CategoryItem>>,
     repositoriesFlow: Flow<List<Repository>>,
+    searchResultsFlow: MutableStateFlow<List<AppListItem>?>,
 ): DiscoverModel {
     val apps = appsFlow.collectAsState(null).value
     val categories = categoriesFlow.collectAsState(null).value
+    val searchResults = searchResultsFlow.collectAsState().value
 
     return if (apps.isNullOrEmpty()) {
         val repositories = repositoriesFlow.collectAsState(null).value
@@ -32,6 +36,7 @@ fun DiscoverPresenter(
             newApps = apps.filter { it.isNew },
             recentlyUpdatedApps = apps.filter { !it.isNew },
             categories = categories,
+            searchResults = searchResults,
         )
     }
 }
@@ -43,4 +48,5 @@ data class LoadedDiscoverModel(
     val newApps: List<AppDiscoverItem>,
     val recentlyUpdatedApps: List<AppDiscoverItem>,
     val categories: List<CategoryItem>?,
+    val searchResults: List<AppListItem>? = null,
 ) : DiscoverModel()
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index abb1c02da..56ef50fd6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -11,13 +11,18 @@ import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import org.fdroid.appsearch.AppSearchManager
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
 import org.fdroid.ui.categories.CategoryItem
+import org.fdroid.ui.lists.AppListItem
 import org.fdroid.updates.UpdatesManager
+import org.fdroid.utils.IoDispatcher
 import java.text.Collator
 import java.util.Locale
 import javax.inject.Inject
@@ -29,6 +34,8 @@ class DiscoverViewModel @Inject constructor(
     db: FDroidDatabase,
     updatesManager: UpdatesManager,
     private val repoManager: RepoManager,
+    private val appSearchManager: AppSearchManager,
+    @IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
@@ -57,6 +64,7 @@ class DiscoverViewModel @Inject constructor(
             )
         }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
+    private val searchResults = MutableStateFlow<List<AppListItem>?>(null)
 
     val localeList = LocaleListCompat.getDefault()
     val discoverModel: StateFlow<DiscoverModel> = scope.launchMolecule(mode = ContextClock) {
@@ -64,7 +72,25 @@ class DiscoverViewModel @Inject constructor(
             appsFlow = apps,
             categoriesFlow = categories,
             repositoriesFlow = repoManager.repositoriesState,
+            searchResultsFlow = searchResults,
         )
     }
 
+    suspend fun search(term: String) = withContext(ioScope.coroutineContext) {
+        searchResults.value = appSearchManager.search(term).mapNotNull {
+            val repository = repoManager.getRepository(it.repoId)
+                ?: return@mapNotNull null
+            AppListItem(
+                packageName = it.packageName,
+                name = it.name ?: "Unknown",
+                summary = it.summary ?: "Unknown",
+                lastUpdated = it.lastUpdated,
+                iconDownloadRequest = it.icon?.getDownloadRequest(repository),
+            )
+        }
+    }
+
+    fun onSearchCleared() {
+        searchResults.value = null
+    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 90c367115..cd0ade4cd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -41,4 +41,9 @@ class RepositoriesViewModel @Inject constructor(
         _visibleRepositoryItem.value = repositoryItem
     }
 
+    fun addRepo() {
+    }
+
+    // TODO update appsearch when repo got disabled
+
 }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 3c174bb0b..4e108e663 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -19,6 +19,7 @@
     <string name="app_list_author">Apps by %s</string>
 
     <string name="search_placeholder">Search…</string>
+    <string name="search_no_results">No apps found.\n\nTry to use less search terms or add/enable more repositories.</string>
     <string name="sort_by_name">Sort by name</string>
     <string name="sort_by_latest">Sort by latest</string>
     <string name="category">Category</string>

From 6b3a4ddea5209bf632a2e86bec3e8703f95005b3 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 29 Jul 2025 14:06:19 -0300
Subject: [PATCH 040/180] Search also for categories with appsearch

---
 .../org/fdroid/appsearch/AppDocument.kt       |  2 +-
 .../org/fdroid/appsearch/AppSearchManager.kt  | 30 ++++++++++++++--
 .../org/fdroid/appsearch/CategoryDocument.kt  | 27 +++++++++++++++
 .../org/fdroid/appsearch/SearchResults.kt     |  9 +++++
 .../org/fdroid/ui/discover/AppsSearch.kt      | 25 ++++++++++----
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  4 +--
 .../fdroid/ui/discover/DiscoverPresenter.kt   |  8 ++---
 .../fdroid/ui/discover/DiscoverViewModel.kt   | 34 +++++++++++++------
 8 files changed, 110 insertions(+), 29 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/appsearch/CategoryDocument.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/appsearch/SearchResults.kt

diff --git a/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt b/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
index 1746b1fae..de6e97725 100644
--- a/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
+++ b/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
@@ -35,7 +35,7 @@ data class AppDocument(
         serializer = FileV2Serializer::class,
     )
     val icon: FileV2?,
-)
+) : AppSearchDoc
 
 class FileV2Serializer : StringSerializer<FileV2> {
     override fun serialize(instance: FileV2): String {
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt b/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
index 116f429a2..5ad87354c 100644
--- a/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
+++ b/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
@@ -9,6 +9,7 @@ import androidx.appsearch.app.SetSchemaRequest
 import androidx.appsearch.localstorage.LocalStorage
 import androidx.concurrent.futures.await
 import androidx.core.os.LocaleListCompat
+import androidx.lifecycle.asFlow
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.awaitCancellation
@@ -21,6 +22,8 @@ import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 import javax.inject.Singleton
 
+sealed interface AppSearchDoc
+
 @Singleton
 class AppSearchManager @Inject constructor(
     @ApplicationContext val context: Context,
@@ -41,7 +44,7 @@ class AppSearchManager @Inject constructor(
             try {
                 val setSchemaRequest = SetSchemaRequest.Builder()
                     .setForceOverride(true)
-                    .addDocumentClasses(AppDocument::class.java)
+                    .addDocumentClasses(AppDocument::class.java, CategoryDocument::class.java)
                     .build()
                 val response = session.setSchemaAsync(setSchemaRequest).await()
                 response.migrationFailures.forEach { failure ->
@@ -68,7 +71,7 @@ class AppSearchManager @Inject constructor(
     }
 
     @SuppressLint("RequiresFeature") // we only use local search which supports this
-    suspend fun search(s: String = "F-Droid"): List<AppDocument> {
+    suspend fun search(s: String = "F-Droid"): List<AppSearchDoc> {
         awaitInitialization()
         val weights = mapOf(
             "name" to 100.0,
@@ -95,7 +98,8 @@ class AppSearchManager @Inject constructor(
             // we just use a single page for simplicity
             val resultList = results.nextPageAsync.await()
             resultList.map { r ->
-                r.getDocument(AppDocument::class.java)
+                if (r.genericDocument.namespace == "app") r.getDocument(AppDocument::class.java)
+                else r.getDocument(CategoryDocument::class.java)
             }
         }
     }
@@ -146,6 +150,26 @@ class AppSearchManager @Inject constructor(
         }
         log.info { "Added ${result.successes.size} apps. Flushing to disk..." }
         session.requestFlushAsync()
+
+        val categoryDocs = db.getRepositoryDao().getLiveCategories().asFlow().first().map {
+            CategoryDocument(
+                id = it.id,
+                repoId = it.repoId,
+                name = it.getName(localeList),
+                description = it.getDescription(localeList),
+                icon = it.getIcon(localeList),
+            )
+        }
+        log.debug { "Got ${categoryDocs.size} categories. Adding to appsearch.." }
+        val categoryPutRequest = PutDocumentsRequest.Builder()
+            .addDocuments(categoryDocs)
+            .build()
+        val categoryResult = session.putAsync(categoryPutRequest).await()
+        if (!categoryResult.isSuccess) log.error {
+            "Error putting documents: $result"
+        }
+        log.info { "Added ${categoryResult.successes.size} categories. Flushing to disk..." }
+        session.requestFlushAsync()
     }
 
     private suspend fun awaitInitialization() {
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/CategoryDocument.kt b/next/src/main/kotlin/org/fdroid/appsearch/CategoryDocument.kt
new file mode 100644
index 000000000..1cb53bdeb
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/appsearch/CategoryDocument.kt
@@ -0,0 +1,27 @@
+package org.fdroid.appsearch
+
+import androidx.appsearch.annotation.Document
+import androidx.appsearch.app.AppSearchSchema.LongPropertyConfig
+import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_NONE
+import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES
+import org.fdroid.index.v2.FileV2
+
+@Document
+data class CategoryDocument(
+    @Document.Namespace
+    val namespace: String = "category",
+    @Document.Id
+    val id: String,
+    @Document.LongProperty(indexingType = LongPropertyConfig.INDEXING_TYPE_RANGE)
+    val repoId: Long,
+    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
+    val name: String?,
+    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
+    val description: String?,
+
+    @Document.StringProperty(
+        indexingType = INDEXING_TYPE_NONE,
+        serializer = FileV2Serializer::class,
+    )
+    val icon: FileV2?,
+) : AppSearchDoc
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/SearchResults.kt b/next/src/main/kotlin/org/fdroid/appsearch/SearchResults.kt
new file mode 100644
index 000000000..868b9e3b6
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/appsearch/SearchResults.kt
@@ -0,0 +1,9 @@
+package org.fdroid.appsearch
+
+import org.fdroid.ui.categories.CategoryItem
+import org.fdroid.ui.lists.AppListItem
+
+data class SearchResults(
+    val apps: List<AppListItem>,
+    val categories: List<CategoryItem>,
+)
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 5e38447c5..a2648a35d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -27,9 +27,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.appsearch.SearchResults
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
-import org.fdroid.ui.lists.AppListItem
+import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.categories.CategoryCard
 import org.fdroid.ui.lists.AppListRow
 import org.fdroid.ui.utils.BigLoadingIndicator
 
@@ -37,9 +39,9 @@ import org.fdroid.ui.utils.BigLoadingIndicator
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppsSearch(
     searchBarState: SearchBarState,
-    searchResults: List<AppListItem>?,
+    searchResults: SearchResults?,
     onSearch: suspend (String) -> Unit,
-    onItemSelected: (AppListItem) -> Unit,
+    onNav: (NavigationKey) -> Unit,
     onSearchCleared: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -77,7 +79,7 @@ fun AppsSearch(
     ) {
         if (searchResults == null) {
             if (textFieldState.text.length >= 3) BigLoadingIndicator()
-        } else if (searchResults.isEmpty()) {
+        } else if (searchResults.apps.isEmpty()) {
             Text(
                 text = stringResource(R.string.search_no_results),
                 textAlign = TextAlign.Center,
@@ -87,9 +89,18 @@ fun AppsSearch(
             )
         } else {
             LazyColumn(modifier = Modifier.fillMaxSize()) {
-                items(searchResults, key = { it.packageName }) { item ->
+                items(
+                    searchResults.categories,
+                    key = { it.id },
+                    contentType = { "category" }) { item ->
+                    CategoryCard(categoryItem = item, onNav = onNav)
+                }
+                items(
+                    searchResults.apps,
+                    key = { it.packageName },
+                    contentType = { "app" }) { item ->
                     AppListRow(item, false, modifier.clickable {
-                        onItemSelected(item)
+                        onNav(NavigationKey.AppDetails(item.packageName))
                     })
                 }
             }
@@ -116,7 +127,7 @@ private fun AppsSearchEmptyPreview() {
     FDroidContent {
         Box(Modifier.fillMaxSize()) {
             val state = rememberSearchBarState(SearchBarValue.Expanded)
-            AppsSearch(state, emptyList(), {}, {}, {})
+            AppsSearch(state, SearchResults(emptyList(), emptyList()), {}, {}, {})
         }
     }
 }
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 42b01ebf9..f2e50ec52 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -120,9 +120,7 @@ fun Discover(
                         searchBarState = searchBarState,
                         searchResults = discoverModel.searchResults,
                         onSearch = onSearch,
-                        onItemSelected = {
-                            onNav(NavigationKey.AppDetails(it.packageName))
-                        },
+                        onNav = onNav,
                         onSearchCleared = onSearchCleared,
                         modifier = Modifier.padding(top = 8.dp),
                     )
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 9096ddd85..0ba5dc256 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -3,17 +3,17 @@ package org.fdroid.ui.discover
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import org.fdroid.appsearch.SearchResults
 import org.fdroid.database.Repository
 import org.fdroid.ui.categories.CategoryItem
-import org.fdroid.ui.lists.AppListItem
 
 @Composable
 fun DiscoverPresenter(
     appsFlow: Flow<List<AppDiscoverItem>>,
     categoriesFlow: Flow<List<CategoryItem>>,
     repositoriesFlow: Flow<List<Repository>>,
-    searchResultsFlow: MutableStateFlow<List<AppListItem>?>,
+    searchResultsFlow: StateFlow<SearchResults?>,
 ): DiscoverModel {
     val apps = appsFlow.collectAsState(null).value
     val categories = categoriesFlow.collectAsState(null).value
@@ -48,5 +48,5 @@ data class LoadedDiscoverModel(
     val newApps: List<AppDiscoverItem>,
     val recentlyUpdatedApps: List<AppDiscoverItem>,
     val categories: List<CategoryItem>?,
-    val searchResults: List<AppListItem>? = null,
+    val searchResults: SearchResults? = null,
 ) : DiscoverModel()
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 56ef50fd6..132e29845 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -15,7 +15,10 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
+import org.fdroid.appsearch.AppDocument
 import org.fdroid.appsearch.AppSearchManager
+import org.fdroid.appsearch.CategoryDocument
+import org.fdroid.appsearch.SearchResults
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
@@ -64,7 +67,7 @@ class DiscoverViewModel @Inject constructor(
             )
         }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
-    private val searchResults = MutableStateFlow<List<AppListItem>?>(null)
+    private val searchResults = MutableStateFlow<SearchResults?>(null)
 
     val localeList = LocaleListCompat.getDefault()
     val discoverModel: StateFlow<DiscoverModel> = scope.launchMolecule(mode = ContextClock) {
@@ -77,17 +80,26 @@ class DiscoverViewModel @Inject constructor(
     }
 
     suspend fun search(term: String) = withContext(ioScope.coroutineContext) {
-        searchResults.value = appSearchManager.search(term).mapNotNull {
-            val repository = repoManager.getRepository(it.repoId)
-                ?: return@mapNotNull null
-            AppListItem(
-                packageName = it.packageName,
-                name = it.name ?: "Unknown",
-                summary = it.summary ?: "Unknown",
-                lastUpdated = it.lastUpdated,
-                iconDownloadRequest = it.icon?.getDownloadRequest(repository),
-            )
+        val categories = mutableListOf<CategoryItem>()
+        val apps = mutableListOf<AppListItem>()
+        appSearchManager.search(term).forEach {
+            if (it is AppDocument) {
+                val repository = repoManager.getRepository(it.repoId) ?: return@forEach
+                AppListItem(
+                    packageName = it.packageName,
+                    name = it.name ?: "Unknown",
+                    summary = it.summary ?: "",
+                    lastUpdated = it.lastUpdated,
+                    iconDownloadRequest = it.icon?.getDownloadRequest(repository),
+                ).also { app -> apps.add(app) }
+            } else if (it is CategoryDocument) {
+                CategoryItem(
+                    id = it.id,
+                    name = it.name ?: "Unknown category",
+                ).also { c -> categories.add(c) }
+            }
         }
+        searchResults.value = SearchResults(apps, categories)
     }
 
     fun onSearchCleared() {

From f95a6496b86be81fc466da7c317f30b347540ced Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 29 Jul 2025 18:14:15 -0300
Subject: [PATCH 041/180] Search comparison prototype

This allows you to compare sqlite LIKE searches with FTS and appsearch, also adds timing information for each search
---
 .../org/fdroid/appsearch/AppDocument.kt       | 41 +++++++--
 .../org/fdroid/appsearch/AppSearchManager.kt  |  2 +-
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  1 +
 .../fdroid/ui/discover/AppSearchInputField.kt | 18 ++--
 .../org/fdroid/ui/discover/AppsSearch.kt      | 19 +++-
 .../kotlin/org/fdroid/ui/discover/Discover.kt | 46 ++++++++++
 .../fdroid/ui/discover/DiscoverPresenter.kt   |  9 ++
 .../fdroid/ui/discover/DiscoverViewModel.kt   | 91 ++++++++++++++++++-
 8 files changed, 198 insertions(+), 29 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt b/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
index de6e97725..3db20578c 100644
--- a/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
+++ b/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
@@ -5,8 +5,11 @@ import androidx.appsearch.app.AppSearchSchema.LongPropertyConfig
 import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_NONE
 import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES
 import androidx.appsearch.app.StringSerializer
-import org.fdroid.index.IndexParser
+import kotlinx.serialization.builtins.MapSerializer
+import kotlinx.serialization.builtins.serializer
+import org.fdroid.index.IndexParser.json
 import org.fdroid.index.v2.FileV2
+import org.fdroid.index.v2.LocalizedTextV2
 
 @Document
 data class AppDocument(
@@ -19,12 +22,21 @@ data class AppDocument(
     @Document.LongProperty(indexingType = LongPropertyConfig.INDEXING_TYPE_RANGE)
     val repoId: Long,
 
-    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
-    val name: String?,
-    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
-    val summary: String?,
-    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
-    val description: String?,
+    @Document.StringProperty(
+        indexingType = INDEXING_TYPE_PREFIXES,
+        serializer = LocalizedTextV2Serializer::class,
+    )
+    val name: LocalizedTextV2?,
+    @Document.StringProperty(
+        indexingType = INDEXING_TYPE_PREFIXES,
+        serializer = LocalizedTextV2Serializer::class,
+    )
+    val summary: LocalizedTextV2?,
+    @Document.StringProperty(
+        indexingType = INDEXING_TYPE_PREFIXES,
+        serializer = LocalizedTextV2Serializer::class,
+    )
+    val description: LocalizedTextV2?,
     @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
     val packageName: String,
     @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
@@ -37,9 +49,22 @@ data class AppDocument(
     val icon: FileV2?,
 ) : AppSearchDoc
 
+private val localizedTextV2Serializer = MapSerializer(String.serializer(), String.serializer())
+
+class LocalizedTextV2Serializer : StringSerializer<LocalizedTextV2> {
+    override fun serialize(instance: LocalizedTextV2): String {
+        return json.encodeToString(localizedTextV2Serializer, instance)
+    }
+
+    @Override
+    override fun deserialize(string: String): LocalizedTextV2? {
+        return json.decodeFromString(localizedTextV2Serializer, string)
+    }
+}
+
 class FileV2Serializer : StringSerializer<FileV2> {
     override fun serialize(instance: FileV2): String {
-        return IndexParser.json.encodeToString(instance)
+        return json.encodeToString(instance)
     }
 
     @Override
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt b/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
index 5ad87354c..f48eb6a09 100644
--- a/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
+++ b/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
@@ -134,7 +134,7 @@ class AppSearchManager @Inject constructor(
                 repoId = app.repoId,
                 name = app.name,
                 summary = app.summary,
-                description = app.getDescription(localeList),
+                description = app.description,
                 packageName = app.packageName,
                 authorName = app.authorName,
                 icon = app.getIcon(localeList),
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 25baf6a12..769ae8b68 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -100,6 +100,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                         isBigScreen = isBigScreen,
                         onSearch = viewModel::search,
                         onSearchCleared = viewModel::onSearchCleared,
+                        onSearchOptionChanged = viewModel::onSearchOptionChanged,
                         modifier = Modifier,
                     )
                 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
index 246014fd3..619912022 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
@@ -13,14 +13,10 @@ import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.launch
 import org.fdroid.next.R
 
@@ -34,13 +30,13 @@ fun AppSearchInputField(
 ) {
     val scope = rememberCoroutineScope()
     // set-up search as you type
-    LaunchedEffect(Unit) {
-        snapshotFlow { textFieldState.text }
-            .debounce(500)
-            .collectLatest {
-                if (it.length > 2) onSearch(textFieldState.text.toString())
-            }
-    }
+//    LaunchedEffect(Unit) {
+//        snapshotFlow { textFieldState.text }
+//            .debounce(500)
+//            .collectLatest {
+//                if (it.length > 2) onSearch(textFieldState.text.toString())
+//            }
+//    }
     SearchBarDefaults.InputField(
         modifier = Modifier,
         searchBarState = searchBarState,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index a2648a35d..41d99a16d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -15,6 +15,7 @@ import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.ExpandedFullScreenSearchBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
@@ -33,13 +34,14 @@ import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryCard
 import org.fdroid.ui.lists.AppListRow
-import org.fdroid.ui.utils.BigLoadingIndicator
+import kotlin.time.Duration
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppsSearch(
     searchBarState: SearchBarState,
     searchResults: SearchResults?,
+    time: Duration?,
     onSearch: suspend (String) -> Unit,
     onNav: (NavigationKey) -> Unit,
     onSearchCleared: () -> Unit,
@@ -78,7 +80,7 @@ fun AppsSearch(
         },
     ) {
         if (searchResults == null) {
-            if (textFieldState.text.length >= 3) BigLoadingIndicator()
+//            if (textFieldState.text.length >= 3) BigLoadingIndicator()
         } else if (searchResults.apps.isEmpty()) {
             Text(
                 text = stringResource(R.string.search_no_results),
@@ -89,6 +91,15 @@ fun AppsSearch(
             )
         } else {
             LazyColumn(modifier = Modifier.fillMaxSize()) {
+                if (time != null) item(key = "time", contentType = "time") {
+                    Text(
+                        "Search time: $time",
+                        color = MaterialTheme.colorScheme.error,
+                        modifier = Modifier
+                            .padding(16.dp)
+                            .fillMaxWidth()
+                    )
+                }
                 items(
                     searchResults.categories,
                     key = { it.id },
@@ -115,7 +126,7 @@ private fun AppsSearchLoadingPreview() {
     FDroidContent {
         Box(Modifier.fillMaxSize()) {
             val state = rememberSearchBarState(SearchBarValue.Expanded)
-            AppsSearch(state, null, {}, {}, {})
+            AppsSearch(state, null, null, {}, {}, {})
         }
     }
 }
@@ -127,7 +138,7 @@ private fun AppsSearchEmptyPreview() {
     FDroidContent {
         Box(Modifier.fillMaxSize()) {
             val state = rememberSearchBarState(SearchBarValue.Expanded)
-            AppsSearch(state, SearchResults(emptyList(), emptyList()), {}, {}, {})
+            AppsSearch(state, SearchResults(emptyList(), emptyList()), null, {}, {}, {})
         }
     }
 }
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 f2e50ec52..e36bdbdc5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -1,7 +1,9 @@
 package org.fdroid.ui.discover
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
@@ -15,6 +17,7 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -26,6 +29,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 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
@@ -55,6 +59,7 @@ fun Discover(
     onListTap: (AppListType) -> Unit,
     onAppTap: (AppDiscoverItem) -> Unit,
     onNav: (NavKey) -> Unit,
+    onSearchOptionChanged: (SearchOption) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val searchBarState = rememberSearchBarState()
@@ -119,11 +124,32 @@ fun Discover(
                     AppsSearch(
                         searchBarState = searchBarState,
                         searchResults = discoverModel.searchResults,
+                        time = discoverModel.searchTime,
                         onSearch = onSearch,
                         onNav = onNav,
                         onSearchCleared = onSearchCleared,
                         modifier = Modifier.padding(top = 8.dp),
                     )
+
+                    SearchRadioButton(
+                        text = "Sqlite LIKE",
+                        isSelected = discoverModel.searchOption == SearchOption.LIKE,
+                    ) {
+                        onSearchOptionChanged(SearchOption.LIKE)
+                    }
+                    SearchRadioButton(
+                        text = "Room FTS4",
+                        isSelected = discoverModel.searchOption == SearchOption.FTS,
+                    ) {
+                        onSearchOptionChanged(SearchOption.FTS)
+                    }
+                    SearchRadioButton(
+                        text = "Appsearch",
+                        isSelected = discoverModel.searchOption == SearchOption.APPSEARCH,
+                    ) {
+                        onSearchOptionChanged(SearchOption.APPSEARCH)
+                    }
+
                     val listNew = AppListType.New(stringResource(R.string.app_list_new))
                     AppCarousel(
                         title = listNew.title,
@@ -165,6 +191,25 @@ fun Discover(
     }
 }
 
+@Composable
+fun SearchRadioButton(text: String, isSelected: Boolean, onClick: () -> Unit) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.clickable(onClick = onClick)
+    ) {
+        Text(
+            text, modifier = Modifier
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+                .weight(1f)
+        )
+        RadioButton(
+            selected = isSelected,
+            onClick = null, modifier = Modifier
+                .padding(end = 16.dp)
+        )
+    }
+}
+
 @Preview
 @Composable
 fun LoadingDiscoverPreview() {
@@ -178,6 +223,7 @@ fun LoadingDiscoverPreview() {
             onNav = {},
             onSearch = {},
             onSearchCleared = {},
+            onSearchOptionChanged = {},
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 0ba5dc256..c3d9d7af8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.appsearch.SearchResults
 import org.fdroid.database.Repository
 import org.fdroid.ui.categories.CategoryItem
+import kotlin.time.Duration
 
 @Composable
 fun DiscoverPresenter(
@@ -14,10 +15,14 @@ fun DiscoverPresenter(
     categoriesFlow: Flow<List<CategoryItem>>,
     repositoriesFlow: Flow<List<Repository>>,
     searchResultsFlow: StateFlow<SearchResults?>,
+    searchOptionFlow: StateFlow<SearchOption>,
+    searchTimeFlow: StateFlow<Duration?>,
 ): DiscoverModel {
     val apps = appsFlow.collectAsState(null).value
     val categories = categoriesFlow.collectAsState(null).value
     val searchResults = searchResultsFlow.collectAsState().value
+    val searchOption = searchOptionFlow.collectAsState().value
+    val searchTime = searchTimeFlow.collectAsState().value
 
     return if (apps.isNullOrEmpty()) {
         val repositories = repositoriesFlow.collectAsState(null).value
@@ -37,6 +42,8 @@ fun DiscoverPresenter(
             recentlyUpdatedApps = apps.filter { !it.isNew },
             categories = categories,
             searchResults = searchResults,
+            searchOption = searchOption,
+            searchTime = searchTime,
         )
     }
 }
@@ -49,4 +56,6 @@ data class LoadedDiscoverModel(
     val recentlyUpdatedApps: List<AppDiscoverItem>,
     val categories: List<CategoryItem>?,
     val searchResults: SearchResults? = null,
+    val searchOption: SearchOption = SearchOption.APPSEARCH,
+    val searchTime: Duration? = null,
 ) : DiscoverModel()
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 132e29845..966176511 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -13,8 +13,11 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
+import mu.KotlinLogging
+import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.appsearch.AppDocument
 import org.fdroid.appsearch.AppSearchManager
 import org.fdroid.appsearch.CategoryDocument
@@ -29,18 +32,27 @@ import org.fdroid.utils.IoDispatcher
 import java.text.Collator
 import java.util.Locale
 import javax.inject.Inject
+import kotlin.time.Duration
+import kotlin.time.measureTime
+
+enum class SearchOption {
+    LIKE,
+    FTS,
+    APPSEARCH,
+}
 
 @HiltViewModel
 class DiscoverViewModel @Inject constructor(
     app: Application,
     savedStateHandle: SavedStateHandle,
-    db: FDroidDatabase,
+    private val db: FDroidDatabase,
     updatesManager: UpdatesManager,
     private val repoManager: RepoManager,
     private val appSearchManager: AppSearchManager,
     @IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
 
+    private val log = KotlinLogging.logger { }
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
     val numUpdates = updatesManager.numUpdates
@@ -68,6 +80,8 @@ class DiscoverViewModel @Inject constructor(
         }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
     private val searchResults = MutableStateFlow<SearchResults?>(null)
+    private val searchOption = MutableStateFlow(SearchOption.FTS)
+    private val searchTime = MutableStateFlow<Duration?>(null)
 
     val localeList = LocaleListCompat.getDefault()
     val discoverModel: StateFlow<DiscoverModel> = scope.launchMolecule(mode = ContextClock) {
@@ -76,19 +90,33 @@ class DiscoverViewModel @Inject constructor(
             categoriesFlow = categories,
             repositoriesFlow = repoManager.repositoriesState,
             searchResultsFlow = searchResults,
+            searchOptionFlow = searchOption,
+            searchTimeFlow = searchTime,
         )
     }
 
     suspend fun search(term: String) = withContext(ioScope.coroutineContext) {
+        val duration = measureTime {
+            searchResults.value = when (searchOption.value) {
+                SearchOption.LIKE -> searchLike(term)
+                SearchOption.FTS -> searchFts(term)
+                SearchOption.APPSEARCH -> searchAppSearch(term)
+            }
+        }
+        searchTime.value = duration
+    }
+
+    private suspend fun searchAppSearch(term: String): SearchResults {
         val categories = mutableListOf<CategoryItem>()
         val apps = mutableListOf<AppListItem>()
-        appSearchManager.search(term).forEach {
+        val sanitized = term.replace(Regex.fromLiteral("\""), "")
+        appSearchManager.search(sanitized).forEach {
             if (it is AppDocument) {
                 val repository = repoManager.getRepository(it.repoId) ?: return@forEach
                 AppListItem(
                     packageName = it.packageName,
-                    name = it.name ?: "Unknown",
-                    summary = it.summary ?: "",
+                    name = it.name?.getBestLocale(localeList) ?: "Unknown",
+                    summary = it.summary?.getBestLocale(localeList) ?: "",
                     lastUpdated = it.lastUpdated,
                     iconDownloadRequest = it.icon?.getDownloadRequest(repository),
                 ).also { app -> apps.add(app) }
@@ -99,10 +127,63 @@ class DiscoverViewModel @Inject constructor(
                 ).also { c -> categories.add(c) }
             }
         }
-        searchResults.value = SearchResults(apps, categories)
+        return SearchResults(apps, categories)
+    }
+
+    private fun searchLike(term: String): SearchResults {
+        val sanitized = term.replace(Regex.fromLiteral("\""), "")
+        val apps = db.getAppDao().getAppSearchItemsLike(sanitized).mapNotNull {
+            val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
+            AppListItem(
+                packageName = it.packageName,
+                name = it.name?.getBestLocale(localeList) ?: "Unknown",
+                summary = it.summary?.getBestLocale(localeList) ?: "",
+                lastUpdated = it.lastUpdated,
+                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
+            )
+        }
+        return SearchResults(apps, emptyList())
+    }
+
+    private suspend fun searchFts(term: String): SearchResults {
+        val sanitized = term.replace(Regex.fromLiteral("\""), "")
+        val query = sanitized.split(' ').joinToString(" ") { word ->
+            if (word.isBlank()) "" else {
+                var isCjk = false
+                // go through word and separate CJK chars (if needed)
+                val newString = word.toList().joinToString("") {
+                    if (Character.isIdeographic(it.code)) {
+                        isCjk = true
+                        "$it* "
+                    } else "$it"
+                }
+                if (isCjk) newString else "$newString*"
+            }
+        }
+        log.info { "Searching for: $query" }
+        val apps = db.getAppDao().getAppSearchItemsFts(query).mapNotNull {
+            val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
+            AppListItem(
+                packageName = it.packageName,
+                name = it.name?.getBestLocale(localeList) ?: "Unknown",
+                summary = it.summary?.getBestLocale(localeList) ?: "",
+                lastUpdated = it.lastUpdated,
+                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
+            )
+        }
+        val categories = this.categories.first().filter {
+            // TODO handle diacritics as well
+            it.name.contains(sanitized, ignoreCase = true)
+        }
+        return SearchResults(apps, categories)
+    }
+
+    fun onSearchOptionChanged(option: SearchOption) {
+        searchOption.value = option
     }
 
     fun onSearchCleared() {
         searchResults.value = null
+        searchTime.value = null
     }
 }

From d2710489e562304e510c7b1b56decd621e8d9b70 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 31 Jul 2025 17:02:48 -0300
Subject: [PATCH 042/180] Remove search prototypes

because we'll stay with an improved version of sqlite FTS
---
 build.gradle                                  |   1 -
 gradle/libs.versions.toml                     |  17 +-
 next/build.gradle.kts                         |   7 -
 .../org/fdroid/appsearch/AppDocument.kt       |  74 -------
 .../org/fdroid/appsearch/AppSearchManager.kt  | 181 ------------------
 .../org/fdroid/appsearch/CategoryDocument.kt  |  27 ---
 .../org/fdroid/repo/RepoUpdateManager.kt      |   6 -
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  12 +-
 .../fdroid/ui/details/AppDetailsViewModel.kt  |   2 -
 .../fdroid/ui/discover/AppSearchInputField.kt |  18 +-
 .../org/fdroid/ui/discover/AppsSearch.kt      |  78 +++++---
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  59 ++----
 .../fdroid/ui/discover/DiscoverPresenter.kt   |  10 -
 .../fdroid/ui/discover/DiscoverViewModel.kt   | 115 +++--------
 .../discover}/SearchResults.kt                |   2 +-
 .../ui/repositories/RepositoriesViewModel.kt  |   3 -
 16 files changed, 113 insertions(+), 499 deletions(-)
 delete mode 100644 next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
 delete mode 100644 next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
 delete mode 100644 next/src/main/kotlin/org/fdroid/appsearch/CategoryDocument.kt
 rename next/src/main/kotlin/org/fdroid/{appsearch => ui/discover}/SearchResults.kt (85%)

diff --git a/build.gradle b/build.gradle
index 2a456ed9c..38cbe29c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,6 @@ plugins {
     alias libs.plugins.android.application apply false
     alias libs.plugins.android.library apply false
     alias libs.plugins.android.ksp apply false
-    alias libs.plugins.android.kapt apply false
     alias libs.plugins.android.hilt apply false
     alias libs.plugins.jetbrains.kotlin.android apply false
     alias libs.plugins.jetbrains.kotlin.multiplatform apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index edbc0b6eb..7c49525fc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,6 @@ compileSdk = "36"
 kotlin = "2.2.21"
 androidGradlePlugin = "8.11.1" # 8.12.0 pulls in aapt2 which has issue on buildserver
 androidKspPlugin = "2.2.21-2.0.4" # first version needs to match kotlin version
-androidKaptPlugin = "2.2.0"
 hilt = "2.56.2"
 hiltWork = "1.2.0"
 hiltNavigationCompose = "1.2.0"
@@ -36,15 +35,13 @@ androidxConstraintlayout = "2.2.1"
 androidxSwipeRefreshLayout = "1.1.0"
 androidxVectordrawable = "1.2.0"
 androidxGridlayout = "1.1.0"
-androidxComposeBom = "2025.09.01"
-androidxActivityCompose = "1.11.0"
+androidxComposeBom = "2025.11.01"
+androidxActivityCompose = "1.12.0"
 accompanistDrawablepainter = "0.37.3"
-appsearch = "1.1.0"
-concurrentFuturesKtx = "1.3.0"
 
 # navigation3
-nav3Core = "1.0.0-alpha10"
-lifecycleViewmodelNav3 = "2.10.0-alpha04"
+nav3Core = "1.0.0"
+lifecycleViewmodelNav3 = "2.10.0"
 material3AdaptiveNav3 = "1.0.0-alpha03"
 
 material = "1.13.0"
@@ -129,11 +126,6 @@ androidx-compose-material3-adaptive-navigation3 = { group = "androidx.compose.ma
 androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
 androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidxHiltCompiler" }
 
-androidx-appsearch = { module = "androidx.appsearch:appsearch", version.ref = "appsearch" }
-androidx-appsearch-compiler = { module = "androidx.appsearch:appsearch-compiler", version.ref = "appsearch" }
-androidx-appsearch-local-storage = { module = "androidx.appsearch:appsearch-local-storage", version.ref = "appsearch" }
-androidx-concurrent-futures-ktx = { module = "androidx.concurrent:concurrent-futures-ktx", version.ref = "concurrentFuturesKtx" }
-
 androidx-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanistDrawablepainter" }
@@ -209,7 +201,6 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-ksp = { id = "com.google.devtools.ksp", version.ref = "androidKspPlugin" }
-android-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "androidKaptPlugin" }
 android-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 jetbrains-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 86a5681b4..81ac95765 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.android.ksp)
-    alias(libs.plugins.android.kapt)
     alias(libs.plugins.android.hilt)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.jetbrains.kotlin.plugin.serialization)
@@ -89,12 +88,6 @@ dependencies {
     ksp(libs.hilt.android.compiler)
     ksp(libs.androidx.hilt.compiler)
 
-    implementation(libs.androidx.appsearch)
-    implementation(libs.androidx.concurrent.futures.ktx)
-    // ksp: https://issuetracker.google.com/issues/234116803
-    kapt(libs.androidx.appsearch.compiler)
-    implementation(libs.androidx.appsearch.local.storage)
-
     debugImplementation(libs.androidx.compose.ui.tooling)
 
     testImplementation(libs.junit)
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt b/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
deleted file mode 100644
index 3db20578c..000000000
--- a/next/src/main/kotlin/org/fdroid/appsearch/AppDocument.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.fdroid.appsearch
-
-import androidx.appsearch.annotation.Document
-import androidx.appsearch.app.AppSearchSchema.LongPropertyConfig
-import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_NONE
-import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES
-import androidx.appsearch.app.StringSerializer
-import kotlinx.serialization.builtins.MapSerializer
-import kotlinx.serialization.builtins.serializer
-import org.fdroid.index.IndexParser.json
-import org.fdroid.index.v2.FileV2
-import org.fdroid.index.v2.LocalizedTextV2
-
-@Document
-data class AppDocument(
-    @Document.Namespace
-    val namespace: String = "app",
-    @Document.Id
-    val id: String,
-    @Document.CreationTimestampMillis
-    val lastUpdated: Long,
-    @Document.LongProperty(indexingType = LongPropertyConfig.INDEXING_TYPE_RANGE)
-    val repoId: Long,
-
-    @Document.StringProperty(
-        indexingType = INDEXING_TYPE_PREFIXES,
-        serializer = LocalizedTextV2Serializer::class,
-    )
-    val name: LocalizedTextV2?,
-    @Document.StringProperty(
-        indexingType = INDEXING_TYPE_PREFIXES,
-        serializer = LocalizedTextV2Serializer::class,
-    )
-    val summary: LocalizedTextV2?,
-    @Document.StringProperty(
-        indexingType = INDEXING_TYPE_PREFIXES,
-        serializer = LocalizedTextV2Serializer::class,
-    )
-    val description: LocalizedTextV2?,
-    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
-    val packageName: String,
-    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
-    val authorName: String?,
-
-    @Document.StringProperty(
-        indexingType = INDEXING_TYPE_NONE,
-        serializer = FileV2Serializer::class,
-    )
-    val icon: FileV2?,
-) : AppSearchDoc
-
-private val localizedTextV2Serializer = MapSerializer(String.serializer(), String.serializer())
-
-class LocalizedTextV2Serializer : StringSerializer<LocalizedTextV2> {
-    override fun serialize(instance: LocalizedTextV2): String {
-        return json.encodeToString(localizedTextV2Serializer, instance)
-    }
-
-    @Override
-    override fun deserialize(string: String): LocalizedTextV2? {
-        return json.decodeFromString(localizedTextV2Serializer, string)
-    }
-}
-
-class FileV2Serializer : StringSerializer<FileV2> {
-    override fun serialize(instance: FileV2): String {
-        return json.encodeToString(instance)
-    }
-
-    @Override
-    override fun deserialize(string: String): FileV2? {
-        return FileV2.deserialize(string)
-    }
-}
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt b/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
deleted file mode 100644
index f48eb6a09..000000000
--- a/next/src/main/kotlin/org/fdroid/appsearch/AppSearchManager.kt
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.fdroid.appsearch
-
-import android.annotation.SuppressLint
-import android.content.Context
-import androidx.appsearch.app.AppSearchSession
-import androidx.appsearch.app.PutDocumentsRequest
-import androidx.appsearch.app.SearchSpec
-import androidx.appsearch.app.SetSchemaRequest
-import androidx.appsearch.localstorage.LocalStorage
-import androidx.concurrent.futures.await
-import androidx.core.os.LocaleListCompat
-import androidx.lifecycle.asFlow
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.awaitCancellation
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import mu.KotlinLogging
-import org.fdroid.database.FDroidDatabase
-import org.fdroid.utils.IoDispatcher
-import javax.inject.Inject
-import javax.inject.Singleton
-
-sealed interface AppSearchDoc
-
-@Singleton
-class AppSearchManager @Inject constructor(
-    @ApplicationContext val context: Context,
-    @IoDispatcher val scope: CoroutineScope,
-    val db: FDroidDatabase,
-) {
-
-    private val log = KotlinLogging.logger { }
-    private val isInitialized: MutableStateFlow<Boolean> = MutableStateFlow(false)
-    private lateinit var session: AppSearchSession
-
-    init {
-        scope.launch {
-            val session = LocalStorage.createSearchSessionAsync(
-                LocalStorage.SearchContext.Builder(context, "fdroid")
-                    .build()
-            ).await()
-            try {
-                val setSchemaRequest = SetSchemaRequest.Builder()
-                    .setForceOverride(true)
-                    .addDocumentClasses(AppDocument::class.java, CategoryDocument::class.java)
-                    .build()
-                val response = session.setSchemaAsync(setSchemaRequest).await()
-                response.migrationFailures.forEach { failure ->
-                    log.warn { "Migration failure: $failure" }
-                }
-                response.incompatibleTypes.forEach { incompatible ->
-                    log.warn { "Incompatible types: $incompatible" }
-                }
-                response.deletedTypes.forEach { deletedTypes ->
-                    log.warn { "Deleted types: $deletedTypes" }
-                }
-                response.migratedTypes.forEach { migratedTypes ->
-                    log.warn { "Migrated types: $migratedTypes" }
-                }
-                this@AppSearchManager.session = session
-                isInitialized.value = true
-                log.info { "Initialized." }
-                awaitCancellation()
-            } finally {
-                log.info { "Closing session..." }
-                session.close()
-            }
-        }
-    }
-
-    @SuppressLint("RequiresFeature") // we only use local search which supports this
-    suspend fun search(s: String = "F-Droid"): List<AppSearchDoc> {
-        awaitInitialization()
-        val weights = mapOf(
-            "name" to 100.0,
-            "summary" to 50.0,
-            "description" to 10.0,
-            "packageName" to 5.0,
-            "authorName" to 1.0,
-        )
-        // https://developer.android.com/reference/androidx/appsearch/app/SearchSpec.Builder#setRankingStrategy(java.lang.String)
-        val now = System.currentTimeMillis()
-        val weeksOldSpec = "($now - this.creationTimestamp()) / ${1000 * 60 * 60 * 24 * 7}"
-        val searchSpec = SearchSpec.Builder()
-            .setResultCountPerPage(200)
-            .setSnippetCount(0)
-            .setSnippetCountPerProperty(1)
-            .addFilterProperties(
-                AppDocument::class.java,
-                listOf("name", "summary", "description", "packageName", "authorName"),
-            )
-            .setRankingStrategy("this.relevanceScore()*100-$weeksOldSpec")
-            .setPropertyWeightsForDocumentClass(AppDocument::class.java, weights)
-            .build()
-        return session.search(s, searchSpec).use { results ->
-            // we just use a single page for simplicity
-            val resultList = results.nextPageAsync.await()
-            resultList.map { r ->
-                if (r.genericDocument.namespace == "app") r.getDocument(AppDocument::class.java)
-                else r.getDocument(CategoryDocument::class.java)
-            }
-        }
-    }
-
-    /**
-     * This removes all documents from the index and re-adds them back based on current DB state.
-     * This is done to ensure that the index is in sync with what the DB has.
-     * Typically, it should be called when
-     * * repos got updated
-     * * repos got disabled (it gets updated when enabled, so that is covered above)
-     * * the preferred repo for an app has changed
-     * * the device locales have changed
-     */
-    // TODO also call this when
-    //  * repos get disabled
-    //  * the preferred repo for an app was changed
-    //  * the device locale was changed
-    fun updateIndex() = scope.launch {
-        awaitInitialization()
-
-        log.debug { "Removing all documents..." }
-        val removeSpec = SearchSpec.Builder().build()
-        session.removeAsync("", removeSpec).await()
-
-        log.debug { "Getting all apps..." }
-        val localeList = LocaleListCompat.getDefault()
-        // TODO check if it makes more sense to do this per-repo
-        val docs = db.getAppDao().getAppSearchItems().map { app ->
-            AppDocument(
-                id = app.packageName,
-                lastUpdated = app.lastUpdated,
-                repoId = app.repoId,
-                name = app.name,
-                summary = app.summary,
-                description = app.description,
-                packageName = app.packageName,
-                authorName = app.authorName,
-                icon = app.getIcon(localeList),
-            )
-        }
-        log.debug { "Got ${docs.size} apps. Adding to appsearch.." }
-        val putRequest = PutDocumentsRequest.Builder()
-            .addDocuments(docs)
-            .build()
-        val result = session.putAsync(putRequest).await()
-        if (!result.isSuccess) log.error {
-            "Error putting documents: $result"
-        }
-        log.info { "Added ${result.successes.size} apps. Flushing to disk..." }
-        session.requestFlushAsync()
-
-        val categoryDocs = db.getRepositoryDao().getLiveCategories().asFlow().first().map {
-            CategoryDocument(
-                id = it.id,
-                repoId = it.repoId,
-                name = it.getName(localeList),
-                description = it.getDescription(localeList),
-                icon = it.getIcon(localeList),
-            )
-        }
-        log.debug { "Got ${categoryDocs.size} categories. Adding to appsearch.." }
-        val categoryPutRequest = PutDocumentsRequest.Builder()
-            .addDocuments(categoryDocs)
-            .build()
-        val categoryResult = session.putAsync(categoryPutRequest).await()
-        if (!categoryResult.isSuccess) log.error {
-            "Error putting documents: $result"
-        }
-        log.info { "Added ${categoryResult.successes.size} categories. Flushing to disk..." }
-        session.requestFlushAsync()
-    }
-
-    private suspend fun awaitInitialization() {
-        if (!isInitialized.value) {
-            isInitialized.first { it }
-        }
-    }
-
-}
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/CategoryDocument.kt b/next/src/main/kotlin/org/fdroid/appsearch/CategoryDocument.kt
deleted file mode 100644
index 1cb53bdeb..000000000
--- a/next/src/main/kotlin/org/fdroid/appsearch/CategoryDocument.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.fdroid.appsearch
-
-import androidx.appsearch.annotation.Document
-import androidx.appsearch.app.AppSearchSchema.LongPropertyConfig
-import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_NONE
-import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES
-import org.fdroid.index.v2.FileV2
-
-@Document
-data class CategoryDocument(
-    @Document.Namespace
-    val namespace: String = "category",
-    @Document.Id
-    val id: String,
-    @Document.LongProperty(indexingType = LongPropertyConfig.INDEXING_TYPE_RANGE)
-    val repoId: Long,
-    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
-    val name: String?,
-    @Document.StringProperty(indexingType = INDEXING_TYPE_PREFIXES)
-    val description: String?,
-
-    @Document.StringProperty(
-        indexingType = INDEXING_TYPE_NONE,
-        serializer = FileV2Serializer::class,
-    )
-    val icon: FileV2?,
-) : AppSearchDoc
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index cdc8d1548..443c91c83 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -11,7 +11,6 @@ import kotlinx.coroutines.flow.map
 import org.fdroid.CompatibilityChecker
 import org.fdroid.CompatibilityCheckerImpl
 import org.fdroid.NotificationManager
-import org.fdroid.appsearch.AppSearchManager
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.download.DownloaderFactory
@@ -101,7 +100,6 @@ class RepoUpdateManager(
             listener = indexUpdateListener,
         )
     } else null,
-    private val appSearchManager: AppSearchManager,
 ) {
 
     @Inject
@@ -112,7 +110,6 @@ class RepoUpdateManager(
         updatesManager: UpdatesManager,
         downloaderFactory: DownloaderFactory,
         notificationManager: NotificationManager,
-        appSearchManager: AppSearchManager,
     ) : this(
         context = context,
         db = db,
@@ -120,7 +117,6 @@ class RepoUpdateManager(
         updatesManager = updatesManager,
         downloaderFactory = downloaderFactory,
         notificationManager = notificationManager,
-        appSearchManager = appSearchManager,
     )
 
     private val isUpdateNotificationEnabled = true
@@ -177,7 +173,6 @@ class RepoUpdateManager(
             if (repoErrors.isNotEmpty()) showRepoErrors(repoErrors)
             if (reposUpdated) {
                 updatesManager.loadUpdates()
-                appSearchManager.updateIndex()
             }
         } finally {
             notificationManager.cancelUpdateRepoNotification()
@@ -203,7 +198,6 @@ class RepoUpdateManager(
             val result = indexV1Updater?.update(repo) ?: repoUpdater.update(repo)
             if (result is IndexUpdateResult.Processed) {
                 updatesManager.loadUpdates()
-                appSearchManager.updateIndex()
             }
             result
         } finally {
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 769ae8b68..c59f7e6c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -26,8 +26,7 @@ import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDe
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
-import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
-import androidx.navigation3.scene.rememberSceneSetupNavEntryDecorator
+import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import org.fdroid.database.AppListSortOrder
@@ -48,7 +47,7 @@ import org.fdroid.ui.repositories.RepositoriesViewModel
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
 fun Main(onListeningForIntent: () -> Unit = {}) {
-    val backStack = rememberNavBackStack<NavigationKey>(NavigationKey.Discover)
+    val backStack = rememberNavBackStack(NavigationKey.Discover)
     // set up intent routing by listening to new intents from activity
     val activity = (LocalActivity.current as ComponentActivity)
     DisposableEffect(backStack) {
@@ -70,13 +69,9 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
     FDroidContent {
         NavDisplay(
             backStack = backStack,
-            onBack = { keysToRemove ->
-                repeat(keysToRemove) { backStack.removeLastOrNull() }
-            },
             sceneStrategy = listDetailStrategy,
             entryDecorators = listOf(
-                rememberSceneSetupNavEntryDecorator(),
-                rememberSavedStateNavEntryDecorator(),
+                rememberSaveableStateHolderNavEntryDecorator(),
                 rememberViewModelStoreNavEntryDecorator(),
             ),
             entryProvider = entryProvider {
@@ -100,7 +95,6 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                         isBigScreen = isBigScreen,
                         onSearch = viewModel::search,
                         onSearchCleared = viewModel::onSearchCleared,
-                        onSearchOptionChanged = viewModel::onSearchOptionChanged,
                         modifier = Modifier,
                     )
                 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 15e400c2e..1f5383842 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -91,8 +91,6 @@ class AppDetailsViewModel @Inject constructor(
             updatesManager.loadUpdates()
         }
     }
-
-    // TODO update app search when preferred repo changes
 }
 
 class AppInfo(
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
index 619912022..246014fd3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
@@ -13,10 +13,14 @@ import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.launch
 import org.fdroid.next.R
 
@@ -30,13 +34,13 @@ fun AppSearchInputField(
 ) {
     val scope = rememberCoroutineScope()
     // set-up search as you type
-//    LaunchedEffect(Unit) {
-//        snapshotFlow { textFieldState.text }
-//            .debounce(500)
-//            .collectLatest {
-//                if (it.length > 2) onSearch(textFieldState.text.toString())
-//            }
-//    }
+    LaunchedEffect(Unit) {
+        snapshotFlow { textFieldState.text }
+            .debounce(500)
+            .collectLatest {
+                if (it.length > 2) onSearch(textFieldState.text.toString())
+            }
+    }
     SearchBarDefaults.InputField(
         modifier = Modifier,
         searchBarState = searchBarState,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 41d99a16d..ae79937c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -2,6 +2,7 @@ package org.fdroid.ui.discover
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -15,7 +16,6 @@ import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.ExpandedFullScreenSearchBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
@@ -28,20 +28,19 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.appsearch.SearchResults
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryCard
+import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListRow
-import kotlin.time.Duration
+import org.fdroid.ui.utils.BigLoadingIndicator
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppsSearch(
     searchBarState: SearchBarState,
     searchResults: SearchResults?,
-    time: Duration?,
     onSearch: suspend (String) -> Unit,
     onNav: (NavigationKey) -> Unit,
     onSearchCleared: () -> Unit,
@@ -80,8 +79,11 @@ fun AppsSearch(
         },
     ) {
         if (searchResults == null) {
-//            if (textFieldState.text.length >= 3) BigLoadingIndicator()
+            if (textFieldState.text.length >= 3) BigLoadingIndicator()
         } else if (searchResults.apps.isEmpty()) {
+            if (searchResults.categories.isNotEmpty()) {
+                CategoriesFlowRow(searchResults.categories, onNav)
+            }
             Text(
                 text = stringResource(R.string.search_no_results),
                 textAlign = TextAlign.Center,
@@ -91,34 +93,42 @@ fun AppsSearch(
             )
         } else {
             LazyColumn(modifier = Modifier.fillMaxSize()) {
-                if (time != null) item(key = "time", contentType = "time") {
-                    Text(
-                        "Search time: $time",
-                        color = MaterialTheme.colorScheme.error,
-                        modifier = Modifier
-                            .padding(16.dp)
-                            .fillMaxWidth()
-                    )
-                }
-                items(
-                    searchResults.categories,
-                    key = { it.id },
-                    contentType = { "category" }) { item ->
-                    CategoryCard(categoryItem = item, onNav = onNav)
+                item(
+                    key = "categories",
+                    contentType = "category",
+                ) {
+                    CategoriesFlowRow(searchResults.categories, onNav)
                 }
                 items(
                     searchResults.apps,
                     key = { it.packageName },
-                    contentType = { "app" }) { item ->
-                    AppListRow(item, false, modifier.clickable {
-                        onNav(NavigationKey.AppDetails(item.packageName))
-                    })
+                    contentType = { "app" },
+                ) { item ->
+                    AppListRow(
+                        item = item, isSelected = false,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .animateItem()
+                            .padding(horizontal = 8.dp)
+                            .clickable {
+                                onNav(NavigationKey.AppDetails(item.packageName))
+                            }
+                    )
                 }
             }
         }
     }
 }
 
+@Composable
+private fun CategoriesFlowRow(categories: List<CategoryItem>, onNav: (NavigationKey) -> Unit) {
+    FlowRow(modifier = Modifier.padding(horizontal = 8.dp)) {
+        categories.forEach { item ->
+            CategoryCard(categoryItem = item, onNav = onNav)
+        }
+    }
+}
+
 @Preview
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -126,7 +136,7 @@ private fun AppsSearchLoadingPreview() {
     FDroidContent {
         Box(Modifier.fillMaxSize()) {
             val state = rememberSearchBarState(SearchBarValue.Expanded)
-            AppsSearch(state, null, null, {}, {}, {})
+            AppsSearch(state, null, {}, {}, {})
         }
     }
 }
@@ -138,7 +148,25 @@ private fun AppsSearchEmptyPreview() {
     FDroidContent {
         Box(Modifier.fillMaxSize()) {
             val state = rememberSearchBarState(SearchBarValue.Expanded)
-            AppsSearch(state, SearchResults(emptyList(), emptyList()), null, {}, {}, {})
+            AppsSearch(state, SearchResults(emptyList(), emptyList()), {}, {}, {})
+        }
+    }
+}
+
+@Preview
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+private fun AppsSearchPreview() {
+    FDroidContent {
+        Box(Modifier.fillMaxSize()) {
+            val state = rememberSearchBarState(SearchBarValue.Expanded)
+            val categories = listOf(
+                CategoryItem("Bookmark", "Bookmark"),
+                CategoryItem("Browser", "Browser"),
+                CategoryItem("Calculator", "Calc"),
+                CategoryItem("Money", "Money"),
+            )
+            AppsSearch(state, SearchResults(emptyList(), categories), {}, {}, {})
         }
     }
 }
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 e36bdbdc5..f4586cc2e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -1,9 +1,7 @@
 package org.fdroid.ui.discover
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
@@ -17,7 +15,6 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -28,8 +25,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 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
@@ -38,6 +35,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
+import kotlinx.coroutines.launch
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.BottomBar
@@ -59,7 +57,6 @@ fun Discover(
     onListTap: (AppListType) -> Unit,
     onAppTap: (AppDiscoverItem) -> Unit,
     onNav: (NavKey) -> Unit,
-    onSearchOptionChanged: (SearchOption) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val searchBarState = rememberSearchBarState()
@@ -101,6 +98,7 @@ fun Discover(
         },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
+        val scope = rememberCoroutineScope()
         Column(
             Modifier
                 .fillMaxSize()
@@ -124,32 +122,19 @@ fun Discover(
                     AppsSearch(
                         searchBarState = searchBarState,
                         searchResults = discoverModel.searchResults,
-                        time = discoverModel.searchTime,
                         onSearch = onSearch,
-                        onNav = onNav,
+                        onNav = {
+                            scope.launch {
+                                // workaround for crash when navigating back:
+                                // IllegalStateException: LayoutCoordinate operations are only valid
+                                // when isAttached is true
+                                searchBarState.animateToCollapsed()
+                            }
+                            onNav(it)
+                        },
                         onSearchCleared = onSearchCleared,
                         modifier = Modifier.padding(top = 8.dp),
                     )
-
-                    SearchRadioButton(
-                        text = "Sqlite LIKE",
-                        isSelected = discoverModel.searchOption == SearchOption.LIKE,
-                    ) {
-                        onSearchOptionChanged(SearchOption.LIKE)
-                    }
-                    SearchRadioButton(
-                        text = "Room FTS4",
-                        isSelected = discoverModel.searchOption == SearchOption.FTS,
-                    ) {
-                        onSearchOptionChanged(SearchOption.FTS)
-                    }
-                    SearchRadioButton(
-                        text = "Appsearch",
-                        isSelected = discoverModel.searchOption == SearchOption.APPSEARCH,
-                    ) {
-                        onSearchOptionChanged(SearchOption.APPSEARCH)
-                    }
-
                     val listNew = AppListType.New(stringResource(R.string.app_list_new))
                     AppCarousel(
                         title = listNew.title,
@@ -191,25 +176,6 @@ fun Discover(
     }
 }
 
-@Composable
-fun SearchRadioButton(text: String, isSelected: Boolean, onClick: () -> Unit) {
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.clickable(onClick = onClick)
-    ) {
-        Text(
-            text, modifier = Modifier
-                .padding(horizontal = 16.dp, vertical = 8.dp)
-                .weight(1f)
-        )
-        RadioButton(
-            selected = isSelected,
-            onClick = null, modifier = Modifier
-                .padding(end = 16.dp)
-        )
-    }
-}
-
 @Preview
 @Composable
 fun LoadingDiscoverPreview() {
@@ -223,7 +189,6 @@ fun LoadingDiscoverPreview() {
             onNav = {},
             onSearch = {},
             onSearchCleared = {},
-            onSearchOptionChanged = {},
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index c3d9d7af8..5316e3548 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -4,10 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
-import org.fdroid.appsearch.SearchResults
 import org.fdroid.database.Repository
 import org.fdroid.ui.categories.CategoryItem
-import kotlin.time.Duration
 
 @Composable
 fun DiscoverPresenter(
@@ -15,14 +13,10 @@ fun DiscoverPresenter(
     categoriesFlow: Flow<List<CategoryItem>>,
     repositoriesFlow: Flow<List<Repository>>,
     searchResultsFlow: StateFlow<SearchResults?>,
-    searchOptionFlow: StateFlow<SearchOption>,
-    searchTimeFlow: StateFlow<Duration?>,
 ): DiscoverModel {
     val apps = appsFlow.collectAsState(null).value
     val categories = categoriesFlow.collectAsState(null).value
     val searchResults = searchResultsFlow.collectAsState().value
-    val searchOption = searchOptionFlow.collectAsState().value
-    val searchTime = searchTimeFlow.collectAsState().value
 
     return if (apps.isNullOrEmpty()) {
         val repositories = repositoriesFlow.collectAsState(null).value
@@ -42,8 +36,6 @@ fun DiscoverPresenter(
             recentlyUpdatedApps = apps.filter { !it.isNew },
             categories = categories,
             searchResults = searchResults,
-            searchOption = searchOption,
-            searchTime = searchTime,
         )
     }
 }
@@ -56,6 +48,4 @@ data class LoadedDiscoverModel(
     val recentlyUpdatedApps: List<AppDiscoverItem>,
     val categories: List<CategoryItem>?,
     val searchResults: SearchResults? = null,
-    val searchOption: SearchOption = SearchOption.APPSEARCH,
-    val searchTime: Duration? = null,
 ) : DiscoverModel()
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 966176511..9e0a9bb0d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -1,6 +1,7 @@
 package org.fdroid.ui.discover
 
 import android.app.Application
+import android.database.sqlite.SQLiteException
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
@@ -18,10 +19,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import mu.KotlinLogging
 import org.fdroid.LocaleChooser.getBestLocale
-import org.fdroid.appsearch.AppDocument
-import org.fdroid.appsearch.AppSearchManager
-import org.fdroid.appsearch.CategoryDocument
-import org.fdroid.appsearch.SearchResults
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
@@ -32,15 +29,8 @@ import org.fdroid.utils.IoDispatcher
 import java.text.Collator
 import java.util.Locale
 import javax.inject.Inject
-import kotlin.time.Duration
 import kotlin.time.measureTime
 
-enum class SearchOption {
-    LIKE,
-    FTS,
-    APPSEARCH,
-}
-
 @HiltViewModel
 class DiscoverViewModel @Inject constructor(
     app: Application,
@@ -48,8 +38,7 @@ class DiscoverViewModel @Inject constructor(
     private val db: FDroidDatabase,
     updatesManager: UpdatesManager,
     private val repoManager: RepoManager,
-    private val appSearchManager: AppSearchManager,
-    @IoDispatcher private val ioScope: CoroutineScope,
+    @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger { }
@@ -80,8 +69,6 @@ class DiscoverViewModel @Inject constructor(
         }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
     private val searchResults = MutableStateFlow<SearchResults?>(null)
-    private val searchOption = MutableStateFlow(SearchOption.FTS)
-    private val searchTime = MutableStateFlow<Duration?>(null)
 
     val localeList = LocaleListCompat.getDefault()
     val discoverModel: StateFlow<DiscoverModel> = scope.launchMolecule(mode = ContextClock) {
@@ -90,62 +77,10 @@ class DiscoverViewModel @Inject constructor(
             categoriesFlow = categories,
             repositoriesFlow = repoManager.repositoriesState,
             searchResultsFlow = searchResults,
-            searchOptionFlow = searchOption,
-            searchTimeFlow = searchTime,
         )
     }
 
     suspend fun search(term: String) = withContext(ioScope.coroutineContext) {
-        val duration = measureTime {
-            searchResults.value = when (searchOption.value) {
-                SearchOption.LIKE -> searchLike(term)
-                SearchOption.FTS -> searchFts(term)
-                SearchOption.APPSEARCH -> searchAppSearch(term)
-            }
-        }
-        searchTime.value = duration
-    }
-
-    private suspend fun searchAppSearch(term: String): SearchResults {
-        val categories = mutableListOf<CategoryItem>()
-        val apps = mutableListOf<AppListItem>()
-        val sanitized = term.replace(Regex.fromLiteral("\""), "")
-        appSearchManager.search(sanitized).forEach {
-            if (it is AppDocument) {
-                val repository = repoManager.getRepository(it.repoId) ?: return@forEach
-                AppListItem(
-                    packageName = it.packageName,
-                    name = it.name?.getBestLocale(localeList) ?: "Unknown",
-                    summary = it.summary?.getBestLocale(localeList) ?: "",
-                    lastUpdated = it.lastUpdated,
-                    iconDownloadRequest = it.icon?.getDownloadRequest(repository),
-                ).also { app -> apps.add(app) }
-            } else if (it is CategoryDocument) {
-                CategoryItem(
-                    id = it.id,
-                    name = it.name ?: "Unknown category",
-                ).also { c -> categories.add(c) }
-            }
-        }
-        return SearchResults(apps, categories)
-    }
-
-    private fun searchLike(term: String): SearchResults {
-        val sanitized = term.replace(Regex.fromLiteral("\""), "")
-        val apps = db.getAppDao().getAppSearchItemsLike(sanitized).mapNotNull {
-            val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
-            AppListItem(
-                packageName = it.packageName,
-                name = it.name?.getBestLocale(localeList) ?: "Unknown",
-                summary = it.summary?.getBestLocale(localeList) ?: "",
-                lastUpdated = it.lastUpdated,
-                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
-            )
-        }
-        return SearchResults(apps, emptyList())
-    }
-
-    private suspend fun searchFts(term: String): SearchResults {
         val sanitized = term.replace(Regex.fromLiteral("\""), "")
         val query = sanitized.split(' ').joinToString(" ") { word ->
             if (word.isBlank()) "" else {
@@ -161,29 +96,37 @@ class DiscoverViewModel @Inject constructor(
             }
         }
         log.info { "Searching for: $query" }
-        val apps = db.getAppDao().getAppSearchItemsFts(query).mapNotNull {
-            val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
-            AppListItem(
-                packageName = it.packageName,
-                name = it.name?.getBestLocale(localeList) ?: "Unknown",
-                summary = it.summary?.getBestLocale(localeList) ?: "",
-                lastUpdated = it.lastUpdated,
-                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
-            )
-        }
-        val categories = this.categories.first().filter {
-            // TODO handle diacritics as well
-            it.name.contains(sanitized, ignoreCase = true)
-        }
-        return SearchResults(apps, categories)
-    }
+        val duration = measureTime {
+            val apps = try {
+                db.getAppDao().getAppSearchItems(query).sortedDescending().mapNotNull {
+                    val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
+                    AppListItem(
 
-    fun onSearchOptionChanged(option: SearchOption) {
-        searchOption.value = option
+                        packageName = it.packageName,
+                        name = it.name.getBestLocale(localeList) ?: "Unknown",
+                        summary = it.summary.getBestLocale(localeList) ?: "",
+                        lastUpdated = it.lastUpdated,
+                        iconDownloadRequest = it.getIcon(localeList)
+                            ?.getDownloadRequest(repository),
+                    )
+                }
+            } catch (e: SQLiteException) {
+                log.error(e) { "Error searching for $query: " }
+                emptyList()
+            }
+            val categories = this@DiscoverViewModel.categories.first().filter {
+                // TODO handle diacritics as well
+                it.name.contains(sanitized, ignoreCase = true)
+            }
+            searchResults.value = SearchResults(apps, categories)
+        }
+        log.debug {
+            val numResults = searchResults.value?.apps?.size ?: 0
+            "Search for $query had $numResults results and took $duration"
+        }
     }
 
     fun onSearchCleared() {
         searchResults.value = null
-        searchTime.value = null
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/appsearch/SearchResults.kt b/next/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt
similarity index 85%
rename from next/src/main/kotlin/org/fdroid/appsearch/SearchResults.kt
rename to next/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt
index 868b9e3b6..5909724af 100644
--- a/next/src/main/kotlin/org/fdroid/appsearch/SearchResults.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt
@@ -1,4 +1,4 @@
-package org.fdroid.appsearch
+package org.fdroid.ui.discover
 
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListItem
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index cd0ade4cd..4daec5bde 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -43,7 +43,4 @@ class RepositoriesViewModel @Inject constructor(
 
     fun addRepo() {
     }
-
-    // TODO update appsearch when repo got disabled
-
 }

From e60061e8a265cb67e4c9e549b65b0b8b76f9e087 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 5 Aug 2025 09:41:48 -0300
Subject: [PATCH 043/180] Add proguard rules

---
 next/proguard-rules.pro | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/next/proguard-rules.pro b/next/proguard-rules.pro
index 481bb4348..339e28672 100644
--- a/next/proguard-rules.pro
+++ b/next/proguard-rules.pro
@@ -1,21 +1,9 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
+-dontobfuscate
+-dontoptimize
+-keepattributes SourceFile,LineNumberTable,Exceptions
+-keep class org.fdroid.fdroid.** {*;}
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+# Logging
+-keep class ch.qos.logback.classic.android.LogcatAppender
+-keepclassmembers class ch.qos.logback.** { *; }
+-keepclassmembers class  org.slf4j.impl.** { *; }

From bbe0f9021b6be852493a6e0ecb1c9f9c94bbf00b Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 8 Aug 2025 16:11:28 -0300
Subject: [PATCH 044/180] Filter bottom sheet

---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  14 +-
 .../org/fdroid/ui/categories/CategoryCard.kt  |  48 ++-
 .../org/fdroid/ui/categories/CategoryList.kt  |  10 +-
 .../org/fdroid/ui/discover/AppsSearch.kt      |   7 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |   3 +-
 .../kotlin/org/fdroid/ui/lists/AppList.kt     |  51 ++-
 .../kotlin/org/fdroid/ui/lists/AppListItem.kt |   4 +-
 .../org/fdroid/ui/lists/AppListPresenter.kt   |  35 +-
 .../kotlin/org/fdroid/ui/lists/AppListRow.kt  |   8 +-
 .../org/fdroid/ui/lists/AppListViewModel.kt   |  48 ++-
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  | 350 ++++++++++--------
 .../fdroid/ui/repositories/Repositories.kt    |  11 -
 .../ui/repositories/RepositoriesViewModel.kt  |  14 +-
 .../fdroid/ui/repositories/RepositoryItem.kt  |  28 ++
 next/src/main/res/values/strings-next.xml     |   1 +
 15 files changed, 384 insertions(+), 248 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index c59f7e6c4..6f1aa9921 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -154,11 +154,17 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                         }
 
                         override fun sortBy(sort: AppListSortOrder) = appListViewModel.sortBy(sort)
-                        override fun addCategory(category: String) =
-                            appListViewModel.addCategory(category)
+                        override fun addCategory(categoryId: String) =
+                            appListViewModel.addCategory(categoryId)
 
-                        override fun removeCategory(category: String) =
-                            appListViewModel.removeCategory(category)
+                        override fun removeCategory(categoryId: String) =
+                            appListViewModel.removeCategory(categoryId)
+
+                        override fun addRepository(repoId: Long) =
+                            appListViewModel.addRepository(repoId)
+
+                        override fun removeRepository(repoId: Long) =
+                            appListViewModel.removeRepository(repoId)
                     }
                     AppList(
                         appListInfo = appListInfo,
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt
index 8404cae29..4bb0dcf7c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt
@@ -1,50 +1,49 @@
 package org.fdroid.ui.categories
 
-import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.AssistChip
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.ui.NavigationKey
-import org.fdroid.ui.lists.AppListType
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
 
 @Composable
 fun CategoryCard(
     categoryItem: CategoryItem,
-    onNav: (NavigationKey) -> Unit,
+    onSelected: () -> Unit,
     modifier: Modifier = Modifier,
+    selected: Boolean = false,
 ) {
-    AssistChip(
-        onClick = {
-            val type = AppListType.Category(categoryItem.name, categoryItem.id)
-            val navKey = NavigationKey.AppList(type)
-            onNav(navKey)
-        },
+    FilterChip(
+        onClick = onSelected,
         leadingIcon = {
-            Image(
+            if (selected) Icon(
+                imageVector = Icons.Default.Check,
+                contentDescription = stringResource(R.string.filter_selected),
+            ) else Icon(
                 imageVector = categoryItem.imageVector,
                 contentDescription = null,
-                contentScale = ContentScale.None,
-                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
-                modifier = Modifier.padding(end = 8.dp),
+                tint = MaterialTheme.colorScheme.primary,
             )
         },
         label = {
             Text(
                 categoryItem.name,
                 maxLines = 2,
-                style = MaterialTheme.typography.bodySmall,
                 overflow = TextOverflow.Ellipsis,
             )
         },
+        selected = selected,
         modifier = modifier.padding(horizontal = 4.dp)
     )
 }
@@ -53,6 +52,17 @@ fun CategoryCard(
 @Composable
 fun CategoryCardPreview() {
     FDroidContent {
-        CategoryCard(CategoryItem("VPN & Proxy", "VPN & Proxy"), {})
+        Column {
+            CategoryCard(
+                CategoryItem("VPN & Proxy", "VPN & Proxy"),
+                selected = true,
+                onSelected = {},
+            )
+            CategoryCard(
+                CategoryItem("VPN & Proxy", "VPN & Proxy"),
+                selected = false,
+                onSelected = {},
+            )
+        }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index 2800b4d61..7f4664bf5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -16,8 +16,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
-import org.fdroid.next.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.lists.AppListType
 import kotlin.math.max
 
 @Composable
@@ -45,7 +47,11 @@ fun CategoryList(
                 )
             }
             items(categories, key = { it.name }) { category ->
-                CategoryCard(category, onNav)
+                CategoryCard(category, {
+                    val type = AppListType.Category(category.name, category.id)
+                    val navKey = NavigationKey.AppList(type)
+                    onNav(navKey)
+                })
             }
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index ae79937c4..709c38c00 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -34,6 +34,7 @@ import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryCard
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListRow
+import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.utils.BigLoadingIndicator
 
 @Composable
@@ -124,7 +125,11 @@ fun AppsSearch(
 private fun CategoriesFlowRow(categories: List<CategoryItem>, onNav: (NavigationKey) -> Unit) {
     FlowRow(modifier = Modifier.padding(horizontal = 8.dp)) {
         categories.forEach { item ->
-            CategoryCard(categoryItem = item, onNav = onNav)
+            CategoryCard(categoryItem = item, onSelected = {
+                val type = AppListType.Category(item.name, item.id)
+                val navKey = NavigationKey.AppList(type)
+                onNav(navKey)
+            })
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 9e0a9bb0d..d5b8cf809 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -101,13 +101,14 @@ class DiscoverViewModel @Inject constructor(
                 db.getAppDao().getAppSearchItems(query).sortedDescending().mapNotNull {
                     val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
                     AppListItem(
-
+                        repoId = it.repoId,
                         packageName = it.packageName,
                         name = it.name.getBestLocale(localeList) ?: "Unknown",
                         summary = it.summary.getBestLocale(localeList) ?: "",
                         lastUpdated = it.lastUpdated,
                         iconDownloadRequest = it.getIcon(localeList)
                             ?.getDownloadRequest(repository),
+                        categoryIds = it.categories?.toSet(),
                     )
                 }
             } catch (e: SQLiteException) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 61201d872..6fdc4ee2c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -1,12 +1,12 @@
 package org.fdroid.ui.lists
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
@@ -25,11 +25,12 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarDefaults.exitUntilCollapsedScrollBehavior
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateListOf
@@ -72,7 +73,7 @@ fun AppList(
                 actions = {
                     IconButton(onClick = { appListInfo.toggleFilterVisibility() }) {
                         val showFilterBadge = addedRepos.isNotEmpty() ||
-                            appListInfo.model.addedCategories.isNotEmpty()
+                            appListInfo.model.filteredCategoryIds.isNotEmpty()
                         BadgedBox(badge = {
                             if (showFilterBadge) Badge(
                                 containerColor = MaterialTheme.colorScheme.secondary,
@@ -94,11 +95,6 @@ fun AppList(
             modifier = Modifier
                 .padding(paddingValues),
         ) {
-            AppsFilter(
-                info = appListInfo,
-                addedRepos = addedRepos,
-                modifier = Modifier.background(TopAppBarDefaults.topAppBarColors().containerColor),
-            )
             val apps = appListInfo.model.apps
             if (apps == null) BigLoadingIndicator()
             else LazyColumn(
@@ -136,6 +132,17 @@ fun AppList(
                     Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
                 }
             }
+            // Bottom Sheet
+            val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
+            if (appListInfo.model.areFiltersShown) {
+                ModalBottomSheet(
+                    modifier = Modifier.fillMaxHeight(),
+                    sheetState = sheetState,
+                    onDismissRequest = { appListInfo.toggleFilterVisibility() },
+                ) {
+                    AppsFilter(info = appListInfo)
+                }
+            }
         }
     }
 }
@@ -147,20 +154,24 @@ private fun Preview() {
         val model = AppListModel(
             list = AppListType.New("New"),
             apps = listOf(
-                AppListItem("1", "This is app 1", "It has summary 2", 0, null),
-                AppListItem("2", "This is app 2", "It has summary 2", 0, null),
+                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null),
+                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null),
             ),
             areFiltersShown = true,
             sortBy = AppListSortOrder.NAME,
-            allCategories = null,
-            addedCategories = emptyList(),
+            categories = null,
+            filteredCategoryIds = emptySet(),
+            repositories = emptyList(),
+            filteredRepositoryIds = emptySet(),
         )
         val info = object : AppListInfo {
             override val model: AppListModel = model
             override fun toggleFilterVisibility() {}
             override fun sortBy(sort: AppListSortOrder) {}
-            override fun addCategory(category: String) {}
-            override fun removeCategory(category: String) {}
+            override fun addCategory(categoryId: String) {}
+            override fun removeCategory(categoryId: String) {}
+            override fun addRepository(repoId: Long) {}
+            override fun removeRepository(repoId: Long) {}
         }
         AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
     }
@@ -175,15 +186,19 @@ private fun PreviewEmpty() {
             apps = null,
             areFiltersShown = true,
             sortBy = AppListSortOrder.NAME,
-            allCategories = null,
-            addedCategories = emptyList(),
+            categories = null,
+            filteredCategoryIds = emptySet(),
+            repositories = emptyList(),
+            filteredRepositoryIds = emptySet(),
         )
         val info = object : AppListInfo {
             override val model: AppListModel = model
             override fun toggleFilterVisibility() {}
             override fun sortBy(sort: AppListSortOrder) {}
-            override fun addCategory(category: String) {}
-            override fun removeCategory(category: String) {}
+            override fun addCategory(categoryId: String) {}
+            override fun removeCategory(categoryId: String) {}
+            override fun addRepository(repoId: Long) {}
+            override fun removeRepository(repoId: Long) {}
         }
         AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
index b6bdd117d..e397ae995 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
@@ -3,9 +3,11 @@ package org.fdroid.ui.lists
 import org.fdroid.download.DownloadRequest
 
 data class AppListItem(
+    val repoId: Long,
     val packageName: String,
     val name: String,
     val summary: String,
     val lastUpdated: Long,
-    val iconDownloadRequest: DownloadRequest?,
+    val iconDownloadRequest: DownloadRequest? = null,
+    val categoryIds: Set<String>? = null,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
index 0cdf70cad..3634a8ae9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.ui.categories.CategoryItem
+import org.fdroid.ui.repositories.RepositoryItem
 import java.util.Locale
 
 @Composable
@@ -16,29 +17,37 @@ fun AppListPresenter(
     appsFlow: StateFlow<List<AppListItem>?>,
     areFiltersShownFlow: StateFlow<Boolean>,
     sortByFlow: StateFlow<AppListSortOrder>,
-    allCategoriesFlow: Flow<List<CategoryItem>>,
-    addedCategoriesFlow: StateFlow<List<String>>,
+    categoriesFlow: Flow<List<CategoryItem>>,
+    filteredCategoryIdsFlow: StateFlow<Set<String>>,
+    repositoriesFlow: Flow<List<RepositoryItem>>,
+    filteredRepositoryIdsFlow: StateFlow<Set<Long>>,
 ): AppListModel {
     val apps = appsFlow.collectAsState(null).value
     val sortBy = sortByFlow.collectAsState().value
-    val allCategories = allCategoriesFlow.collectAsState(null).value
-    val addedCategories = addedCategoriesFlow.collectAsState().value
+    val categories = categoriesFlow.collectAsState(null).value
+    val filteredCategoryIds = filteredCategoryIdsFlow.collectAsState().value
+    val repositories = repositoriesFlow.collectAsState(emptyList()).value
+    val filteredRepositoryIds = filteredRepositoryIdsFlow.collectAsState().value
 
-    val filteredApps = apps?.filter { app ->
-        addedCategories.isEmpty() || addedCategories.any { app.summary.contains(it) }
+    val filteredApps = apps?.filter {
+        (filteredRepositoryIds.isEmpty() || it.repoId in filteredRepositoryIds) &&
+            (filteredCategoryIds.isEmpty() ||
+                (it.categoryIds ?: emptySet()).intersect(filteredCategoryIds).isNotEmpty())
     }
-
+    val locale = Locale.getDefault()
     return AppListModel(
         list = listFlow.collectAsState().value,
         apps = if (sortBy == AppListSortOrder.NAME) {
-            filteredApps?.sortedBy { it.name.lowercase(Locale.getDefault()) }
+            filteredApps?.sortedBy { it.name.lowercase(locale) }
         } else {
             filteredApps?.sortedByDescending { it.lastUpdated }
         },
         areFiltersShown = areFiltersShownFlow.collectAsState().value,
         sortBy = sortBy,
-        allCategories = allCategories,
-        addedCategories = addedCategories,
+        categories = categories,
+        filteredCategoryIds = filteredCategoryIds,
+        repositories = repositories,
+        filteredRepositoryIds = filteredRepositoryIds,
     )
 }
 
@@ -47,6 +56,8 @@ data class AppListModel(
     val apps: List<AppListItem>?,
     val areFiltersShown: Boolean,
     val sortBy: AppListSortOrder,
-    val allCategories: List<CategoryItem>?,
-    val addedCategories: List<String>,
+    val categories: List<CategoryItem>?,
+    val filteredCategoryIds: Set<String>,
+    val repositories: List<RepositoryItem>,
+    val filteredRepositoryIds: Set<Long>,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
index b86f28d1c..996b01b61 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
@@ -49,8 +49,8 @@ fun AppListRow(
 @Composable
 fun AppListRowPreview() {
     FDroidContent {
-        val item1 = AppListItem("1", "This is app 1", "It has summary 2", 0, null)
-        val item2 = AppListItem("2", "This is app 2", "It has summary 2", 0, null)
+        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null)
+        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null)
         Column {
             AppListRow(item1, false)
             AppListRow(item2, true)
@@ -62,8 +62,8 @@ fun AppListRowPreview() {
 @Composable
 fun AppListRowPreviewNight() {
     FDroidContent {
-        val item1 = AppListItem("1", "This is app 1", "It has summary 2", 0, null)
-        val item2 = AppListItem("2", "This is app 2", "It has summary 2", 0, null)
+        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null)
+        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null)
         Column {
             AppListRow(item1, false)
             AppListRow(item2, true)
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 02f5953e0..7e7db45b9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -28,6 +28,7 @@ import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
 import org.fdroid.next.R
 import org.fdroid.ui.categories.CategoryItem
+import org.fdroid.ui.repositories.RepositoryItem
 import java.text.Collator
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -56,12 +57,19 @@ class AppListViewModel @Inject constructor(
             )
         }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
+    private val repositories = repoManager.repositoriesState.map { repositories ->
+        repositories.mapNotNull {
+            if (it.enabled) RepositoryItem(it, localeList)
+            else null
+        }.sortedBy { it.weight }
+    }
 
     private val currentList =
         MutableStateFlow<AppListType>(AppListType.New(app.getString(R.string.app_list_new)))
-    private val showFilters = savedStateHandle.getMutableStateFlow("showFilters", true)
+    private val showFilters = savedStateHandle.getMutableStateFlow("showFilters", false)
     private val sortBy = MutableStateFlow(AppListSortOrder.LAST_UPDATED)
-    private val addedCategories = MutableStateFlow<List<String>>(emptyList())
+    private val filteredCategoryIds = MutableStateFlow<Set<String>>(emptySet())
+    private val filteredRepositoryIds = MutableStateFlow<Set<Long>>(emptySet())
 
     val appListModel: StateFlow<AppListModel> = scope.launchMolecule(mode = ContextClock) {
         AppListPresenter(
@@ -69,8 +77,10 @@ class AppListViewModel @Inject constructor(
             appsFlow = apps,
             areFiltersShownFlow = showFilters,
             sortByFlow = sortBy,
-            allCategoriesFlow = categories,
-            addedCategoriesFlow = addedCategories,
+            categoriesFlow = categories,
+            filteredCategoryIdsFlow = filteredCategoryIds,
+            repositoriesFlow = repositories,
+            filteredRepositoryIdsFlow = filteredRepositoryIds,
         )
     }
 
@@ -106,7 +116,7 @@ class AppListViewModel @Inject constructor(
         appsLiveData = null
 
         currentList.value = type
-        when (type) {
+        when (type) { // TODO we may want to clean up the mess below and introduce new DB methods
             is AppListType.Author -> {
                 appsLiveData = db.getAppDao().getAppListItemsForAuthor(
                     packageManager = application.packageManager,
@@ -171,31 +181,49 @@ class AppListViewModel @Inject constructor(
     }
 
     fun addCategory(category: String) {
-        addedCategories.update {
-            addedCategories.value.toMutableList().apply {
+        filteredCategoryIds.update {
+            filteredCategoryIds.value.toMutableSet().apply {
                 add(category)
             }
         }
     }
 
     fun removeCategory(category: String) {
-        addedCategories.update {
-            addedCategories.value.toMutableList().apply {
+        filteredCategoryIds.update {
+            filteredCategoryIds.value.toMutableSet().apply {
                 remove(category)
             }
         }
     }
 
+    fun addRepository(repoId: Long) {
+        filteredRepositoryIds.update {
+            filteredRepositoryIds.value.toMutableSet().apply {
+                add(repoId)
+            }
+        }
+    }
+
+    fun removeRepository(repoId: Long) {
+        filteredRepositoryIds.update {
+            filteredRepositoryIds.value.toMutableSet().apply {
+                remove(repoId)
+            }
+        }
+    }
+
     fun onAppOverviewItems(items: List<AppOverviewItem>) {
         apps.value = items.mapNotNull {
             val repository = repoManager.getRepository(it.repoId)
                 ?: return@mapNotNull null
             AppListItem(
+                repoId = it.repoId,
                 packageName = it.packageName,
                 name = it.name ?: "Unknown",
                 summary = it.summary ?: "Unknown",
                 lastUpdated = it.lastUpdated,
                 iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
+                categoryIds = it.categories?.toSet(),
             )
         }
     }
@@ -205,11 +233,13 @@ class AppListViewModel @Inject constructor(
             val repository = repoManager.getRepository(it.repoId)
                 ?: return@mapNotNull null
             AppListItem(
+                repoId = it.repoId,
                 packageName = it.packageName,
                 name = it.name ?: "Unknown",
                 summary = it.summary ?: "Unknown",
                 lastUpdated = it.lastUpdated,
                 iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
+                categoryIds = it.categories?.toSet(),
             )
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index a99b894e8..34c35efba 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -1,198 +1,242 @@
 package org.fdroid.ui.lists
 
-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Arrangement.spacedBy
-import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Sort
 import androidx.compose.material.icons.filled.AccessTime
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.ArrowDropDown
-import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material.icons.filled.Category
+import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.SortByAlpha
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.FilterChip
-import androidx.compose.material3.FilterChipDefaults
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
+import org.fdroid.ui.categories.CategoryCard
+import org.fdroid.ui.categories.CategoryItem
+import org.fdroid.ui.icons.PackageVariant
+import org.fdroid.ui.repositories.RepositoryItem
+import org.fdroid.ui.utils.AsyncShimmerImage
 
 interface AppListInfo {
     val model: AppListModel
 
     fun toggleFilterVisibility()
     fun sortBy(sort: AppListSortOrder)
-    fun addCategory(category: String)
-    fun removeCategory(category: String)
+    fun addCategory(categoryId: String)
+    fun removeCategory(categoryId: String)
+    fun addRepository(repoId: Long)
+    fun removeRepository(repoId: Long)
 }
 
 @Composable
-fun ColumnScope.AppsFilter(
+fun AppsFilter(
     info: AppListInfo,
-    addedRepos: MutableList<String>,
     modifier: Modifier = Modifier,
 ) {
-    AnimatedVisibility(info.model.areFiltersShown) {
+    val scrollState = rememberScrollState()
+    Column(modifier = Modifier.verticalScroll(scrollState)) {
+        FilterHeader(Icons.AutoMirrored.Default.Sort, "Sorting")
         FlowRow(
+            horizontalArrangement = spacedBy(8.dp),
             modifier = modifier
                 .fillMaxWidth()
                 .padding(horizontal = 16.dp),
-            horizontalArrangement = spacedBy(16.dp),
         ) {
-            var sortByMenuExpanded by remember { mutableStateOf(false) }
-            var repoMenuExpanded by remember { mutableStateOf(false) }
-            var categoryMenuExpanded by remember { mutableStateOf(false) }
+            val byNameSelected = info.model.sortBy == AppListSortOrder.NAME
             FilterChip(
-                selected = false,
+                selected = byNameSelected,
                 leadingIcon = {
-                    val vector = when (info.model.sortBy) {
-                        AppListSortOrder.NAME -> Icons.Filled.SortByAlpha
-                        AppListSortOrder.LAST_UPDATED -> Icons.Filled.AccessTime
-                    }
-                    Icon(vector, null, modifier = Modifier.size(FilterChipDefaults.IconSize))
-                },
-                trailingIcon = {
-                    Icon(Icons.Filled.ArrowDropDown, null)
-                },
-                label = {
-                    val s = when (info.model.sortBy) {
-                        AppListSortOrder.NAME -> stringResource(R.string.sort_by_name)
-                        AppListSortOrder.LAST_UPDATED -> stringResource(R.string.sort_by_latest)
-                    }
-                    Text(s)
-                    DropdownMenu(
-                        expanded = sortByMenuExpanded,
-                        onDismissRequest = { sortByMenuExpanded = false },
-                    ) {
-                        DropdownMenuItem(
-                            text = { Text(stringResource(R.string.sort_by_name)) },
-                            leadingIcon = {
-                                Icon(Icons.Filled.SortByAlpha, null)
-                            },
-                            onClick = {
-                                info.sortBy(AppListSortOrder.NAME)
-                                sortByMenuExpanded = false
-                            },
-                        )
-                        DropdownMenuItem(
-                            text = { Text(stringResource(R.string.sort_by_latest)) },
-                            leadingIcon = {
-                                Icon(
-                                    imageVector = Icons.Filled.AccessTime,
-                                    contentDescription = null,
-                                )
-                            },
-                            onClick = {
-                                info.sortBy(AppListSortOrder.LAST_UPDATED)
-                                sortByMenuExpanded = false
-                            },
-                        )
-                    }
-                },
-                onClick = { sortByMenuExpanded = !sortByMenuExpanded },
-            )
-            if (!info.model.allCategories.isNullOrEmpty()) FilterChip(
-                selected = false,
-                leadingIcon = {
-                    Icon(
-                        Icons.Filled.Add,
-                        null,
-                        modifier = Modifier.size(FilterChipDefaults.IconSize),
-                    )
-                },
-                label = {
-                    Text(stringResource(R.string.category))
-                    DropdownMenu(
-                        expanded = categoryMenuExpanded,
-                        onDismissRequest = { categoryMenuExpanded = false },
-                    ) {
-                        info.model.allCategories?.forEach { category ->
-                            DropdownMenuItem(
-                                text = { Text(category.name) },
-                                onClick = {
-                                    info.addCategory(category.id)
-                                    categoryMenuExpanded = false
-                                },
-                            )
-                        }
-                    }
-                },
-                onClick = { categoryMenuExpanded = !categoryMenuExpanded },
-            )
-            FilterChip(
-                selected = false,
-                leadingIcon = {
-                    Icon(
-                        imageVector = Icons.Filled.Add,
-                        contentDescription = null,
-                        modifier = Modifier.size(FilterChipDefaults.IconSize),
-                    )
-                },
-                label = {
-                    Text(stringResource(R.string.repo_details))
-                    DropdownMenu(
-                        expanded = repoMenuExpanded,
-                        onDismissRequest = { repoMenuExpanded = false },
-                    ) {
-                        val repos = listOf(
-                            "F-Droid",
-                            "Guardian Project",
-                            "IzzyOnDroid",
-                        )
-                        repos.forEach { category ->
-                            DropdownMenuItem(
-                                text = { Text(category) },
-                                onClick = {
-                                    addedRepos.add(category)
-                                    repoMenuExpanded = false
-                                },
-                            )
-                        }
-                    }
-                },
-                onClick = { repoMenuExpanded = !repoMenuExpanded },
-            )
-            info.model.addedCategories.forEach { category ->
-                FilterChip(
-                    selected = true,
-                    trailingIcon = {
+                    if (byNameSelected) {
                         Icon(
-                            imageVector = Icons.Filled.Clear,
-                            contentDescription = null,
-                            modifier = Modifier.size(FilterChipDefaults.IconSize),
+                            imageVector = Icons.Default.Check,
+                            contentDescription = stringResource(R.string.filter_selected),
                         )
-                    },
-                    label = { Text(category) },
-                    onClick = { info.removeCategory(category) }
-                )
+                    } else {
+                        Icon(Icons.Default.SortByAlpha, null)
+                    }
+                },
+                label = {
+                    Text(stringResource(R.string.sort_by_name))
+                },
+                onClick = {
+                    if (!byNameSelected) info.sortBy(AppListSortOrder.NAME)
+                },
+            )
+            val byLatestSelected = info.model.sortBy == AppListSortOrder.LAST_UPDATED
+            FilterChip(
+                selected = byLatestSelected,
+                leadingIcon = {
+                    if (byLatestSelected) {
+                        Icon(
+                            imageVector = Icons.Default.Check,
+                            contentDescription = stringResource(R.string.filter_selected),
+                        )
+                    } else {
+                        Icon(Icons.Default.AccessTime, null)
+                    }
+                },
+                label = {
+                    Text(stringResource(R.string.sort_by_latest))
+                },
+                onClick = {
+                    if (!byLatestSelected) info.sortBy(AppListSortOrder.LAST_UPDATED)
+                },
+            )
+
+        }
+        val categories = info.model.categories
+        if (categories != null) {
+            HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
+            FilterHeader(Icons.Default.Category, "Categories")
+            FlowRow(
+                modifier = modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
+            ) {
+                categories.forEach { item ->
+                    val isSelected = item.id in info.model.filteredCategoryIds
+                    CategoryCard(item, selected = isSelected, onSelected = {
+                        if (isSelected) {
+                            info.removeCategory(item.id)
+                        } else {
+                            info.addCategory(item.id)
+                        }
+                    })
+                }
             }
-            addedRepos.forEach { repo ->
-                FilterChip(
-                    selected = true,
-                    trailingIcon = {
-                        Icon(
-                            imageVector = Icons.Filled.Clear,
-                            contentDescription = null,
-                            modifier = Modifier.size(FilterChipDefaults.IconSize),
-                        )
-                    },
-                    label = { Text(repo) },
-                    onClick = { addedRepos.remove(repo) }
-                )
+        }
+        if (info.model.repositories.isNotEmpty()) {
+            HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
+            FilterHeader(PackageVariant, "Repositories")
+            FlowRow(
+                horizontalArrangement = spacedBy(8.dp),
+                modifier = modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
+            ) {
+                info.model.repositories.forEach { repo ->
+                    val selected = repo.repoId in info.model.filteredRepositoryIds
+                    FilterChip(
+                        selected = selected,
+                        leadingIcon = {
+                            if (selected) {
+                                Icon(
+                                    imageVector = Icons.Default.Check,
+                                    contentDescription = stringResource(R.string.filter_selected),
+                                )
+                            } else AsyncShimmerImage(
+                                model = repo.icon,
+                                contentDescription = null,
+                                modifier = Modifier.size(24.dp)
+                            )
+                        },
+                        label = {
+                            Text(repo.name)
+                        },
+                        onClick = {
+                            if (selected) {
+                                info.removeRepository(repo.repoId)
+                            } else {
+                                info.addRepository(repo.repoId)
+                            }
+                        },
+                    )
+                }
             }
         }
     }
 }
+
+@Composable
+private fun FilterHeader(icon: ImageVector, text: String) {
+    Row(
+        horizontalArrangement = spacedBy(8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            tint = MaterialTheme.colorScheme.primary,
+        )
+        Text(text = text, style = MaterialTheme.typography.titleMedium)
+    }
+}
+
+@Composable
+@Preview
+private fun Preview() {
+    FDroidContent {
+        val model = AppListModel(
+            list = AppListType.New("New"),
+            apps = listOf(
+                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null),
+                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null),
+            ),
+            areFiltersShown = true,
+            sortBy = AppListSortOrder.NAME,
+            categories = listOf(
+                CategoryItem("App Store & Updater", "App Store & Updater"),
+                CategoryItem("Browser", "Browser"),
+                CategoryItem("Calendar & Agenda", "Calendar & Agenda"),
+                CategoryItem("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
+                CategoryItem("Connectivity", "Connectivity"),
+                CategoryItem("Development", "Development"),
+                CategoryItem("doesn't exist", "Foo bar"),
+            ),
+            filteredCategoryIds = setOf("Browser"),
+            repositories = listOf(
+                RepositoryItem(
+                    repoId = 1,
+                    address = "http://example.org",
+                    name = "F-Droid",
+                    icon = null,
+                    timestamp = 42,
+                    lastUpdated = null,
+                    weight = 1,
+                    enabled = true,
+                ),
+                RepositoryItem(
+                    repoId = 2,
+                    address = "http://example.org",
+                    name = "Guardian Project Repository",
+                    icon = null,
+                    timestamp = 42,
+                    lastUpdated = null,
+                    weight = 2,
+                    enabled = true,
+                ),
+            ),
+            filteredRepositoryIds = setOf(2),
+        )
+        val info = object : AppListInfo {
+            override val model: AppListModel = model
+            override fun toggleFilterVisibility() {}
+            override fun sortBy(sort: AppListSortOrder) {}
+            override fun addCategory(categoryId: String) {}
+            override fun removeCategory(categoryId: String) {}
+            override fun addRepository(repoId: Long) {}
+            override fun removeRepository(repoId: Long) {}
+        }
+        AppsFilter(info)
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index be0fb9105..29bd0bd99 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -118,14 +118,3 @@ fun RepositoriesScaffoldPreview() {
         Repositories(repos, repos[0].repoId, {}, {}) { }
     }
 }
-
-data class RepositoryItem(
-    val repoId: Long,
-    val address: String,
-    val name: String,
-    val icon: DownloadRequest? = null,
-    val timestamp: Long,
-    val lastUpdated: Long?,
-    val weight: Int,
-    val enabled: Boolean,
-)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 4daec5bde..ff06fd579 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
-import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
 import javax.inject.Inject
 
@@ -20,18 +19,7 @@ class RepositoriesViewModel @Inject constructor(
 
     private val localeList = LocaleListCompat.getDefault()
     val repos: Flow<List<RepositoryItem>> = repoManager.repositoriesState.map { repos ->
-        repos.map {
-            RepositoryItem(
-                repoId = it.repoId,
-                address = it.address,
-                name = it.getName(localeList) ?: "Unknown Repo",
-                icon = it.getIcon(localeList)?.getDownloadRequest(it),
-                timestamp = it.timestamp,
-                lastUpdated = it.lastUpdated,
-                weight = it.weight,
-                enabled = it.enabled,
-            )
-        }
+        repos.map { RepositoryItem(it, localeList) }
     }
 
     private val _visibleRepositoryItem = MutableStateFlow<RepositoryItem?>(null)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
new file mode 100644
index 000000000..e9eca64c7
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
@@ -0,0 +1,28 @@
+package org.fdroid.ui.repositories
+
+import androidx.core.os.LocaleListCompat
+import org.fdroid.database.Repository
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.getDownloadRequest
+
+data class RepositoryItem(
+    val repoId: Long,
+    val address: String,
+    val name: String,
+    val icon: DownloadRequest? = null,
+    val timestamp: Long,
+    val lastUpdated: Long?,
+    val weight: Int,
+    val enabled: Boolean,
+) {
+    constructor(repo: Repository, localeList: LocaleListCompat) : this(
+        repoId = repo.repoId,
+        address = repo.address,
+        name = repo.getName(localeList) ?: "Unknown Repo",
+        icon = repo.getIcon(localeList)?.getDownloadRequest(repo),
+        timestamp = repo.timestamp,
+        lastUpdated = repo.lastUpdated,
+        weight = repo.weight,
+        enabled = repo.enabled,
+    )
+}
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 4e108e663..cb2efaad6 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -22,6 +22,7 @@
     <string name="search_no_results">No apps found.\n\nTry to use less search terms or add/enable more repositories.</string>
     <string name="sort_by_name">Sort by name</string>
     <string name="sort_by_latest">Sort by latest</string>
+    <string name="filter_selected">selected</string>
     <string name="category">Category</string>
 
     <string name="author_by">By %1$s</string>

From 885122bf9fc121fe89b5c87999466e36eee9b5eb Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 8 Aug 2025 18:55:28 -0300
Subject: [PATCH 045/180] Add search query filter to lists

---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   3 +
 .../kotlin/org/fdroid/ui/lists/AppList.kt     |  77 ++++++++-
 .../org/fdroid/ui/lists/AppListPresenter.kt   |  23 ++-
 .../org/fdroid/ui/lists/AppListViewModel.kt   | 155 ++++--------------
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  |   2 +
 5 files changed, 132 insertions(+), 128 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 6f1aa9921..14bd2e43b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -165,6 +165,9 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
 
                         override fun removeRepository(repoId: Long) =
                             appListViewModel.removeRepository(repoId)
+
+                        override fun onSearch(query: String) =
+                            appListViewModel.onSearch(query)
                     }
                     AppList(
                         appListInfo = appListInfo,
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 6fdc4ee2c..c856ef87b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -8,16 +8,20 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.FilterList
+import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -27,26 +31,43 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarDefaults.exitUntilCollapsedScrollBehavior
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.debounce
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.utils.BigLoadingIndicator
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
+@OptIn(
+    ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class,
+    FlowPreview::class
+)
 fun AppList(
     appListInfo: AppListInfo,
     currentPackageName: String?,
@@ -54,16 +75,56 @@ fun AppList(
     onBackClicked: () -> Unit,
     onItemClick: (String) -> Unit,
 ) {
+    var searchActive by rememberSaveable { mutableStateOf(false) }
+    val searchFieldState = rememberTextFieldState()
+    val focusRequester = remember { FocusRequester() }
     val scrollBehavior = exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
     val addedRepos = remember { mutableStateListOf<String>() }
     Scaffold(
         topBar = {
-            TopAppBar(
+            if (searchActive) {
+                SearchBarDefaults.InputField(
+                    state = searchFieldState,
+                    leadingIcon = {
+                        IconButton(onClick = { searchActive = false }) {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                                contentDescription = stringResource(R.string.back),
+                            )
+                        }
+                    },
+                    onSearch = appListInfo::onSearch,
+                    expanded = false,
+                    onExpandedChange = {},
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .focusRequester(focusRequester)
+                        .statusBarsPadding()
+                        .height(TopAppBarDefaults.TopAppBarExpandedHeight)
+                        .padding(horizontal = 8.dp)
+                )
+                LaunchedEffect(Unit) {
+                    focusRequester.requestFocus()
+                    snapshotFlow { searchFieldState.text }
+                        .debounce(500)
+                        .collectLatest {
+                            if (it.length >= 2) {
+                                appListInfo.onSearch(searchFieldState.text.toString())
+                            }
+                        }
+                }
+            } else TopAppBar(
                 title = {
-                    Text(appListInfo.model.list.title)
+                    Text(
+                        appListInfo.model.list.title,
+                        maxLines = 1,
+                        overflow = TextOverflow.MiddleEllipsis,
+                    )
                 },
                 navigationIcon = {
-                    IconButton(onClick = onBackClicked) {
+                    IconButton(onClick = {
+                        if (searchActive) searchActive = false else onBackClicked()
+                    }) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Default.ArrowBack,
                             contentDescription = stringResource(R.string.back),
@@ -71,6 +132,12 @@ fun AppList(
                     }
                 },
                 actions = {
+                    IconButton(onClick = { searchActive = true }) {
+                        Icon(
+                            Icons.Filled.Search,
+                            contentDescription = null,
+                        )
+                    }
                     IconButton(onClick = { appListInfo.toggleFilterVisibility() }) {
                         val showFilterBadge = addedRepos.isNotEmpty() ||
                             appListInfo.model.filteredCategoryIds.isNotEmpty()
@@ -172,6 +239,7 @@ private fun Preview() {
             override fun removeCategory(categoryId: String) {}
             override fun addRepository(repoId: Long) {}
             override fun removeRepository(repoId: Long) {}
+            override fun onSearch(query: String) {}
         }
         AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
     }
@@ -199,6 +267,7 @@ private fun PreviewEmpty() {
             override fun removeCategory(categoryId: String) {}
             override fun addRepository(repoId: Long) {}
             override fun removeRepository(repoId: Long) {}
+            override fun onSearch(query: String) {}
         }
         AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
index 3634a8ae9..e89a6151e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
@@ -4,6 +4,7 @@ package org.fdroid.ui.lists
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.remember
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.AppListSortOrder
@@ -21,6 +22,7 @@ fun AppListPresenter(
     filteredCategoryIdsFlow: StateFlow<Set<String>>,
     repositoriesFlow: Flow<List<RepositoryItem>>,
     filteredRepositoryIdsFlow: StateFlow<Set<Long>>,
+    searchQueryFlow: StateFlow<String>,
 ): AppListModel {
     val apps = appsFlow.collectAsState(null).value
     val sortBy = sortByFlow.collectAsState().value
@@ -28,11 +30,24 @@ fun AppListPresenter(
     val filteredCategoryIds = filteredCategoryIdsFlow.collectAsState().value
     val repositories = repositoriesFlow.collectAsState(emptyList()).value
     val filteredRepositoryIds = filteredRepositoryIdsFlow.collectAsState().value
+    val searchQuery = searchQueryFlow.collectAsState().value
 
+    val availableCategoryIds = remember(apps) {
+        apps?.flatMap { it.categoryIds ?: emptySet() }?.toSet() ?: emptySet()
+    }
+    val filteredCategories = remember(categories, apps) {
+        categories?.filter {
+            it.id in availableCategoryIds
+        }
+    }
     val filteredApps = apps?.filter {
-        (filteredRepositoryIds.isEmpty() || it.repoId in filteredRepositoryIds) &&
-            (filteredCategoryIds.isEmpty() ||
-                (it.categoryIds ?: emptySet()).intersect(filteredCategoryIds).isNotEmpty())
+        val matchesCategories = filteredCategoryIds.isEmpty() ||
+            (it.categoryIds ?: emptySet()).intersect(filteredCategoryIds).isNotEmpty()
+        val matchesRepos = filteredRepositoryIds.isEmpty() || it.repoId in filteredRepositoryIds
+        val matchesQuery = searchQuery.isEmpty() ||
+            it.name.contains(searchQuery, ignoreCase = true) ||
+            it.summary.contains(searchQuery, ignoreCase = true)
+        matchesCategories && matchesRepos && matchesQuery
     }
     val locale = Locale.getDefault()
     return AppListModel(
@@ -44,7 +59,7 @@ fun AppListPresenter(
         },
         areFiltersShown = areFiltersShownFlow.collectAsState().value,
         sortBy = sortBy,
-        categories = categories,
+        categories = filteredCategories,
         filteredCategoryIds = filteredCategoryIds,
         repositories = repositories,
         filteredRepositoryIds = filteredRepositoryIds,
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 7e7db45b9..916dedf06 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -2,27 +2,24 @@ package org.fdroid.ui.lists
 
 import android.app.Application
 import androidx.annotation.UiThread
+import androidx.annotation.WorkerThread
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.Observer
 import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.application
 import androidx.lifecycle.asFlow
-import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
 import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
-import mu.KotlinLogging
+import kotlinx.coroutines.launch
 import org.fdroid.database.AppListSortOrder
-import org.fdroid.database.AppOverviewItem
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
@@ -31,7 +28,6 @@ import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.repositories.RepositoryItem
 import java.text.Collator
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @HiltViewModel
@@ -42,12 +38,10 @@ class AppListViewModel @Inject constructor(
     private val repoManager: RepoManager,
 ) : AndroidViewModel(app) {
 
-    private val log = KotlinLogging.logger { }
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
     private val localeList = LocaleListCompat.getDefault()
     private val apps = MutableStateFlow<List<AppListItem>?>(null)
-    private var appsLiveData: LiveData<*>? = null
     private val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
         val collator = Collator.getInstance(Locale.getDefault())
         categories.map { category ->
@@ -63,6 +57,7 @@ class AppListViewModel @Inject constructor(
             else null
         }.sortedBy { it.weight }
     }
+    private val query = MutableStateFlow("")
 
     private val currentList =
         MutableStateFlow<AppListType>(AppListType.New(app.getString(R.string.app_list_new)))
@@ -81,94 +76,42 @@ class AppListViewModel @Inject constructor(
             filteredCategoryIdsFlow = filteredCategoryIds,
             repositoriesFlow = repositories,
             filteredRepositoryIdsFlow = filteredRepositoryIds,
+            searchQueryFlow = query,
         )
     }
 
-    @Suppress("UNCHECKED_CAST")
-    private val appsObserver = Observer<Any> { items ->
-        val list = items as? List<*> ?: return@Observer
-        if (list.isEmpty()) {
-            apps.value = emptyList()
-        } else {
-            when (items[0]) {
-                is AppOverviewItem -> onAppOverviewItems(items as List<AppOverviewItem>)
-                is org.fdroid.database.AppListItem -> {
-                    onAppListItems(items as List<org.fdroid.database.AppListItem>)
-                }
-                else -> error("Unknown item class: ${items[0]?.javaClass?.name}")
-            }
-        }
-    }
-
-    init {
-        log.info("init $this")
-    }
-
-    override fun onCleared() {
-        log.info("onCleared $this")
-        appsLiveData?.removeObserver(appsObserver)
-    }
-
     @UiThread
     fun load(type: AppListType) {
         apps.value = null
-        appsLiveData?.removeObserver(appsObserver)
-        appsLiveData = null
-
         currentList.value = type
-        when (type) { // TODO we may want to clean up the mess below and introduce new DB methods
-            is AppListType.Author -> {
-                appsLiveData = db.getAppDao().getAppListItemsForAuthor(
-                    packageManager = application.packageManager,
-                    author = type.authorName,
-                    searchQuery = null,
-                    sortOrder = sortBy.value,
-                ).apply {
-                    observeForever(appsObserver)
-                }
-            }
-            is AppListType.Category -> {
-                appsLiveData = db.getAppDao().getAppListItems(
-                    packageManager = application.packageManager,
-                    category = type.categoryId,
-                    searchQuery = null,
-                    sortOrder = sortBy.value,
-                ).apply {
-                    observeForever(appsObserver)
-                }
-            }
-            is AppListType.New -> {
-                val cutOffMillis = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(14)
-                appsLiveData = db.getAppDao().getAppOverviewItems().map { list ->
-                    list.filter { it.added > cutOffMillis && it.lastUpdated == it.added }
-                }.apply {
-                    observeForever(appsObserver)
-                }
-            }
-            is AppListType.RecentlyUpdated -> {
-                appsLiveData = db.getAppDao().getAppOverviewItems().apply {
-                    observeForever(appsObserver)
-                }
-            }
-            is AppListType.All -> {
-                appsLiveData = db.getAppDao().getAppListItems(
-                    packageManager = application.packageManager,
-                    searchQuery = null,
-                    sortOrder = sortBy.value,
-                ).apply {
-                    observeForever(appsObserver)
-                }
-            }
-            is AppListType.Repository -> {
-                appsLiveData = db.getAppDao().getAppListItems(
-                    packageManager = application.packageManager,
-                    repoId = type.repoId,
-                    searchQuery = null,
-                    sortOrder = sortBy.value,
-                ).apply {
-                    observeForever(appsObserver)
-                }
-            }
+
+        viewModelScope.launch(Dispatchers.IO) {
+            apps.value = loadApps(type)
+        }
+    }
+
+    @WorkerThread
+    private suspend fun loadApps(type: AppListType): List<AppListItem> {
+        val appDao = db.getAppDao()
+        return when (type) {
+            is AppListType.Author -> appDao.getAppsByAuthor(type.authorName)
+            is AppListType.Category -> appDao.getAppsByCategory(type.categoryId)
+            is AppListType.New -> appDao.getNewApps()
+            is AppListType.RecentlyUpdated -> appDao.getRecentlyUpdatedApps()
+            is AppListType.All -> appDao.getAllApps()
+            is AppListType.Repository -> appDao.getAppsByRepository(type.repoId)
+        }.mapNotNull {
+            val repository = repoManager.getRepository(it.repoId)
+                ?: return@mapNotNull null
+            AppListItem(
+                repoId = it.repoId,
+                packageName = it.packageName,
+                name = it.name ?: "Unknown",
+                summary = it.summary ?: "Unknown",
+                lastUpdated = it.lastUpdated,
+                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
+                categoryIds = it.categories?.toSet(),
+            )
         }
     }
 
@@ -212,35 +155,7 @@ class AppListViewModel @Inject constructor(
         }
     }
 
-    fun onAppOverviewItems(items: List<AppOverviewItem>) {
-        apps.value = items.mapNotNull {
-            val repository = repoManager.getRepository(it.repoId)
-                ?: return@mapNotNull null
-            AppListItem(
-                repoId = it.repoId,
-                packageName = it.packageName,
-                name = it.name ?: "Unknown",
-                summary = it.summary ?: "Unknown",
-                lastUpdated = it.lastUpdated,
-                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
-                categoryIds = it.categories?.toSet(),
-            )
-        }
-    }
-
-    private fun onAppListItems(items: List<org.fdroid.database.AppListItem>) {
-        apps.value = items.mapNotNull {
-            val repository = repoManager.getRepository(it.repoId)
-                ?: return@mapNotNull null
-            AppListItem(
-                repoId = it.repoId,
-                packageName = it.packageName,
-                name = it.name ?: "Unknown",
-                summary = it.summary ?: "Unknown",
-                lastUpdated = it.lastUpdated,
-                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
-                categoryIds = it.categories?.toSet(),
-            )
-        }
+    fun onSearch(query: String) {
+        this.query.value = query
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index 34c35efba..76ca9fb73 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -45,6 +45,7 @@ interface AppListInfo {
     fun removeCategory(categoryId: String)
     fun addRepository(repoId: Long)
     fun removeRepository(repoId: Long)
+    fun onSearch(query: String)
 }
 
 @Composable
@@ -236,6 +237,7 @@ private fun Preview() {
             override fun removeCategory(categoryId: String) {}
             override fun addRepository(repoId: Long) {}
             override fun removeRepository(repoId: Long) {}
+            override fun onSearch(query: String) {}
         }
         AppsFilter(info)
     }

From 9818f586a7a24ad739d9c6b3e22fe4589a4cb08e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 15 Aug 2025 12:00:29 -0300
Subject: [PATCH 046/180] Enable setDiagnosticStackTraceEnabled for compose in
 debug builds

---
 next/src/main/kotlin/org/fdroid/App.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index f065ba334..45ab98f49 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -2,6 +2,8 @@ package org.fdroid
 
 import android.app.Application
 import android.content.Context
+import androidx.compose.runtime.Composer
+import androidx.compose.runtime.ExperimentalComposeRuntimeApi
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import coil3.ImageLoader
@@ -36,8 +38,10 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
             .setWorkerFactory(workerFactory)
             .build()
 
+    @OptIn(ExperimentalComposeRuntimeApi::class)
     override fun onCreate() {
         super.onCreate()
+        Composer.setDiagnosticStackTraceEnabled(BuildConfig.DEBUG)
         RepoUpdateWorker.Companion.scheduleOrCancel(applicationContext)
     }
 

From 1246f13199244a7a3a6adbf156021ac75675c547 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 18 Aug 2025 17:16:48 -0300
Subject: [PATCH 047/180] Improve information hierarchy for search results

---
 .../org/fdroid/ui/discover/AppsSearch.kt      | 99 +++++++++++++++----
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  5 +-
 2 files changed, 85 insertions(+), 19 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 709c38c00..515aa6b24 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -2,8 +2,8 @@ package org.fdroid.ui.discover
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -15,12 +15,14 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.ExpandedFullScreenSearchBar
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SearchBar
 import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopSearchBar
 import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -33,6 +35,7 @@ import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryCard
 import org.fdroid.ui.categories.CategoryItem
+import org.fdroid.ui.lists.AppListItem
 import org.fdroid.ui.lists.AppListRow
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.utils.BigLoadingIndicator
@@ -47,9 +50,8 @@ fun AppsSearch(
     onSearchCleared: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    TopSearchBar(
+    SearchBar(
         state = searchBarState,
-        windowInsets = WindowInsets(),
         inputField = {
             // InputField is different from ExpandedFullScreenSearchBar to separate textFieldState
             SearchBarDefaults.InputField(
@@ -94,11 +96,32 @@ fun AppsSearch(
             )
         } else {
             LazyColumn(modifier = Modifier.fillMaxSize()) {
-                item(
-                    key = "categories",
-                    contentType = "category",
-                ) {
-                    CategoriesFlowRow(searchResults.categories, onNav)
+                if (searchResults.categories.isNotEmpty()) {
+                    item(
+                        key = "categories",
+                        contentType = "category",
+                    ) {
+                        CategoriesFlowRow(searchResults.categories, onNav)
+                    }
+                }
+                if (searchResults.apps.isNotEmpty()) {
+                    item(
+                        key = "appsHeader",
+                        contentType = "appsHeader",
+                    ) {
+                        Column {
+                            if (searchResults.categories.isNotEmpty()) {
+                                HorizontalDivider(
+                                    modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)
+                                )
+                            }
+                            Text(
+                                text = stringResource(R.string.apps),
+                                style = MaterialTheme.typography.labelLarge,
+                                modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)
+                            )
+                        }
+                    }
                 }
                 items(
                     searchResults.apps,
@@ -110,7 +133,6 @@ fun AppsSearch(
                         modifier = Modifier
                             .fillMaxWidth()
                             .animateItem()
-                            .padding(horizontal = 8.dp)
                             .clickable {
                                 onNav(NavigationKey.AppDetails(item.packageName))
                             }
@@ -123,13 +145,32 @@ fun AppsSearch(
 
 @Composable
 private fun CategoriesFlowRow(categories: List<CategoryItem>, onNav: (NavigationKey) -> Unit) {
-    FlowRow(modifier = Modifier.padding(horizontal = 8.dp)) {
-        categories.forEach { item ->
-            CategoryCard(categoryItem = item, onSelected = {
-                val type = AppListType.Category(item.name, item.id)
-                val navKey = NavigationKey.AppList(type)
-                onNav(navKey)
-            })
+    Column(modifier = Modifier.padding(horizontal = 8.dp)) {
+        Text(
+            text = stringResource(R.string.main_menu__categories),
+            style = MaterialTheme.typography.labelLarge,
+            modifier = Modifier.padding(8.dp)
+        )
+        FlowRow {
+            categories.forEach { item ->
+                CategoryCard(categoryItem = item, onSelected = {
+                    val type = AppListType.Category(item.name, item.id)
+                    val navKey = NavigationKey.AppList(type)
+                    onNav(navKey)
+                })
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+private fun AppsSearchCollapsedPreview() {
+    FDroidContent {
+        Box(Modifier.fillMaxSize()) {
+            val state = rememberSearchBarState()
+            AppsSearch(state, null, {}, {}, {})
         }
     }
 }
@@ -161,7 +202,7 @@ private fun AppsSearchEmptyPreview() {
 @Preview
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-private fun AppsSearchPreview() {
+private fun AppsSearchOnlyCategoriesPreview() {
     FDroidContent {
         Box(Modifier.fillMaxSize()) {
             val state = rememberSearchBarState(SearchBarValue.Expanded)
@@ -175,3 +216,25 @@ private fun AppsSearchPreview() {
         }
     }
 }
+
+@Preview
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+private fun AppsSearchPreview() {
+    FDroidContent {
+        Box(Modifier.fillMaxSize()) {
+            val state = rememberSearchBarState(SearchBarValue.Expanded)
+            val categories = listOf(
+                CategoryItem("Bookmark", "Bookmark"),
+                CategoryItem("Browser", "Browser"),
+                CategoryItem("Calculator", "Calc"),
+                CategoryItem("Money", "Money"),
+            )
+            val apps = listOf(
+                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null),
+                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null),
+            )
+            AppsSearch(state, SearchResults(apps, categories), {}, {}, {})
+        }
+    }
+}
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 f4586cc2e..65871feec 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -27,6 +27,7 @@ import androidx.compose.runtime.mutableStateOf
 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
@@ -133,7 +134,9 @@ fun Discover(
                             onNav(it)
                         },
                         onSearchCleared = onSearchCleared,
-                        modifier = Modifier.padding(top = 8.dp),
+                        modifier = Modifier
+                            .padding(16.dp)
+                            .align(Alignment.CenterHorizontally),
                     )
                     val listNew = AppListType.New(stringResource(R.string.app_list_new))
                     AppCarousel(

From 080cdbb71dbffd40f18fcd656ebe151dc41e3327 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 20 Aug 2025 16:34:23 -0300
Subject: [PATCH 048/180] Do diacritics insensitive category search

---
 .../fdroid/ui/discover/DiscoverViewModel.kt   | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index d5b8cf809..f76273fb9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -27,9 +27,11 @@ import org.fdroid.ui.lists.AppListItem
 import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
 import java.text.Collator
+import java.text.Normalizer
+import java.text.Normalizer.Form.NFKD
 import java.util.Locale
 import javax.inject.Inject
-import kotlin.time.measureTime
+import kotlin.time.measureTimedValue
 
 @HiltViewModel
 class DiscoverViewModel @Inject constructor(
@@ -43,6 +45,8 @@ class DiscoverViewModel @Inject constructor(
 
     private val log = KotlinLogging.logger { }
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+    private val collator = Collator.getInstance(Locale.getDefault())
+    private val normalizerRegex = "\\p{M}".toRegex()
 
     val numUpdates = updatesManager.numUpdates
     val apps = db.getAppDao().getAppOverviewItems().asFlow().map { list ->
@@ -60,7 +64,6 @@ class DiscoverViewModel @Inject constructor(
         }
     }
     val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
-        val collator = Collator.getInstance(Locale.getDefault())
         categories.map { category ->
             CategoryItem(
                 id = category.id,
@@ -96,8 +99,8 @@ class DiscoverViewModel @Inject constructor(
             }
         }
         log.info { "Searching for: $query" }
-        val duration = measureTime {
-            val apps = try {
+        val timedApps = measureTimedValue {
+            try {
                 db.getAppDao().getAppSearchItems(query).sortedDescending().mapNotNull {
                     val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
                     AppListItem(
@@ -115,19 +118,30 @@ class DiscoverViewModel @Inject constructor(
                 log.error(e) { "Error searching for $query: " }
                 emptyList()
             }
-            val categories = this@DiscoverViewModel.categories.first().filter {
-                // TODO handle diacritics as well
-                it.name.contains(sanitized, ignoreCase = true)
-            }
-            searchResults.value = SearchResults(apps, categories)
         }
+        val timedCategories = measureTimedValue {
+            this@DiscoverViewModel.categories.first().filter {
+                // normalization removed diacritics, so searches without them work
+                it.name.normalize().contains(sanitized.normalize(), ignoreCase = true)
+            }
+        }
+        searchResults.value = SearchResults(timedApps.value, timedCategories.value)
         log.debug {
             val numResults = searchResults.value?.apps?.size ?: 0
-            "Search for $query had $numResults results and took $duration"
+            "Search for $query had $numResults results " +
+                "and took ${timedApps.duration} and ${timedCategories.duration}"
         }
     }
 
     fun onSearchCleared() {
         searchResults.value = null
     }
+
+    /**
+     * Normalizes the string by removing any diacritics that may appear.
+     */
+    private fun String.normalize(): String {
+        if (Normalizer.isNormalized(this, NFKD)) return this
+        return Normalizer.normalize(this, NFKD).replace(normalizerRegex, "")
+    }
 }

From c77da155e9e0aef9754990dd376025b300d7a43d Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 21 Aug 2025 16:47:08 -0300
Subject: [PATCH 049/180] Improve app list search filtering

---
 .../fdroid/ui/discover/AppSearchInputField.kt |  19 ++-
 .../org/fdroid/ui/discover/AppsSearch.kt      |  15 ++-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |  14 +-
 .../kotlin/org/fdroid/ui/lists/AppList.kt     | 122 +++++++++---------
 .../org/fdroid/ui/lists/AppListPresenter.kt   |   7 +-
 .../org/fdroid/ui/lists/AppListViewModel.kt   |   4 +-
 .../org/fdroid/ui/lists/TopSearchBar.kt       |  85 ++++++++++++
 .../kotlin/org/fdroid/ui/utils/UiUtils.kt     |  12 ++
 next/src/main/res/values/strings-next.xml     |   4 +
 9 files changed, 194 insertions(+), 88 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
index 246014fd3..204499eab 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
@@ -1,6 +1,7 @@
 package org.fdroid.ui.discover
 
 import androidx.compose.foundation.text.input.TextFieldState
+import androidx.compose.foundation.text.input.placeCursorAtEnd
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Clear
@@ -21,6 +22,7 @@ import androidx.compose.ui.res.stringResource
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
 import org.fdroid.next.R
 
@@ -35,10 +37,16 @@ fun AppSearchInputField(
     val scope = rememberCoroutineScope()
     // set-up search as you type
     LaunchedEffect(Unit) {
+        textFieldState.edit { placeCursorAtEnd() }
         snapshotFlow { textFieldState.text }
+            .distinctUntilChanged()
             .debounce(500)
             .collectLatest {
-                if (it.length > 2) onSearch(textFieldState.text.toString())
+                if (it.isEmpty()) {
+                    onSearchCleared()
+                } else if (it.length >= SEARCH_THRESHOLD) {
+                    onSearch(textFieldState.text.toString())
+                }
             }
     }
     SearchBarDefaults.InputField(
@@ -60,15 +68,18 @@ fun AppSearchInputField(
                     )
                 }
             } else {
-                Icon(Icons.Default.Search, contentDescription = null)
+                Icon(
+                    imageVector = Icons.Default.Search,
+                    contentDescription = stringResource(R.string.menu_search),
+                )
             }
         },
         trailingIcon = {
             if (textFieldState.text.isNotEmpty()) {
                 IconButton(onClick = onSearchCleared) {
                     Icon(
-                        Icons.Filled.Clear,
-                        contentDescription = null,
+                        imageVector = Icons.Filled.Clear,
+                        contentDescription = stringResource(R.string.clear_search),
                     )
                 }
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 515aa6b24..9922940e8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -40,6 +40,11 @@ import org.fdroid.ui.lists.AppListRow
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.utils.BigLoadingIndicator
 
+/**
+ * The minimum amount of characters we start auto-searching for.
+ */
+const val SEARCH_THRESHOLD = 2
+
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun AppsSearch(
@@ -50,13 +55,14 @@ fun AppsSearch(
     onSearchCleared: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val textFieldState = rememberTextFieldState()
     SearchBar(
         state = searchBarState,
         inputField = {
-            // InputField is different from ExpandedFullScreenSearchBar to separate textFieldState
+            // InputField is different from ExpandedFullScreenSearchBar to separate onSearch()
             SearchBarDefaults.InputField(
                 searchBarState = searchBarState,
-                textFieldState = rememberTextFieldState(),
+                textFieldState = textFieldState,
                 placeholder = { Text(stringResource(R.string.search_placeholder)) },
                 leadingIcon = {
                     Icon(imageVector = Icons.Default.Search, contentDescription = null)
@@ -66,7 +72,6 @@ fun AppsSearch(
         },
         modifier = modifier,
     )
-    val textFieldState = rememberTextFieldState()
     ExpandedFullScreenSearchBar(
         state = searchBarState,
         inputField = {
@@ -82,8 +87,8 @@ fun AppsSearch(
         },
     ) {
         if (searchResults == null) {
-            if (textFieldState.text.length >= 3) BigLoadingIndicator()
-        } else if (searchResults.apps.isEmpty()) {
+            if (textFieldState.text.length >= SEARCH_THRESHOLD) BigLoadingIndicator()
+        } else if (searchResults.apps.isEmpty() && textFieldState.text.length >= SEARCH_THRESHOLD) {
             if (searchResults.categories.isNotEmpty()) {
                 CategoriesFlowRow(searchResults.categories, onNav)
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index f76273fb9..335755af2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -24,11 +24,10 @@ import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListItem
+import org.fdroid.ui.utils.normalize
 import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
 import java.text.Collator
-import java.text.Normalizer
-import java.text.Normalizer.Form.NFKD
 import java.util.Locale
 import javax.inject.Inject
 import kotlin.time.measureTimedValue
@@ -46,7 +45,6 @@ class DiscoverViewModel @Inject constructor(
     private val log = KotlinLogging.logger { }
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
     private val collator = Collator.getInstance(Locale.getDefault())
-    private val normalizerRegex = "\\p{M}".toRegex()
 
     val numUpdates = updatesManager.numUpdates
     val apps = db.getAppDao().getAppOverviewItems().asFlow().map { list ->
@@ -55,7 +53,7 @@ class DiscoverViewModel @Inject constructor(
                 ?: return@mapNotNull null
             AppDiscoverItem(
                 packageName = it.packageName,
-                name = it.name ?: "Unknown",
+                name = it.getName(localeList) ?: "Unknown App",
                 isNew = it.lastUpdated == it.added,
                 lastUpdated = it.lastUpdated,
                 iconDownloadRequest = it.getIcon(localeList)
@@ -136,12 +134,4 @@ class DiscoverViewModel @Inject constructor(
     fun onSearchCleared() {
         searchResults.value = null
     }
-
-    /**
-     * Normalizes the string by removing any diacritics that may appear.
-     */
-    private fun String.normalize(): String {
-        if (Normalizer.isNormalized(this, NFKD)) return this
-        return Normalizer.normalize(this, NFKD).replace(normalizerRegex, "")
-    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index c856ef87b..4bf3475a3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -7,17 +7,15 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.FilterList
@@ -31,33 +29,24 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarDefaults.exitUntilCollapsedScrollBehavior
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.debounce
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
@@ -76,47 +65,19 @@ fun AppList(
     onItemClick: (String) -> Unit,
 ) {
     var searchActive by rememberSaveable { mutableStateOf(false) }
-    val searchFieldState = rememberTextFieldState()
-    val focusRequester = remember { FocusRequester() }
     val scrollBehavior = exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
-    val addedRepos = remember { mutableStateListOf<String>() }
     Scaffold(
         topBar = {
             if (searchActive) {
-                SearchBarDefaults.InputField(
-                    state = searchFieldState,
-                    leadingIcon = {
-                        IconButton(onClick = { searchActive = false }) {
-                            Icon(
-                                imageVector = Icons.AutoMirrored.Default.ArrowBack,
-                                contentDescription = stringResource(R.string.back),
-                            )
-                        }
-                    },
-                    onSearch = appListInfo::onSearch,
-                    expanded = false,
-                    onExpandedChange = {},
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .focusRequester(focusRequester)
-                        .statusBarsPadding()
-                        .height(TopAppBarDefaults.TopAppBarExpandedHeight)
-                        .padding(horizontal = 8.dp)
-                )
-                LaunchedEffect(Unit) {
-                    focusRequester.requestFocus()
-                    snapshotFlow { searchFieldState.text }
-                        .debounce(500)
-                        .collectLatest {
-                            if (it.length >= 2) {
-                                appListInfo.onSearch(searchFieldState.text.toString())
-                            }
-                        }
+                val onSearchCleared = { appListInfo.onSearch("") }
+                TopSearchBar(onSearch = appListInfo::onSearch, onSearchCleared) {
+                    searchActive = false
+                    onSearchCleared()
                 }
             } else TopAppBar(
                 title = {
                     Text(
-                        appListInfo.model.list.title,
+                        text = appListInfo.model.list.title,
                         maxLines = 1,
                         overflow = TextOverflow.MiddleEllipsis,
                     )
@@ -134,21 +95,24 @@ fun AppList(
                 actions = {
                     IconButton(onClick = { searchActive = true }) {
                         Icon(
-                            Icons.Filled.Search,
-                            contentDescription = null,
+                            imageVector = Icons.Filled.Search,
+                            contentDescription = stringResource(R.string.menu_search),
                         )
                     }
                     IconButton(onClick = { appListInfo.toggleFilterVisibility() }) {
-                        val showFilterBadge = addedRepos.isNotEmpty() ||
-                            appListInfo.model.filteredCategoryIds.isNotEmpty()
+                        val showFilterBadge =
+                            appListInfo.model.filteredRepositoryIds.isNotEmpty() ||
+                                appListInfo.model.filteredCategoryIds.isNotEmpty()
                         BadgedBox(badge = {
                             if (showFilterBadge) Badge(
                                 containerColor = MaterialTheme.colorScheme.secondary,
                             )
                         }) {
                             Icon(
-                                Icons.Filled.FilterList,
-                                contentDescription = null,
+                                imageVector = Icons.Filled.FilterList,
+                                contentDescription = stringResource(
+                                    R.string.search_filter_no_results
+                                ),
                             )
                         }
                     }
@@ -159,12 +123,19 @@ fun AppList(
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         Column(
-            modifier = Modifier
-                .padding(paddingValues),
+            modifier = Modifier.padding(paddingValues),
         ) {
             val apps = appListInfo.model.apps
             if (apps == null) BigLoadingIndicator()
-            else LazyColumn(
+            else if (apps.isEmpty()) {
+                Text(
+                    text = stringResource(R.string.search_filter_no_results),
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(16.dp),
+                )
+            } else LazyColumn(
                 contentPadding = PaddingValues(vertical = 8.dp),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
                 modifier = Modifier.then(
@@ -184,15 +155,14 @@ fun AppList(
                             onClick = { onItemClick(navItem.packageName) }
                         )
                     }
-                    val modifier = Modifier
-                        .fillMaxWidth()
-                        .animateItem()
-                        .padding(horizontal = 8.dp)
-                        .then(interactionModifier)
                     AppListRow(
                         item = navItem,
                         isSelected = isSelected,
-                        modifier = modifier,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .animateItem()
+                            .padding(horizontal = 8.dp)
+                            .then(interactionModifier)
                     )
                 }
                 item(contentType = "S") {
@@ -247,7 +217,7 @@ private fun Preview() {
 
 @Preview
 @Composable
-private fun PreviewEmpty() {
+private fun PreviewLoading() {
     FDroidContent {
         val model = AppListModel(
             list = AppListType.New("New"),
@@ -272,3 +242,31 @@ private fun PreviewEmpty() {
         AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
     }
 }
+
+@Preview
+@Composable
+private fun PreviewEmpty() {
+    FDroidContent {
+        val model = AppListModel(
+            list = AppListType.New("New"),
+            apps = emptyList(),
+            areFiltersShown = true,
+            sortBy = AppListSortOrder.NAME,
+            categories = null,
+            filteredCategoryIds = emptySet(),
+            repositories = emptyList(),
+            filteredRepositoryIds = emptySet(),
+        )
+        val info = object : AppListInfo {
+            override val model: AppListModel = model
+            override fun toggleFilterVisibility() {}
+            override fun sortBy(sort: AppListSortOrder) {}
+            override fun addCategory(categoryId: String) {}
+            override fun removeCategory(categoryId: String) {}
+            override fun addRepository(repoId: Long) {}
+            override fun removeRepository(repoId: Long) {}
+            override fun onSearch(query: String) {}
+        }
+        AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
index e89a6151e..ea738b8bd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.repositories.RepositoryItem
+import org.fdroid.ui.utils.normalize
 import java.util.Locale
 
 @Composable
@@ -30,7 +31,7 @@ fun AppListPresenter(
     val filteredCategoryIds = filteredCategoryIdsFlow.collectAsState().value
     val repositories = repositoriesFlow.collectAsState(emptyList()).value
     val filteredRepositoryIds = filteredRepositoryIdsFlow.collectAsState().value
-    val searchQuery = searchQueryFlow.collectAsState().value
+    val searchQuery = searchQueryFlow.collectAsState().value.normalize()
 
     val availableCategoryIds = remember(apps) {
         apps?.flatMap { it.categoryIds ?: emptySet() }?.toSet() ?: emptySet()
@@ -45,8 +46,8 @@ fun AppListPresenter(
             (it.categoryIds ?: emptySet()).intersect(filteredCategoryIds).isNotEmpty()
         val matchesRepos = filteredRepositoryIds.isEmpty() || it.repoId in filteredRepositoryIds
         val matchesQuery = searchQuery.isEmpty() ||
-            it.name.contains(searchQuery, ignoreCase = true) ||
-            it.summary.contains(searchQuery, ignoreCase = true)
+            it.name.normalize().contains(searchQuery, ignoreCase = true) ||
+            it.summary.normalize().contains(searchQuery, ignoreCase = true)
         matchesCategories && matchesRepos && matchesQuery
     }
     val locale = Locale.getDefault()
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 916dedf06..8221a3341 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -106,8 +106,8 @@ class AppListViewModel @Inject constructor(
             AppListItem(
                 repoId = it.repoId,
                 packageName = it.packageName,
-                name = it.name ?: "Unknown",
-                summary = it.summary ?: "Unknown",
+                name = it.getName(localeList) ?: "Unknown App",
+                summary = it.getSummary(localeList) ?: "Unknown",
                 lastUpdated = it.lastUpdated,
                 iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
                 categoryIds = it.categories?.toSet(),
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt b/next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
new file mode 100644
index 000000000..45c772b30
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
@@ -0,0 +1,85 @@
+package org.fdroid.ui.lists
+
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material3.AppBarWithSearch
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.SearchBarDefaults
+import androidx.compose.material3.rememberSearchBarState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.res.stringResource
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.debounce
+import org.fdroid.next.R
+import org.fdroid.ui.discover.AppSearchInputField
+import org.fdroid.ui.discover.SEARCH_THRESHOLD
+
+/**
+ * This is a top app bar that isn't mean to ever expand with results, but for in-list filtering.
+ * There may still be potential to factor out common code with [AppSearchInputField].
+ */
+@Composable
+@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class)
+fun TopSearchBar(
+    onSearch: (String) -> Unit,
+    onSearchCleared: () -> Unit,
+    onHideSearch: () -> Unit,
+) {
+    val searchFieldState = rememberTextFieldState()
+    val focusRequester = remember { FocusRequester() }
+    AppBarWithSearch(
+        state = rememberSearchBarState(),
+        inputField = {
+            SearchBarDefaults.InputField(
+                state = searchFieldState,
+                leadingIcon = {
+                    IconButton(onClick = onHideSearch) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            contentDescription = stringResource(R.string.back),
+                        )
+                    }
+                },
+                trailingIcon = {
+                    if (searchFieldState.text.isNotEmpty()) {
+                        IconButton(onClick = {
+                            searchFieldState.setTextAndPlaceCursorAtEnd("")
+                            onSearchCleared()
+                        }) {
+                            Icon(
+                                imageVector = Icons.Filled.Clear,
+                                contentDescription = stringResource(R.string.clear_search),
+                            )
+                        }
+                    }
+                },
+                onSearch = onSearch,
+                expanded = false,
+                onExpandedChange = {},
+                modifier = Modifier.focusRequester(focusRequester)
+            )
+        },
+    )
+    LaunchedEffect(Unit) {
+        focusRequester.requestFocus()
+        snapshotFlow { searchFieldState.text }
+            .debounce(500)
+            .collectLatest {
+                if (it.length >= SEARCH_THRESHOLD || it.isEmpty()) {
+                    onSearch(searchFieldState.text.toString())
+                }
+            }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
index c06393b7d..236cbd25e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
@@ -5,6 +5,8 @@ import android.content.Intent
 import android.text.format.DateUtils
 import android.util.Log
 import androidx.compose.ui.platform.UriHandler
+import java.text.Normalizer
+import java.text.Normalizer.Form.NFKD
 
 fun Context.startActivitySafe(i: Intent?) {
     if (i == null) return
@@ -23,6 +25,16 @@ fun UriHandler.openUriSafe(uri: String) {
     }
 }
 
+private val normalizerRegex = "\\p{M}".toRegex()
+
+/**
+ * Normalizes the string by removing any diacritics that may appear.
+ */
+fun String.normalize(): String {
+    if (Normalizer.isNormalized(this, NFKD)) return this
+    return Normalizer.normalize(this, NFKD).replace(normalizerRegex, "")
+}
+
 fun Long.asRelativeTimeString(): String {
     return DateUtils.getRelativeTimeSpanString(
         this,
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index cb2efaad6..a6d560c97 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -20,8 +20,12 @@
 
     <string name="search_placeholder">Search…</string>
     <string name="search_no_results">No apps found.\n\nTry to use less search terms or add/enable more repositories.</string>
+    <string name="search_filter_no_results">No matching apps.\n\nTry to use less search terms or remove filters.</string>
     <string name="sort_by_name">Sort by name</string>
     <string name="sort_by_latest">Sort by latest</string>
+    <!-- Used for filtering lists of apps by certain criteria -->
+    <string name="filter">Filter</string>
+    <!-- Used for filter chips (e.g. categories) when they are currently selected -->
     <string name="filter_selected">selected</string>
     <string name="category">Category</string>
 

From fa1573a1ecb0d989464013fa83a2917bec9c59ad Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 21 Aug 2025 17:30:52 -0300
Subject: [PATCH 050/180] Add search filtering to My Apps

---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    | 17 ++--
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  | 81 ++++++++++++++-----
 .../kotlin/org/fdroid/ui/apps/MyAppsInfo.kt   | 16 ++++
 .../org/fdroid/ui/apps/MyAppsPresenter.kt     | 24 +++---
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     | 16 ++--
 next/src/main/res/values/strings-next.xml     |  3 +
 6 files changed, 120 insertions(+), 37 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 14bd2e43b..f99c18ff5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -33,6 +33,7 @@ import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.apps.MyApps
+import org.fdroid.ui.apps.MyAppsInfo
 import org.fdroid.ui.apps.MyAppsViewModel
 import org.fdroid.ui.details.AppDetails
 import org.fdroid.ui.details.AppDetailsViewModel
@@ -104,10 +105,18 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                     },
                 ) {
                     val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
-                    val myAppsModel =
-                        myAppsViewModel.myAppsModel.collectAsStateWithLifecycle().value
+                    val myAppsInfo = object : MyAppsInfo {
+                        override val model =
+                            myAppsViewModel.myAppsModel.collectAsStateWithLifecycle().value
+
+                        override fun refresh() = myAppsViewModel.refresh()
+                        override fun changeSortOrder(sort: AppListSortOrder) =
+                            myAppsViewModel.changeSortOrder(sort)
+
+                        override fun search(query: String) = myAppsViewModel.search(query)
+                    }
                     MyApps(
-                        myAppsModel = myAppsModel,
+                        myAppsInfo = myAppsInfo,
                         currentPackageName = if (isBigScreen) {
                             (backStack.last() as? NavigationKey.AppDetails)?.packageName
                         } else null,
@@ -115,9 +124,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                             backStack.add(NavigationKey.AppDetails(it))
                         },
                         onNav = { backStack.add(it) },
-                        onRefresh = myAppsViewModel::refresh,
                         isBigScreen = isBigScreen,
-                        onSortChanged = myAppsViewModel::changeSortOrder,
                     )
                 }
                 entry<NavigationKey.AppDetails>(
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 7a5ca5ac9..9a5af700d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -1,8 +1,11 @@
 package org.fdroid.ui.apps
 
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.annotation.RestrictTo
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -11,6 +14,7 @@ import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccessTime
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.SortByAlpha
 import androidx.compose.material3.Button
 import androidx.compose.material3.DropdownMenu
@@ -30,11 +34,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.LifecycleStartEffect
@@ -45,6 +51,7 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.lists.TopSearchBar
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.Names
 import org.fdroid.ui.utils.getPreviewVersion
@@ -53,29 +60,46 @@ import java.util.concurrent.TimeUnit.DAYS
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun MyApps(
-    myAppsModel: MyAppsModel,
+    myAppsInfo: MyAppsInfo,
     currentPackageName: String?,
     onAppItemClick: (String) -> Unit,
     onNav: (NavKey) -> Unit,
-    onSortChanged: (AppListSortOrder) -> Unit,
-    onRefresh: () -> Unit,
     isBigScreen: Boolean,
     modifier: Modifier = Modifier,
 ) {
+    val myAppsModel = myAppsInfo.model
     LifecycleStartEffect(myAppsModel) {
-        onRefresh()
+        myAppsInfo.refresh()
         onStopOrDispose { }
     }
     val updatableApps = myAppsModel.appUpdates
     val installedApps = myAppsModel.installedApps
     val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
+    var searchActive by rememberSaveable { mutableStateOf(false) }
+    val onSearchCleared = { myAppsInfo.search("") }
+    // when search bar is shown, back button closes it again
+    BackHandler(enabled = searchActive) {
+        searchActive = false
+        onSearchCleared()
+    }
+    val onBackPressedDispatcher = LocalOnBackPressedDispatcherOwner.current?.onBackPressedDispatcher
     Scaffold(
         topBar = {
-            TopAppBar(
+            if (searchActive) {
+                TopSearchBar(onSearch = myAppsInfo::search, onSearchCleared) {
+                    onBackPressedDispatcher?.onBackPressed()
+                }
+            } else TopAppBar(
                 title = {
                     Text(stringResource(R.string.menu_apps_my))
                 },
                 actions = {
+                    IconButton(onClick = { searchActive = true }) {
+                        Icon(
+                            imageVector = Icons.Filled.Search,
+                            contentDescription = stringResource(R.string.menu_search),
+                        )
+                    }
                     var sortByMenuExpanded by remember { mutableStateOf(false) }
                     IconButton(onClick = { sortByMenuExpanded = !sortByMenuExpanded }) {
                         Icon(Icons.Filled.MoreVert, null)
@@ -96,7 +120,7 @@ fun MyApps(
                                 )
                             },
                             onClick = {
-                                onSortChanged(AppListSortOrder.NAME)
+                                myAppsInfo.changeSortOrder(AppListSortOrder.NAME)
                                 sortByMenuExpanded = false
                             },
                         )
@@ -112,7 +136,7 @@ fun MyApps(
                                 )
                             },
                             onClick = {
-                                onSortChanged(LAST_UPDATED)
+                                myAppsInfo.changeSortOrder(LAST_UPDATED)
                                 sortByMenuExpanded = false
                             },
                         )
@@ -127,7 +151,20 @@ fun MyApps(
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         if (updatableApps == null && installedApps == null) BigLoadingIndicator()
-        else LazyColumn(
+        else if (updatableApps.isNullOrEmpty() && installedApps.isNullOrEmpty()) {
+            Text(
+                text = if (searchActive) {
+                    stringResource(R.string.search_my_apps_no_results)
+                } else {
+                    stringResource(R.string.my_apps_empty)
+                },
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .padding(paddingValues)
+                    .fillMaxSize()
+                    .padding(16.dp),
+            )
+        } else LazyColumn(
             modifier
                 .padding(paddingValues)
                 .then(
@@ -212,19 +249,24 @@ fun MyApps(
 @Preview
 @Composable
 fun MyAppsLoadingPreview() {
+    val info = object : MyAppsInfo {
+        override val model = MyAppsModel(
+            appUpdates = null,
+            installedApps = null,
+            sortOrder = AppListSortOrder.NAME,
+        )
+
+        override fun refresh() {}
+        override fun changeSortOrder(sort: AppListSortOrder) {}
+        override fun search(query: String) {}
+    }
     FDroidContent {
         MyApps(
-            myAppsModel = MyAppsModel(
-                appUpdates = null,
-                installedApps = null,
-                sortOrder = AppListSortOrder.NAME,
-            ),
+            myAppsInfo = info,
             currentPackageName = null,
             onAppItemClick = {},
             onNav = {},
-            onSortChanged = { },
             isBigScreen = false,
-            onRefresh = {},
         )
     }
 }
@@ -272,13 +314,16 @@ fun MyAppsPreview() {
             sortOrder = AppListSortOrder.NAME,
         )
         MyApps(
-            myAppsModel = model,
+            myAppsInfo = object : MyAppsInfo {
+                override val model = model
+                override fun refresh() {}
+                override fun changeSortOrder(sort: AppListSortOrder) {}
+                override fun search(query: String) {}
+            },
             currentPackageName = null,
             onAppItemClick = {},
             onNav = {},
-            onSortChanged = { },
             isBigScreen = false,
-            onRefresh = {},
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
new file mode 100644
index 000000000..d60f19d0e
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
@@ -0,0 +1,16 @@
+package org.fdroid.ui.apps
+
+import org.fdroid.database.AppListSortOrder
+
+interface MyAppsInfo {
+    val model: MyAppsModel
+    fun refresh()
+    fun changeSortOrder(sort: AppListSortOrder)
+    fun search(query: String)
+}
+
+data class MyAppsModel(
+    val appUpdates: List<AppUpdateItem>? = null,
+    val installedApps: List<InstalledAppItem>? = null,
+    val sortOrder: AppListSortOrder = AppListSortOrder.NAME,
+)
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index c5336f86a..d86695390 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -6,6 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.ui.utils.normalize
 import java.text.Collator
 import java.util.Locale
 
@@ -13,26 +14,37 @@ import java.util.Locale
 fun MyAppsPresenter(
     appUpdatesFlow: StateFlow<List<AppUpdateItem>?>,
     installedAppsFlow: StateFlow<List<InstalledAppItem>?>,
+    searchQueryFlow: StateFlow<String>,
     sortOrderFlow: StateFlow<AppListSortOrder>,
 ): MyAppsModel {
     val appUpdates = appUpdatesFlow.collectAsState().value
     val installedApps = installedAppsFlow.collectAsState().value
+    val searchQuery = searchQueryFlow.collectAsState().value.normalize()
     val sortOrder = sortOrderFlow.collectAsState().value
     val packageNames = appUpdates?.map { it.packageName } ?: emptyList()
     val collator = Collator.getInstance(Locale.getDefault())
+
+    val updates = if (searchQuery.isBlank()) appUpdates else appUpdates?.filter {
+        it.name.normalize().contains(searchQuery, ignoreCase = true)
+    }
+    val installed = if (searchQuery.isBlank()) installedApps else installedApps?.filter {
+        it.name.normalize().contains(searchQuery, ignoreCase = true)
+    }
     return MyAppsModel(
         appUpdates = when (sortOrder) {
-            AppListSortOrder.NAME -> appUpdates?.sortedWith { a1, a2 ->
+            AppListSortOrder.NAME -> updates?.sortedWith { a1, a2 ->
+                // storing collator.getCollationKey() and using that could be an optimization
                 collator.compare(a1.name, a2.name)
             }
-            AppListSortOrder.LAST_UPDATED -> appUpdates?.sortedByDescending { it.update.added }
+            AppListSortOrder.LAST_UPDATED -> updates?.sortedByDescending { it.update.added }
         },
-        installedApps = installedApps?.filter {
+        installedApps = installed?.filter {
             // filter out apps already in updates
             it.packageName !in packageNames
         }?.let { apps ->
             when (sortOrder) {
                 AppListSortOrder.NAME -> apps.sortedWith { a1, a2 ->
+                    // storing collator.getCollationKey() and using that could be an optimization
                     collator.compare(a1.name, a2.name)
                 }
                 AppListSortOrder.LAST_UPDATED -> apps.sortedByDescending { it.lastUpdated }
@@ -41,9 +53,3 @@ fun MyAppsPresenter(
         sortOrder = sortOrder,
     )
 }
-
-data class MyAppsModel(
-    val appUpdates: List<AppUpdateItem>? = null,
-    val installedApps: List<InstalledAppItem>? = null,
-    val sortOrder: AppListSortOrder = AppListSortOrder.NAME,
-)
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index c4273594f..54ff6c936 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -40,14 +40,13 @@ class MyAppsViewModel @Inject constructor(
     private val repoManager: RepoManager,
 ) : AndroidViewModel(app) {
 
-    val updates = updatesManager.updates
-    val numUpdates = updatesManager.numUpdates
+    private val localeList = LocaleListCompat.getDefault()
+    private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+
+    private val updates = updatesManager.updates
     private val installedApps = MutableStateFlow<List<InstalledAppItem>?>(null)
     private var installedAppsLiveData =
         db.getAppDao().getInstalledAppListItems(application.packageManager)
-    private val sortOrder = savedStateHandle.getMutableStateFlow("sort", AppListSortOrder.NAME)
-    private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
-    private val localeList = LocaleListCompat.getDefault()
     private val installedAppsObserver = Observer<List<AppListItem>> { list ->
         installedApps.value = list.map { app ->
             InstalledAppItem(
@@ -61,10 +60,13 @@ class MyAppsViewModel @Inject constructor(
             )
         }
     }
+    private val searchQuery = savedStateHandle.getMutableStateFlow<String>("query", "")
+    private val sortOrder = savedStateHandle.getMutableStateFlow("sort", AppListSortOrder.NAME)
     val myAppsModel: StateFlow<MyAppsModel> = scope.launchMolecule(mode = ContextClock) {
         MyAppsPresenter(
             appUpdatesFlow = updates,
             installedAppsFlow = installedApps,
+            searchQueryFlow = searchQuery,
             sortOrderFlow = sortOrder,
         )
     }
@@ -77,6 +79,10 @@ class MyAppsViewModel @Inject constructor(
         installedAppsLiveData.removeObserver(installedAppsObserver)
     }
 
+    fun search(query: String) {
+        searchQuery.value = query
+    }
+
     fun changeSortOrder(sort: AppListSortOrder) {
         sortOrder.value = sort
     }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index a6d560c97..83556e90d 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -13,6 +13,8 @@
     <string name="no_app_selected">No app selected</string>
     <string name="no_repository_selected">No repository selected</string>
 
+    <string name="my_apps_empty">No apps installed.\n\nInstall apps and they will appear here.</string>
+
     <string name="app_list_new">New apps</string>
     <string name="app_list_recently_updated">Recently updated</string>
     <string name="app_list_all">All apps</string>
@@ -21,6 +23,7 @@
     <string name="search_placeholder">Search…</string>
     <string name="search_no_results">No apps found.\n\nTry to use less search terms or add/enable more repositories.</string>
     <string name="search_filter_no_results">No matching apps.\n\nTry to use less search terms or remove filters.</string>
+    <string name="search_my_apps_no_results">No matching apps.\n\nTry to use less search terms.</string>
     <string name="sort_by_name">Sort by name</string>
     <string name="sort_by_latest">Sort by latest</string>
     <!-- Used for filtering lists of apps by certain criteria -->

From 6d3ab98ccf41e9f6a82ca2bdaf6b74890678af0c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 1 Sep 2025 17:25:22 -0300
Subject: [PATCH 051/180] Add categories to app details page

---
 .../kotlin/org/fdroid/ui/details/AppDetails.kt | 18 ++++++++++++++++++
 .../org/fdroid/ui/details/AppDetailsItem.kt    |  9 +++++++++
 .../org/fdroid/ui/details/ExpandableSection.kt |  4 ++--
 .../kotlin/org/fdroid/ui/utils/PreviewUtils.kt |  5 +++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index 3400c8ca6..d85edd48e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -3,6 +3,7 @@ package org.fdroid.ui.details
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -12,6 +13,7 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Category
 import androidx.compose.material.icons.filled.ChangeHistory
 import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.CurrencyBitcoin
@@ -64,6 +66,7 @@ import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
+import org.fdroid.ui.categories.CategoryCard
 import org.fdroid.ui.icons.License
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.utils.AsyncShimmerImage
@@ -351,6 +354,21 @@ fun AppDetails(
                     }
                 }
             }
+            if (!item.categories.isNullOrEmpty()) ExpandableSection(
+                icon = rememberVectorPainter(Icons.Default.Category),
+                title = stringResource(R.string.main_menu__categories),
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                initiallyExpanded = true,
+            ) {
+                FlowRow(modifier = Modifier.padding(start = 16.dp)) {
+                    item.categories.forEach { item ->
+                        CategoryCard(item, onSelected = {
+                            val categoryNav = AppListType.Category(item.name, item.id)
+                            onNav(NavigationKey.AppList(categoryNav))
+                        })
+                    }
+                }
+            }
             // More apps by dev
             if (item.authorHasMoreThanOneApp) {
                 val authorName = item.app.authorName!!
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index fa8f8cc69..41af0eb94 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -14,6 +14,7 @@ import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.install.SessionInstallManager
+import org.fdroid.ui.categories.CategoryItem
 
 data class AppDetailsItem(
     val app: AppMetadata,
@@ -34,6 +35,7 @@ data class AppDetailsItem(
     val icon: DownloadRequest? = null,
     val featureGraphic: DownloadRequest? = null,
     val phoneScreenshots: List<DownloadRequest> = emptyList(),
+    val categories: List<CategoryItem>? = null,
     val versions: List<PackageVersion>? = null,
     val installedVersion: PackageVersion? = null,
     /**
@@ -88,6 +90,13 @@ data class AppDetailsItem(
         phoneScreenshots = dbApp.getPhoneScreenshots(localeList).mapNotNull {
             it.getDownloadRequest(repository)
         },
+        categories = dbApp.metadata.categories?.mapNotNull { categoryId ->
+            val category = repository.getCategories()[categoryId] ?: return@mapNotNull null
+            CategoryItem(
+                id = category.id,
+                name = category.getName(localeList) ?: "Unknown Category",
+            )
+        },
         versions = versions,
         installedVersion = installedVersion,
         installedVersionCode = installedVersionCode,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt b/next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt
index a94a155d8..c59a7c93c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt
@@ -30,10 +30,10 @@ fun ExpandableSection(
     icon: Painter?,
     title: String,
     modifier: Modifier = Modifier,
+    initiallyExpanded: Boolean = LocalInspectionMode.current,
     content: @Composable () -> Unit,
 ) {
-    val isPreview = LocalInspectionMode.current
-    var sectionExpanded by rememberSaveable { mutableStateOf(isPreview) }
+    var sectionExpanded by rememberSaveable { mutableStateOf(initiallyExpanded) }
     Column(modifier = modifier.fillMaxWidth()) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 4fffd31a9..e06a7fb51 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -7,6 +7,7 @@ import org.fdroid.database.AppPrefs
 import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
+import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.details.AntiFeature
 import org.fdroid.ui.details.AppDetailsActions
 import org.fdroid.ui.details.AppDetailsItem
@@ -114,6 +115,10 @@ val testApp = AppDetailsItem(
         "Therefore this app can be used on devices without Google Services installed. " +
         "Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.\n\n" +
         LoremIpsum(128).values.joinToString(" "),
+    categories = listOf(
+        CategoryItem("Multimedia", "Multimedia"),
+        CategoryItem("Internet", "Internet"),
+    ),
     antiFeatures = listOf(
         AntiFeature(
             id = "NonFreeNet",

From 3356643a5de7d84ba25a4e5f833a2436b1b72fec Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 2 Sep 2025 17:30:38 -0300
Subject: [PATCH 052/180] Onboarding for app list filter

does not yet persist that onboarding was seen
---
 gradle/libs.versions.toml                     |  3 +-
 next/build.gradle.kts                         |  4 +-
 .../org/fdroid/settings/SettingsManager.kt    | 20 ++++++
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  4 ++
 .../kotlin/org/fdroid/ui/lists/AppList.kt     | 72 ++++++++++---------
 .../org/fdroid/ui/lists/AppListViewModel.kt   |  5 ++
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  | 14 ++--
 .../org/fdroid/ui/utils/PreviewUtils.kt       | 16 +++++
 .../kotlin/org/fdroid/utils/OnboardingCard.kt | 63 ++++++++++++++++
 next/src/main/res/values/strings-next.xml     |  4 ++
 10 files changed, 160 insertions(+), 45 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/utils/OnboardingCard.kt

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7c49525fc..6062f661b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,6 +21,7 @@ glide = "5.0.5"
 glideCompose = "1.0.0-beta08"
 coilCompose = "3.3.0"
 molecule = "2.2.0"
+hints = "1.1.1"
 
 androidxCoreKtx = "1.17.0"
 androidxAppcompat = "1.7.1"
@@ -138,12 +139,12 @@ glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref =
 glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glideCompose" }
 glide-annotations = { module = "com.github.bumptech.glide:annotations", version.ref = "glide" }
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" }
-coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coilCompose" }
 
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
 
 molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
+compose-hints = { module = "com.viktormykhailiv:compose-hints", version.ref = "hints" }
 guardianproject-netcipher = { module = "info.guardianproject.netcipher:netcipher", version.ref = "guardianprojectNetcipher" }
 guardianproject-panic = { module = "info.guardianproject.panic:panic", version.ref = "guardianprojectPanic" }
 nanohttpd = { module = "org.nanohttpd:nanohttpd", version.ref = "nanohttpd" }
diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 81ac95765..1be24544c 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         applicationId = "org.fdroid.next"
-        minSdk = 23
+        minSdk = 24
         targetSdk = 36
         versionCode = 1
         versionName = "1.0"
@@ -77,7 +77,7 @@ dependencies {
 
     implementation(libs.molecule.runtime)
     implementation(libs.coil.compose)
-    implementation(libs.coil.network.okhttp)
+    implementation(libs.compose.hints)
 
     implementation(libs.slf4j.api)
     implementation(libs.logback.android)
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
new file mode 100644
index 000000000..36770c018
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -0,0 +1,20 @@
+package org.fdroid.settings
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SettingsManager @Inject constructor() {
+
+    // TODO read this value from persistent storage
+    private val _showFilterOnboarding = MutableStateFlow(true)
+    val showFilterOnboarding = _showFilterOnboarding.asStateFlow()
+
+    fun onFilterOnboardingSeen() {
+        _showFilterOnboarding.value = false
+        // TODO persist
+    }
+
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index f99c18ff5..f63b65acd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -155,6 +155,8 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                     val appListInfo = object : AppListInfo {
                         override val model =
                             appListViewModel.appListModel.collectAsStateWithLifecycle().value
+                        override val showOnboarding: Boolean =
+                            appListViewModel.showOnboarding.collectAsStateWithLifecycle().value
 
                         override fun toggleFilterVisibility() {
                             appListViewModel.toggleListFilterVisibility()
@@ -175,6 +177,8 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
 
                         override fun onSearch(query: String) =
                             appListViewModel.onSearch(query)
+
+                        override fun onOnboardingSeen() = appListViewModel.onOnboardingSeen()
                     }
                     AppList(
                         appListInfo = appListInfo,
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 4bf3475a3..8d79acfe3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.FilterList
@@ -35,6 +36,7 @@ import androidx.compose.material3.TopAppBarDefaults.exitUntilCollapsedScrollBeha
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -46,11 +48,17 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.viktormykhailiv.compose.hints.hintAnchor
+import com.viktormykhailiv.compose.hints.rememberHint
+import com.viktormykhailiv.compose.hints.rememberHintAnchorState
+import com.viktormykhailiv.compose.hints.rememberHintController
 import kotlinx.coroutines.FlowPreview
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.utils.BigLoadingIndicator
+import org.fdroid.ui.utils.getAppListInfo
+import org.fdroid.utils.OnboardingCard
 
 @Composable
 @OptIn(
@@ -66,6 +74,25 @@ fun AppList(
 ) {
     var searchActive by rememberSaveable { mutableStateOf(false) }
     val scrollBehavior = exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
+
+    val hintController = rememberHintController(
+        overlay = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.8f),
+    )
+    val hint = rememberHint {
+        OnboardingCard(
+            title = stringResource(R.string.onboarding_app_list_filter_title),
+            message = stringResource(R.string.onboarding_app_list_filter_message),
+            modifier = Modifier.padding(horizontal = 32.dp, vertical = 8.dp),
+        ) {
+            appListInfo.onOnboardingSeen()
+            hintController.dismiss()
+        }
+    }
+    val hintAnchor = rememberHintAnchorState(hint)
+    LaunchedEffect(appListInfo.showOnboarding) {
+        if (appListInfo.showOnboarding) hintController.show(hintAnchor)
+    }
+
     Scaffold(
         topBar = {
             if (searchActive) {
@@ -99,7 +126,13 @@ fun AppList(
                             contentDescription = stringResource(R.string.menu_search),
                         )
                     }
-                    IconButton(onClick = { appListInfo.toggleFilterVisibility() }) {
+                    IconButton(
+                        onClick = { appListInfo.toggleFilterVisibility() },
+                        modifier = Modifier.hintAnchor(
+                            state = hintAnchor,
+                            shape = RoundedCornerShape(16.dp),
+                        )
+                    ) {
                         val showFilterBadge =
                             appListInfo.model.filteredRepositoryIds.isNotEmpty() ||
                                 appListInfo.model.filteredCategoryIds.isNotEmpty()
@@ -123,7 +156,9 @@ fun AppList(
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         Column(
-            modifier = Modifier.padding(paddingValues),
+            modifier = Modifier
+                .padding(paddingValues)
+                .fillMaxSize()
         ) {
             val apps = appListInfo.model.apps
             if (apps == null) BigLoadingIndicator()
@@ -201,16 +236,7 @@ private fun Preview() {
             repositories = emptyList(),
             filteredRepositoryIds = emptySet(),
         )
-        val info = object : AppListInfo {
-            override val model: AppListModel = model
-            override fun toggleFilterVisibility() {}
-            override fun sortBy(sort: AppListSortOrder) {}
-            override fun addCategory(categoryId: String) {}
-            override fun removeCategory(categoryId: String) {}
-            override fun addRepository(repoId: Long) {}
-            override fun removeRepository(repoId: Long) {}
-            override fun onSearch(query: String) {}
-        }
+        val info = getAppListInfo(model)
         AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
     }
 }
@@ -229,16 +255,7 @@ private fun PreviewLoading() {
             repositories = emptyList(),
             filteredRepositoryIds = emptySet(),
         )
-        val info = object : AppListInfo {
-            override val model: AppListModel = model
-            override fun toggleFilterVisibility() {}
-            override fun sortBy(sort: AppListSortOrder) {}
-            override fun addCategory(categoryId: String) {}
-            override fun removeCategory(categoryId: String) {}
-            override fun addRepository(repoId: Long) {}
-            override fun removeRepository(repoId: Long) {}
-            override fun onSearch(query: String) {}
-        }
+        val info = getAppListInfo(model)
         AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
     }
 }
@@ -257,16 +274,7 @@ private fun PreviewEmpty() {
             repositories = emptyList(),
             filteredRepositoryIds = emptySet(),
         )
-        val info = object : AppListInfo {
-            override val model: AppListModel = model
-            override fun toggleFilterVisibility() {}
-            override fun sortBy(sort: AppListSortOrder) {}
-            override fun addCategory(categoryId: String) {}
-            override fun removeCategory(categoryId: String) {}
-            override fun addRepository(repoId: Long) {}
-            override fun removeRepository(repoId: Long) {}
-            override fun onSearch(query: String) {}
-        }
+        val info = getAppListInfo(model)
         AppList(appListInfo = info, currentPackageName = null, onBackClicked = {}, onItemClick = {})
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 8221a3341..6599c3734 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -24,6 +24,7 @@ import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
 import org.fdroid.next.R
+import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.repositories.RepositoryItem
 import java.text.Collator
@@ -36,6 +37,7 @@ class AppListViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
+    private val settingsManager: SettingsManager,
 ) : AndroidViewModel(app) {
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
@@ -65,6 +67,7 @@ class AppListViewModel @Inject constructor(
     private val sortBy = MutableStateFlow(AppListSortOrder.LAST_UPDATED)
     private val filteredCategoryIds = MutableStateFlow<Set<String>>(emptySet())
     private val filteredRepositoryIds = MutableStateFlow<Set<Long>>(emptySet())
+    val showOnboarding = settingsManager.showFilterOnboarding
 
     val appListModel: StateFlow<AppListModel> = scope.launchMolecule(mode = ContextClock) {
         AppListPresenter(
@@ -158,4 +161,6 @@ class AppListViewModel @Inject constructor(
     fun onSearch(query: String) {
         this.query.value = query
     }
+
+    fun onOnboardingSeen() = settingsManager.onFilterOnboardingSeen()
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index 76ca9fb73..bc339cbfc 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -35,9 +35,11 @@ import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.icons.PackageVariant
 import org.fdroid.ui.repositories.RepositoryItem
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.getAppListInfo
 
 interface AppListInfo {
     val model: AppListModel
+    val showOnboarding: Boolean
 
     fun toggleFilterVisibility()
     fun sortBy(sort: AppListSortOrder)
@@ -46,6 +48,7 @@ interface AppListInfo {
     fun addRepository(repoId: Long)
     fun removeRepository(repoId: Long)
     fun onSearch(query: String)
+    fun onOnboardingSeen()
 }
 
 @Composable
@@ -229,16 +232,7 @@ private fun Preview() {
             ),
             filteredRepositoryIds = setOf(2),
         )
-        val info = object : AppListInfo {
-            override val model: AppListModel = model
-            override fun toggleFilterVisibility() {}
-            override fun sortBy(sort: AppListSortOrder) {}
-            override fun addCategory(categoryId: String) {}
-            override fun removeCategory(categoryId: String) {}
-            override fun addRepository(repoId: Long) {}
-            override fun removeRepository(repoId: Long) {}
-            override fun onSearch(query: String) {}
-        }
+        val info = getAppListInfo(model)
         AppsFilter(info)
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index e06a7fb51..645bb78d3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -2,6 +2,7 @@ package org.fdroid.ui.utils
 
 import android.content.Intent
 import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
+import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppPrefs
 import org.fdroid.index.v2.PackageManifest
@@ -11,6 +12,8 @@ import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.details.AntiFeature
 import org.fdroid.ui.details.AppDetailsActions
 import org.fdroid.ui.details.AppDetailsItem
+import org.fdroid.ui.lists.AppListInfo
+import org.fdroid.ui.lists.AppListModel
 import java.util.concurrent.TimeUnit.DAYS
 
 object Names {
@@ -164,3 +167,16 @@ fun getPreviewVersion(versionName: String, size: Long? = null) = object : Packag
     }
     override val hasKnownVulnerability: Boolean = false
 }
+
+fun getAppListInfo(model: AppListModel) = object : AppListInfo {
+    override val model: AppListModel = model
+    override val showOnboarding: Boolean = false
+    override fun toggleFilterVisibility() {}
+    override fun sortBy(sort: AppListSortOrder) {}
+    override fun addCategory(categoryId: String) {}
+    override fun removeCategory(categoryId: String) {}
+    override fun addRepository(repoId: Long) {}
+    override fun removeRepository(repoId: Long) {}
+    override fun onSearch(query: String) {}
+    override fun onOnboardingSeen() {}
+}
diff --git a/next/src/main/kotlin/org/fdroid/utils/OnboardingCard.kt b/next/src/main/kotlin/org/fdroid/utils/OnboardingCard.kt
new file mode 100644
index 000000000..5812c1460
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/utils/OnboardingCard.kt
@@ -0,0 +1,63 @@
+package org.fdroid.utils
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TooltipDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun OnboardingCard(
+    title: String,
+    message: String,
+    modifier: Modifier = Modifier,
+    onGotIt: () -> Unit = {}
+) {
+    ElevatedCard(
+        modifier = modifier
+            .widthIn(max = TooltipDefaults.richTooltipMaxWidth)
+    ) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.titleSmall,
+            modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 8.dp)
+        )
+        Text(
+            text = message,
+            style = MaterialTheme.typography.bodyMedium,
+            modifier = Modifier.padding(horizontal = 16.dp)
+        )
+        TextButton(
+            onClick = onGotIt,
+            modifier = Modifier
+                .padding(vertical = 8.dp, horizontal = 16.dp)
+        ) {
+            Text(text = stringResource(R.string.got_it))
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        OnboardingCard(
+            title = "Filter",
+            message = "Here you can apply filters to the list of apps," +
+                " e.g. showing only apps within a certain category or repository. " +
+                "Changing the sort order is also possible.",
+            modifier = Modifier.padding(horizontal = 32.dp, vertical = 8.dp),
+        ) { }
+    }
+}
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 83556e90d..4ce38a0f5 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -48,4 +48,8 @@
     <string name="signer_colon">Signer: %1$s</string>
     <string name="architectures_colon">Architectures: %1$s</string>
 
+    <string name="onboarding_app_list_filter_title">Filter</string>
+    <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
+    <string name="got_it">Got it</string>
+
 </resources>

From f0605095322b344063c2f2f14b44c7bb47ff1a5c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 3 Sep 2025 16:40:56 -0300
Subject: [PATCH 053/180] Only show filters for repositories actually in the
 list

and show categories and repositories only when there's more than one option
---
 .../kotlin/org/fdroid/ui/lists/AppListPresenter.kt  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
index ea738b8bd..982a65314 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
@@ -34,13 +34,22 @@ fun AppListPresenter(
     val searchQuery = searchQueryFlow.collectAsState().value.normalize()
 
     val availableCategoryIds = remember(apps) {
-        apps?.flatMap { it.categoryIds ?: emptySet() }?.toSet() ?: emptySet()
+        // if there's only one category, we'll not show the filters for it
+        apps?.flatMap { it.categoryIds ?: emptySet() }?.toSet()?.takeIf { it.size > 1 }
+            ?: emptySet()
     }
     val filteredCategories = remember(categories, apps) {
         categories?.filter {
             it.id in availableCategoryIds
         }
     }
+    val availableRepositories = remember(apps) {
+        val repoIds = mutableSetOf<Long>()
+        apps?.forEach { repoIds.add(it.repoId) }
+        val repos = repositories.filter { it.repoId in repoIds }
+        // if there's only one repository, we'll not show the filters for it
+        if (repos.size > 1) repos else emptyList()
+    }
     val filteredApps = apps?.filter {
         val matchesCategories = filteredCategoryIds.isEmpty() ||
             (it.categoryIds ?: emptySet()).intersect(filteredCategoryIds).isNotEmpty()
@@ -62,7 +71,7 @@ fun AppListPresenter(
         sortBy = sortBy,
         categories = filteredCategories,
         filteredCategoryIds = filteredCategoryIds,
-        repositories = repositories,
+        repositories = availableRepositories,
         filteredRepositoryIds = filteredRepositoryIds,
     )
 }

From d9168476a2ca10f166ac38e55bd3327bf20fc370 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 4 Sep 2025 10:18:29 -0300
Subject: [PATCH 054/180] Also find CamelCase apps

---
 .../fdroid/ui/discover/DiscoverViewModel.kt   | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 335755af2..62f84e6e1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -83,18 +83,23 @@ class DiscoverViewModel @Inject constructor(
 
     suspend fun search(term: String) = withContext(ioScope.coroutineContext) {
         val sanitized = term.replace(Regex.fromLiteral("\""), "")
-        val query = sanitized.split(' ').joinToString(" ") { word ->
-            if (word.isBlank()) "" else {
-                var isCjk = false
-                // go through word and separate CJK chars (if needed)
-                val newString = word.toList().joinToString("") {
-                    if (Character.isIdeographic(it.code)) {
-                        isCjk = true
-                        "$it* "
-                    } else "$it"
-                }
-                if (isCjk) newString else "$newString*"
+        val splits = sanitized.split(' ').filter { it.isNotBlank() }
+        val query = splits.joinToString(" AND ") { word ->
+            var isCjk = false
+            // go through word and separate CJK chars (if needed)
+            val newString = word.toList().joinToString("") {
+                if (Character.isIdeographic(it.code)) {
+                    isCjk = true
+                    "$it* "
+                } else "$it"
             }
+            // add * to enable prefix matches
+            if (isCjk) newString else "$newString*"
+        }.let { firstPassQuery ->
+            // if we had more than one word, also look for both combined to find CamelCase names
+            if (splits.size > 1) {
+                "$firstPassQuery OR ${splits.joinToString("")}*"
+            } else firstPassQuery
         }
         log.info { "Searching for: $query" }
         val timedApps = measureTimedValue {

From b40d263d9a2258e8abb6762127011bb4e5b14b0e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 4 Sep 2025 16:49:57 -0300
Subject: [PATCH 055/180] More features for AppList filter sheet

filter by only compatible apps
saving certain options
clearing all filters
---
 .../org/fdroid/settings/SettingsManager.kt    | 12 ++-
 next/src/main/kotlin/org/fdroid/ui/Main.kt    | 29 ++----
 .../org/fdroid/ui/discover/AppsSearch.kt      |  4 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |  1 +
 .../kotlin/org/fdroid/ui/lists/AppList.kt     | 31 +++---
 .../kotlin/org/fdroid/ui/lists/AppListInfo.kt | 37 +++++++
 .../kotlin/org/fdroid/ui/lists/AppListItem.kt |  1 +
 .../org/fdroid/ui/lists/AppListPresenter.kt   | 21 +---
 .../kotlin/org/fdroid/ui/lists/AppListRow.kt  |  8 +-
 .../org/fdroid/ui/lists/AppListViewModel.kt   | 55 +++++++----
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  | 97 +++++++++++++------
 .../org/fdroid/ui/utils/PreviewUtils.kt       | 25 +++--
 next/src/main/res/values/strings-next.xml     |  4 +
 13 files changed, 209 insertions(+), 116 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt

diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index 36770c018..8be0f4f6b 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -2,16 +2,26 @@ package org.fdroid.settings
 
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import org.fdroid.database.AppListSortOrder
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SettingsManager @Inject constructor() {
 
-    // TODO read this value from persistent storage
+    // TODO read these values from persistent storage
+    private val _filterIncompatible = MutableStateFlow(false)
+    val filterIncompatible = _filterIncompatible.asStateFlow()
+    private val _appListSortOrder = MutableStateFlow(AppListSortOrder.LAST_UPDATED)
+    val appListSortOrder = _appListSortOrder.asStateFlow()
     private val _showFilterOnboarding = MutableStateFlow(true)
     val showFilterOnboarding = _showFilterOnboarding.asStateFlow()
 
+    fun saveAppListFilter(sortOrder: AppListSortOrder, filterIncompatible: Boolean) {
+        _appListSortOrder.value = sortOrder
+        _filterIncompatible.value = filterIncompatible
+    }
+
     fun onFilterOnboardingSeen() {
         _showFilterOnboarding.value = false
         // TODO persist
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index f63b65acd..50b89d12e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -40,7 +40,9 @@ import org.fdroid.ui.details.AppDetailsViewModel
 import org.fdroid.ui.discover.Discover
 import org.fdroid.ui.discover.DiscoverViewModel
 import org.fdroid.ui.lists.AppList
+import org.fdroid.ui.lists.AppListActions
 import org.fdroid.ui.lists.AppListInfo
+import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.lists.AppListViewModel
 import org.fdroid.ui.repositories.Repositories
 import org.fdroid.ui.repositories.RepositoriesViewModel
@@ -155,30 +157,13 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                     val appListInfo = object : AppListInfo {
                         override val model =
                             appListViewModel.appListModel.collectAsStateWithLifecycle().value
+                        override val actions: AppListActions = appListViewModel
+                        override val list: AppListType =
+                            appListViewModel.currentList.collectAsStateWithLifecycle().value
+                        override val showFilters: Boolean =
+                            appListViewModel.showFilters.collectAsStateWithLifecycle().value
                         override val showOnboarding: Boolean =
                             appListViewModel.showOnboarding.collectAsStateWithLifecycle().value
-
-                        override fun toggleFilterVisibility() {
-                            appListViewModel.toggleListFilterVisibility()
-                        }
-
-                        override fun sortBy(sort: AppListSortOrder) = appListViewModel.sortBy(sort)
-                        override fun addCategory(categoryId: String) =
-                            appListViewModel.addCategory(categoryId)
-
-                        override fun removeCategory(categoryId: String) =
-                            appListViewModel.removeCategory(categoryId)
-
-                        override fun addRepository(repoId: Long) =
-                            appListViewModel.addRepository(repoId)
-
-                        override fun removeRepository(repoId: Long) =
-                            appListViewModel.removeRepository(repoId)
-
-                        override fun onSearch(query: String) =
-                            appListViewModel.onSearch(query)
-
-                        override fun onOnboardingSeen() = appListViewModel.onOnboardingSeen()
                     }
                     AppList(
                         appListInfo = appListInfo,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 9922940e8..40ec46d82 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -236,8 +236,8 @@ private fun AppsSearchPreview() {
                 CategoryItem("Money", "Money"),
             )
             val apps = listOf(
-                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null),
-                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null),
+                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null),
+                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null),
             )
             AppsSearch(state, SearchResults(apps, categories), {}, {}, {})
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 62f84e6e1..e083e0905 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -112,6 +112,7 @@ class DiscoverViewModel @Inject constructor(
                         name = it.name.getBestLocale(localeList) ?: "Unknown",
                         summary = it.summary.getBestLocale(localeList) ?: "",
                         lastUpdated = it.lastUpdated,
+                        isCompatible = true, // doesn't matter here, as we don't filter
                         iconDownloadRequest = it.getIcon(localeList)
                             ?.getDownloadRequest(repository),
                         categoryIds = it.categories?.toSet(),
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 8d79acfe3..08a20b9b7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -32,7 +32,7 @@ import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults.exitUntilCollapsedScrollBehavior
+import androidx.compose.material3.TopAppBarDefaults.enterAlwaysScrollBehavior
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
@@ -73,7 +73,7 @@ fun AppList(
     onItemClick: (String) -> Unit,
 ) {
     var searchActive by rememberSaveable { mutableStateOf(false) }
-    val scrollBehavior = exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
+    val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
 
     val hintController = rememberHintController(
         overlay = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.8f),
@@ -84,7 +84,7 @@ fun AppList(
             message = stringResource(R.string.onboarding_app_list_filter_message),
             modifier = Modifier.padding(horizontal = 32.dp, vertical = 8.dp),
         ) {
-            appListInfo.onOnboardingSeen()
+            appListInfo.actions.onOnboardingSeen()
             hintController.dismiss()
         }
     }
@@ -96,15 +96,15 @@ fun AppList(
     Scaffold(
         topBar = {
             if (searchActive) {
-                val onSearchCleared = { appListInfo.onSearch("") }
-                TopSearchBar(onSearch = appListInfo::onSearch, onSearchCleared) {
+                val onSearchCleared = { appListInfo.actions.onSearch("") }
+                TopSearchBar(onSearch = appListInfo.actions::onSearch, onSearchCleared) {
                     searchActive = false
                     onSearchCleared()
                 }
             } else TopAppBar(
                 title = {
                     Text(
-                        text = appListInfo.model.list.title,
+                        text = appListInfo.list.title,
                         maxLines = 1,
                         overflow = TextOverflow.MiddleEllipsis,
                     )
@@ -127,7 +127,7 @@ fun AppList(
                         )
                     }
                     IconButton(
-                        onClick = { appListInfo.toggleFilterVisibility() },
+                        onClick = { appListInfo.actions.toggleFilterVisibility() },
                         modifier = Modifier.hintAnchor(
                             state = hintAnchor,
                             shape = RoundedCornerShape(16.dp),
@@ -206,11 +206,11 @@ fun AppList(
             }
             // Bottom Sheet
             val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
-            if (appListInfo.model.areFiltersShown) {
+            if (appListInfo.showFilters) {
                 ModalBottomSheet(
                     modifier = Modifier.fillMaxHeight(),
                     sheetState = sheetState,
-                    onDismissRequest = { appListInfo.toggleFilterVisibility() },
+                    onDismissRequest = { appListInfo.actions.toggleFilterVisibility() },
                 ) {
                     AppsFilter(info = appListInfo)
                 }
@@ -224,13 +224,12 @@ fun AppList(
 private fun Preview() {
     FDroidContent {
         val model = AppListModel(
-            list = AppListType.New("New"),
             apps = listOf(
-                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null),
-                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null),
+                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null),
+                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null),
             ),
-            areFiltersShown = true,
             sortBy = AppListSortOrder.NAME,
+            filterIncompatible = true,
             categories = null,
             filteredCategoryIds = emptySet(),
             repositories = emptyList(),
@@ -246,10 +245,9 @@ private fun Preview() {
 private fun PreviewLoading() {
     FDroidContent {
         val model = AppListModel(
-            list = AppListType.New("New"),
             apps = null,
-            areFiltersShown = true,
             sortBy = AppListSortOrder.NAME,
+            filterIncompatible = false,
             categories = null,
             filteredCategoryIds = emptySet(),
             repositories = emptyList(),
@@ -265,10 +263,9 @@ private fun PreviewLoading() {
 private fun PreviewEmpty() {
     FDroidContent {
         val model = AppListModel(
-            list = AppListType.New("New"),
             apps = emptyList(),
-            areFiltersShown = true,
             sortBy = AppListSortOrder.NAME,
+            filterIncompatible = false,
             categories = null,
             filteredCategoryIds = emptySet(),
             repositories = emptyList(),
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt
new file mode 100644
index 000000000..270acca99
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt
@@ -0,0 +1,37 @@
+package org.fdroid.ui.lists
+
+import org.fdroid.database.AppListSortOrder
+import org.fdroid.ui.categories.CategoryItem
+import org.fdroid.ui.repositories.RepositoryItem
+
+interface AppListInfo {
+    val model: AppListModel
+    val actions: AppListActions
+    val list: AppListType
+    val showFilters: Boolean
+    val showOnboarding: Boolean
+}
+
+data class AppListModel(
+    val apps: List<AppListItem>?,
+    val sortBy: AppListSortOrder,
+    val filterIncompatible: Boolean,
+    val categories: List<CategoryItem>?,
+    val filteredCategoryIds: Set<String>,
+    val repositories: List<RepositoryItem>,
+    val filteredRepositoryIds: Set<Long>,
+)
+
+interface AppListActions {
+    fun toggleFilterVisibility()
+    fun sortBy(sort: AppListSortOrder)
+    fun toggleFilterIncompatible()
+    fun addCategory(categoryId: String)
+    fun removeCategory(categoryId: String)
+    fun addRepository(repoId: Long)
+    fun removeRepository(repoId: Long)
+    fun saveFilters()
+    fun clearFilters()
+    fun onSearch(query: String)
+    fun onOnboardingSeen()
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
index e397ae995..042fae7f1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
@@ -8,6 +8,7 @@ data class AppListItem(
     val name: String,
     val summary: String,
     val lastUpdated: Long,
+    val isCompatible: Boolean,
     val iconDownloadRequest: DownloadRequest? = null,
     val categoryIds: Set<String>? = null,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
index 982a65314..85a079c85 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
@@ -15,10 +15,9 @@ import java.util.Locale
 
 @Composable
 fun AppListPresenter(
-    listFlow: StateFlow<AppListType>,
     appsFlow: StateFlow<List<AppListItem>?>,
-    areFiltersShownFlow: StateFlow<Boolean>,
     sortByFlow: StateFlow<AppListSortOrder>,
+    filterIncompatibleFlow: StateFlow<Boolean>,
     categoriesFlow: Flow<List<CategoryItem>>,
     filteredCategoryIdsFlow: StateFlow<Set<String>>,
     repositoriesFlow: Flow<List<RepositoryItem>>,
@@ -27,6 +26,7 @@ fun AppListPresenter(
 ): AppListModel {
     val apps = appsFlow.collectAsState(null).value
     val sortBy = sortByFlow.collectAsState().value
+    val filterIncompatible = filterIncompatibleFlow.collectAsState().value
     val categories = categoriesFlow.collectAsState(null).value
     val filteredCategoryIds = filteredCategoryIdsFlow.collectAsState().value
     val repositories = repositoriesFlow.collectAsState(emptyList()).value
@@ -57,32 +57,21 @@ fun AppListPresenter(
         val matchesQuery = searchQuery.isEmpty() ||
             it.name.normalize().contains(searchQuery, ignoreCase = true) ||
             it.summary.normalize().contains(searchQuery, ignoreCase = true)
-        matchesCategories && matchesRepos && matchesQuery
+        val matchesCompatibility = !filterIncompatible || it.isCompatible
+        matchesCategories && matchesRepos && matchesQuery && matchesCompatibility
     }
     val locale = Locale.getDefault()
     return AppListModel(
-        list = listFlow.collectAsState().value,
         apps = if (sortBy == AppListSortOrder.NAME) {
             filteredApps?.sortedBy { it.name.lowercase(locale) }
         } else {
             filteredApps?.sortedByDescending { it.lastUpdated }
         },
-        areFiltersShown = areFiltersShownFlow.collectAsState().value,
         sortBy = sortBy,
+        filterIncompatible = filterIncompatible,
         categories = filteredCategories,
         filteredCategoryIds = filteredCategoryIds,
         repositories = availableRepositories,
         filteredRepositoryIds = filteredRepositoryIds,
     )
 }
-
-data class AppListModel(
-    val list: AppListType,
-    val apps: List<AppListItem>?,
-    val areFiltersShown: Boolean,
-    val sortBy: AppListSortOrder,
-    val categories: List<CategoryItem>?,
-    val filteredCategoryIds: Set<String>,
-    val repositories: List<RepositoryItem>,
-    val filteredRepositoryIds: Set<Long>,
-)
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
index 996b01b61..838f99483 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
@@ -49,8 +49,8 @@ fun AppListRow(
 @Composable
 fun AppListRowPreview() {
     FDroidContent {
-        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null)
-        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null)
+        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null)
+        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null)
         Column {
             AppListRow(item1, false)
             AppListRow(item2, true)
@@ -62,8 +62,8 @@ fun AppListRowPreview() {
 @Composable
 fun AppListRowPreviewNight() {
     FDroidContent {
-        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null)
-        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null)
+        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null)
+        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null)
         Column {
             AppListRow(item1, false)
             AppListRow(item2, true)
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 6599c3734..afb6d56cb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -38,7 +39,7 @@ class AppListViewModel @Inject constructor(
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
     private val settingsManager: SettingsManager,
-) : AndroidViewModel(app) {
+) : AndroidViewModel(app), AppListActions {
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
@@ -61,20 +62,23 @@ class AppListViewModel @Inject constructor(
     }
     private val query = MutableStateFlow("")
 
-    private val currentList =
+    private val _currentList =
         MutableStateFlow<AppListType>(AppListType.New(app.getString(R.string.app_list_new)))
-    private val showFilters = savedStateHandle.getMutableStateFlow("showFilters", false)
-    private val sortBy = MutableStateFlow(AppListSortOrder.LAST_UPDATED)
+    val currentList = _currentList.asStateFlow()
+    private val _showFilters = savedStateHandle.getMutableStateFlow("showFilters", false)
+    val showFilters = _showFilters.asStateFlow()
+
+    private val sortBy = MutableStateFlow(settingsManager.appListSortOrder.value)
+    private val filterIncompatible = MutableStateFlow(settingsManager.filterIncompatible.value)
     private val filteredCategoryIds = MutableStateFlow<Set<String>>(emptySet())
     private val filteredRepositoryIds = MutableStateFlow<Set<Long>>(emptySet())
     val showOnboarding = settingsManager.showFilterOnboarding
 
     val appListModel: StateFlow<AppListModel> = scope.launchMolecule(mode = ContextClock) {
         AppListPresenter(
-            listFlow = currentList,
             appsFlow = apps,
-            areFiltersShownFlow = showFilters,
             sortByFlow = sortBy,
+            filterIncompatibleFlow = filterIncompatible,
             categoriesFlow = categories,
             filteredCategoryIdsFlow = filteredCategoryIds,
             repositoriesFlow = repositories,
@@ -86,7 +90,7 @@ class AppListViewModel @Inject constructor(
     @UiThread
     fun load(type: AppListType) {
         apps.value = null
-        currentList.value = type
+        _currentList.value = type
 
         viewModelScope.launch(Dispatchers.IO) {
             apps.value = loadApps(type)
@@ -112,37 +116,42 @@ class AppListViewModel @Inject constructor(
                 name = it.getName(localeList) ?: "Unknown App",
                 summary = it.getSummary(localeList) ?: "Unknown",
                 lastUpdated = it.lastUpdated,
+                isCompatible = it.isCompatible,
                 iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
                 categoryIds = it.categories?.toSet(),
             )
         }
     }
 
-    fun toggleListFilterVisibility() {
-        showFilters.update { !it }
+    override fun toggleFilterVisibility() {
+        _showFilters.update { !it }
     }
 
-    fun sortBy(sort: AppListSortOrder) {
+    override fun sortBy(sort: AppListSortOrder) {
         sortBy.update { sort }
     }
 
-    fun addCategory(category: String) {
+    override fun toggleFilterIncompatible() {
+        filterIncompatible.update { !it }
+    }
+
+    override fun addCategory(categoryId: String) {
         filteredCategoryIds.update {
             filteredCategoryIds.value.toMutableSet().apply {
-                add(category)
+                add(categoryId)
             }
         }
     }
 
-    fun removeCategory(category: String) {
+    override fun removeCategory(categoryId: String) {
         filteredCategoryIds.update {
             filteredCategoryIds.value.toMutableSet().apply {
-                remove(category)
+                remove(categoryId)
             }
         }
     }
 
-    fun addRepository(repoId: Long) {
+    override fun addRepository(repoId: Long) {
         filteredRepositoryIds.update {
             filteredRepositoryIds.value.toMutableSet().apply {
                 add(repoId)
@@ -150,7 +159,7 @@ class AppListViewModel @Inject constructor(
         }
     }
 
-    fun removeRepository(repoId: Long) {
+    override fun removeRepository(repoId: Long) {
         filteredRepositoryIds.update {
             filteredRepositoryIds.value.toMutableSet().apply {
                 remove(repoId)
@@ -158,9 +167,19 @@ class AppListViewModel @Inject constructor(
         }
     }
 
-    fun onSearch(query: String) {
+    override fun saveFilters() {
+        settingsManager.saveAppListFilter(sortBy.value, filterIncompatible.value)
+    }
+
+    override fun clearFilters() {
+        filterIncompatible.value = false
+        filteredCategoryIds.value = emptySet()
+        filteredRepositoryIds.value = emptySet()
+    }
+
+    override fun onSearch(query: String) {
         this.query.value = query
     }
 
-    fun onOnboardingSeen() = settingsManager.onFilterOnboardingSeen()
+    override fun onOnboardingSeen() = settingsManager.onFilterOnboardingSeen()
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index bc339cbfc..a8eac185f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -4,9 +4,11 @@ import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
@@ -14,12 +16,17 @@ import androidx.compose.material.icons.automirrored.filled.Sort
 import androidx.compose.material.icons.filled.AccessTime
 import androidx.compose.material.icons.filled.Category
 import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material.icons.filled.PhonelinkErase
+import androidx.compose.material.icons.filled.Save
 import androidx.compose.material.icons.filled.SortByAlpha
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -36,20 +43,7 @@ import org.fdroid.ui.icons.PackageVariant
 import org.fdroid.ui.repositories.RepositoryItem
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.getAppListInfo
-
-interface AppListInfo {
-    val model: AppListModel
-    val showOnboarding: Boolean
-
-    fun toggleFilterVisibility()
-    fun sortBy(sort: AppListSortOrder)
-    fun addCategory(categoryId: String)
-    fun removeCategory(categoryId: String)
-    fun addRepository(repoId: Long)
-    fun removeRepository(repoId: Long)
-    fun onSearch(query: String)
-    fun onOnboardingSeen()
-}
+import kotlin.random.Random
 
 @Composable
 fun AppsFilter(
@@ -58,7 +52,10 @@ fun AppsFilter(
 ) {
     val scrollState = rememberScrollState()
     Column(modifier = Modifier.verticalScroll(scrollState)) {
-        FilterHeader(Icons.AutoMirrored.Default.Sort, "Sorting")
+        FilterHeader(
+            icon = Icons.AutoMirrored.Default.Sort,
+            text = stringResource(R.string.sort_title),
+        )
         FlowRow(
             horizontalArrangement = spacedBy(8.dp),
             modifier = modifier
@@ -82,7 +79,7 @@ fun AppsFilter(
                     Text(stringResource(R.string.sort_by_name))
                 },
                 onClick = {
-                    if (!byNameSelected) info.sortBy(AppListSortOrder.NAME)
+                    if (!byNameSelected) info.actions.sortBy(AppListSortOrder.NAME)
                 },
             )
             val byLatestSelected = info.model.sortBy == AppListSortOrder.LAST_UPDATED
@@ -102,15 +99,46 @@ fun AppsFilter(
                     Text(stringResource(R.string.sort_by_latest))
                 },
                 onClick = {
-                    if (!byLatestSelected) info.sortBy(AppListSortOrder.LAST_UPDATED)
+                    if (!byLatestSelected) info.actions.sortBy(AppListSortOrder.LAST_UPDATED)
                 },
             )
-
+            FilterChip(
+                selected = info.model.filterIncompatible,
+                leadingIcon = {
+                    if (info.model.filterIncompatible) {
+                        Icon(
+                            imageVector = Icons.Default.Check,
+                            contentDescription = stringResource(R.string.filter_selected),
+                        )
+                    } else {
+                        Icon(Icons.Default.PhonelinkErase, null)
+                    }
+                },
+                label = {
+                    Text(stringResource(R.string.filter_only_compatible))
+                },
+                onClick = info.actions::toggleFilterIncompatible,
+            )
+        }
+        TextButton(
+            onClick = info.actions::saveFilters,
+            modifier = modifier
+                .align(Alignment.End)
+                .padding(horizontal = 16.dp),
+        ) {
+            Icon(Icons.Default.Save, null)
+            Spacer(modifier.width(ButtonDefaults.IconSpacing))
+            Text(
+                text = stringResource(R.string.filter_button_save)
+            )
         }
         val categories = info.model.categories
         if (categories != null) {
             HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
-            FilterHeader(Icons.Default.Category, "Categories")
+            FilterHeader(
+                icon = Icons.Default.Category,
+                text = stringResource(R.string.main_menu__categories),
+            )
             FlowRow(
                 modifier = modifier
                     .fillMaxWidth()
@@ -120,9 +148,9 @@ fun AppsFilter(
                     val isSelected = item.id in info.model.filteredCategoryIds
                     CategoryCard(item, selected = isSelected, onSelected = {
                         if (isSelected) {
-                            info.removeCategory(item.id)
+                            info.actions.removeCategory(item.id)
                         } else {
-                            info.addCategory(item.id)
+                            info.actions.addCategory(item.id)
                         }
                     })
                 }
@@ -130,7 +158,10 @@ fun AppsFilter(
         }
         if (info.model.repositories.isNotEmpty()) {
             HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
-            FilterHeader(PackageVariant, "Repositories")
+            FilterHeader(
+                icon = PackageVariant,
+                text = stringResource(R.string.app_details_repositories),
+            )
             FlowRow(
                 horizontalArrangement = spacedBy(8.dp),
                 modifier = modifier
@@ -158,15 +189,26 @@ fun AppsFilter(
                         },
                         onClick = {
                             if (selected) {
-                                info.removeRepository(repo.repoId)
+                                info.actions.removeRepository(repo.repoId)
                             } else {
-                                info.addRepository(repo.repoId)
+                                info.actions.addRepository(repo.repoId)
                             }
                         },
                     )
                 }
             }
         }
+        HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
+        TextButton(
+            onClick = info.actions::clearFilters,
+            modifier = modifier
+                .align(Alignment.End)
+                .padding(horizontal = 16.dp),
+        ) {
+            Icon(Icons.Default.Clear, null)
+            Spacer(modifier.width(ButtonDefaults.IconSpacing))
+            Text(stringResource(R.string.filter_button_clear_all))
+        }
     }
 }
 
@@ -191,13 +233,12 @@ private fun FilterHeader(icon: ImageVector, text: String) {
 private fun Preview() {
     FDroidContent {
         val model = AppListModel(
-            list = AppListType.New("New"),
             apps = listOf(
-                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, null),
-                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, null),
+                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null),
+                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null),
             ),
-            areFiltersShown = true,
             sortBy = AppListSortOrder.NAME,
+            filterIncompatible = Random.nextBoolean(),
             categories = listOf(
                 CategoryItem("App Store & Updater", "App Store & Updater"),
                 CategoryItem("Browser", "Browser"),
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 645bb78d3..931f5ed8d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -12,8 +12,10 @@ import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.details.AntiFeature
 import org.fdroid.ui.details.AppDetailsActions
 import org.fdroid.ui.details.AppDetailsItem
+import org.fdroid.ui.lists.AppListActions
 import org.fdroid.ui.lists.AppListInfo
 import org.fdroid.ui.lists.AppListModel
+import org.fdroid.ui.lists.AppListType
 import java.util.concurrent.TimeUnit.DAYS
 
 object Names {
@@ -170,13 +172,20 @@ fun getPreviewVersion(versionName: String, size: Long? = null) = object : Packag
 
 fun getAppListInfo(model: AppListModel) = object : AppListInfo {
     override val model: AppListModel = model
+    override val actions: AppListActions = object : AppListActions {
+        override fun toggleFilterVisibility() {}
+        override fun sortBy(sort: AppListSortOrder) {}
+        override fun toggleFilterIncompatible() {}
+        override fun addCategory(categoryId: String) {}
+        override fun removeCategory(categoryId: String) {}
+        override fun addRepository(repoId: Long) {}
+        override fun removeRepository(repoId: Long) {}
+        override fun saveFilters() {}
+        override fun clearFilters() {}
+        override fun onSearch(query: String) {}
+        override fun onOnboardingSeen() {}
+    }
+    override val list: AppListType = AppListType.New("New")
+    override val showFilters: Boolean = false
     override val showOnboarding: Boolean = false
-    override fun toggleFilterVisibility() {}
-    override fun sortBy(sort: AppListSortOrder) {}
-    override fun addCategory(categoryId: String) {}
-    override fun removeCategory(categoryId: String) {}
-    override fun addRepository(repoId: Long) {}
-    override fun removeRepository(repoId: Long) {}
-    override fun onSearch(query: String) {}
-    override fun onOnboardingSeen() {}
 }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 4ce38a0f5..331b30dab 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -24,8 +24,12 @@
     <string name="search_no_results">No apps found.\n\nTry to use less search terms or add/enable more repositories.</string>
     <string name="search_filter_no_results">No matching apps.\n\nTry to use less search terms or remove filters.</string>
     <string name="search_my_apps_no_results">No matching apps.\n\nTry to use less search terms.</string>
+    <string name="sort_title">Sorting and compatibility</string>
     <string name="sort_by_name">Sort by name</string>
     <string name="sort_by_latest">Sort by latest</string>
+    <string name="filter_only_compatible">Apps compatible with this device</string>
+    <string name="filter_button_save">Save above as default</string>
+    <string name="filter_button_clear_all">Clear all filters</string>
     <!-- Used for filtering lists of apps by certain criteria -->
     <string name="filter">Filter</string>
     <!-- Used for filter chips (e.g. categories) when they are currently selected -->

From 8361dc76add556108989ccd0456bd68c40324935 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 5 Sep 2025 11:12:27 -0300
Subject: [PATCH 056/180] Use chips for categories on discover page

---
 .../{CategoryCard.kt => CategoryChip.kt}      |  6 +--
 .../org/fdroid/ui/categories/CategoryList.kt  | 40 +++++++------------
 .../org/fdroid/ui/details/AppDetails.kt       |  4 +-
 .../org/fdroid/ui/discover/AppsSearch.kt      |  4 +-
 .../kotlin/org/fdroid/ui/discover/Discover.kt | 11 +++--
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  |  4 +-
 6 files changed, 30 insertions(+), 39 deletions(-)
 rename next/src/main/kotlin/org/fdroid/ui/categories/{CategoryCard.kt => CategoryChip.kt} (96%)

diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
similarity index 96%
rename from next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt
rename to next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
index 4bb0dcf7c..d4a065b54 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryCard.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
@@ -18,7 +18,7 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 
 @Composable
-fun CategoryCard(
+fun CategoryChip(
     categoryItem: CategoryItem,
     onSelected: () -> Unit,
     modifier: Modifier = Modifier,
@@ -53,12 +53,12 @@ fun CategoryCard(
 fun CategoryCardPreview() {
     FDroidContent {
         Column {
-            CategoryCard(
+            CategoryChip(
                 CategoryItem("VPN & Proxy", "VPN & Proxy"),
                 selected = true,
                 onSelected = {},
             )
-            CategoryCard(
+            CategoryChip(
                 CategoryItem("VPN & Proxy", "VPN & Proxy"),
                 selected = false,
                 onSelected = {},
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index 7f4664bf5..d560cc4bb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -1,13 +1,9 @@
 package org.fdroid.ui.categories
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.GridItemSpan
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -20,7 +16,6 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.lists.AppListType
-import kotlin.math.max
 
 @Composable
 fun CategoryList(
@@ -28,26 +23,19 @@ fun CategoryList(
     onNav: (NavKey) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    if (categories != null) Column {
-        val state = rememberLazyGridState()
-        LazyVerticalGrid(
-            state = state,
-            columns = GridCells.Adaptive(150.dp),
-            contentPadding = PaddingValues(12.dp),
-            userScrollEnabled = false,
-            modifier = modifier,
+    if (categories != null) Column(
+        modifier = modifier
+    ) {
+        Text(
+            text = stringResource(R.string.main_menu__categories),
+            style = MaterialTheme.typography.titleLarge,
+            modifier = Modifier.padding(bottom = 8.dp, start = 4.dp),
+        )
+        FlowRow(
+            horizontalArrangement = Arrangement.Start,
         ) {
-            item(key = "header", span = {
-                GridItemSpan(max(1, state.layoutInfo.maxSpan))
-            }) {
-                Text(
-                    text = stringResource(R.string.main_menu__categories),
-                    style = MaterialTheme.typography.titleLarge,
-                    modifier = Modifier.padding(bottom = 8.dp, start = 4.dp),
-                )
-            }
-            items(categories, key = { it.name }) { category ->
-                CategoryCard(category, {
+            categories.forEach { category ->
+                CategoryChip(category, {
                     val type = AppListType.Category(category.name, category.id)
                     val navKey = NavigationKey.AppList(type)
                     onNav(navKey)
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index d85edd48e..a1e2947cd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -66,7 +66,7 @@ import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
-import org.fdroid.ui.categories.CategoryCard
+import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.icons.License
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.utils.AsyncShimmerImage
@@ -362,7 +362,7 @@ fun AppDetails(
             ) {
                 FlowRow(modifier = Modifier.padding(start = 16.dp)) {
                     item.categories.forEach { item ->
-                        CategoryCard(item, onSelected = {
+                        CategoryChip(item, onSelected = {
                             val categoryNav = AppListType.Category(item.name, item.id)
                             onNav(NavigationKey.AppList(categoryNav))
                         })
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 40ec46d82..ea5e3a529 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -33,7 +33,7 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
-import org.fdroid.ui.categories.CategoryCard
+import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListItem
 import org.fdroid.ui.lists.AppListRow
@@ -158,7 +158,7 @@ private fun CategoriesFlowRow(categories: List<CategoryItem>, onNav: (Navigation
         )
         FlowRow {
             categories.forEach { item ->
-                CategoryCard(categoryItem = item, onSelected = {
+                CategoryChip(categoryItem = item, onSelected = {
                     val type = AppListType.Category(item.name, item.id)
                     val navKey = NavigationKey.AppList(type)
                     onNav(navKey)
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 65871feec..c4c38dde5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -4,7 +4,6 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -171,9 +170,13 @@ fun Discover(
                 }
             }
             AnimatedVisibility(discoverModel is LoadedDiscoverModel) {
-                val categories = (discoverModel as LoadedDiscoverModel).categories
-                // TODO remove max height hack
-                CategoryList(categories, onNav, Modifier.heightIn(max = 2000.dp))
+                CategoryList(
+                    categories = (discoverModel as LoadedDiscoverModel).categories,
+                    onNav = onNav,
+                    modifier = Modifier
+                        .padding(16.dp)
+                        .fillMaxWidth()
+                )
             }
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index a8eac185f..485f96e4a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -37,7 +37,7 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
-import org.fdroid.ui.categories.CategoryCard
+import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.icons.PackageVariant
 import org.fdroid.ui.repositories.RepositoryItem
@@ -146,7 +146,7 @@ fun AppsFilter(
             ) {
                 categories.forEach { item ->
                     val isSelected = item.id in info.model.filteredCategoryIds
-                    CategoryCard(item, selected = isSelected, onSelected = {
+                    CategoryChip(item, selected = isSelected, onSelected = {
                         if (isSelected) {
                             info.actions.removeCategory(item.id)
                         } else {

From 7909ec46d56c6fe3d81be2ca5d082d758bf42276 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 15 Sep 2025 16:13:55 -0300
Subject: [PATCH 057/180] group categories on discover screen

in order to make them easier to parse/browse through
---
 .../org/fdroid/ui/categories/CategoryGroup.kt | 22 +++++++
 .../org/fdroid/ui/categories/CategoryItem.kt  | 63 +++++++++++++++++++
 .../org/fdroid/ui/categories/CategoryList.kt  | 57 +++++++++++------
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  5 +-
 .../fdroid/ui/discover/DiscoverPresenter.kt   |  5 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |  2 +-
 next/src/main/res/values/strings-next.xml     | 10 +++
 7 files changed, 140 insertions(+), 24 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
new file mode 100644
index 000000000..6e8c8eaf6
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
@@ -0,0 +1,22 @@
+package org.fdroid.ui.categories
+
+import androidx.annotation.StringRes
+import org.fdroid.next.R
+
+data class CategoryGroup(
+    val id: String,
+    @get:StringRes
+    val name: Int,
+)
+
+object CategoryGroups {
+    val productivity = CategoryGroup("productivity", R.string.category_group_productivity)
+    val tools = CategoryGroup("tools", R.string.category_group_tools)
+    val wallets = CategoryGroup("wallets", R.string.category_group_wallets)
+    val media = CategoryGroup("media", R.string.category_group_media)
+    val communication = CategoryGroup("communication", R.string.category_group_communication)
+    val device = CategoryGroup("device", R.string.category_group_device)
+    val storage = CategoryGroup("storage", R.string.category_group_storage)
+    val interests = CategoryGroup("interests", R.string.category_group_interests)
+    val misc = CategoryGroup("misc", R.string.category_group_misc)
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
index 86f67f68e..2829250d1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
@@ -126,4 +126,67 @@ data class CategoryItem(val id: String, val name: String) {
             "Writing" -> Icons.Default.EditNote
             else -> Icons.Default.Category
         }
+    val group: CategoryGroup
+        get() = when (id) {
+            "App Store & Updater" -> CategoryGroups.device
+            "Bookmark" -> CategoryGroups.storage
+            "Browser" -> CategoryGroups.productivity
+            "Calculator" -> CategoryGroups.tools
+            "Calendar & Agenda" -> CategoryGroups.productivity
+            "Cloud Storage & File Sync" -> CategoryGroups.storage
+            "Connectivity" -> CategoryGroups.device
+            "Development" -> CategoryGroups.interests
+            "DNS & Hosts" -> CategoryGroups.device
+            "Draw" -> CategoryGroups.interests
+            "Ebook Reader" -> CategoryGroups.media
+            "Email" -> CategoryGroups.communication
+            "File Encryption & Vault" -> CategoryGroups.storage
+            "File Transfer" -> CategoryGroups.storage
+            "Finance Manager" -> CategoryGroups.wallets
+            "Forum" -> CategoryGroups.communication
+            "Gallery" -> CategoryGroups.storage
+            "Games" -> CategoryGroups.media
+            "Graphics" -> CategoryGroups.interests
+            "Habit Tracker" -> CategoryGroups.productivity
+            "Icon Pack" -> CategoryGroups.device
+            "Internet" -> CategoryGroups.productivity
+            "Keyboard & IME" -> CategoryGroups.device
+            "Launcher" -> CategoryGroups.device
+            "Local Media Player" -> CategoryGroups.media
+            "Messaging" -> CategoryGroups.communication
+            "Money" -> CategoryGroups.wallets
+            "Multimedia" -> CategoryGroups.media
+            "Music Practice Tool" -> CategoryGroups.interests
+            "Navigation" -> CategoryGroups.tools
+            "News" -> CategoryGroups.interests
+            "Note" -> CategoryGroups.storage
+            "Online Media Player" -> CategoryGroups.media
+            "Pass Wallet" -> CategoryGroups.wallets
+            "Password & 2FA" -> CategoryGroups.device
+            "Phone & SMS" -> CategoryGroups.communication
+            "Podcast" -> CategoryGroups.media
+            "Public Transport" -> CategoryGroups.tools
+            "Reading" -> CategoryGroups.media
+            "Recipe Manager" -> CategoryGroups.interests
+            "Science & Education" -> CategoryGroups.interests
+            "Security" -> CategoryGroups.device
+            "Shopping List" -> CategoryGroups.tools
+            "Social Network" -> CategoryGroups.communication
+            "Sports & Health" -> CategoryGroups.interests
+            "System" -> CategoryGroups.device
+            "Task" -> CategoryGroups.productivity
+            "Text Editor" -> CategoryGroups.productivity
+            "Theming" -> CategoryGroups.device
+            "Time" -> CategoryGroups.productivity
+            "Translation & Dictionary" -> CategoryGroups.tools
+            "Voice & Video Chat" -> CategoryGroups.communication
+            "Unit Convertor" -> CategoryGroups.tools
+            "VPN & Proxy" -> CategoryGroups.device
+            "Wallet" -> CategoryGroups.wallets
+            "Wallpaper" -> CategoryGroups.device
+            "Weather" -> CategoryGroups.tools
+            "Workout" -> CategoryGroups.interests
+            "Writing" -> CategoryGroups.productivity
+            else -> CategoryGroups.misc
+        }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index d560cc4bb..2c7a95a00 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -7,7 +7,9 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -19,11 +21,11 @@ import org.fdroid.ui.lists.AppListType
 
 @Composable
 fun CategoryList(
-    categories: List<CategoryItem>?,
+    categoryMap: Map<CategoryGroup, List<CategoryItem>>?,
     onNav: (NavKey) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    if (categories != null) Column(
+    if (categoryMap != null) Column(
         modifier = modifier
     ) {
         Text(
@@ -31,15 +33,28 @@ fun CategoryList(
             style = MaterialTheme.typography.titleLarge,
             modifier = Modifier.padding(bottom = 8.dp, start = 4.dp),
         )
-        FlowRow(
-            horizontalArrangement = Arrangement.Start,
-        ) {
-            categories.forEach { category ->
-                CategoryChip(category, {
-                    val type = AppListType.Category(category.name, category.id)
-                    val navKey = NavigationKey.AppList(type)
-                    onNav(navKey)
-                })
+        // we'll sort the groups here, because before we didn't have the context to get names
+        val context = LocalContext.current
+        val sortedMap = remember(categoryMap) {
+            val comparator = compareBy<CategoryGroup> { context.getString(it.name) }
+            categoryMap.toSortedMap(comparator)
+        }
+        sortedMap.forEach { (group, categories) ->
+            Text(
+                text = stringResource(group.name),
+                style = MaterialTheme.typography.titleMedium,
+                modifier = Modifier.padding(4.dp),
+            )
+            FlowRow(
+                horizontalArrangement = Arrangement.Start,
+            ) {
+                categories.forEach { category ->
+                    CategoryChip(category, {
+                        val type = AppListType.Category(category.name, category.id)
+                        val navKey = NavigationKey.AppList(type)
+                        onNav(navKey)
+                    })
+                }
             }
         }
     }
@@ -49,14 +64,18 @@ fun CategoryList(
 @Composable
 fun CategoryListPreview() {
     FDroidContent {
-        val categories = listOf(
-            CategoryItem("App Store & Updater", "App Store & Updater"),
-            CategoryItem("Browser", "Browser"),
-            CategoryItem("Calendar & Agenda", "Calendar & Agenda"),
-            CategoryItem("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
-            CategoryItem("Connectivity", "Connectivity"),
-            CategoryItem("Development", "Development"),
-            CategoryItem("doesn't exist", "Foo bar"),
+        val categories = mapOf(
+            CategoryGroups.productivity to listOf(
+                CategoryItem("App Store & Updater", "App Store & Updater"),
+                CategoryItem("Browser", "Browser"),
+                CategoryItem("Calendar & Agenda", "Calendar & Agenda"),
+            ),
+            CategoryGroups.media to listOf(
+                CategoryItem("Cloud Storage & File Sync", "Cloud Storage & File Sync"),
+                CategoryItem("Connectivity", "Connectivity"),
+                CategoryItem("Development", "Development"),
+                CategoryItem("doesn't exist", "Foo bar"),
+            )
         )
         CategoryList(categories, {})
     }
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 c4c38dde5..ab12c9f65 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -171,10 +171,11 @@ fun Discover(
             }
             AnimatedVisibility(discoverModel is LoadedDiscoverModel) {
                 CategoryList(
-                    categories = (discoverModel as LoadedDiscoverModel).categories,
+                    categoryMap = (discoverModel as LoadedDiscoverModel).categories,
                     onNav = onNav,
                     modifier = Modifier
-                        .padding(16.dp)
+                        .padding(horizontal = 16.dp)
+                        .padding(bottom = 16.dp)
                         .fillMaxWidth()
                 )
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 5316e3548..20064ace8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.Repository
+import org.fdroid.ui.categories.CategoryGroup
 import org.fdroid.ui.categories.CategoryItem
 
 @Composable
@@ -34,7 +35,7 @@ fun DiscoverPresenter(
         LoadedDiscoverModel(
             newApps = apps.filter { it.isNew },
             recentlyUpdatedApps = apps.filter { !it.isNew },
-            categories = categories,
+            categories = categories?.groupBy { it.group },
             searchResults = searchResults,
         )
     }
@@ -46,6 +47,6 @@ object NoEnabledReposDiscoverModel : DiscoverModel()
 data class LoadedDiscoverModel(
     val newApps: List<AppDiscoverItem>,
     val recentlyUpdatedApps: List<AppDiscoverItem>,
-    val categories: List<CategoryItem>?,
+    val categories: Map<CategoryGroup, List<CategoryItem>>?,
     val searchResults: SearchResults? = null,
 ) : DiscoverModel()
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index e083e0905..ef9bac3ec 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -61,7 +61,7 @@ class DiscoverViewModel @Inject constructor(
             )
         }
     }
-    val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
+    private val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
         categories.map { category ->
             CategoryItem(
                 id = category.id,
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 331b30dab..76f709f0f 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -36,6 +36,16 @@
     <string name="filter_selected">selected</string>
     <string name="category">Category</string>
 
+    <string name="category_group_productivity">Productivity</string>
+    <string name="category_group_tools">Tools</string>
+    <string name="category_group_wallets">Digital Wallets</string>
+    <string name="category_group_media">Entertainment &amp; Media</string>
+    <string name="category_group_communication">Communication</string>
+    <string name="category_group_device">Device</string>
+    <string name="category_group_storage">Files &amp; Storage</string>
+    <string name="category_group_interests">Interests</string>
+    <string name="category_group_misc">Miscellaneous</string>
+
     <string name="author_by">By %1$s</string>
     <string name="last_updated">Last updated: %1$s</string>
     <!-- The placeholder in round brackets will be replaced with the size of the app -->

From 68dae57310aa950ff783ee522a796fd222d2a91b Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 14 Oct 2025 14:43:54 -0300
Subject: [PATCH 058/180] Improve no repos message on discover screen

---
 .../kotlin/org/fdroid/ui/discover/Discover.kt | 25 ++++++++++++++++++-
 next/src/main/res/values/strings-next.xml     |  2 +-
 2 files changed, 25 insertions(+), 2 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 ab12c9f65..7fc618359 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -166,7 +166,13 @@ fun Discover(
                     }
                 }
                 NoEnabledReposDiscoverModel -> {
-                    Text(stringResource(R.string.no_repos_enabled))
+                    Text(
+                        text = stringResource(R.string.no_repos_enabled),
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(horizontal = 16.dp, vertical = 64.dp)
+                    )
                 }
             }
             AnimatedVisibility(discoverModel is LoadedDiscoverModel) {
@@ -199,3 +205,20 @@ fun LoadingDiscoverPreview() {
         )
     }
 }
+
+@Preview
+@Composable
+private fun NoEnabledReposPreview() {
+    FDroidContent {
+        Discover(
+            discoverModel = NoEnabledReposDiscoverModel,
+            numUpdates = 0,
+            isBigScreen = false,
+            onListTap = {},
+            onAppTap = {},
+            onNav = {},
+            onSearch = {},
+            onSearchCleared = {},
+        )
+    }
+}
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 76f709f0f..6afcc7cf8 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -9,7 +9,7 @@
     <string name="menu_apps_my">My apps</string>
 
     <string name="first_start_loading">Retrieving apps…\n\nThis may take some time.</string>
-    <string name="no_repos_enabled">No repositories enabled.\nEnable at least one repository to see apps.</string>
+    <string name="no_repos_enabled">No repositories enabled.\nEnable or add at least one repository to see apps.</string>
     <string name="no_app_selected">No app selected</string>
     <string name="no_repository_selected">No repository selected</string>
 

From 2b5a98c6921361989f6d06bbf0c7bc19c2a88682 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 15 Sep 2025 17:35:19 -0300
Subject: [PATCH 059/180] Use dedicated DB methods for getting new and recently
 updated apps

Otherwise the 200 apps limit causes us to miss apps that we'd still consider "new".
---
 .../org/fdroid/ui/discover/AppCarousel.kt     | 10 +++---
 .../org/fdroid/ui/discover/AppDiscoverItem.kt |  1 -
 .../fdroid/ui/discover/DiscoverPresenter.kt   | 14 ++++----
 .../fdroid/ui/discover/DiscoverViewModel.kt   | 32 ++++++++++++-------
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
index a9cf9e804..b6ce13048 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
@@ -94,11 +94,11 @@ fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
 @Composable
 fun AppCarouselPreview() {
     val apps = listOf(
-        AppDiscoverItem("", Names.randomName, isNew = true),
-        AppDiscoverItem("", Names.randomName, isNew = false),
-        AppDiscoverItem("", Names.randomName, isNew = false),
-        AppDiscoverItem("", Names.randomName, isNew = false),
-        AppDiscoverItem("", Names.randomName, isNew = false),
+        AppDiscoverItem("", Names.randomName),
+        AppDiscoverItem("", Names.randomName),
+        AppDiscoverItem("", Names.randomName),
+        AppDiscoverItem("", Names.randomName),
+        AppDiscoverItem("", Names.randomName),
     )
     FDroidContent {
         AppCarousel("Preview Apps", apps, onTitleTap = {}) {}
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
index 550662e0a..48fe22e85 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
@@ -6,6 +6,5 @@ class AppDiscoverItem(
     val packageName: String,
     val name: String,
     val iconDownloadRequest: DownloadRequest? = null,
-    val isNew: Boolean,
     val lastUpdated: Long = -1,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 20064ace8..a1f8f0f53 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -10,18 +10,20 @@ import org.fdroid.ui.categories.CategoryItem
 
 @Composable
 fun DiscoverPresenter(
-    appsFlow: Flow<List<AppDiscoverItem>>,
+    newAppsFlow: Flow<List<AppDiscoverItem>>,
+    recentlyUpdatedAppsFlow: Flow<List<AppDiscoverItem>>,
     categoriesFlow: Flow<List<CategoryItem>>,
     repositoriesFlow: Flow<List<Repository>>,
     searchResultsFlow: StateFlow<SearchResults?>,
 ): DiscoverModel {
-    val apps = appsFlow.collectAsState(null).value
+    val newApps = newAppsFlow.collectAsState(null).value
+    val recentlyUpdatedApps = recentlyUpdatedAppsFlow.collectAsState(null).value
     val categories = categoriesFlow.collectAsState(null).value
     val searchResults = searchResultsFlow.collectAsState().value
 
-    return if (apps.isNullOrEmpty()) {
+    return if (newApps.isNullOrEmpty() || recentlyUpdatedApps.isNullOrEmpty()) {
         val repositories = repositoriesFlow.collectAsState(null).value
-        if (apps == null) {
+        if (newApps == null && recentlyUpdatedApps == null) {
             LoadingDiscoverModel(false)
         } else if (repositories?.all { !it.enabled } == true) {
             NoEnabledReposDiscoverModel
@@ -33,8 +35,8 @@ fun DiscoverPresenter(
         }
     } else {
         LoadedDiscoverModel(
-            newApps = apps.filter { it.isNew },
-            recentlyUpdatedApps = apps.filter { !it.isNew },
+            newApps = newApps,
+            recentlyUpdatedApps = recentlyUpdatedApps,
             categories = categories?.groupBy { it.group },
             searchResults = searchResults,
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index ef9bac3ec..27e2e10ca 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -19,7 +19,9 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import mu.KotlinLogging
 import org.fdroid.LocaleChooser.getBestLocale
+import org.fdroid.database.AppOverviewItem
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.database.Repository
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
 import org.fdroid.ui.categories.CategoryItem
@@ -47,18 +49,16 @@ class DiscoverViewModel @Inject constructor(
     private val collator = Collator.getInstance(Locale.getDefault())
 
     val numUpdates = updatesManager.numUpdates
-    val apps = db.getAppDao().getAppOverviewItems().asFlow().map { list ->
+    val newApps = db.getAppDao().getNewAppsFlow().map { list ->
         list.mapNotNull {
-            val repository = repoManager.getRepository(it.repoId)
-                ?: return@mapNotNull null
-            AppDiscoverItem(
-                packageName = it.packageName,
-                name = it.getName(localeList) ?: "Unknown App",
-                isNew = it.lastUpdated == it.added,
-                lastUpdated = it.lastUpdated,
-                iconDownloadRequest = it.getIcon(localeList)
-                    ?.getDownloadRequest(repository),
-            )
+            val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
+            it.toAppDiscoverItem(repository)
+        }
+    }
+    val recentlyUpdatedApps = db.getAppDao().getRecentlyUpdatedAppsFlow().map { list ->
+        list.mapNotNull {
+            val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
+            it.toAppDiscoverItem(repository)
         }
     }
     private val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
@@ -74,7 +74,8 @@ class DiscoverViewModel @Inject constructor(
     val localeList = LocaleListCompat.getDefault()
     val discoverModel: StateFlow<DiscoverModel> = scope.launchMolecule(mode = ContextClock) {
         DiscoverPresenter(
-            appsFlow = apps,
+            newAppsFlow = newApps,
+            recentlyUpdatedAppsFlow = recentlyUpdatedApps,
             categoriesFlow = categories,
             repositoriesFlow = repoManager.repositoriesState,
             searchResultsFlow = searchResults,
@@ -140,4 +141,11 @@ class DiscoverViewModel @Inject constructor(
     fun onSearchCleared() {
         searchResults.value = null
     }
+
+    private fun AppOverviewItem.toAppDiscoverItem(repository: Repository) = AppDiscoverItem(
+        packageName = packageName,
+        name = getName(localeList) ?: "Unknown App",
+        lastUpdated = lastUpdated,
+        iconDownloadRequest = getIcon(localeList)?.getDownloadRequest(repository),
+    )
 }

From f24ff287d8efb106d029e4bc622a3ad74a0ef4ac Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 22 Sep 2025 11:54:28 -0300
Subject: [PATCH 060/180] Implement installation of apps and updates

---
 next/src/main/AndroidManifest.xml             |  14 +-
 next/src/main/kotlin/org/fdroid/App.kt        |  10 +-
 .../org/fdroid/install/AppInstallListener.kt  |  10 +
 .../org/fdroid/install/AppInstallManager.kt   | 230 ++++++++++++
 .../install/InstallBroadcastReceiver.kt       |  48 +++
 .../kotlin/org/fdroid/install/InstallState.kt |  27 ++
 .../org/fdroid/install/PreApprovalResult.kt   |   8 +
 .../fdroid/install/SessionInstallManager.kt   | 334 +++++++++++++++++-
 .../org/fdroid/ui/details/AppDetails.kt       |  25 +-
 .../org/fdroid/ui/details/AppDetailsHeader.kt | 118 ++++++-
 .../org/fdroid/ui/details/AppDetailsItem.kt   |  23 +-
 .../fdroid/ui/details/AppDetailsViewModel.kt  |  68 +++-
 .../org/fdroid/ui/details/DetailsPresenter.kt |   9 +
 .../kotlin/org/fdroid/ui/details/Versions.kt  |  40 ++-
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  18 +-
 next/src/main/res/values/strings-next.xml     |   1 +
 16 files changed, 938 insertions(+), 45 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/install/AppInstallListener.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/install/InstallState.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt

diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
index 57f43d9e0..9014a5f99 100644
--- a/next/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -6,16 +6,26 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE"
+        tools:ignore="ForegroundServicesPolicy" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
+    <uses-permission
+        android:name="android.permission.REQUEST_INSTALL_PACKAGES"
+        tools:ignore="RequestInstallPackagesPolicy" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
+
     <application
         android:name="org.fdroid.App"
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Fdroidclient">
+        android:theme="@style/Theme.Fdroidclient"
+        tools:targetApi="33">
         <activity
             android:name="org.fdroid.MainActivity"
             android:exported="true"
diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index 45ab98f49..c5ab51296 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -50,12 +50,8 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
             .crossfade(true)
             .components {
                 val downloadRequestKeyer = object : Keyer<DownloadRequest> {
-                    override fun key(
-                        data: DownloadRequest,
-                        options: Options
-                    ): String {
-                        return data.indexFile.sha256
-                            ?: (data.mirrors[0].baseUrl + data.indexFile.name)
+                    override fun key(data: DownloadRequest, options: Options): String {
+                        return data.getCacheKey()
                     }
                 }
                 add(downloadRequestKeyer)
@@ -84,3 +80,5 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
             .build()
     }
 }
+
+fun DownloadRequest.getCacheKey() = indexFile.sha256 ?: (mirrors[0].baseUrl + indexFile.name)
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallListener.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallListener.kt
new file mode 100644
index 000000000..ed5d9f7b6
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallListener.kt
@@ -0,0 +1,10 @@
+package org.fdroid.install
+
+import android.app.PendingIntent
+
+interface AppInstallListener {
+    fun onStartInstall(sessionId: Int)
+    fun onUserConfirmationNeeded(sessionId: Int, intent: PendingIntent)
+    fun onInstalled()
+    fun onInstallError(msg: String?)
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
new file mode 100644
index 000000000..520e37605
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -0,0 +1,230 @@
+package org.fdroid.install
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.annotation.UiThread
+import androidx.annotation.WorkerThread
+import coil3.SingletonImageLoader
+import coil3.memory.MemoryCache
+import coil3.request.ImageRequest
+import coil3.size.Size
+import coil3.toBitmap
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import mu.KotlinLogging
+import org.fdroid.database.AppMetadata
+import org.fdroid.database.AppVersion
+import org.fdroid.database.Repository
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.DownloaderFactory
+import org.fdroid.getCacheKey
+import org.fdroid.utils.IoDispatcher
+import java.io.File
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.ConcurrentLinkedQueue
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppInstallManager @Inject constructor(
+    @param:ApplicationContext private val context: Context,
+    private val downloaderFactory: DownloaderFactory,
+    private val sessionInstallManager: SessionInstallManager,
+    @param:IoDispatcher private val scope: CoroutineScope,
+) {
+
+    private val log = KotlinLogging.logger { }
+    private val queue = ConcurrentLinkedQueue<AppVersion>()
+    private val apps = ConcurrentHashMap<String, MutableStateFlow<InstallState>>()
+    private val jobs = ConcurrentHashMap<String, Job>()
+
+    fun getAppFlow(packageName: String): StateFlow<InstallState> {
+        return apps.getOrPut(packageName) {
+            MutableStateFlow(InstallState.Unknown)
+        }
+    }
+
+    @UiThread
+    suspend fun install(
+        appMetadata: AppMetadata,
+        version: AppVersion,
+        repo: Repository,
+        iconDownloadRequest: DownloadRequest?,
+    ): InstallState? {
+        val flow = apps.getOrPut(appMetadata.packageName) {
+            MutableStateFlow(InstallState.Starting)
+        }
+        val job = scope.async {
+            installInt(flow, appMetadata, version, repo, iconDownloadRequest)
+        }
+        // keep track of this job, in case we want to cancel it
+        jobs.put(appMetadata.packageName, job)
+        // wait for job to return
+        val result = try {
+            job.await()
+        } catch (_: CancellationException) {
+            InstallState.UserAborted
+        } finally {
+            // remove job as it has completed
+            jobs.remove(appMetadata.packageName)
+        }
+        flow.update { result }
+        return result
+    }
+
+    @WorkerThread
+    private suspend fun installInt(
+        flow: MutableStateFlow<InstallState>,
+        appMetadata: AppMetadata,
+        version: AppVersion,
+        repo: Repository,
+        iconDownloadRequest: DownloadRequest?,
+    ): InstallState {
+        flow.update { InstallState.Starting }
+        val coroutineContext = currentCoroutineContext()
+        // get the icon for pre-approval (usually in memory cache, so should be quick)
+        coroutineContext.ensureActive()
+        val icon = getIcon(iconDownloadRequest)
+        // request pre-approval from user (if available)
+        coroutineContext.ensureActive()
+        val preApprovalResult = sessionInstallManager.requestPreapproval(appMetadata, icon)
+        // continue depending on result, abort early if no approval was given
+        return when (preApprovalResult) {
+            is PreApprovalResult.Error -> InstallState.Error(preApprovalResult.errorMsg)
+            is PreApprovalResult.UserAborted -> InstallState.UserAborted
+            else -> {
+                flow.update { InstallState.PreApproved(preApprovalResult) }
+                val sessionId = (preApprovalResult as? PreApprovalResult.Success)?.sessionId
+                coroutineContext.ensureActive()
+                // download file
+                val file = File(context.cacheDir, version.file.sha256)
+                val downloader =
+                    downloaderFactory.create(repo, android.net.Uri.EMPTY, version.file, file)
+                downloader.setListener { bytesRead, totalBytes ->
+                    coroutineContext.ensureActive()
+                    flow.update {
+                        InstallState.Downloading(sessionId, bytesRead, totalBytes)
+                    }
+                }
+                try {
+                    downloader.download()
+                    log.debug { "Download completed" }
+                } catch (e: Exception) {
+                    if (e is CancellationException) throw e
+                    log.error(e) { "Error downloading ${version.file}" }
+                    val msg = "Download failed: ${e::class.java.simpleName} ${e.message}"
+                    return InstallState.Error(msg)
+                }
+                coroutineContext.ensureActive()
+                flow.update { InstallState.Installing(sessionId) }
+                val result = sessionInstallManager.install(sessionId, version.packageName, file)
+                if (result is InstallState.PreApprovalFailed) {
+                    // if pre-approval failed (e.g. due to app label mismatch),
+                    // then try to install again, this time not using the pre-approved session
+                    sessionInstallManager.install(null, version.packageName, file)
+                } else {
+                    result
+                }
+            }
+        }
+    }
+
+    /**
+     * Request user confirmation for installation and suspend until we get a result.
+     */
+    @UiThread
+    suspend fun requestUserConfirmation(
+        packageName: String,
+        installState: InstallState.UserConfirmationNeeded,
+    ): InstallState? {
+        val flow = apps[packageName] ?: error("No state for $packageName $installState")
+        if (flow.value !is InstallState.UserConfirmationNeeded) {
+            log.error { "Unexpected state: ${flow.value}" }
+            return null
+        }
+        val result = sessionInstallManager.requestUserConfirmation(installState)
+        flow.update { result }
+        return result
+    }
+
+    /**
+     * A workaround for Android 10, 11, 12 and 13 where tapping outside the confirmation dialog
+     * dismisses it without any feedback for us.
+     * So when our activity resumes while we are in state [InstallState.UserConfirmationNeeded]
+     * we need to call this method, so we can manually check if our session progressed or not.
+     * If it didn't progress and the state hasn't changed, we fire up the confirmation intent again.
+     */
+    @UiThread
+    fun checkUserConfirmation(
+        packageName: String,
+        installState: InstallState.UserConfirmationNeeded,
+    ) {
+        val flow = apps[packageName] ?: error("No state for $packageName $installState")
+        if (flow.value !is InstallState.UserConfirmationNeeded) {
+            log.debug { "State has changed. Now: ${flow.value}" }
+            return
+        }
+        val sessionInfo =
+            context.packageManager.packageInstaller.getSessionInfo(installState.sessionId)
+                ?: run {
+                    log.error { "Session ${installState.sessionId} does not exist anymore" }
+                    return
+                }
+        if (sessionInfo.progress <= installState.progress) {
+            log.info {
+                "Session did not progress: ${sessionInfo.progress} <= ${installState.progress}"
+            }
+            // we fire up intent again to force the user to do a proper yes/no decision,
+            // so our session and our coroutine above don't get stuck
+            installState.intent.send()
+        } else {
+            log.debug { "Session has progressed, doing nothing" }
+        }
+    }
+
+    fun cancel(packageName: String) {
+        val job = jobs[packageName]
+        log.debug { "Canceling job for $packageName $job" }
+        job?.cancel()
+    }
+
+    @UiThread
+    fun cleanUp(packageName: String) {
+        val flow = apps[packageName] ?: return
+        if (!flow.value.showProgress) {
+            log.info { "Cleaning up state for $packageName ${flow.value}" }
+            jobs.remove(packageName)?.cancel()
+            apps.remove(packageName)
+        }
+    }
+
+    /**
+     * Gets icon for preapproval from memory cache.
+     * In the unlikely event, that the icon isn't in the cache,
+     * we we download it with the given [iconDownloadRequest].
+     */
+    private suspend fun getIcon(iconDownloadRequest: DownloadRequest?): Bitmap? {
+        return iconDownloadRequest?.let { downloadRequest ->
+            // try memory cache first and download, if not found
+            val memoryCache = SingletonImageLoader.get(context).memoryCache
+            val key = downloadRequest.getCacheKey()
+            memoryCache?.get(MemoryCache.Key(key))?.image?.toBitmap() ?: run {
+                // not found in cache, download icon
+                val request = ImageRequest.Builder(context)
+                    .data(downloadRequest)
+                    .size(Size.ORIGINAL)
+                    .build()
+                SingletonImageLoader.get(context).execute(request).image?.toBitmap()
+            }
+        }
+    }
+
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt b/next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
new file mode 100644
index 000000000..6878d05cc
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
@@ -0,0 +1,48 @@
+package org.fdroid.install
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.Intent.EXTRA_INTENT
+import android.content.pm.PackageInstaller.EXTRA_PACKAGE_NAME
+import android.content.pm.PackageInstaller.EXTRA_SESSION_ID
+import android.content.pm.PackageInstaller.EXTRA_STATUS
+import android.content.pm.PackageInstaller.EXTRA_STATUS_MESSAGE
+import androidx.core.content.IntentCompat.getParcelableExtra
+import mu.KotlinLogging
+
+class InstallBroadcastReceiver(
+    private val sessionId: Int,
+    private val listener: InstallBroadcastReceiver.(
+        status: Int,
+        confirmIntent: Intent?,
+        msg: String?,
+    ) -> Unit,
+) : BroadcastReceiver() {
+
+    private val log = KotlinLogging.logger { }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        val receivedSessionId = intent.getIntExtra(EXTRA_SESSION_ID, -1)
+        if (receivedSessionId != sessionId) {
+            log.warn {
+                "Received intent for session $receivedSessionId, but expected $sessionId"
+            }
+            return
+        }
+        val confirmIntent = getParcelableExtra(intent, EXTRA_INTENT, Intent::class.java)
+        val packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME)
+        val status = intent.getIntExtra(EXTRA_STATUS, Int.Companion.MIN_VALUE)
+        val msg = intent.getStringExtra(EXTRA_STATUS_MESSAGE)
+        val warnings = intent.getStringArrayListExtra("android.content.pm.extra.WARNINGS")
+        log.info {
+            "Received broadcast for $packageName ($sessionId) $status: $msg"
+        }
+        if (warnings != null && warnings.isNotEmpty()) {
+            warnings.forEach {
+                log.warn { it }
+            }
+        }
+        listener(status, confirmIntent, msg)
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallState.kt b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
new file mode 100644
index 000000000..0ccb89ade
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
@@ -0,0 +1,27 @@
+package org.fdroid.install
+
+import android.app.PendingIntent
+
+sealed class InstallState(val showProgress: Boolean) {
+    data object Unknown : InstallState(false)
+    data object Starting : InstallState(true)
+    data class PreApproved(val result: PreApprovalResult) : InstallState(true)
+    data class Downloading(
+        val sessionId: Int?,
+        val downloadedBytes: Long,
+        val totalBytes: Long,
+    ) : InstallState(true)
+
+    data class Installing(val sessionId: Int?) : InstallState(true)
+    data class UserConfirmationNeeded(
+        val sessionId: Int,
+        val intent: PendingIntent,
+        val progress: Float,
+    ) : InstallState(true)
+
+    data object PreApprovalFailed : InstallState(true)
+
+    data object Installed : InstallState(false)
+    data object UserAborted : InstallState(false)
+    data class Error(val msg: String?) : InstallState(false)
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt b/next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
new file mode 100644
index 000000000..ab0013ce2
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
@@ -0,0 +1,8 @@
+package org.fdroid.install
+
+sealed interface PreApprovalResult {
+    data object NotSupported : PreApprovalResult
+    data object UserAborted : PreApprovalResult
+    data class Success(val sessionId: Int) : PreApprovalResult
+    data class Error(val errorMsg: String?) : PreApprovalResult
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
index ff418468d..a3d97c9a8 100644
--- a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
@@ -1,25 +1,329 @@
 package org.fdroid.install
 
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_IMMUTABLE
+import android.app.PendingIntent.FLAG_MUTABLE
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.IntentSender
+import android.content.pm.PackageInfo
+import android.content.pm.PackageInstaller
+import android.content.pm.PackageInstaller.EXTRA_PACKAGE_NAME
+import android.content.pm.PackageInstaller.EXTRA_SESSION_ID
+import android.content.pm.PackageInstaller.SessionParams
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.icu.util.ULocale
 import android.os.Build.VERSION.SDK_INT
+import androidx.annotation.RequiresApi
+import androidx.annotation.WorkerThread
+import androidx.core.content.ContextCompat.RECEIVER_NOT_EXPORTED
+import androidx.core.content.ContextCompat.registerReceiver
+import androidx.core.os.LocaleListCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import mu.KotlinLogging
+import org.fdroid.LocaleChooser.getBestLocale
+import org.fdroid.database.AppMetadata
+import org.fdroid.utils.IoDispatcher
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.resume
 
-object SessionInstallManager {
+@Singleton
+class SessionInstallManager @Inject constructor(
+    @param:ApplicationContext private val context: Context,
+    @param:IoDispatcher private val coroutineScope: CoroutineScope,
+) {
+
+    private val log = KotlinLogging.logger { }
+    private val installer = context.packageManager.packageInstaller
+
+    companion object {
+        private const val ACTION_INSTALL = "org.fdroid.install.SessionInstallManager.install"
+
+        /**
+         * If this returns true, we can use
+         * [SessionParams.setRequireUserAction] with false,
+         * thus updating the app with the given targetSdk without user action.
+         */
+        fun isAutoUpdateSupported(targetSdk: Int): Boolean {
+            if (SDK_INT < 31) return false // not supported below Android 12
+
+            if (SDK_INT == 31 && targetSdk >= 29) return true
+            if (SDK_INT == 32 && targetSdk >= 29) return true
+            if (SDK_INT == 33 && targetSdk >= 30) return true
+            if (SDK_INT == 34 && targetSdk >= 31) return true
+            // This needs to be adjusted as new Android versions are released
+            // https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionParams#setRequireUserAction(int)
+            // https://cs.android.com/android/platform/superproject/+/android-16.0.0_r2:frameworks/base/services/core/java/com/android/server/pm/PackageInstallerSession.java;l=329;drc=73caa0299d9196ddeefe4f659f557fb880f6536d
+            // current code requires targetSdk 33 on SDK 35+
+            return SDK_INT >= 35 && targetSdk >= 33
+        }
+    }
+
+    init {
+        // abandon old sessions, because there's a limit
+        // that will throw IllegalStateException when we try to open new sessions
+        coroutineScope.launch {
+            for (session in installer.mySessions) {
+                log.debug { "Abandon session ${session.sessionId} for ${session.appPackageName}" }
+                try {
+                    installer.abandonSession(session.sessionId)
+                } catch (e: SecurityException) {
+                    log.error(e) { "Error abandoning session: " }
+                }
+            }
+        }
+    }
 
     /**
-     * If this returns true, we can use
-     * [android.content.pm.PackageInstaller.SessionParams.setRequireUserAction] with false,
-     * thus updating the app with the given targetSdk without user action.
+     * Requests installation pre-approval (if available on this device).
      */
-    fun isTargetSdkSupported(targetSdk: Int): Boolean {
-        if (SDK_INT < 31) return false // not supported below Android 12
+    suspend fun requestPreapproval(app: AppMetadata, icon: Bitmap?): PreApprovalResult {
+        return if (SDK_INT >= 34) {
+            try {
+                preapproval(app, icon)
+            } catch (e: Exception) {
+                log.error(e) { "Error requesting pre-approval: " }
+                PreApprovalResult.Error("${e::class.java.simpleName} ${e.message}")
+            }
+        } else {
+            PreApprovalResult.NotSupported
+        }
+    }
 
-        if (SDK_INT == 31 && targetSdk >= 29) return true
-        if (SDK_INT == 32 && targetSdk >= 29) return true
-        if (SDK_INT == 33 && targetSdk >= 30) return true
-        if (SDK_INT == 34 && targetSdk >= 31) return true
-        // This needs to be adjusted as new Android versions are released
-        // https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionParams#setRequireUserAction(int)
-        // https://cs.android.com/android/platform/superproject/+/android-16.0.0_r2:frameworks/base/services/core/java/com/android/server/pm/PackageInstallerSession.java;l=329;drc=73caa0299d9196ddeefe4f659f557fb880f6536d
-        // current code requires targetSdk 33 on SDK 35+
-        return SDK_INT >= 35 && targetSdk >= 33
+    @RequiresApi(34)
+    private suspend fun preapproval(
+        app: AppMetadata,
+        icon: Bitmap?,
+    ): PreApprovalResult = suspendCancellableCoroutine { cont ->
+        val params = getSessionParams(app.packageName)
+        val sessionId = installer.createSession(params)
+        log.info { "Opened session $sessionId" }
+        val name = app.name.getBestLocale(LocaleListCompat.getDefault()) ?: ""
+
+        val receiver = InstallBroadcastReceiver(sessionId) { status, intent, msg ->
+            when (status) {
+                PackageInstaller.STATUS_SUCCESS -> {
+                    cont.resume(PreApprovalResult.Success(sessionId))
+                    context.unregisterReceiver(this)
+                }
+                PackageInstaller.STATUS_PENDING_USER_ACTION -> {
+                    val flags = FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
+                    val pendingIntent =
+                        PendingIntent.getActivity(context, sessionId, intent, flags)
+                    // There should be no bugs on Android versions where this is supported
+                    // and we should be in the foreground right now,
+                    // so fire up intent here and now.
+                    pendingIntent.send()
+                }
+                else -> { // some error, can't help it now, continue
+                    if (status == PackageInstaller.STATUS_FAILURE_ABORTED) {
+                        cont.resume(PreApprovalResult.UserAborted)
+                    } else {
+                        cont.resume(PreApprovalResult.Error(msg))
+                    }
+                    context.unregisterReceiver(this)
+                }
+            }
+        }
+        registerReceiver(
+            context,
+            receiver,
+            IntentFilter(ACTION_INSTALL),
+            RECEIVER_NOT_EXPORTED
+        )
+        cont.invokeOnCancellation {
+            log.info { "Pre-approval cancelled." }
+            context.unregisterReceiver(receiver)
+        }
+
+        installer.openSession(sessionId).use { session ->
+            log.info { "app name locales: ${app.name} using: ${ULocale.getDefault()}" }
+            val details = PackageInstaller.PreapprovalDetails.Builder()
+                .setPackageName(app.packageName)
+                .setLabel(name)
+                .setLocale(ULocale.getDefault()) // TODO get the real one used for label
+                .apply { if (icon != null) setIcon(icon) }
+                .build()
+            val sender = getInstallIntentSender(sessionId, app.packageName)
+            session.requestUserPreapproval(details, sender)
+        }
+        sessionId
+    }
+
+    @WorkerThread
+    @SuppressLint("RequestInstallPackagesPolicy")
+    suspend fun install(
+        sessionId: Int?,
+        packageName: String,
+        apkFile: File,
+    ): InstallState = suspendCancellableCoroutine { cont ->
+        val size = apkFile.length()
+        log.info { "Installing ${apkFile.name} with size $size bytes" }
+
+        val sessionId = try {
+            if (sessionId == null) {
+                val params = getSessionParams(packageName, size)
+                installer.createSession(params)
+            } else {
+                sessionId
+            }
+        } catch (e: Exception) {
+            log.error(e) { "Error when creating session: " }
+            cont.resume(InstallState.Error("${e::class.java.simpleName} ${e.message}"))
+            return@suspendCancellableCoroutine
+        }
+        // set-up receiver for install result
+        val receiver = InstallBroadcastReceiver(sessionId) { status, intent, msg ->
+            context.unregisterReceiver(this)
+            when (status) {
+                PackageInstaller.STATUS_SUCCESS -> {
+                    cont.resume(InstallState.Installed)
+                }
+                PackageInstaller.STATUS_PENDING_USER_ACTION -> {
+                    val flags = if (SDK_INT >= 31) {
+                        FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
+                    } else {
+                        FLAG_UPDATE_CURRENT
+                    }
+                    val pendingIntent =
+                        PendingIntent.getActivity(context, sessionId, intent, flags)
+                    val progress = installer.getSessionInfo(sessionId)?.progress
+                        ?: error("No session info for $sessionId")
+                    cont.resume(
+                        InstallState.UserConfirmationNeeded(sessionId, pendingIntent, progress)
+                    )
+                }
+                else -> {
+                    if (status == PackageInstaller.STATUS_FAILURE_ABORTED) {
+                        cont.resume(InstallState.UserAborted)
+                    } else if (status == PackageInstaller.STATUS_FAILURE &&
+                        msg != null &&
+                        msg.contains("PreapprovalDetails")
+                    ) {
+                        cont.resume(InstallState.PreApprovalFailed)
+                    } else {
+                        cont.resume(InstallState.Error(msg))
+                    }
+                }
+            }
+        }
+        registerReceiver(
+            context,
+            receiver,
+            IntentFilter(ACTION_INSTALL),
+            RECEIVER_NOT_EXPORTED
+        )
+        cont.invokeOnCancellation {
+            log.info { "App installation was cancelled, unregistering broadcast receiver..." }
+            context.unregisterReceiver(receiver)
+            try {
+                installer.abandonSession(sessionId)
+            } catch (e: SecurityException) {
+                // this can happen if the cancellation came too late and session already concluded
+                log.warn(e) { "Error while abandoning session: " }
+            }
+        }
+        // do the actual installation
+        try {
+            installer.openSession(sessionId).use { session ->
+                apkFile.inputStream().use { inputStream ->
+                    session.openWrite(packageName, 0, size).use { outputStream ->
+                        inputStream.copyTo(outputStream)
+                        session.fsync(outputStream)
+                    }
+                }
+                val sender = getInstallIntentSender(sessionId, packageName)
+                log.info { "Committing session..." }
+                session.commit(sender)
+            }
+        } catch (e: Exception) {
+            log.error(e) { "Error during install session: " }
+            cont.resume(InstallState.Error("${e::class.java.simpleName} ${e.message}"))
+        }
+    }
+
+    suspend fun requestUserConfirmation(
+        installState: InstallState.UserConfirmationNeeded,
+    ): InstallState = suspendCancellableCoroutine { cont ->
+        val receiver = InstallBroadcastReceiver(installState.sessionId) { status, intent, msg ->
+            context.unregisterReceiver(this)
+            when (status) {
+                PackageInstaller.STATUS_SUCCESS -> {
+                    cont.resume(InstallState.Installed)
+                }
+                PackageInstaller.STATUS_PENDING_USER_ACTION -> {
+                    error("Got STATUS_PENDING_USER_ACTION again")
+                }
+                else -> {
+                    if (status == PackageInstaller.STATUS_FAILURE_ABORTED) {
+                        cont.resume(InstallState.UserAborted)
+                    } else {
+                        cont.resume(InstallState.Error(msg))
+                    }
+                }
+            }
+        }
+        registerReceiver(
+            context,
+            receiver,
+            IntentFilter(ACTION_INSTALL),
+            RECEIVER_NOT_EXPORTED,
+        )
+        cont.invokeOnCancellation {
+            context.unregisterReceiver(receiver)
+        }
+        installState.intent.send()
+    }
+
+    private fun getSessionParams(packageName: String, size: Long? = null): SessionParams {
+        val params = SessionParams(SessionParams.MODE_FULL_INSTALL)
+        params.setAppPackageName(packageName)
+        size?.let { params.setSize(it) }
+        params.setInstallLocation(PackageInfo.INSTALL_LOCATION_AUTO)
+        if (SDK_INT >= 26) {
+            params.setInstallReason(PackageManager.INSTALL_REASON_USER)
+        }
+        if (SDK_INT >= 31) {
+            params.setRequireUserAction(SessionParams.USER_ACTION_NOT_REQUIRED)
+        }
+        if (SDK_INT >= 33) {
+            params.setPackageSource(PackageInstaller.PACKAGE_SOURCE_STORE)
+        }
+        if (SDK_INT >= 34) {
+            // Once the update ownership enforcement is enabled,
+            // the other installers will need the user action to update the package
+            // even if the installers have been granted the INSTALL_PACKAGES permission.
+            // The update ownership enforcement can only be enabled on initial installation.
+            // Set this to true on package update is a no-op.
+            params.setRequestUpdateOwnership(true)
+        }
+        return params
+    }
+
+    private fun getInstallIntentSender(
+        sessionId: Int,
+        packageName: String,
+    ): IntentSender {
+        // Don't use a different action for preapproval and installation,
+        // because Android sometimes sends installation broadcasts to preapproval intent.
+        val broadcastIntent = Intent(ACTION_INSTALL).apply {
+            setPackage(context.packageName)
+            putExtra(EXTRA_SESSION_ID, sessionId)
+            putExtra(EXTRA_PACKAGE_NAME, packageName)
+            addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
+        }
+        // intent flag needs to be mutable, otherwise the intent has no extras
+        val flags = if (SDK_INT >= 31) FLAG_UPDATE_CURRENT or FLAG_MUTABLE else FLAG_UPDATE_CURRENT
+        val pendingIntent = PendingIntent.getBroadcast(context, sessionId, broadcastIntent, flags)
+        return pendingIntent.intentSender
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index a1e2947cd..3f57238f0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -1,5 +1,6 @@
 package org.fdroid.ui.details
 
+import android.util.Log
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.foundation.layout.Column
@@ -34,6 +35,8 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
@@ -41,6 +44,7 @@ import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
 import androidx.compose.material3.carousel.rememberCarouselState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -51,6 +55,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.LinkAnnotation
@@ -64,6 +69,7 @@ import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
 import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.install.InstallState
 import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryChip
@@ -84,7 +90,9 @@ fun AppDetails(
     onBackNav: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
+    val context = LocalContext.current
     val topAppBarState = rememberTopAppBarState()
+    val snackbarHostState = remember { SnackbarHostState() }
     val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(topAppBarState)
     if (item == null) BigLoadingIndicator()
     else Scaffold(
@@ -92,10 +100,23 @@ fun AppDetails(
         topBar = {
             AppDetailsTopAppBar(item, topAppBarState, scrollBehavior, onBackNav)
         },
+        snackbarHost = { SnackbarHost(snackbarHostState) },
     ) { innerPadding ->
+        // react to install state changes
+        LaunchedEffect(item.installState) {
+            val state = item.installState
+            if (state is InstallState.UserConfirmationNeeded) {
+                Log.i("AppDetails", "Requesting user confirmation... $state")
+                item.actions.requestUserConfirmation(item.app.packageName, state)
+            } else if (state is InstallState.Error) {
+                val msg = context.getString(R.string.install_error_notify_title, state.msg ?: "")
+                snackbarHostState.showSnackbar(msg)
+            }
+        }
+        val scrollState = rememberScrollState()
         Column(
             modifier = modifier
-                .verticalScroll(rememberScrollState())
+                .verticalScroll(scrollState)
                 .fillMaxWidth()
                 .padding(bottom = innerPadding.calculateBottomPadding()),
         ) {
@@ -329,7 +350,7 @@ fun AppDetails(
             }
             // Versions
             if (!item.versions.isNullOrEmpty()) {
-                Versions(item)
+                Versions(item) { scrollState.scrollTo(0) }
             }
             // Developer contact
             if (item.showAuthorContact) ExpandableSection(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 36d24b182..365223d36 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -1,6 +1,9 @@
 package org.fdroid.ui.details
 
 import android.text.format.Formatter
+import android.util.Log
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -12,19 +15,29 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.Error
 import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearWavyProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.ProgressIndicatorDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.graphics.BlendMode
@@ -38,8 +51,12 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import coil3.compose.AsyncImage
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.install.InstallState
 import org.fdroid.next.R
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.asRelativeTimeString
@@ -147,12 +164,83 @@ fun AppDetailsHeader(
         onPreferredRepoChanged = {},
         modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
     )
+    // check user confirmation ON_RESUME to work around Android bug
+    val lifecycleOwner = LocalLifecycleOwner.current
+    val currentInstallState by rememberUpdatedState(item.installState)
+    DisposableEffect(lifecycleOwner) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                val state = currentInstallState
+                if (state is InstallState.UserConfirmationNeeded) {
+                    Log.i("AppDetailsHeader", "Resumed. Checking user confirmation... $state")
+                    item.actions.checkUserConfirmation(item.app.packageName, state)
+                }
+            }
+        }
+        lifecycleOwner.lifecycle.addObserver(observer)
+        onDispose {
+            lifecycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
     // Main Buttons
-    if (item.showOpenButton || item.mainButtonState != MainButtonState.NONE) Row(
+    val buttonLineModifier = Modifier
+        .fillMaxWidth()
+        .padding(horizontal = 16.dp, vertical = 8.dp)
+    if (item.mainButtonState == MainButtonState.PROGRESS) {
+        Row(
+            modifier = buttonLineModifier,
+            verticalAlignment = CenterVertically,
+        ) {
+            Column(
+                verticalArrangement = spacedBy(8.dp, CenterVertically),
+                modifier = Modifier.weight(1f)
+            ) {
+                val strRes = when (item.installState) {
+                    InstallState.Starting -> R.string.status_install_preparing
+                    is InstallState.PreApproved -> R.string.status_install_preparing
+                    is InstallState.Downloading -> R.string.downloading
+                    is InstallState.Installing -> R.string.installing
+                    is InstallState.UserConfirmationNeeded -> R.string.installing
+                    else -> -1
+                }
+                if (strRes >= 0) Text(
+                    text = stringResource(strRes),
+                    style = MaterialTheme.typography.bodyMedium,
+                )
+                if (item.installState is InstallState.Downloading) {
+                    val animatedProgress by animateFloatAsState(
+                        targetValue = item.installState.downloadedBytes /
+                            item.installState.totalBytes.toFloat(),
+                        animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
+                    )
+                    LinearWavyProgressIndicator(
+                        stopSize = 0.dp,
+                        progress = { animatedProgress },
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                } else {
+                    LinearWavyProgressIndicator(modifier = Modifier.fillMaxWidth())
+                }
+            }
+            var cancelled by remember { mutableStateOf(false) }
+            IconButton(onClick = {
+                if (!cancelled) item.actions.cancelInstall(item.app.packageName)
+                cancelled = true
+            }) {
+                AnimatedVisibility(cancelled) {
+                    CircularProgressIndicator(modifier = Modifier.size(24.dp))
+                }
+                AnimatedVisibility(!cancelled) {
+                    Icon(
+                        imageVector = Icons.Default.Cancel,
+                        contentDescription = stringResource(R.string.cancel),
+                    )
+                }
+            }
+        }
+    } else if (item.showOpenButton || item.mainButtonState != MainButtonState.NONE) Row(
         horizontalArrangement = spacedBy(8.dp, CenterHorizontally),
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp, vertical = 8.dp),
+        modifier = buttonLineModifier,
     ) {
         if (item.showOpenButton) {
             val context = LocalContext.current
@@ -166,7 +254,16 @@ fun AppDetailsHeader(
             }
         }
         if (item.mainButtonState != MainButtonState.NONE) {
-            Button(onClick = {}, modifier = Modifier.weight(1f)) {
+            // button is for either installing or updating
+            Button(
+                onClick = {
+                    require(item.suggestedVersion != null) {
+                        "suggestedVersion was null"
+                    }
+                    item.actions.installAction(item.app, item.suggestedVersion)
+                },
+                modifier = Modifier.weight(1f)
+            ) {
                 if (item.mainButtonState == MainButtonState.INSTALL) {
                     Text(stringResource(R.string.menu_install))
                 } else if (item.mainButtonState == MainButtonState.UPDATE) {
@@ -186,3 +283,14 @@ fun AppDetailsHeaderPreview() {
         }
     }
 }
+
+@Preview
+@Composable
+private fun PreviewProgress() {
+    FDroidContent {
+        Column {
+            val app = testApp.copy(installState = InstallState.Starting)
+            AppDetailsHeader(app, PaddingValues())
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 41af0eb94..54761b93b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -13,12 +13,14 @@ import org.fdroid.download.DownloadRequest
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.v2.PackageVersion
+import org.fdroid.install.InstallState
 import org.fdroid.install.SessionInstallManager
 import org.fdroid.ui.categories.CategoryItem
 
 data class AppDetailsItem(
     val app: AppMetadata,
     val actions: AppDetailsActions,
+    val installState: InstallState,
     /**
      * The ID of the repo that is currently set as preferred.
      * Note that the repository ID of this [app] may be different.
@@ -45,7 +47,7 @@ data class AppDetailsItem(
     /**
      * The currently suggested version for installation.
      */
-    val suggestedVersion: PackageVersion? = null,
+    val suggestedVersion: AppVersion? = null,
     /**
      * Similar to [suggestedVersion], but doesn't obey [appPrefs] for ignoring versions.
      * This is useful for (un-)ignoring this version.
@@ -68,6 +70,7 @@ data class AppDetailsItem(
         repositories: List<Repository>,
         dbApp: App,
         actions: AppDetailsActions,
+        installState: InstallState,
         versions: List<AppVersion>?,
         installedVersion: AppVersion?,
         installedVersionCode: Long?,
@@ -80,6 +83,7 @@ data class AppDetailsItem(
     ) : this(
         app = dbApp.metadata,
         actions = actions,
+        installState = installState,
         preferredRepoId = preferredRepoId,
         repositories = repositories,
         name = dbApp.name ?: "Unknown App",
@@ -138,7 +142,9 @@ data class AppDetailsItem(
      */
     val mainButtonState: MainButtonState
         get() {
-            return if (installedVersionCode == null) { // app is not installed
+            return if (installState.showProgress) {
+                MainButtonState.PROGRESS
+            } else if (installedVersionCode == null) { // app is not installed
                 if (suggestedVersion == null) MainButtonState.NONE
                 else MainButtonState.INSTALL
             } else { // app is installed
@@ -163,7 +169,7 @@ data class AppDetailsItem(
             val targetSdk = suggestedVersion?.packageManifest?.targetSdkVersion
             // auto-updates are only available on SDK 31 and up
             return if (targetSdk != null && SDK_INT >= 31) {
-                !SessionInstallManager.isTargetSdkSupported(targetSdk)
+                !SessionInstallManager.isAutoUpdateSupported(targetSdk)
             } else {
                 false
             }
@@ -182,6 +188,16 @@ data class AppDetailsItem(
 }
 
 class AppDetailsActions(
+    val installAction: (AppMetadata, AppVersion) -> Unit,
+    val requestUserConfirmation: (String, InstallState.UserConfirmationNeeded) -> Unit,
+    /**
+     * A workaround for Android 10, 11, 12 and 13 where tapping outside the confirmation dialog
+     * dismisses it without any feedback for us.
+     * So when our activity resumes while we are in state [InstallState.UserConfirmationNeeded]
+     * we need to call this method, so we can manually check if our session progressed or not.
+     */
+    val checkUserConfirmation: (String, InstallState.UserConfirmationNeeded) -> Unit,
+    val cancelInstall: (String) -> Unit,
     val allowBetaVersions: () -> Unit,
     val ignoreAllUpdates: (() -> Unit)? = null,
     val ignoreThisUpdate: (() -> Unit)? = null,
@@ -195,6 +211,7 @@ enum class MainButtonState {
     NONE,
     INSTALL,
     UPDATE,
+    PROGRESS,
 }
 
 data class AntiFeature(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 1f5383842..d10499e0b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -7,18 +7,26 @@ import android.content.pm.PackageManager
 import android.content.pm.PackageManager.GET_SIGNATURES
 import androidx.annotation.UiThread
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
 import app.cash.molecule.RecompositionMode.Immediate
 import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import mu.KotlinLogging
 import org.fdroid.UpdateChecker
+import org.fdroid.database.AppMetadata
+import org.fdroid.database.AppVersion
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.RepoManager
+import org.fdroid.install.AppInstallManager
+import org.fdroid.install.InstallState
 import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
@@ -26,12 +34,14 @@ import javax.inject.Inject
 @HiltViewModel
 class AppDetailsViewModel @Inject constructor(
     private val app: Application,
-    @IoDispatcher private val scope: CoroutineScope,
+    @param:IoDispatcher private val scope: CoroutineScope,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
     private val updateChecker: UpdateChecker,
     private val updatesManager: UpdatesManager,
+    private val appInstallManager: AppInstallManager,
 ) : AndroidViewModel(app) {
+    private val log = KotlinLogging.logger { }
     private val packageInfoFlow = MutableStateFlow<AppInfo?>(null)
 
     val appDetails: StateFlow<AppDetailsItem?> = scope.launchMolecule(
@@ -41,6 +51,7 @@ class AppDetailsViewModel @Inject constructor(
             db = db,
             repoManager = repoManager,
             updateChecker = updateChecker,
+            appInstallManager = appInstallManager,
             viewModel = this,
             packageInfoFlow = packageInfoFlow,
         )
@@ -48,6 +59,10 @@ class AppDetailsViewModel @Inject constructor(
 
     fun setAppDetails(packageName: String) {
         packageInfoFlow.value = null
+        loadPackageInfoFlow(packageName)
+    }
+
+    private fun loadPackageInfoFlow(packageName: String) {
         val packageManager = app.packageManager
         scope.launch {
             val packageInfo = try {
@@ -64,6 +79,57 @@ class AppDetailsViewModel @Inject constructor(
         }
     }
 
+    @UiThread
+    fun install(appMetadata: AppMetadata, version: AppVersion) {
+        val repo = repoManager.getRepository(version.repoId) ?: return // TODO
+        val icon = appDetails.value?.icon
+        viewModelScope.launch(Dispatchers.Main) {
+            val result = appInstallManager.install(appMetadata, version, repo, icon)
+            if (result is InstallState.Installed) {
+                // to reload packageInfoFlow with fresh packageInfo
+                loadPackageInfoFlow(appMetadata.packageName)
+            }
+        }
+    }
+
+    @UiThread
+    fun requestUserConfirmation(
+        packageName: String,
+        installState: InstallState.UserConfirmationNeeded,
+    ) {
+        scope.launch(Dispatchers.Main) {
+            val result = appInstallManager.requestUserConfirmation(packageName, installState)
+            if (result is InstallState.Installed) withContext(Dispatchers.Main) {
+                // to reload packageInfoFlow with fresh packageInfo
+                loadPackageInfoFlow(packageName)
+            }
+        }
+    }
+
+    @UiThread
+    fun checkUserConfirmation(
+        packageName: String,
+        installState: InstallState.UserConfirmationNeeded,
+    ) {
+        scope.launch(Dispatchers.Main) {
+            delay(500) // wait a moment to increase chance that state got updated
+            appInstallManager.checkUserConfirmation(packageName, installState)
+        }
+    }
+
+    @UiThread
+    fun cancelInstall(packageName: String) {
+        appInstallManager.cancel(packageName)
+    }
+
+    override fun onCleared() {
+        val packageName = packageInfoFlow.value?.packageName
+        log.info { "App details screen left: $packageName" }
+        packageName?.let {
+            appInstallManager.cleanUp(it)
+        }
+    }
+
     @UiThread
     fun allowBetaUpdates() {
         val appPrefs = appDetails.value?.appPrefs ?: return
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 711879244..21cf96033 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -14,6 +14,7 @@ import org.fdroid.UpdateChecker
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
+import org.fdroid.install.AppInstallManager
 import org.fdroid.utils.sha256
 
 private const val TAG = "DetailsPresenter"
@@ -25,6 +26,7 @@ fun DetailsPresenter(
     db: FDroidDatabase,
     repoManager: RepoManager,
     updateChecker: UpdateChecker,
+    appInstallManager: AppInstallManager,
     viewModel: AppDetailsViewModel,
     packageInfoFlow: StateFlow<AppInfo?>,
 ): AppDetailsItem? {
@@ -41,6 +43,7 @@ fun DetailsPresenter(
             repoManager.getRepository(repoId)
         }
     }
+    val installState = appInstallManager.getAppFlow(packageName).collectAsState().value
 
     val versions =
         db.getVersionDao().getAppVersions(packageName).asFlow().collectAsState(null).value
@@ -91,12 +94,17 @@ fun DetailsPresenter(
     Log.d(TAG, "   app '${app.name}' ($packageName) in ${repo.address}")
     Log.d(TAG, "   versions: ${versions?.size}")
     Log.d(TAG, "   appPrefs: $appPrefs")
+    Log.d(TAG, "   installState: $installState")
     return AppDetailsItem(
         repository = repo,
         preferredRepoId = preferredRepoId,
         repositories = repositories, // TODO maybe use emptyList() when only in F-Droid repo
         dbApp = app,
         actions = AppDetailsActions(
+            installAction = viewModel::install,
+            requestUserConfirmation = viewModel::requestUserConfirmation,
+            checkUserConfirmation = viewModel::checkUserConfirmation,
+            cancelInstall = viewModel::cancelInstall,
             allowBetaVersions = viewModel::allowBetaUpdates,
             ignoreAllUpdates = if (installedVersionCode == null) {
                 null
@@ -116,6 +124,7 @@ fun DetailsPresenter(
             launchIntent = packagePair.launchIntent,
             shareIntent = getShareIntent(repo, packageName, app.name ?: ""),
         ),
+        installState = installState,
         versions = versions,
         installedVersion = installedVersion,
         installedVersionCode = installedVersionCode,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index 8378a8ad2..b7be2a384 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -19,6 +19,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -30,6 +31,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
+import org.fdroid.database.AppVersion
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.next.R
@@ -41,6 +44,7 @@ import org.fdroid.ui.utils.testApp
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 fun Versions(
     item: AppDetailsItem,
+    scrollUp: suspend () -> Unit,
 ) {
     ExpandableSection(
         icon = rememberVectorPainter(Icons.Default.AccessTime),
@@ -53,12 +57,20 @@ fun Versions(
                     version = version,
                     isInstalled = item.installedVersion == version,
                     isSuggested = item.suggestedVersion == version,
-                    isInstallable = if (item.installedVersion == null) {
-                        true
+                    isInstallable = if (item.installState.showProgress) {
+                        false
                     } else {
-                        // TODO take compatibility and signer into account
-                        item.installedVersion.versionCode < version.versionCode
+                        if (item.installedVersion == null) {
+                            true
+                        } else {
+                            // TODO take compatibility and signer into account
+                            item.installedVersion.versionCode < version.versionCode
+                        }
                     },
+                    installAction = { version: AppVersion ->
+                        item.actions.installAction(item.app, version)
+                    },
+                    scrollUp = scrollUp,
                 )
             }
         }
@@ -71,6 +83,8 @@ fun Version(
     isInstalled: Boolean,
     isSuggested: Boolean,
     isInstallable: Boolean,
+    installAction: (AppVersion) -> Unit,
+    scrollUp: suspend () -> Unit,
 ) {
     val isPreview = LocalInspectionMode.current
     var expanded by rememberSaveable { mutableStateOf(isPreview) }
@@ -172,10 +186,18 @@ fun Version(
                         )
                     }
                 }
-                if (isInstallable) FDroidOutlineButton(
-                    text = stringResource(R.string.menu_install),
-                    onClick = {},
-                )
+                if (isInstallable) {
+                    val coroutineScope = rememberCoroutineScope()
+                    FDroidOutlineButton(
+                        text = stringResource(R.string.menu_install),
+                        onClick = {
+                            installAction(version as AppVersion)
+                            coroutineScope.launch {
+                                scrollUp()
+                            }
+                        },
+                    )
+                }
             }
         }
     }
@@ -185,6 +207,6 @@ fun Version(
 @Composable
 fun VersionsPreview() {
     FDroidContent {
-        Versions(testApp)
+        Versions(testApp) {}
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 931f5ed8d..72ea9193c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -8,6 +8,7 @@ import org.fdroid.database.AppPrefs
 import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
+import org.fdroid.install.InstallState
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.details.AntiFeature
 import org.fdroid.ui.details.AppDetailsActions
@@ -111,7 +112,20 @@ val testApp = AppDetailsItem(
         categories = listOf("Internet", "Multimedia"),
         isCompatible = true,
     ),
-    actions = AppDetailsActions({}, {}, {}, {}, {}, Intent(), Intent()),
+    actions = AppDetailsActions(
+        installAction = { _, _ -> },
+        requestUserConfirmation = { _, _ -> },
+        checkUserConfirmation = { _, _ -> },
+        cancelInstall = {},
+        allowBetaVersions = {},
+        ignoreAllUpdates = {},
+        ignoreThisUpdate = {},
+        shareApk = {},
+        uninstallApp = {},
+        launchIntent = Intent(),
+        shareIntent = Intent(),
+    ),
+    installState = InstallState.Unknown,
     appPrefs = AppPrefs("org.schabi.newpipe"),
     name = "New Pipe",
     summary = "Lightweight YouTube frontend",
@@ -149,7 +163,7 @@ val testApp = AppDetailsItem(
         testVersion2,
     ),
     installedVersion = testVersion2,
-    suggestedVersion = testVersion1,
+    suggestedVersion = null,
     possibleUpdate = testVersion1,
 )
 
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 6afcc7cf8..2d9f95c26 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -50,6 +50,7 @@
     <string name="last_updated">Last updated: %1$s</string>
     <!-- The placeholder in round brackets will be replaced with the size of the app -->
     <string name="last_updated_with_size">Last updated: %1$s (%2$s)</string>
+    <string name="status_install_preparing">Preparing installation…</string>
     <string name="whats_new_title">What\'s new</string>
     <string name="donate_title">Donate</string>
     <string name="anti_features_title">This app has anti-features</string>

From 34049b2f9c251a127954de41e187fae9048e5917 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 1 Oct 2025 11:37:40 -0300
Subject: [PATCH 061/180] Implement uninstallation of installed apps

---
 .../org/fdroid/install/AppInstallManager.kt   | 30 ++++++++++++++++++-
 .../kotlin/org/fdroid/install/InstallState.kt |  2 ++
 .../org/fdroid/ui/details/AppDetailsItem.kt   |  4 ++-
 .../org/fdroid/ui/details/AppDetailsMenu.kt   |  9 ++++--
 .../fdroid/ui/details/AppDetailsViewModel.kt  | 10 +++++++
 .../org/fdroid/ui/details/DetailsPresenter.kt |  9 +++++-
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  3 +-
 7 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index 520e37605..f8ee23be4 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -1,7 +1,10 @@
 package org.fdroid.install
 
+import android.app.Activity
 import android.content.Context
+import android.content.Intent.ACTION_DELETE
 import android.graphics.Bitmap
+import androidx.activity.result.ActivityResult
 import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
 import coil3.SingletonImageLoader
@@ -58,7 +61,7 @@ class AppInstallManager @Inject constructor(
         version: AppVersion,
         repo: Repository,
         iconDownloadRequest: DownloadRequest?,
-    ): InstallState? {
+    ): InstallState {
         val flow = apps.getOrPut(appMetadata.packageName) {
             MutableStateFlow(InstallState.Starting)
         }
@@ -196,6 +199,31 @@ class AppInstallManager @Inject constructor(
         job?.cancel()
     }
 
+    /**
+     * Must be called after receiving the result from the [ACTION_DELETE] uninstall Intent.
+     *
+     * Note: We are not using [android.content.pm.PackageInstaller.uninstall],
+     * because on Android 10 to 13 (at least) we don't get feedback
+     * when the user taps outside the confirmation dialog.
+     * Using this non-deprecated API ([ACTION_DELETE]) seems to work
+     * without issues everywhere.
+     */
+    @UiThread
+    fun onUninstallResult(packageName: String, activityResult: ActivityResult): InstallState {
+        val flow = apps.getOrPut(packageName) {
+            MutableStateFlow(InstallState.Unknown)
+        }
+        val result = when (activityResult.resultCode) {
+            Activity.RESULT_OK -> InstallState.Uninstalled
+            Activity.RESULT_FIRST_USER -> InstallState.UserAborted
+            else -> InstallState.UserAborted
+        }
+        val code = activityResult.data?.getIntExtra("android.intent.extra.INSTALL_RESULT", -1)
+        log.info { "Uninstall result received: ${activityResult.resultCode} => $result ($code)" }
+        flow.update { result }
+        return result
+    }
+
     @UiThread
     fun cleanUp(packageName: String) {
         val flow = apps[packageName] ?: return
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallState.kt b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
index 0ccb89ade..a6a2b8712 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
@@ -24,4 +24,6 @@ sealed class InstallState(val showProgress: Boolean) {
     data object Installed : InstallState(false)
     data object UserAborted : InstallState(false)
     data class Error(val msg: String?) : InstallState(false)
+
+    data object Uninstalled : InstallState(false)
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 54761b93b..f4ab8874d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -2,6 +2,7 @@ package org.fdroid.ui.details
 
 import android.content.Intent
 import android.os.Build.VERSION.SDK_INT
+import androidx.activity.result.ActivityResult
 import androidx.annotation.VisibleForTesting
 import androidx.core.os.LocaleListCompat
 import org.fdroid.database.App
@@ -198,11 +199,12 @@ class AppDetailsActions(
      */
     val checkUserConfirmation: (String, InstallState.UserConfirmationNeeded) -> Unit,
     val cancelInstall: (String) -> Unit,
+    val onUninstallResult: (String, ActivityResult) -> Unit,
     val allowBetaVersions: () -> Unit,
     val ignoreAllUpdates: (() -> Unit)? = null,
     val ignoreThisUpdate: (() -> Unit)? = null,
     val shareApk: (() -> Unit)? = null,
-    val uninstallApp: (() -> Unit)? = null,
+    val uninstallIntent: Intent? = null,
     val launchIntent: Intent? = null,
     val shareIntent: Intent? = null,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
index 33a9cb6de..546acb9ac 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
@@ -1,6 +1,8 @@
 package org.fdroid.ui.details
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Preview
@@ -24,6 +26,9 @@ fun AppDetailsMenu(
     expanded: Boolean,
     onDismiss: () -> Unit,
 ) {
+    val uninstallLauncher = rememberLauncherForActivityResult(StartActivityForResult()) {
+        item.actions.onUninstallResult(item.app.packageName, it)
+    }
     DropdownMenu(
         expanded = expanded,
         onDismissRequest = onDismiss,
@@ -87,13 +92,13 @@ fun AppDetailsMenu(
                 onDismiss()
             },
         )
-        if (item.actions.uninstallApp != null) DropdownMenuItem(
+        if (item.actions.uninstallIntent != null) DropdownMenuItem(
             leadingIcon = {
                 Icon(Icons.Default.Delete, null)
             },
             text = { Text(stringResource(R.string.menu_uninstall)) },
             onClick = {
-                item.actions.uninstallApp()
+                uninstallLauncher.launch(item.actions.uninstallIntent)
                 onDismiss()
             },
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index d10499e0b..5c7689233 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.GET_SIGNATURES
+import androidx.activity.result.ActivityResult
 import androidx.annotation.UiThread
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
@@ -122,6 +123,15 @@ class AppDetailsViewModel @Inject constructor(
         appInstallManager.cancel(packageName)
     }
 
+    @UiThread
+    fun onUninstallResult(packageName: String, activityResult: ActivityResult) {
+        val result = appInstallManager.onUninstallResult(packageName, activityResult)
+        if (result is InstallState.Uninstalled) {
+            // to reload packageInfoFlow with fresh packageInfo
+            loadPackageInfoFlow(packageName)
+        }
+    }
+
     override fun onCleared() {
         val packageName = packageInfoFlow.value?.packageName
         log.info { "App details screen left: $packageName" }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 21cf96033..65781911d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -1,6 +1,7 @@
 package org.fdroid.ui.details
 
 import android.content.Intent
+import android.net.Uri
 import android.util.Log
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -105,6 +106,7 @@ fun DetailsPresenter(
             requestUserConfirmation = viewModel::requestUserConfirmation,
             checkUserConfirmation = viewModel::checkUserConfirmation,
             cancelInstall = viewModel::cancelInstall,
+            onUninstallResult = viewModel::onUninstallResult,
             allowBetaVersions = viewModel::allowBetaUpdates,
             ignoreAllUpdates = if (installedVersionCode == null) {
                 null
@@ -120,7 +122,12 @@ fun DetailsPresenter(
                 viewModel::ignoreThisUpdate
             },
             shareApk = null, // TODO
-            uninstallApp = null, // TODO
+            uninstallIntent = packagePair.packageInfo?.let {
+                Intent(Intent.ACTION_DELETE).apply {
+                    setData(Uri.fromParts("package", it.packageName, null))
+                    putExtra(Intent.EXTRA_RETURN_RESULT, true)
+                }
+            },
             launchIntent = packagePair.launchIntent,
             shareIntent = getShareIntent(repo, packageName, app.name ?: ""),
         ),
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 72ea9193c..d51118b03 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -117,11 +117,12 @@ val testApp = AppDetailsItem(
         requestUserConfirmation = { _, _ -> },
         checkUserConfirmation = { _, _ -> },
         cancelInstall = {},
+        onUninstallResult = { _, _ -> },
         allowBetaVersions = {},
         ignoreAllUpdates = {},
         ignoreThisUpdate = {},
         shareApk = {},
-        uninstallApp = {},
+        uninstallIntent = Intent(),
         launchIntent = Intent(),
         shareIntent = Intent(),
     ),

From 9948edc7833982993b1f76bc44b0cb748da9130a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 2 Oct 2025 17:28:20 -0300
Subject: [PATCH 062/180] Show install states in notification and My apps
 screen

---
 .../kotlin/org/fdroid/NotificationManager.kt  |  69 +++--
 .../org/fdroid/download/LocalIconFetcher.kt   |   8 +-
 .../org/fdroid/install/AppInstallManager.kt   | 199 +++++++++++---
 .../install/InstallNotificationState.kt       | 108 ++++++++
 .../kotlin/org/fdroid/install/InstallState.kt |  80 +++++-
 .../fdroid/install/SessionInstallManager.kt   |  36 ++-
 .../org/fdroid/repo/RepoUpdateWorker.kt       |   8 +-
 .../main/kotlin/org/fdroid/ui/IntentRouter.kt |  10 +-
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   5 +
 .../org/fdroid/ui/apps/AppUpdateItem.kt       |  13 -
 .../org/fdroid/ui/apps/InstallingAppRow.kt    | 112 ++++++++
 .../kotlin/org/fdroid/ui/apps/MyAppItem.kt    |  40 +++
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  | 259 +++++++++++-------
 .../kotlin/org/fdroid/ui/apps/MyAppsInfo.kt   |   3 +
 .../org/fdroid/ui/apps/MyAppsPresenter.kt     |  69 +++--
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |  31 ++-
 .../org/fdroid/ui/details/AppDetailsHeader.kt |   9 +-
 .../org/fdroid/ui/details/AppDetailsItem.kt   |   2 +-
 .../fdroid/ui/details/AppDetailsViewModel.kt  |  21 +-
 .../org/fdroid/ui/details/DetailsPresenter.kt |   4 +-
 .../kotlin/org/fdroid/ui/details/Versions.kt  |   2 +-
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  16 +-
 .../org/fdroid/updates/UpdatesManager.kt      |  31 ++-
 next/src/main/res/values/strings-next.xml     |  12 +
 24 files changed, 907 insertions(+), 240 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
 delete mode 100644 next/src/main/kotlin/org/fdroid/ui/apps/AppUpdateItem.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt

diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
index 73cbb851d..75fa9a4c9 100644
--- a/next/src/main/kotlin/org/fdroid/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -3,34 +3,48 @@ package org.fdroid
 import android.Manifest.permission.POST_NOTIFICATIONS
 import android.content.Context
 import android.content.pm.PackageManager.PERMISSION_GRANTED
+import androidx.annotation.StringRes
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.BigTextStyle
 import androidx.core.app.NotificationCompat.CATEGORY_SERVICE
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.NotificationManagerCompat.IMPORTANCE_LOW
 import androidx.core.content.ContextCompat.checkSelfPermission
 import dagger.hilt.android.qualifiers.ApplicationContext
+import org.fdroid.install.InstallNotificationState
 import org.fdroid.next.R
 import javax.inject.Inject
 
 const val NOTIFICATION_ID_REPO_UPDATE: Int = 0
+const val NOTIFICATION_ID_APP_INSTALLS: Int = 1
 const val CHANNEL_UPDATES = "update-channel"
+const val CHANNEL_INSTALLS = "install-channel"
 
 class NotificationManager @Inject constructor(
-    @ApplicationContext private val context: Context,
+    @param:ApplicationContext private val context: Context,
 ) {
 
     private val nm = NotificationManagerCompat.from(context)
     private var lastRepoUpdateNotification = 0L
 
     init {
-        val updateChannel = NotificationChannelCompat.Builder(
-            CHANNEL_UPDATES, IMPORTANCE_LOW
-        ).setName(context.getString(R.string.notification_channel_updates_title))
-            .setDescription(context.getString(R.string.notification_channel_updates_description))
-            .build()
-        nm.createNotificationChannel(updateChannel)
+        createNotificationChannels()
+    }
+
+    private fun createNotificationChannels() {
+        val channels = listOf(
+            NotificationChannelCompat.Builder(CHANNEL_UPDATES, IMPORTANCE_LOW)
+                .setName(s(R.string.notification_channel_updates_title))
+                .setDescription(s(R.string.notification_channel_updates_description))
+                .build(),
+            NotificationChannelCompat.Builder(CHANNEL_INSTALLS, IMPORTANCE_LOW)
+                .setName(s(R.string.notification_channel_installs_title))
+                .setDescription(s(R.string.notification_channel_installs_description))
+                .build(),
+        )
+        nm.createNotificationChannelsCompat(channels)
     }
 
     fun showUpdateRepoNotification(msg: String, throttle: Boolean = true, progress: Int? = null) {
@@ -58,19 +72,36 @@ class NotificationManager @Inject constructor(
         .setOngoing(true)
         .setProgress(100, progress ?: 0, progress == null)
 
-    fun getAppUpdateNotification(
-        msg: String? = null,
-    ) = NotificationCompat.Builder(context, CHANNEL_UPDATES)
-        .setSmallIcon(R.drawable.ic_refresh)
-        .setCategory(CATEGORY_SERVICE)
-        .setContentTitle(context.getString(R.string.banner_updating_apps))
-        .setContentText(msg)
-        .setOngoing(true)
-        .setProgress(100, 0, true)
+    fun showAppInstallNotification(installNotificationState: InstallNotificationState) {
+        // TODO we may need some throttling when many apps download at the same time
+        val n = getAppInstallNotification(installNotificationState).build()
+        if (checkSelfPermission(context, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
+            nm.notify(NOTIFICATION_ID_APP_INSTALLS, n)
+        }
+    }
 
+    fun getAppInstallNotification(state: InstallNotificationState): NotificationCompat.Builder {
+        val pi = state.getPendingIntent(context)
+        val builder = NotificationCompat.Builder(context, CHANNEL_INSTALLS)
+            .setSmallIcon(R.drawable.ic_notification)
+            .setCategory(CATEGORY_SERVICE)
+            .setContentTitle(state.getTitle(context))
+            .setStyle(BigTextStyle().bigText(state.getBigText(context)))
+            .setContentIntent(pi)
+            .setOngoing(true)
+            .setProgress(100, state.percent ?: 0, state.percent == null)
+        return builder
+    }
+
+    fun cancelAppInstallNotification() {
+        nm.cancel(NOTIFICATION_ID_APP_INSTALLS)
+    }
+
+    // TODO pass in bigText with apps and their version changes
     fun showAppUpdatesAvailableNotification(numUpdates: Int) {
         val n = getAppUpdatesAvailableNotification(numUpdates).build()
         if (checkSelfPermission(context, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
+            // TODO different ID
             nm.notify(NOTIFICATION_ID_REPO_UPDATE, n)
         }
     }
@@ -81,7 +112,7 @@ class NotificationManager @Inject constructor(
             numUpdates, numUpdates,
         )
         val text = context.getString(R.string.notification_title_summary_app_update_available)
-
+        // TODO different channel
         return NotificationCompat.Builder(context, CHANNEL_UPDATES)
             .setSmallIcon(R.drawable.ic_notification)
             .setPriority(PRIORITY_HIGH)
@@ -90,4 +121,8 @@ class NotificationManager @Inject constructor(
             .setOngoing(false)
             .setAutoCancel(true)
     }
+
+    private fun s(@StringRes id: Int): String {
+        return context.getString(id)
+    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt b/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
index ec30fe5b6..73af4b010 100644
--- a/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
+++ b/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
@@ -14,7 +14,11 @@ import mu.KotlinLogging
 import org.fdroid.download.coil.DownloadRequestFetcher
 import javax.inject.Inject
 
-data class PackageName(val packageName: String, val iconDownloadRequest: DownloadRequest?)
+data class PackageName(
+    val packageName: String,
+    val iconDownloadRequest: DownloadRequest?,
+    val warnOnError: Boolean = false,
+)
 
 class LocalIconFetcher(
     private val packageManager: PackageManager,
@@ -29,7 +33,7 @@ class LocalIconFetcher(
             val info = packageManager.getApplicationInfo(data.packageName, 0)
             info.loadUnbadgedIcon(packageManager)
         } catch (e: PackageManager.NameNotFoundException) {
-            log.error(e) { "Error getting icon from packageManager: " }
+            if (data.warnOnError) log.error(e) { "Error getting icon from packageManager: " }
             return downloadRequestFetcher?.fetch()
         }
 
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index f8ee23be4..7421d0e14 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -4,9 +4,11 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent.ACTION_DELETE
 import android.graphics.Bitmap
+import android.net.Uri
 import androidx.activity.result.ActivityResult
 import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
+import androidx.core.os.LocaleListCompat
 import coil3.SingletonImageLoader
 import coil3.memory.MemoryCache
 import coil3.request.ImageRequest
@@ -19,10 +21,15 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.updateAndGet
 import mu.KotlinLogging
+import org.fdroid.LocaleChooser.getBestLocale
+import org.fdroid.NotificationManager
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppVersion
 import org.fdroid.database.Repository
@@ -32,7 +39,6 @@ import org.fdroid.getCacheKey
 import org.fdroid.utils.IoDispatcher
 import java.io.File
 import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.ConcurrentLinkedQueue
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -41,35 +47,33 @@ class AppInstallManager @Inject constructor(
     @param:ApplicationContext private val context: Context,
     private val downloaderFactory: DownloaderFactory,
     private val sessionInstallManager: SessionInstallManager,
+    private val notificationManager: NotificationManager,
     @param:IoDispatcher private val scope: CoroutineScope,
 ) {
 
     private val log = KotlinLogging.logger { }
-    private val queue = ConcurrentLinkedQueue<AppVersion>()
-    private val apps = ConcurrentHashMap<String, MutableStateFlow<InstallState>>()
+    private val apps = MutableStateFlow<Map<String, InstallState>>(emptyMap())
     private val jobs = ConcurrentHashMap<String, Job>()
+    val appInstallStates = apps.asStateFlow()
 
-    fun getAppFlow(packageName: String): StateFlow<InstallState> {
-        return apps.getOrPut(packageName) {
-            MutableStateFlow(InstallState.Unknown)
-        }
+    fun getAppFlow(packageName: String): Flow<InstallState> {
+        return apps.map { it[packageName] ?: InstallState.Unknown }
     }
 
     @UiThread
     suspend fun install(
         appMetadata: AppMetadata,
         version: AppVersion,
+        currentVersionName: String?,
         repo: Repository,
         iconDownloadRequest: DownloadRequest?,
     ): InstallState {
-        val flow = apps.getOrPut(appMetadata.packageName) {
-            MutableStateFlow(InstallState.Starting)
-        }
+        val packageName = appMetadata.packageName
         val job = scope.async {
-            installInt(flow, appMetadata, version, repo, iconDownloadRequest)
+            installInt(appMetadata, version, currentVersionName, repo, iconDownloadRequest)
         }
         // keep track of this job, in case we want to cancel it
-        jobs.put(appMetadata.packageName, job)
+        jobs.put(packageName, job)
         // wait for job to return
         val result = try {
             job.await()
@@ -77,21 +81,31 @@ class AppInstallManager @Inject constructor(
             InstallState.UserAborted
         } finally {
             // remove job as it has completed
-            jobs.remove(appMetadata.packageName)
+            jobs.remove(packageName)
         }
-        flow.update { result }
+        apps.updateApp(packageName) { result }
+        onStatesUpdated()
         return result
     }
 
     @WorkerThread
     private suspend fun installInt(
-        flow: MutableStateFlow<InstallState>,
         appMetadata: AppMetadata,
         version: AppVersion,
+        currentVersionName: String?,
         repo: Repository,
         iconDownloadRequest: DownloadRequest?,
     ): InstallState {
-        flow.update { InstallState.Starting }
+        apps.updateApp(appMetadata.packageName) {
+            InstallState.Starting(
+                name = appMetadata.name.getBestLocale(LocaleListCompat.getDefault()) ?: "Unknown",
+                versionName = version.versionName,
+                currentVersionName = currentVersionName,
+                lastUpdated = version.added,
+                iconDownloadRequest = iconDownloadRequest,
+            )
+        }
+        onStatesUpdated()
         val coroutineContext = currentCoroutineContext()
         // get the icon for pre-approval (usually in memory cache, so should be quick)
         coroutineContext.ensureActive()
@@ -104,18 +118,38 @@ class AppInstallManager @Inject constructor(
             is PreApprovalResult.Error -> InstallState.Error(preApprovalResult.errorMsg)
             is PreApprovalResult.UserAborted -> InstallState.UserAborted
             else -> {
-                flow.update { InstallState.PreApproved(preApprovalResult) }
+                apps.checkAndUpdateApp(appMetadata.packageName) {
+                    InstallState.PreApproved(
+                        name = it.name,
+                        versionName = it.versionName,
+                        currentVersionName = it.currentVersionName,
+                        lastUpdated = it.lastUpdated,
+                        iconDownloadRequest = it.iconDownloadRequest,
+                        result = preApprovalResult,
+                    )
+                }
                 val sessionId = (preApprovalResult as? PreApprovalResult.Success)?.sessionId
                 coroutineContext.ensureActive()
                 // download file
                 val file = File(context.cacheDir, version.file.sha256)
                 val downloader =
-                    downloaderFactory.create(repo, android.net.Uri.EMPTY, version.file, file)
+                    downloaderFactory.create(repo, Uri.EMPTY, version.file, file)
+                val now = System.currentTimeMillis()
                 downloader.setListener { bytesRead, totalBytes ->
                     coroutineContext.ensureActive()
-                    flow.update {
-                        InstallState.Downloading(sessionId, bytesRead, totalBytes)
+                    apps.checkAndUpdateApp(appMetadata.packageName) {
+                        InstallState.Downloading(
+                            name = it.name,
+                            versionName = it.versionName,
+                            currentVersionName = it.currentVersionName,
+                            lastUpdated = it.lastUpdated,
+                            iconDownloadRequest = it.iconDownloadRequest,
+                            downloadedBytes = bytesRead,
+                            totalBytes = totalBytes,
+                            startMillis = now,
+                        )
                     }
+                    onStatesUpdated()
                 }
                 try {
                     downloader.download()
@@ -127,12 +161,23 @@ class AppInstallManager @Inject constructor(
                     return InstallState.Error(msg)
                 }
                 coroutineContext.ensureActive()
-                flow.update { InstallState.Installing(sessionId) }
-                val result = sessionInstallManager.install(sessionId, version.packageName, file)
-                if (result is InstallState.PreApprovalFailed) {
+                val newState = apps.checkAndUpdateApp(appMetadata.packageName) {
+                    InstallState.Installing(
+                        name = it.name,
+                        versionName = it.versionName,
+                        currentVersionName = it.currentVersionName,
+                        lastUpdated = it.lastUpdated,
+                        iconDownloadRequest = it.iconDownloadRequest,
+                    )
+                }
+                val result =
+                    sessionInstallManager.install(sessionId, version.packageName, newState, file)
+                if (result is InstallState.PreApproved &&
+                    result.result is PreApprovalResult.Error
+                ) {
                     // if pre-approval failed (e.g. due to app label mismatch),
                     // then try to install again, this time not using the pre-approved session
-                    sessionInstallManager.install(null, version.packageName, file)
+                    sessionInstallManager.install(null, version.packageName, newState, file)
                 } else {
                     result
                 }
@@ -148,13 +193,16 @@ class AppInstallManager @Inject constructor(
         packageName: String,
         installState: InstallState.UserConfirmationNeeded,
     ): InstallState? {
-        val flow = apps[packageName] ?: error("No state for $packageName $installState")
-        if (flow.value !is InstallState.UserConfirmationNeeded) {
-            log.error { "Unexpected state: ${flow.value}" }
+        val state = apps.value[packageName] ?: error("No state for $packageName $installState")
+        if (state !is InstallState.UserConfirmationNeeded) {
+            log.error { "Unexpected state: $state" }
             return null
         }
+        log.info { "Requesting user confirmation for $packageName" }
         val result = sessionInstallManager.requestUserConfirmation(installState)
-        flow.update { result }
+        log.info { "User confirmation for $packageName $result" }
+        apps.updateApp(packageName) { result }
+        onStatesUpdated()
         return result
     }
 
@@ -170,9 +218,9 @@ class AppInstallManager @Inject constructor(
         packageName: String,
         installState: InstallState.UserConfirmationNeeded,
     ) {
-        val flow = apps[packageName] ?: error("No state for $packageName $installState")
-        if (flow.value !is InstallState.UserConfirmationNeeded) {
-            log.debug { "State has changed. Now: ${flow.value}" }
+        val state = apps.value[packageName] ?: error("No state for $packageName $installState")
+        if (state !is InstallState.UserConfirmationNeeded) {
+            log.debug { "State has changed. Now: $state" }
             return
         }
         val sessionInfo =
@@ -210,9 +258,6 @@ class AppInstallManager @Inject constructor(
      */
     @UiThread
     fun onUninstallResult(packageName: String, activityResult: ActivityResult): InstallState {
-        val flow = apps.getOrPut(packageName) {
-            MutableStateFlow(InstallState.Unknown)
-        }
         val result = when (activityResult.resultCode) {
             Activity.RESULT_OK -> InstallState.Uninstalled
             Activity.RESULT_FIRST_USER -> InstallState.UserAborted
@@ -220,17 +265,67 @@ class AppInstallManager @Inject constructor(
         }
         val code = activityResult.data?.getIntExtra("android.intent.extra.INSTALL_RESULT", -1)
         log.info { "Uninstall result received: ${activityResult.resultCode} => $result ($code)" }
-        flow.update { result }
+        apps.updateApp(packageName) { result }
         return result
     }
 
     @UiThread
     fun cleanUp(packageName: String) {
-        val flow = apps[packageName] ?: return
-        if (!flow.value.showProgress) {
-            log.info { "Cleaning up state for $packageName ${flow.value}" }
+        val state = apps.value[packageName] ?: return
+        if (!state.showProgress) {
+            log.info { "Cleaning up state for $packageName $state" }
             jobs.remove(packageName)?.cancel()
-            apps.remove(packageName)
+            apps.update { oldApps ->
+                oldApps.toMutableMap().apply {
+                    remove(packageName)
+                }
+            }
+        }
+    }
+
+    private fun onStatesUpdated() {
+        val appStates = mutableListOf<AppState>()
+        var numBytesDownloaded = 0L
+        var numTotalBytes = 0L
+        // go throw all apps that have active state
+        apps.value.toMap().forEach { packageName, state ->
+            // assign a category to each in progress state
+            val appStateCategory = when (state) {
+                is InstallState.Installing, is InstallState.PreApproved,
+                is InstallState.Starting -> AppStateCategory.INSTALLING
+                is InstallState.Downloading -> {
+                    numBytesDownloaded += state.downloadedBytes
+                    numTotalBytes += state.totalBytes
+                    AppStateCategory.INSTALLING
+                }
+                is InstallState.Installed -> AppStateCategory.INSTALLED
+                is InstallState.UserConfirmationNeeded -> AppStateCategory.NEEDS_CONFIRMATION
+                else -> null
+            }
+            // track app state for in progress apps
+            val appState = appStateCategory?.let {
+                // all states that get a category above must be InstallStateWithInfo
+                state as InstallStateWithInfo
+                AppState(
+                    packageName = packageName,
+                    category = it,
+                    name = state.name,
+                    installVersionName = state.versionName,
+                    currentVersionName = state.currentVersionName,
+                )
+            }
+            if (appState != null) appStates.add(appState)
+        }
+        val notificationState = InstallNotificationState(
+            apps = appStates,
+            numBytesDownloaded = numBytesDownloaded,
+            numTotalBytes = numTotalBytes,
+        )
+        if (notificationState.isInProgress) {
+            notificationManager.showAppInstallNotification(notificationState)
+        } else {
+            // cancel notification if no more apps are in progress
+            notificationManager.cancelAppInstallNotification()
         }
     }
 
@@ -255,4 +350,28 @@ class AppInstallManager @Inject constructor(
         }
     }
 
+    private fun MutableStateFlow<Map<String, InstallState>>.updateApp(
+        packageName: String,
+        function: (InstallState) -> InstallState,
+    ) = update { oldMap ->
+        val newMap = oldMap.toMutableMap()
+        newMap[packageName] = function(newMap[packageName] ?: InstallState.Unknown)
+        newMap
+    }
+
+    private fun MutableStateFlow<Map<String, InstallState>>.checkAndUpdateApp(
+        packageName: String,
+        function: (InstallStateWithInfo) -> InstallStateWithInfo,
+    ): InstallStateWithInfo {
+        return updateAndGet { oldMap ->
+            val oldState = oldMap[packageName]
+            check(oldState is InstallStateWithInfo) {
+                "State for $packageName was $oldState"
+            }
+            val newMap = oldMap.toMutableMap()
+            newMap[packageName] = function(oldState)
+            newMap
+        }[packageName] as InstallStateWithInfo
+    }
+
 }
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
new file mode 100644
index 000000000..55c3bfd8d
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
@@ -0,0 +1,108 @@
+package org.fdroid.install
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_IMMUTABLE
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import android.content.Intent
+import androidx.annotation.StringRes
+import org.fdroid.MainActivity
+import org.fdroid.next.R
+import org.fdroid.ui.IntentRouter.Companion.ACTION_MY_APPS
+import kotlin.math.roundToInt
+
+data class InstallNotificationState(
+    val apps: List<AppState>,
+    val numBytesDownloaded: Long,
+    val numTotalBytes: Long,
+) {
+    val percent: Int? = if (numTotalBytes > 0) {
+        ((numBytesDownloaded.toFloat() / numTotalBytes) * 100).roundToInt()
+    } else {
+        null
+    }
+    val needsConfirmation: Boolean
+        get() = apps.find { it.category == AppStateCategory.NEEDS_CONFIRMATION } != null
+    val isInProgress: Boolean = apps.any { it.category != AppStateCategory.INSTALLED }
+
+    fun getTitle(context: Context): String {
+        val numActiveApps: Int = apps.count { it.category != AppStateCategory.INSTALLED }
+        val installTitle = context.resources.getQuantityString(
+            R.plurals.notification_installing_title,
+            numActiveApps,
+            numActiveApps,
+        )
+        val needsUserConfirmation =
+            apps.find { it.category == AppStateCategory.NEEDS_CONFIRMATION } != null
+        return if (needsUserConfirmation) {
+            val s = context.getString(R.string.notification_installing_confirmation)
+            "$s $installTitle"
+        } else {
+            installTitle
+        }
+    }
+
+    fun getBigText(context: Context): String {
+        // split app apps into their categories
+        val installing = mutableListOf<AppState>()
+        val toConfirm = mutableListOf<AppState>()
+        val installed = mutableListOf<AppState>()
+        apps.forEach { appState ->
+            when (appState.category) {
+                AppStateCategory.INSTALLING -> installing.add(appState)
+                AppStateCategory.NEEDS_CONFIRMATION -> toConfirm.add(appState)
+                AppStateCategory.INSTALLED -> installed.add(appState)
+            }
+        }
+        val sb = StringBuilder()
+        fun printApps(@StringRes titleRes: Int, list: List<AppState>, showTitle: Boolean = true) {
+            if (list.isEmpty()) return
+            if (showTitle) {
+                if (sb.isNotEmpty()) sb.append("\n⠀\n")
+                sb.append(context.getString(titleRes))
+            }
+            sb.append("\n")
+            list.forEach { appState ->
+                sb.append("• ").append(appState.displayStr).append("\n")
+            }
+        }
+
+        val showInstallTitle = toConfirm.isNotEmpty() || installed.isNotEmpty()
+        printApps(R.string.notification_installing_section_confirmation, toConfirm)
+        printApps(R.string.notification_installing_section_installing, installing, showInstallTitle)
+        printApps(R.string.notification_installing_section_installed, installed)
+        return sb.toString()
+    }
+
+    fun getPendingIntent(context: Context): PendingIntent {
+        val i = Intent(ACTION_MY_APPS).apply {
+            setClass(context, MainActivity::class.java)
+        }
+        val flags = FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
+        return PendingIntent.getActivity(context, 0, i, flags)
+    }
+}
+
+data class AppState(
+    val packageName: String,
+    val category: AppStateCategory,
+    val name: String,
+    val installVersionName: String,
+    val currentVersionName: String?,
+) {
+    val displayStr: String
+        get() {
+            val versionStr = if (currentVersionName == null) {
+                installVersionName
+            } else {
+                "$currentVersionName → $installVersionName"
+            }
+            return "$name $versionStr"
+        }
+}
+
+enum class AppStateCategory {
+    INSTALLING,
+    NEEDS_CONFIRMATION,
+    INSTALLED
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallState.kt b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
index a6a2b8712..09790b905 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
@@ -1,29 +1,93 @@
 package org.fdroid.install
 
 import android.app.PendingIntent
+import org.fdroid.download.DownloadRequest
 
 sealed class InstallState(val showProgress: Boolean) {
     data object Unknown : InstallState(false)
-    data object Starting : InstallState(true)
-    data class PreApproved(val result: PreApprovalResult) : InstallState(true)
+    data class Starting(
+        override val name: String,
+        override val versionName: String,
+        override val currentVersionName: String? = null,
+        override val lastUpdated: Long,
+        override val iconDownloadRequest: DownloadRequest? = null,
+    ) : InstallStateWithInfo(true)
+
+    data class PreApproved(
+        override val name: String,
+        override val versionName: String,
+        override val currentVersionName: String?,
+        override val lastUpdated: Long,
+        override val iconDownloadRequest: DownloadRequest?,
+        val result: PreApprovalResult,
+    ) : InstallStateWithInfo(true)
+
     data class Downloading(
-        val sessionId: Int?,
+        override val name: String,
+        override val versionName: String,
+        override val currentVersionName: String?,
+        override val lastUpdated: Long,
+        override val iconDownloadRequest: DownloadRequest?,
         val downloadedBytes: Long,
         val totalBytes: Long,
-    ) : InstallState(true)
+        val startMillis: Long,
+    ) : InstallStateWithInfo(true) {
+        val progress: Float get() = downloadedBytes / totalBytes.toFloat()
+    }
+
+    data class Installing(
+        override val name: String,
+        override val versionName: String,
+        override val currentVersionName: String?,
+        override val lastUpdated: Long,
+        override val iconDownloadRequest: DownloadRequest?,
+    ) : InstallStateWithInfo(true)
 
-    data class Installing(val sessionId: Int?) : InstallState(true)
     data class UserConfirmationNeeded(
+        override val name: String,
+        override val versionName: String,
+        override val currentVersionName: String?,
+        override val lastUpdated: Long,
+        override val iconDownloadRequest: DownloadRequest?,
         val sessionId: Int,
         val intent: PendingIntent,
         val progress: Float,
-    ) : InstallState(true)
+    ) : InstallStateWithInfo(true) {
+        constructor(
+            state: InstallStateWithInfo,
+            sessionId: Int,
+            intent: PendingIntent,
+            progress: Float
+        ) : this(
+            name = state.name,
+            versionName = state.versionName,
+            currentVersionName = state.currentVersionName,
+            lastUpdated = state.lastUpdated,
+            iconDownloadRequest = state.iconDownloadRequest,
+            sessionId = sessionId,
+            intent = intent,
+            progress = progress
+        )
+    }
 
-    data object PreApprovalFailed : InstallState(true)
+    data class Installed(
+        override val name: String,
+        override val versionName: String,
+        override val currentVersionName: String?,
+        override val lastUpdated: Long,
+        override val iconDownloadRequest: DownloadRequest?,
+    ) : InstallStateWithInfo(false)
 
-    data object Installed : InstallState(false)
     data object UserAborted : InstallState(false)
     data class Error(val msg: String?) : InstallState(false)
 
     data object Uninstalled : InstallState(false)
 }
+
+sealed class InstallStateWithInfo(showProgress: Boolean) : InstallState(showProgress) {
+    abstract val name: String
+    abstract val versionName: String
+    abstract val currentVersionName: String?
+    abstract val lastUpdated: Long
+    abstract val iconDownloadRequest: DownloadRequest?
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
index a3d97c9a8..e7c2340e6 100644
--- a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
@@ -164,6 +164,7 @@ class SessionInstallManager @Inject constructor(
     suspend fun install(
         sessionId: Int?,
         packageName: String,
+        state: InstallStateWithInfo,
         apkFile: File,
     ): InstallState = suspendCancellableCoroutine { cont ->
         val size = apkFile.length()
@@ -186,7 +187,14 @@ class SessionInstallManager @Inject constructor(
             context.unregisterReceiver(this)
             when (status) {
                 PackageInstaller.STATUS_SUCCESS -> {
-                    cont.resume(InstallState.Installed)
+                    val newState = InstallState.Installed(
+                        name = state.name,
+                        versionName = state.versionName,
+                        currentVersionName = state.currentVersionName,
+                        lastUpdated = state.lastUpdated,
+                        iconDownloadRequest = state.iconDownloadRequest,
+                    )
+                    cont.resume(newState)
                 }
                 PackageInstaller.STATUS_PENDING_USER_ACTION -> {
                     val flags = if (SDK_INT >= 31) {
@@ -199,7 +207,12 @@ class SessionInstallManager @Inject constructor(
                     val progress = installer.getSessionInfo(sessionId)?.progress
                         ?: error("No session info for $sessionId")
                     cont.resume(
-                        InstallState.UserConfirmationNeeded(sessionId, pendingIntent, progress)
+                        InstallState.UserConfirmationNeeded(
+                            state = state,
+                            sessionId = sessionId,
+                            intent = pendingIntent,
+                            progress = progress,
+                        )
                     )
                 }
                 else -> {
@@ -209,7 +222,15 @@ class SessionInstallManager @Inject constructor(
                         msg != null &&
                         msg.contains("PreapprovalDetails")
                     ) {
-                        cont.resume(InstallState.PreApprovalFailed)
+                        val newState = InstallState.PreApproved(
+                            name = state.name,
+                            versionName = state.versionName,
+                            currentVersionName = state.currentVersionName,
+                            lastUpdated = state.lastUpdated,
+                            iconDownloadRequest = state.iconDownloadRequest,
+                            result = PreApprovalResult.Error(msg),
+                        )
+                        cont.resume(newState)
                     } else {
                         cont.resume(InstallState.Error(msg))
                     }
@@ -258,7 +279,14 @@ class SessionInstallManager @Inject constructor(
             context.unregisterReceiver(this)
             when (status) {
                 PackageInstaller.STATUS_SUCCESS -> {
-                    cont.resume(InstallState.Installed)
+                    val newState = InstallState.Installed(
+                        name = installState.name,
+                        versionName = installState.versionName,
+                        currentVersionName = installState.currentVersionName,
+                        lastUpdated = installState.lastUpdated,
+                        iconDownloadRequest = installState.iconDownloadRequest,
+                    )
+                    cont.resume(newState)
                 }
                 PackageInstaller.STATUS_PENDING_USER_ACTION -> {
                     error("Got STATUS_PENDING_USER_ACTION again")
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
index cfa26f388..37c959044 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
@@ -22,6 +22,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import mu.KotlinLogging
 import org.fdroid.NOTIFICATION_ID_REPO_UPDATE
 import org.fdroid.NotificationManager
 import java.util.concurrent.TimeUnit
@@ -93,11 +94,14 @@ class RepoUpdateWorker @AssistedInject constructor(
         }
     }
 
+    private val log = KotlinLogging.logger { }
+
     override suspend fun doWork(): Result {
+        log.info { "Starting RepoUpdateWorker... $runAttemptCount" }
         try {
             setForeground(getForegroundInfo())
         } catch (e: Exception) {
-            Log.e(TAG, "Error while running setForeground", e)
+            log.error(e) { "Error while running setForeground" }
         }
         val repoId = inputData.getLong("repoId", -1)
         return try {
@@ -105,7 +109,7 @@ class RepoUpdateWorker @AssistedInject constructor(
             else repoUpdateManager.updateRepos()
             Result.success()
         } catch (e: Exception) {
-            Log.e(TAG, "Error updating repos", e)
+            log.error(e) { "Error updating repos" }
             Result.failure()
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
index 7c8ebfa30..9ad1c4ed7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
@@ -14,13 +14,17 @@ class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Inten
     private val log = KotlinLogging.logger { }
     private val packageNameRegex = "[A-Za-z\\d_.]+".toRegex()
 
+    companion object {
+        const val ACTION_MY_APPS = "org.fdroid.action.MY_APPS"
+    }
+
     override fun accept(value: Intent) {
         val intent = value
         log.info { "Incoming intent: $intent" }
         val uri = intent.data
         if (ACTION_MAIN == intent.action) {
             // launcher intent, do nothing
-        } else if (SDK_INT >= 24 && ACTION_SHOW_APP_INFO == intent.action) { // App Details
+        } else if (ACTION_SHOW_APP_INFO == intent.action) { // App Details
             val packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME) ?: return
             if (packageName.matches(packageNameRegex)) {
                 backStack.add(NavigationKey.AppDetails(packageName))
@@ -40,6 +44,10 @@ class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Inten
                 val packageName = uri.lastPathSegment ?: return
                 backStack.add(NavigationKey.AppDetails(packageName))
             }
+        } else if (ACTION_MY_APPS == intent.action) {
+            if (backStack.lastOrNull() !is NavigationKey.MyApps) {
+                backStack.add(NavigationKey.MyApps)
+            }
         } else {
             log.warn { "Unknown intent: $intent - uri: $uri $SDK_INT" }
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 50b89d12e..75a84cc34 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -31,6 +31,7 @@ import androidx.navigation3.ui.NavDisplay
 import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.install.InstallState
 import org.fdroid.next.R
 import org.fdroid.ui.apps.MyApps
 import org.fdroid.ui.apps.MyAppsInfo
@@ -116,6 +117,10 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                             myAppsViewModel.changeSortOrder(sort)
 
                         override fun search(query: String) = myAppsViewModel.search(query)
+                        override fun confirmAppInstall(
+                            packageName: String,
+                            state: InstallState.UserConfirmationNeeded,
+                        ) = myAppsViewModel.confirmAppInstall(packageName, state)
                     }
                     MyApps(
                         myAppsInfo = myAppsInfo,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/AppUpdateItem.kt b/next/src/main/kotlin/org/fdroid/ui/apps/AppUpdateItem.kt
deleted file mode 100644
index 1a528fc25..000000000
--- a/next/src/main/kotlin/org/fdroid/ui/apps/AppUpdateItem.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.fdroid.ui.apps
-
-import org.fdroid.download.DownloadRequest
-import org.fdroid.index.v2.PackageVersion
-
-data class AppUpdateItem(
-    val packageName: String,
-    val name: String,
-    val installedVersionName: String,
-    val update: PackageVersion,
-    val whatsNew: String?,
-    val iconDownloadRequest: DownloadRequest? = null,
-)
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
new file mode 100644
index 000000000..6e500f047
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
@@ -0,0 +1,112 @@
+package org.fdroid.ui.apps
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.download.PackageName
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.install.InstallState
+import org.fdroid.next.R
+import org.fdroid.ui.utils.AsyncShimmerImage
+
+@Composable
+fun InstallingAppRow(
+    app: InstallingAppItem,
+    isSelected: Boolean,
+    modifier: Modifier = Modifier
+) {
+    Column(modifier = modifier) {
+        ListItem(
+            leadingContent = {
+                AsyncShimmerImage(
+                    model = PackageName(app.packageName, app.iconDownloadRequest, false),
+                    error = painterResource(R.drawable.ic_repo_app_default),
+                    contentDescription = null,
+                    modifier = Modifier.size(48.dp),
+                )
+            },
+            headlineContent = {
+                Text(app.name)
+            },
+            supportingContent = {
+                val currentVersionName = app.installState.currentVersionName
+                if (currentVersionName == null) {
+                    Text(app.installState.versionName)
+                } else {
+                    Text("$currentVersionName → ${app.installState.versionName}")
+                }
+            },
+            trailingContent = {
+                if (app.installState is InstallState.Installed) {
+                    Icon(
+                        imageVector = Icons.Default.CheckCircle,
+                        contentDescription = stringResource(R.string.app_installed),
+                        tint = MaterialTheme.colorScheme.secondary,
+                    )
+                } else {
+                    if (app.installState is InstallState.Downloading) {
+                        CircularProgressIndicator(progress = { app.installState.progress })
+                    } else {
+                        CircularProgressIndicator()
+                    }
+                }
+            },
+            colors = ListItemDefaults.colors(
+                containerColor = if (isSelected) {
+                    MaterialTheme.colorScheme.surfaceVariant
+                } else {
+                    Color.Transparent
+                }
+            ),
+            modifier = modifier,
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    val installingApp1 = InstallingAppItem(
+        packageName = "A1",
+        installState = InstallState.Downloading(
+            name = "Installing App 1",
+            versionName = "1.0.4",
+            currentVersionName = null,
+            lastUpdated = 23,
+            iconDownloadRequest = null,
+            downloadedBytes = 25,
+            totalBytes = 100,
+            startMillis = System.currentTimeMillis(),
+        )
+    )
+    val installingApp2 = InstallingAppItem(
+        packageName = "A2",
+        installState = InstallState.Installed(
+            name = "Installing App 2",
+            versionName = "2.0.1",
+            currentVersionName = null,
+            lastUpdated = 13,
+            iconDownloadRequest = null,
+        )
+    )
+    FDroidContent {
+        Column {
+            InstallingAppRow(installingApp1, false)
+            InstallingAppRow(installingApp2, true)
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
new file mode 100644
index 000000000..2e4d86ede
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
@@ -0,0 +1,40 @@
+package org.fdroid.ui.apps
+
+import org.fdroid.download.DownloadRequest
+import org.fdroid.index.v2.PackageVersion
+import org.fdroid.install.InstallStateWithInfo
+
+sealed class MyAppItem {
+    abstract val packageName: String
+    abstract val name: String
+    abstract val lastUpdated: Long
+    abstract val iconDownloadRequest: DownloadRequest?
+}
+
+data class InstallingAppItem(
+    override val packageName: String,
+    val installState: InstallStateWithInfo,
+) : MyAppItem() {
+    override val name: String = installState.name
+    override val lastUpdated: Long = installState.lastUpdated
+    override val iconDownloadRequest: DownloadRequest? = installState.iconDownloadRequest
+}
+
+data class AppUpdateItem(
+    override val packageName: String,
+    override val name: String,
+    val installedVersionName: String,
+    val update: PackageVersion,
+    val whatsNew: String?,
+    override val iconDownloadRequest: DownloadRequest? = null,
+) : MyAppItem() {
+    override val lastUpdated: Long = update.added
+}
+
+data class InstalledAppItem(
+    override val packageName: String,
+    override val name: String,
+    val installedVersionName: String,
+    override val lastUpdated: Long,
+    override val iconDownloadRequest: DownloadRequest? = null,
+) : MyAppItem()
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 9a5af700d..fdcbe0477 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.material.icons.Icons
@@ -31,6 +32,8 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults.enterAlwaysScrollBehavior
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -43,17 +46,21 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle.State.STARTED
 import androidx.lifecycle.compose.LifecycleStartEffect
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppListSortOrder.LAST_UPDATED
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.install.InstallState
 import org.fdroid.next.R
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.lists.TopSearchBar
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.Names
+import org.fdroid.ui.utils.getMyAppsInfo
 import org.fdroid.ui.utils.getPreviewVersion
 import java.util.concurrent.TimeUnit.DAYS
 
@@ -68,10 +75,28 @@ fun MyApps(
     modifier: Modifier = Modifier,
 ) {
     val myAppsModel = myAppsInfo.model
-    LifecycleStartEffect(myAppsModel) {
+    val appToConfirm by remember(myAppsInfo.model.installingApps) {
+        derivedStateOf {
+            myAppsInfo.model.installingApps.find { app ->
+                app.installState is InstallState.UserConfirmationNeeded
+            }
+        }
+    }
+    LifecycleStartEffect(Unit) {
         myAppsInfo.refresh()
         onStopOrDispose { }
     }
+    // Ask user to confirm appToConfirm whenever it changes and we are in STARTED state.
+    // In tests, waiting for RESUME didn't work, because the LaunchedEffect ran before.
+    val lifecycleOwner = LocalLifecycleOwner.current
+    LaunchedEffect(appToConfirm) {
+        val app = appToConfirm
+        if (app != null && lifecycleOwner.lifecycle.currentState.isAtLeast(STARTED)) {
+            val state = app.installState as InstallState.UserConfirmationNeeded
+            myAppsInfo.confirmAppInstall(app.packageName, state)
+        }
+    }
+    val installingApps = myAppsModel.installingApps
     val updatableApps = myAppsModel.appUpdates
     val installedApps = myAppsModel.installedApps
     val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
@@ -150,8 +175,12 @@ fun MyApps(
         },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
+        val lazyListState = rememberLazyListState()
         if (updatableApps == null && installedApps == null) BigLoadingIndicator()
-        else if (updatableApps.isNullOrEmpty() && installedApps.isNullOrEmpty()) {
+        else if (installingApps.isEmpty() &&
+            updatableApps.isNullOrEmpty() &&
+            installedApps.isNullOrEmpty()
+        ) {
             Text(
                 text = if (searchActive) {
                     stringResource(R.string.search_my_apps_no_results)
@@ -164,84 +193,126 @@ fun MyApps(
                     .fillMaxSize()
                     .padding(16.dp),
             )
-        } else LazyColumn(
-            modifier
-                .padding(paddingValues)
-                .then(
-                    if (currentPackageName == null) Modifier
-                    else Modifier.selectableGroup()
-                ),
-        ) {
-            if (updatableApps == null || updatableApps.isNotEmpty()) {
-                item(key = "A", contentType = "header") {
-                    Row(verticalAlignment = Alignment.CenterVertically) {
+        } else {
+            LazyColumn(
+                state = lazyListState,
+                modifier = modifier
+                    .padding(paddingValues)
+                    .then(
+                        if (currentPackageName == null) Modifier
+                        else Modifier.selectableGroup()
+                    ),
+            ) {
+                // Updates header with Update all button (only show when there's a list below)
+                if (!updatableApps.isNullOrEmpty()) {
+                    item(key = "A", contentType = "header") {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            Text(
+                                text = stringResource(R.string.updates),
+                                style = MaterialTheme.typography.titleMedium,
+                                modifier = Modifier
+                                    .padding(16.dp)
+                                    .weight(1f),
+                            )
+                            Button(
+                                onClick = {},
+                                modifier = Modifier.padding(end = 16.dp),
+                            ) {
+                                Text(stringResource(R.string.update_all))
+                            }
+                        }
+                    }
+                    // List of updatable apps
+                    items(
+                        items = updatableApps,
+                        key = { it.packageName },
+                        contentType = { "A" },
+                    ) { app ->
+                        val isSelected = app.packageName == currentPackageName
+                        val interactionModifier = if (currentPackageName == null) {
+                            Modifier.clickable(
+                                onClick = { onAppItemClick(app.packageName) }
+                            )
+                        } else {
+                            Modifier.selectable(
+                                selected = isSelected,
+                                onClick = { onAppItemClick(app.packageName) }
+                            )
+                        }
+                        val modifier = Modifier.Companion
+                            .animateItem()
+                            .then(interactionModifier)
+                        UpdatableAppRow(app, isSelected, modifier)
+                    }
+                }
+                // Apps currently installing header
+                if (installingApps.isNotEmpty()) {
+                    item(key = "B", contentType = "header") {
                         Text(
-                            text = stringResource(R.string.updates),
+                            text = stringResource(R.string.notification_title_summary_installing),
                             style = MaterialTheme.typography.titleMedium,
                             modifier = Modifier
                                 .padding(16.dp)
-                                .weight(1f),
                         )
-                        if (updatableApps?.isNotEmpty() == true) Button(
-                            onClick = {},
-                            modifier = Modifier.padding(end = 16.dp),
-                        ) {
-                            Text(stringResource(R.string.update_all))
+                    }
+                    // List of currently installing apps
+                    items(
+                        items = installingApps,
+                        key = { it.packageName },
+                        contentType = { "B" },
+                    ) { app ->
+                        val isSelected = app.packageName == currentPackageName
+                        val interactionModifier = if (currentPackageName == null) {
+                            Modifier.clickable(
+                                onClick = { onAppItemClick(app.packageName) }
+                            )
+                        } else {
+                            Modifier.selectable(
+                                selected = isSelected,
+                                onClick = { onAppItemClick(app.packageName) }
+                            )
                         }
+                        val modifier = Modifier.Companion
+                            .animateItem()
+                            .then(interactionModifier)
+                        InstallingAppRow(app, isSelected, modifier)
                     }
                 }
-            }
-            if (updatableApps != null) items(
-                items = updatableApps,
-                key = { it.packageName },
-                contentType = { "A" },
-            ) { app ->
-                val isSelected = app.packageName == currentPackageName
-                val interactionModifier = if (currentPackageName == null) {
-                    Modifier.clickable(
-                        onClick = { onAppItemClick(app.packageName) }
-                    )
-                } else {
-                    Modifier.selectable(
-                        selected = isSelected,
-                        onClick = { onAppItemClick(app.packageName) }
-                    )
+                // Installed apps header (only show when we have non-empty lists above)
+                if ((installingApps.isNotEmpty() || !updatableApps.isNullOrEmpty()) &&
+                    !installedApps.isNullOrEmpty()
+                ) {
+                    item(key = "C", contentType = "header") {
+                        Text(
+                            text = stringResource(R.string.installed_apps__activity_title),
+                            style = MaterialTheme.typography.titleMedium,
+                            modifier = Modifier.padding(16.dp),
+                        )
+                    }
                 }
-                val modifier = Modifier.Companion
-                    .animateItem()
-                    .then(interactionModifier)
-                UpdatableAppRow(app, isSelected, modifier)
-            }
-            if (!updatableApps.isNullOrEmpty() && !installedApps.isNullOrEmpty()) {
-                item(key = "B", contentType = "header") {
-                    Text(
-                        text = stringResource(R.string.installed_apps__activity_title),
-                        style = MaterialTheme.typography.titleMedium,
-                        modifier = Modifier.padding(16.dp),
-                    )
+                // List of installed apps
+                if (installedApps != null) items(
+                    items = installedApps,
+                    key = { it.packageName },
+                    contentType = { "C" },
+                ) { app ->
+                    val isSelected = app.packageName == currentPackageName
+                    val interactionModifier = if (currentPackageName == null) {
+                        Modifier.clickable(
+                            onClick = { onAppItemClick(app.packageName) }
+                        )
+                    } else {
+                        Modifier.selectable(
+                            selected = isSelected,
+                            onClick = { onAppItemClick(app.packageName) }
+                        )
+                    }
+                    val modifier = Modifier
+                        .animateItem()
+                        .then(interactionModifier)
+                    InstalledAppRow(app, isSelected, modifier)
                 }
             }
-            if (installedApps != null) items(
-                items = installedApps,
-                key = { it.packageName },
-                contentType = { "B" },
-            ) { app ->
-                val isSelected = app.packageName == currentPackageName
-                val interactionModifier = if (currentPackageName == null) {
-                    Modifier.clickable(
-                        onClick = { onAppItemClick(app.packageName) }
-                    )
-                } else {
-                    Modifier.selectable(
-                        selected = isSelected,
-                        onClick = { onAppItemClick(app.packageName) }
-                    )
-                }
-                val modifier = Modifier
-                    .animateItem()
-                    .then(interactionModifier)
-                InstalledAppRow(app, isSelected, modifier)
-            }
         }
     }
 }
@@ -249,20 +320,15 @@ fun MyApps(
 @Preview
 @Composable
 fun MyAppsLoadingPreview() {
-    val info = object : MyAppsInfo {
-        override val model = MyAppsModel(
-            appUpdates = null,
-            installedApps = null,
-            sortOrder = AppListSortOrder.NAME,
-        )
-
-        override fun refresh() {}
-        override fun changeSortOrder(sort: AppListSortOrder) {}
-        override fun search(query: String) {}
-    }
+    val model = MyAppsModel(
+        installingApps = emptyList(),
+        appUpdates = null,
+        installedApps = null,
+        sortOrder = AppListSortOrder.NAME,
+    )
     FDroidContent {
         MyApps(
-            myAppsInfo = info,
+            myAppsInfo = getMyAppsInfo(model),
             currentPackageName = null,
             onAppItemClick = {},
             onNav = {},
@@ -276,50 +342,59 @@ fun MyAppsLoadingPreview() {
 @RestrictTo(RestrictTo.Scope.TESTS)
 fun MyAppsPreview() {
     FDroidContent {
+        val installingApp1 = InstallingAppItem(
+            packageName = "A1",
+            installState = InstallState.Downloading(
+                name = "Installing App 1",
+                versionName = "1.0.4",
+                currentVersionName = null,
+                lastUpdated = 23,
+                iconDownloadRequest = null,
+                downloadedBytes = 25,
+                totalBytes = 100,
+                startMillis = System.currentTimeMillis(),
+            )
+        )
         val app1 = AppUpdateItem(
-            packageName = "AX",
+            packageName = "B1",
             name = "App Update 123",
             installedVersionName = "1.0.1",
             update = getPreviewVersion("1.1.0", 123456789),
             whatsNew = "This is new, all is new, nothing old.",
         )
         val app2 = AppUpdateItem(
-            packageName = "BX",
+            packageName = "B2",
             name = Names.randomName,
             installedVersionName = "3.0.1",
             update = getPreviewVersion("3.1.0", 9876543),
             whatsNew = null,
         )
         val installedApp1 = InstalledAppItem(
-            packageName = "1",
+            packageName = "C1",
             name = Names.randomName,
             installedVersionName = "1",
             lastUpdated = System.currentTimeMillis() - DAYS.toMillis(1)
         )
         val installedApp2 = InstalledAppItem(
-            packageName = "2",
+            packageName = "C2",
             name = Names.randomName,
             installedVersionName = "2",
             lastUpdated = System.currentTimeMillis() - DAYS.toMillis(2)
         )
         val installedApp3 = InstalledAppItem(
-            packageName = "3",
+            packageName = "C3",
             name = Names.randomName,
             installedVersionName = "3",
             lastUpdated = System.currentTimeMillis() - DAYS.toMillis(3)
         )
         val model = MyAppsModel(
+            installingApps = listOf(installingApp1),
             appUpdates = listOf(app1, app2),
             installedApps = listOf(installedApp1, installedApp2, installedApp3),
             sortOrder = AppListSortOrder.NAME,
         )
         MyApps(
-            myAppsInfo = object : MyAppsInfo {
-                override val model = model
-                override fun refresh() {}
-                override fun changeSortOrder(sort: AppListSortOrder) {}
-                override fun search(query: String) {}
-            },
+            myAppsInfo = getMyAppsInfo(model),
             currentPackageName = null,
             onAppItemClick = {},
             onNav = {},
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
index d60f19d0e..c34c22756 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
@@ -1,15 +1,18 @@
 package org.fdroid.ui.apps
 
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.install.InstallState
 
 interface MyAppsInfo {
     val model: MyAppsModel
     fun refresh()
     fun changeSortOrder(sort: AppListSortOrder)
     fun search(query: String)
+    fun confirmAppInstall(packageName: String, state: InstallState.UserConfirmationNeeded)
 }
 
 data class MyAppsModel(
+    val installingApps: List<InstallingAppItem>,
     val appUpdates: List<AppUpdateItem>? = null,
     val installedApps: List<InstalledAppItem>? = null,
     val sortOrder: AppListSortOrder = AppListSortOrder.NAME,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index d86695390..aea9b3075 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -6,50 +6,71 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.install.InstallState
+import org.fdroid.install.InstallStateWithInfo
 import org.fdroid.ui.utils.normalize
 import java.text.Collator
 import java.util.Locale
 
 @Composable
 fun MyAppsPresenter(
+    appInstallStatesFlow: StateFlow<Map<String, InstallState>>,
     appUpdatesFlow: StateFlow<List<AppUpdateItem>?>,
     installedAppsFlow: StateFlow<List<InstalledAppItem>?>,
     searchQueryFlow: StateFlow<String>,
     sortOrderFlow: StateFlow<AppListSortOrder>,
 ): MyAppsModel {
+    val appInstallStates = appInstallStatesFlow.collectAsState().value
     val appUpdates = appUpdatesFlow.collectAsState().value
     val installedApps = installedAppsFlow.collectAsState().value
     val searchQuery = searchQueryFlow.collectAsState().value.normalize()
     val sortOrder = sortOrderFlow.collectAsState().value
-    val packageNames = appUpdates?.map { it.packageName } ?: emptyList()
-    val collator = Collator.getInstance(Locale.getDefault())
+    val processedPackageNames = mutableSetOf<String>()
 
-    val updates = if (searchQuery.isBlank()) appUpdates else appUpdates?.filter {
+    val installingApps = appInstallStates.mapNotNull { (packageName, state) ->
+        if (state is InstallStateWithInfo) {
+            processedPackageNames.add(packageName)
+            InstallingAppItem(packageName, state)
+        } else {
+            null
+        }
+    }
+    val installing = if (searchQuery.isBlank()) installingApps else installingApps.filter {
         it.name.normalize().contains(searchQuery, ignoreCase = true)
     }
-    val installed = if (searchQuery.isBlank()) installedApps else installedApps?.filter {
-        it.name.normalize().contains(searchQuery, ignoreCase = true)
+    val updates = appUpdates?.filter {
+        val keep = if (searchQuery.isBlank()) {
+            it.packageName !in processedPackageNames
+        } else {
+            it.packageName !in processedPackageNames &&
+                it.name.normalize().contains(searchQuery, ignoreCase = true)
+        }
+        processedPackageNames.add(it.packageName)
+        keep
+    }
+    val installed = installedApps?.filter {
+        if (searchQuery.isBlank()) {
+            it.packageName !in processedPackageNames
+        } else {
+            it.packageName !in processedPackageNames &&
+                it.name.normalize().contains(searchQuery, ignoreCase = true)
+        }
     }
     return MyAppsModel(
-        appUpdates = when (sortOrder) {
-            AppListSortOrder.NAME -> updates?.sortedWith { a1, a2 ->
-                // storing collator.getCollationKey() and using that could be an optimization
-                collator.compare(a1.name, a2.name)
-            }
-            AppListSortOrder.LAST_UPDATED -> updates?.sortedByDescending { it.update.added }
-        },
-        installedApps = installed?.filter {
-            // filter out apps already in updates
-            it.packageName !in packageNames
-        }?.let { apps ->
-            when (sortOrder) {
-                AppListSortOrder.NAME -> apps.sortedWith { a1, a2 ->
-                    // storing collator.getCollationKey() and using that could be an optimization
-                    collator.compare(a1.name, a2.name)
-                }
-                AppListSortOrder.LAST_UPDATED -> apps.sortedByDescending { it.lastUpdated }
-            }
-        },
+        installingApps = installing.sort(sortOrder),
+        appUpdates = updates?.sort(sortOrder),
+        installedApps = installed?.sort(sortOrder),
         sortOrder = sortOrder,
     )
 }
+
+private fun <T : MyAppItem> List<T>.sort(sortOrder: AppListSortOrder): List<T> {
+    val collator = Collator.getInstance(Locale.getDefault())
+    return when (sortOrder) {
+        AppListSortOrder.NAME -> sortedWith { a1, a2 ->
+            // storing collator.getCollationKey() and using that could be an optimization
+            collator.compare(a1.name, a2.name)
+        }
+        AppListSortOrder.LAST_UPDATED -> sortedByDescending { it.lastUpdated }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index 54ff6c936..78c125572 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -12,36 +12,37 @@ import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import mu.KotlinLogging
 import org.fdroid.database.AppListItem
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
-import org.fdroid.download.DownloadRequest
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
+import org.fdroid.install.AppInstallManager
+import org.fdroid.install.InstallState
 import org.fdroid.updates.UpdatesManager
+import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 
-data class InstalledAppItem(
-    val packageName: String,
-    val name: String,
-    val installedVersionName: String,
-    val lastUpdated: Long,
-    val iconDownloadRequest: DownloadRequest? = null,
-)
-
 @HiltViewModel
 class MyAppsViewModel @Inject constructor(
     app: Application,
+    @param:IoDispatcher private val scope: CoroutineScope,
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
+    private val appInstallManager: AppInstallManager,
     private val updatesManager: UpdatesManager,
     private val repoManager: RepoManager,
 ) : AndroidViewModel(app) {
 
+    private val log = KotlinLogging.logger { }
     private val localeList = LocaleListCompat.getDefault()
-    private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+    private val moleculeScope =
+        CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
     private val updates = updatesManager.updates
     private val installedApps = MutableStateFlow<List<InstalledAppItem>?>(null)
@@ -62,8 +63,9 @@ class MyAppsViewModel @Inject constructor(
     }
     private val searchQuery = savedStateHandle.getMutableStateFlow<String>("query", "")
     private val sortOrder = savedStateHandle.getMutableStateFlow("sort", AppListSortOrder.NAME)
-    val myAppsModel: StateFlow<MyAppsModel> = scope.launchMolecule(mode = ContextClock) {
+    val myAppsModel: StateFlow<MyAppsModel> = moleculeScope.launchMolecule(mode = ContextClock) {
         MyAppsPresenter(
+            appInstallStatesFlow = appInstallManager.appInstallStates,
             appUpdatesFlow = updates,
             installedAppsFlow = installedApps,
             searchQueryFlow = searchQuery,
@@ -97,4 +99,11 @@ class MyAppsViewModel @Inject constructor(
                 observeForever(installedAppsObserver)
             }
     }
+
+    fun confirmAppInstall(packageName: String, state: InstallState.UserConfirmationNeeded) {
+        log.info { "Asking user to confirm install of $packageName..." }
+        scope.launch(Dispatchers.Main) {
+            appInstallManager.requestUserConfirmation(packageName, state)
+        }
+    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 365223d36..f319f5c5b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -196,7 +196,7 @@ fun AppDetailsHeader(
                 modifier = Modifier.weight(1f)
             ) {
                 val strRes = when (item.installState) {
-                    InstallState.Starting -> R.string.status_install_preparing
+                    is InstallState.Starting -> R.string.status_install_preparing
                     is InstallState.PreApproved -> R.string.status_install_preparing
                     is InstallState.Downloading -> R.string.downloading
                     is InstallState.Installing -> R.string.installing
@@ -209,8 +209,7 @@ fun AppDetailsHeader(
                 )
                 if (item.installState is InstallState.Downloading) {
                     val animatedProgress by animateFloatAsState(
-                        targetValue = item.installState.downloadedBytes /
-                            item.installState.totalBytes.toFloat(),
+                        targetValue = item.installState.progress,
                         animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
                     )
                     LinearWavyProgressIndicator(
@@ -260,7 +259,7 @@ fun AppDetailsHeader(
                     require(item.suggestedVersion != null) {
                         "suggestedVersion was null"
                     }
-                    item.actions.installAction(item.app, item.suggestedVersion)
+                    item.actions.installAction(item.app, item.suggestedVersion, item.icon)
                 },
                 modifier = Modifier.weight(1f)
             ) {
@@ -289,7 +288,7 @@ fun AppDetailsHeaderPreview() {
 private fun PreviewProgress() {
     FDroidContent {
         Column {
-            val app = testApp.copy(installState = InstallState.Starting)
+            val app = testApp.copy(installState = InstallState.Starting("", "", "", 23))
             AppDetailsHeader(app, PaddingValues())
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index f4ab8874d..1667c2bd0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -189,7 +189,7 @@ data class AppDetailsItem(
 }
 
 class AppDetailsActions(
-    val installAction: (AppMetadata, AppVersion) -> Unit,
+    val installAction: (AppMetadata, AppVersion, DownloadRequest?) -> Unit,
     val requestUserConfirmation: (String, InstallState.UserConfirmationNeeded) -> Unit,
     /**
      * A workaround for Android 10, 11, 12 and 13 where tapping outside the confirmation dialog
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 5c7689233..68fdc4024 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -24,6 +24,7 @@ import org.fdroid.UpdateChecker
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppVersion
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.download.DownloadRequest
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
@@ -45,7 +46,7 @@ class AppDetailsViewModel @Inject constructor(
     private val log = KotlinLogging.logger { }
     private val packageInfoFlow = MutableStateFlow<AppInfo?>(null)
 
-    val appDetails: StateFlow<AppDetailsItem?> = scope.launchMolecule(
+    val appDetails: StateFlow<AppDetailsItem?> = viewModelScope.launchMolecule(
         context = Dispatchers.IO, mode = Immediate,
     ) {
         DetailsPresenter(
@@ -81,11 +82,19 @@ class AppDetailsViewModel @Inject constructor(
     }
 
     @UiThread
-    fun install(appMetadata: AppMetadata, version: AppVersion) {
-        val repo = repoManager.getRepository(version.repoId) ?: return // TODO
-        val icon = appDetails.value?.icon
-        viewModelScope.launch(Dispatchers.Main) {
-            val result = appInstallManager.install(appMetadata, version, repo, icon)
+    fun install(
+        appMetadata: AppMetadata,
+        version: AppVersion,
+        iconDownloadRequest: DownloadRequest?,
+    ) {
+        scope.launch(Dispatchers.Main) {
+            val result = appInstallManager.install(
+                appMetadata = appMetadata,
+                version = version,
+                currentVersionName = packageInfoFlow.value?.packageInfo?.versionName,
+                repo = repoManager.getRepository(version.repoId) ?: return@launch, // TODO
+                iconDownloadRequest = iconDownloadRequest,
+            )
             if (result is InstallState.Installed) {
                 // to reload packageInfoFlow with fresh packageInfo
                 loadPackageInfoFlow(appMetadata.packageName)
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 65781911d..9f4c96e26 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -16,6 +16,7 @@ import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
+import org.fdroid.install.InstallState
 import org.fdroid.utils.sha256
 
 private const val TAG = "DetailsPresenter"
@@ -44,7 +45,8 @@ fun DetailsPresenter(
             repoManager.getRepository(repoId)
         }
     }
-    val installState = appInstallManager.getAppFlow(packageName).collectAsState().value
+    val installState =
+        appInstallManager.getAppFlow(packageName).collectAsState(InstallState.Unknown).value
 
     val versions =
         db.getVersionDao().getAppVersions(packageName).asFlow().collectAsState(null).value
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index b7be2a384..eee8789d5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -68,7 +68,7 @@ fun Versions(
                         }
                     },
                     installAction = { version: AppVersion ->
-                        item.actions.installAction(item.app, version)
+                        item.actions.installAction(item.app, version, item.icon)
                     },
                     scrollUp = scrollUp,
                 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index d51118b03..44dca49a8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -9,6 +9,8 @@ import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
 import org.fdroid.install.InstallState
+import org.fdroid.ui.apps.MyAppsInfo
+import org.fdroid.ui.apps.MyAppsModel
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.details.AntiFeature
 import org.fdroid.ui.details.AppDetailsActions
@@ -113,7 +115,7 @@ val testApp = AppDetailsItem(
         isCompatible = true,
     ),
     actions = AppDetailsActions(
-        installAction = { _, _ -> },
+        installAction = { _, _, _ -> },
         requestUserConfirmation = { _, _ -> },
         checkUserConfirmation = { _, _ -> },
         cancelInstall = {},
@@ -204,3 +206,15 @@ fun getAppListInfo(model: AppListModel) = object : AppListInfo {
     override val showFilters: Boolean = false
     override val showOnboarding: Boolean = false
 }
+
+fun getMyAppsInfo(model: MyAppsModel): MyAppsInfo = object : MyAppsInfo {
+    override val model = model
+    override fun refresh() {}
+    override fun changeSortOrder(sort: AppListSortOrder) {}
+    override fun search(query: String) {}
+    override fun confirmAppInstall(
+        packageName: String,
+        state: InstallState.UserConfirmationNeeded,
+    ) {
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 55ff83855..39938eb14 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -5,6 +5,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import mu.KotlinLogging
 import org.fdroid.database.DbUpdateChecker
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
@@ -19,6 +20,8 @@ class UpdatesManager @Inject constructor(
     @IoDispatcher private val coroutineScope: CoroutineScope,
     private val repoManager: RepoManager,
 ) {
+    private val log = KotlinLogging.logger { }
+
     private val _updates = MutableStateFlow<List<AppUpdateItem>?>(null)
     val updates = _updates.asStateFlow()
     private val _numUpdates = MutableStateFlow(0)
@@ -31,17 +34,23 @@ class UpdatesManager @Inject constructor(
     fun loadUpdates() = coroutineScope.launch {
         // TODO (includeKnownVulnerabilities = true) and show in AppDetails
         val localeList = LocaleListCompat.getDefault()
-        val updates = dbUpdateChecker.getUpdatableApps(onlyFromPreferredRepo = true).map { update ->
-            AppUpdateItem(
-                packageName = update.packageName,
-                name = update.name ?: "Unknown app",
-                installedVersionName = update.installedVersionName,
-                update = update.update,
-                whatsNew = update.update.getWhatsNew(localeList),
-                iconDownloadRequest = repoManager.getRepository(update.repoId)?.let { repo ->
-                    update.getIcon(localeList)?.getDownloadRequest(repo)
-                },
-            )
+        val updates = try {
+            log.info { "Checking for updates..." }
+            dbUpdateChecker.getUpdatableApps(onlyFromPreferredRepo = true).map { update ->
+                AppUpdateItem(
+                    packageName = update.packageName,
+                    name = update.name ?: "Unknown app",
+                    installedVersionName = update.installedVersionName,
+                    update = update.update,
+                    whatsNew = update.update.getWhatsNew(localeList),
+                    iconDownloadRequest = repoManager.getRepository(update.repoId)?.let { repo ->
+                        update.getIcon(localeList)?.getDownloadRequest(repo)
+                    },
+                )
+            }
+        } catch (e: Exception) {
+            log.error(e) { "Error loading updates: " }
+            return@launch
         }
         _updates.value = updates
         _numUpdates.value = updates.size
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 2d9f95c26..2689ed80a 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -62,6 +62,18 @@
     <string name="size_colon">Size: %1$s</string>
     <string name="signer_colon">Signer: %1$s</string>
     <string name="architectures_colon">Architectures: %1$s</string>
+    <plurals name="notification_installing_title">
+        <item quantity="one">Installing %1$d app…</item>
+        <item quantity="other">Installing %1$d apps…</item>
+    </plurals>
+    <plurals name="notification_updating_title">
+        <item quantity="one">Updating %1$d app…</item>
+        <item quantity="other">Updating %1$d apps…</item>
+    </plurals>
+    <string name="notification_installing_section_installing">Installing:</string>
+    <string name="notification_installing_section_confirmation">Needs user confirmation:</string>
+    <string name="notification_installing_section_installed">Installed:</string>
+    <string name="notification_installing_confirmation">Tap to confirm.</string>
 
     <string name="onboarding_app_list_filter_title">Filter</string>
     <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>

From 23c1ca370dad39f2d225b0a38361b63b5a24d9b6 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 6 Oct 2025 15:49:17 -0300
Subject: [PATCH 063/180] Run a foreground service while downloading/installing
 apps

---
 next/src/main/AndroidManifest.xml             |  4 ++
 .../kotlin/org/fdroid/NotificationManager.kt  | 20 ++++---
 .../org/fdroid/install/AppInstallManager.kt   | 10 ++++
 .../org/fdroid/install/AppInstallService.kt   | 55 +++++++++++++++++++
 .../install/InstallNotificationState.kt       | 17 +++++-
 .../org/fdroid/repo/RepoUpdateWorker.kt       |  2 +-
 6 files changed, 98 insertions(+), 10 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/install/AppInstallService.kt

diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
index 9014a5f99..cfd6bec9f 100644
--- a/next/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -67,6 +67,10 @@
             </intent-filter>
         </activity>
 
+        <service
+            android:name="org.fdroid.install.AppInstallService"
+            android:exported="false"
+            android:foregroundServiceType="dataSync" />
         <!-- needed for declaring foregroundServiceType for WorkManager -->
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"
diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
index 75fa9a4c9..dfddce667 100644
--- a/next/src/main/kotlin/org/fdroid/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -17,11 +17,6 @@ import org.fdroid.install.InstallNotificationState
 import org.fdroid.next.R
 import javax.inject.Inject
 
-const val NOTIFICATION_ID_REPO_UPDATE: Int = 0
-const val NOTIFICATION_ID_APP_INSTALLS: Int = 1
-const val CHANNEL_UPDATES = "update-channel"
-const val CHANNEL_INSTALLS = "install-channel"
-
 class NotificationManager @Inject constructor(
     @param:ApplicationContext private val context: Context,
 ) {
@@ -29,6 +24,13 @@ class NotificationManager @Inject constructor(
     private val nm = NotificationManagerCompat.from(context)
     private var lastRepoUpdateNotification = 0L
 
+    companion object {
+        const val NOTIFICATION_ID_REPO_UPDATE: Int = 0
+        const val NOTIFICATION_ID_APP_INSTALLS: Int = 1
+        private const val CHANNEL_UPDATES = "update-channel"
+        private const val CHANNEL_INSTALLS = "install-channel"
+    }
+
     init {
         createNotificationChannels()
     }
@@ -88,8 +90,12 @@ class NotificationManager @Inject constructor(
             .setContentTitle(state.getTitle(context))
             .setStyle(BigTextStyle().bigText(state.getBigText(context)))
             .setContentIntent(pi)
-            .setOngoing(true)
-            .setProgress(100, state.percent ?: 0, state.percent == null)
+            .setOngoing(state.isInstallingSomeApp)
+            .apply {
+                if (state.isInstallingSomeApp) {
+                    setProgress(100, state.percent ?: 0, state.percent == null)
+                }
+            }
         return builder
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index 7421d0e14..449201ef0 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -2,6 +2,7 @@ package org.fdroid.install
 
 import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.content.Intent.ACTION_DELETE
 import android.graphics.Bitmap
 import android.net.Uri
@@ -321,7 +322,16 @@ class AppInstallManager @Inject constructor(
             numBytesDownloaded = numBytesDownloaded,
             numTotalBytes = numTotalBytes,
         )
+        val serviceIntent = Intent(context, AppInstallService::class.java)
+        // stop foreground service, if no app is installing and it is still running
+        if (!notificationState.isInstallingSomeApp && AppInstallService.isServiceRunning) {
+            context.stopService(serviceIntent)
+        }
         if (notificationState.isInProgress) {
+            // start foreground service if at least one app is installing and not already running
+            if (notificationState.isInstallingSomeApp && !AppInstallService.isServiceRunning) {
+                context.startService(serviceIntent)
+            }
             notificationManager.showAppInstallNotification(notificationState)
         } else {
             // cancel notification if no more apps are in progress
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
new file mode 100644
index 000000000..681afa8e5
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
@@ -0,0 +1,55 @@
+package org.fdroid.install
+
+import android.app.Service
+import android.content.Intent
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
+import android.os.Build.VERSION.SDK_INT
+import android.os.IBinder
+import androidx.core.app.ServiceCompat
+import dagger.hilt.android.AndroidEntryPoint
+import mu.KotlinLogging
+import org.fdroid.NotificationManager
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AppInstallService : Service() {
+
+    companion object {
+        var isServiceRunning = false
+            private set
+    }
+
+    private val log = KotlinLogging.logger { }
+
+    @Inject
+    lateinit var notificationManager: NotificationManager
+
+    override fun onCreate() {
+        log.info { "onCreate" }
+        isServiceRunning = true
+        super.onCreate() // apparently importing for injection
+    }
+
+    override fun onStartCommand(
+        intent: Intent,
+        flags: Int,
+        startId: Int
+    ): Int {
+        log.info { "onStartCommand" }
+        val notificationState = InstallNotificationState()
+        ServiceCompat.startForeground(
+            this,
+            NotificationManager.NOTIFICATION_ID_APP_INSTALLS,
+            notificationManager.getAppInstallNotification(notificationState).build(),
+            if (SDK_INT >= 30) FOREGROUND_SERVICE_TYPE_MANIFEST else 0,
+        )
+        return super.onStartCommand(intent, flags, startId)
+    }
+
+    override fun onBind(intent: Intent): IBinder? = null
+
+    override fun onDestroy() {
+        log.info { "onDestroy" }
+        isServiceRunning = false
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
index 55c3bfd8d..24bee438f 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
@@ -16,15 +16,28 @@ data class InstallNotificationState(
     val numBytesDownloaded: Long,
     val numTotalBytes: Long,
 ) {
+
+    constructor() : this(emptyList(), 0, 0)
+
     val percent: Int? = if (numTotalBytes > 0) {
         ((numBytesDownloaded.toFloat() / numTotalBytes) * 100).roundToInt()
     } else {
         null
     }
-    val needsConfirmation: Boolean
-        get() = apps.find { it.category == AppStateCategory.NEEDS_CONFIRMATION } != null
+
+    /**
+     * Returns true if there are apps that have an installation in progress which could be
+     * waiting for user confirmation or downloading, or waiting for system installer.
+     */
     val isInProgress: Boolean = apps.any { it.category != AppStateCategory.INSTALLED }
 
+    /**
+     * Returns true if there is at least one app either downloading for actually installing.
+     * If there are only apps that have been installed already or are waiting for user confirmation,
+     * this will return false.
+     */
+    val isInstallingSomeApp: Boolean = apps.any { it.category == AppStateCategory.INSTALLING }
+
     fun getTitle(context: Context): String {
         val numActiveApps: Int = apps.count { it.category != AppStateCategory.INSTALLED }
         val installTitle = context.resources.getQuantityString(
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
index 37c959044..846d9c344 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
@@ -23,8 +23,8 @@ import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import mu.KotlinLogging
-import org.fdroid.NOTIFICATION_ID_REPO_UPDATE
 import org.fdroid.NotificationManager
+import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_REPO_UPDATE
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeUnit.MINUTES
 

From f8d83cd39cd9808ac68f36291cf5ac43eeb0fa89 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 6 Oct 2025 17:37:47 -0300
Subject: [PATCH 064/180] Don't ask for pre-approval, if auto-update should be
 possible

---
 next/src/main/AndroidManifest.xml             |  1 +
 .../org/fdroid/install/AppInstallManager.kt   |  9 +++-
 .../fdroid/install/SessionInstallManager.kt   | 43 +++++++++++++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
index cfd6bec9f..13803d9ab 100644
--- a/next/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         tools:ignore="RequestInstallPackagesPolicy" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
 
     <application
         android:name="org.fdroid.App"
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index 449201ef0..5bf199402 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -113,12 +113,17 @@ class AppInstallManager @Inject constructor(
         val icon = getIcon(iconDownloadRequest)
         // request pre-approval from user (if available)
         coroutineContext.ensureActive()
-        val preApprovalResult = sessionInstallManager.requestPreapproval(appMetadata, icon)
+        val preApprovalResult = sessionInstallManager.requestPreapproval(
+            app = appMetadata,
+            icon = icon,
+            isUpdate = currentVersionName != null,
+            version = version,
+        )
         // continue depending on result, abort early if no approval was given
         return when (preApprovalResult) {
             is PreApprovalResult.Error -> InstallState.Error(preApprovalResult.errorMsg)
             is PreApprovalResult.UserAborted -> InstallState.UserAborted
-            else -> {
+            is PreApprovalResult.Success, PreApprovalResult.NotSupported -> {
                 apps.checkAndUpdateApp(appMetadata.packageName) {
                     InstallState.PreApproved(
                         name = it.name,
diff --git a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
index e7c2340e6..6ce22d0b7 100644
--- a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
@@ -30,6 +30,7 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 import mu.KotlinLogging
 import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.database.AppMetadata
+import org.fdroid.database.AppVersion
 import org.fdroid.utils.IoDispatcher
 import java.io.File
 import javax.inject.Inject
@@ -60,11 +61,12 @@ class SessionInstallManager @Inject constructor(
             if (SDK_INT == 32 && targetSdk >= 29) return true
             if (SDK_INT == 33 && targetSdk >= 30) return true
             if (SDK_INT == 34 && targetSdk >= 31) return true
+            if (SDK_INT == 35 && targetSdk >= 33) return true
             // This needs to be adjusted as new Android versions are released
             // https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionParams#setRequireUserAction(int)
             // https://cs.android.com/android/platform/superproject/+/android-16.0.0_r2:frameworks/base/services/core/java/com/android/server/pm/PackageInstallerSession.java;l=329;drc=73caa0299d9196ddeefe4f659f557fb880f6536d
-            // current code requires targetSdk 33 on SDK 35+
-            return SDK_INT >= 35 && targetSdk >= 33
+            // current code requires targetSdk 34 on SDK 36+
+            return SDK_INT >= 36 && targetSdk >= 34
         }
     }
 
@@ -86,8 +88,16 @@ class SessionInstallManager @Inject constructor(
     /**
      * Requests installation pre-approval (if available on this device).
      */
-    suspend fun requestPreapproval(app: AppMetadata, icon: Bitmap?): PreApprovalResult {
-        return if (SDK_INT >= 34) {
+    suspend fun requestPreapproval(
+        app: AppMetadata,
+        icon: Bitmap?,
+        isUpdate: Boolean,
+        version: AppVersion
+    ): PreApprovalResult {
+        return if (isUpdate && canDoAutoUpdate(version)) {
+            // should not be needed, so we say not supported
+            PreApprovalResult.NotSupported
+        } else if (SDK_INT >= 34) {
             try {
                 preapproval(app, icon)
             } catch (e: Exception) {
@@ -337,6 +347,31 @@ class SessionInstallManager @Inject constructor(
         return params
     }
 
+    private fun canDoAutoUpdate(version: AppVersion): Boolean {
+        if (SDK_INT < 31) return false
+        val targetSdkVersion = version.manifest.targetSdkVersion ?: return false
+        // docs: https://developer.android.com/reference/android/content/pm/PackageInstaller.SessionParams#setRequireUserAction(int)
+        return if (isAutoUpdateSupported(targetSdkVersion)) {
+            val ourPackageName = context.packageName
+            if (ourPackageName == version.packageName) return true
+            val sourceInfo = try {
+                context.packageManager.getInstallSourceInfo(version.packageName)
+            } catch (e: Exception) {
+                log.error(e) { "Could not get package info: " }
+                return false
+            }
+            if (SDK_INT >= 34 && sourceInfo.updateOwnerPackageName == ourPackageName) {
+                true
+            } else if (sourceInfo.installingPackageName == ourPackageName) {
+                true
+            } else {
+                false
+            }
+        } else {
+            false
+        }
+    }
+
     private fun getInstallIntentSender(
         sessionId: Int,
         packageName: String,

From d02da86eaa763e576f019f46b24cdaebbbe365e0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 7 Oct 2025 14:52:14 -0300
Subject: [PATCH 065/180] Implement "Update all" apps button

---
 .../install/InstallNotificationState.kt       | 12 +++++-
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  1 +
 .../kotlin/org/fdroid/ui/apps/MyAppItem.kt    |  1 +
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |  4 +-
 .../kotlin/org/fdroid/ui/apps/MyAppsInfo.kt   |  1 +
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |  4 ++
 .../org/fdroid/ui/apps/UpdatableAppRow.kt     |  2 +
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  1 +
 .../org/fdroid/updates/UpdatesManager.kt      | 37 ++++++++++++++++++-
 9 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
index 24bee438f..6719c4bc3 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
@@ -38,10 +38,20 @@ data class InstallNotificationState(
      */
     val isInstallingSomeApp: Boolean = apps.any { it.category == AppStateCategory.INSTALLING }
 
+    /**
+     * Returns true if *all* apps being installed are updates to existing apps.
+     */
+    private val isUpdatingApps: Boolean = apps.all { it.currentVersionName != null }
+
     fun getTitle(context: Context): String {
+        val titleRes = if (isUpdatingApps) {
+            R.plurals.notification_updating_title
+        } else {
+            R.plurals.notification_installing_title
+        }
         val numActiveApps: Int = apps.count { it.category != AppStateCategory.INSTALLED }
         val installTitle = context.resources.getQuantityString(
-            R.plurals.notification_installing_title,
+            titleRes,
             numActiveApps,
             numActiveApps,
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 75a84cc34..8eddc1394 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -113,6 +113,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                             myAppsViewModel.myAppsModel.collectAsStateWithLifecycle().value
 
                         override fun refresh() = myAppsViewModel.refresh()
+                        override fun updateAll() = myAppsViewModel.updateAll()
                         override fun changeSortOrder(sort: AppListSortOrder) =
                             myAppsViewModel.changeSortOrder(sort)
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
index 2e4d86ede..4200d8657 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
@@ -21,6 +21,7 @@ data class InstallingAppItem(
 }
 
 data class AppUpdateItem(
+    val repoId: Long,
     override val packageName: String,
     override val name: String,
     val installedVersionName: String,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index fdcbe0477..5ac43c812 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -215,7 +215,7 @@ fun MyApps(
                                     .weight(1f),
                             )
                             Button(
-                                onClick = {},
+                                onClick = myAppsInfo::updateAll,
                                 modifier = Modifier.padding(end = 16.dp),
                             ) {
                                 Text(stringResource(R.string.update_all))
@@ -356,6 +356,7 @@ fun MyAppsPreview() {
             )
         )
         val app1 = AppUpdateItem(
+            repoId = 1,
             packageName = "B1",
             name = "App Update 123",
             installedVersionName = "1.0.1",
@@ -363,6 +364,7 @@ fun MyAppsPreview() {
             whatsNew = "This is new, all is new, nothing old.",
         )
         val app2 = AppUpdateItem(
+            repoId = 2,
             packageName = "B2",
             name = Names.randomName,
             installedVersionName = "3.0.1",
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
index c34c22756..0feca5b7e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
@@ -6,6 +6,7 @@ import org.fdroid.install.InstallState
 interface MyAppsInfo {
     val model: MyAppsModel
     fun refresh()
+    fun updateAll()
     fun changeSortOrder(sort: AppListSortOrder)
     fun search(query: String)
     fun confirmAppInstall(packageName: String, state: InstallState.UserConfirmationNeeded)
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index 78c125572..18a950b95 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -81,6 +81,10 @@ class MyAppsViewModel @Inject constructor(
         installedAppsLiveData.removeObserver(installedAppsObserver)
     }
 
+    fun updateAll() {
+        updatesManager.updateAll()
+    }
+
     fun search(query: String) {
         searchQuery.value = query
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index bd8abf8d4..9fdbcb6fc 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -103,6 +103,7 @@ fun UpdatableAppRow(
 @Composable
 fun UpdatableAppRowPreview() {
     val app1 = AppUpdateItem(
+        repoId = 1,
         packageName = "A",
         name = "App Update 123",
         installedVersionName = "1.0.1",
@@ -110,6 +111,7 @@ fun UpdatableAppRowPreview() {
         whatsNew = "This is new, all is new, nothing old.",
     )
     val app2 = AppUpdateItem(
+        repoId = 2,
         packageName = "B",
         name = "App Update 456",
         installedVersionName = "1.0.1",
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 44dca49a8..c14f40aa6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -210,6 +210,7 @@ fun getAppListInfo(model: AppListModel) = object : AppListInfo {
 fun getMyAppsInfo(model: MyAppsModel): MyAppsInfo = object : MyAppsInfo {
     override val model = model
     override fun refresh() {}
+    override fun updateAll() {}
     override fun changeSortOrder(sort: AppListSortOrder) {}
     override fun search(query: String) {}
     override fun confirmAppInstall(
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 39938eb14..b984f5846 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -5,20 +5,28 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import mu.KotlinLogging
+import org.fdroid.database.AppVersion
 import org.fdroid.database.DbUpdateChecker
+import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
+import org.fdroid.install.AppInstallManager
 import org.fdroid.ui.apps.AppUpdateItem
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.math.min
 
 @Singleton
 class UpdatesManager @Inject constructor(
+    private val db: FDroidDatabase,
     private val dbUpdateChecker: DbUpdateChecker,
-    @IoDispatcher private val coroutineScope: CoroutineScope,
     private val repoManager: RepoManager,
+    private val appInstallManager: AppInstallManager,
+    @param:IoDispatcher private val coroutineScope: CoroutineScope,
 ) {
     private val log = KotlinLogging.logger { }
 
@@ -38,6 +46,7 @@ class UpdatesManager @Inject constructor(
             log.info { "Checking for updates..." }
             dbUpdateChecker.getUpdatableApps(onlyFromPreferredRepo = true).map { update ->
                 AppUpdateItem(
+                    repoId = update.repoId,
                     packageName = update.packageName,
                     name = update.name ?: "Unknown app",
                     installedVersionName = update.installedVersionName,
@@ -55,4 +64,30 @@ class UpdatesManager @Inject constructor(
         _updates.value = updates
         _numUpdates.value = updates.size
     }
+
+    fun updateAll() {
+        val concurrencyLimit = min(Runtime.getRuntime().availableProcessors(), 8)
+        val semaphore = Semaphore(concurrencyLimit)
+        updates.value?.forEach { update ->
+            // launch a new co-routine for each app to update
+            coroutineScope.launch {
+                // suspend here until we get a permit from the semaphore (there's free workers)
+                semaphore.withPermit {
+                    updateApp(update)
+                }
+            }
+        }
+    }
+
+    private suspend fun updateApp(update: AppUpdateItem) {
+        val app = db.getAppDao().getApp(update.repoId, update.packageName) ?: return
+        appInstallManager.install(
+            appMetadata = app.metadata,
+            // we know this is true, because we set this above in loadUpdates()
+            version = update.update as AppVersion,
+            currentVersionName = update.installedVersionName,
+            repo = repoManager.getRepository(update.repoId) ?: return,
+            iconDownloadRequest = update.iconDownloadRequest
+        )
+    }
 }

From e9957cb7c2b9581e0662c8732b8ee689ef728179 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 7 Oct 2025 15:56:57 -0300
Subject: [PATCH 066/180] Use a worker to update all apps once a day

---
 next/src/main/kotlin/org/fdroid/App.kt        |   9 +-
 .../kotlin/org/fdroid/NotificationManager.kt  |  59 +++++---
 .../org/fdroid/install/AppInstallManager.kt   |  84 ++++++-----
 .../org/fdroid/install/AppInstallService.kt   |  16 ++-
 .../install/InstallNotificationState.kt       |  20 +++
 .../fdroid/install/SessionInstallManager.kt   |   8 +-
 .../org/fdroid/ui/apps/MyAppsPresenter.kt     |   1 +
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |   4 +-
 .../kotlin/org/fdroid/ui/utils/UiUtils.kt     |  22 +++
 .../org/fdroid/updates/AppUpdateWorker.kt     | 132 ++++++++++++++++++
 .../org/fdroid/updates/UpdatesManager.kt      |   7 +-
 next/src/main/res/values/strings-next.xml     |   7 +
 12 files changed, 302 insertions(+), 67 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt

diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index c5ab51296..5473ea481 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.Context
 import androidx.compose.runtime.Composer
 import androidx.compose.runtime.ExperimentalComposeRuntimeApi
+import androidx.compose.runtime.tooling.ComposeStackTraceMode
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import coil3.ImageLoader
@@ -22,6 +23,7 @@ import org.fdroid.download.PackageName
 import org.fdroid.download.coil.DownloadRequestFetcher
 import org.fdroid.next.BuildConfig
 import org.fdroid.repo.RepoUpdateWorker
+import org.fdroid.updates.AppUpdateWorker
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -41,8 +43,11 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
     @OptIn(ExperimentalComposeRuntimeApi::class)
     override fun onCreate() {
         super.onCreate()
-        Composer.setDiagnosticStackTraceEnabled(BuildConfig.DEBUG)
-        RepoUpdateWorker.Companion.scheduleOrCancel(applicationContext)
+        if (BuildConfig.DEBUG) {
+            Composer.setDiagnosticStackTraceMode(ComposeStackTraceMode.SourceInformation)
+        }
+        RepoUpdateWorker.scheduleOrCancel(applicationContext)
+        AppUpdateWorker.scheduleOrCancel(applicationContext)
     }
 
     override fun newImageLoader(context: Context): ImageLoader {
diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
index dfddce667..1c00eec80 100644
--- a/next/src/main/kotlin/org/fdroid/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -27,8 +27,10 @@ class NotificationManager @Inject constructor(
     companion object {
         const val NOTIFICATION_ID_REPO_UPDATE: Int = 0
         const val NOTIFICATION_ID_APP_INSTALLS: Int = 1
+        const val NOTIFICATION_ID_APP_INSTALL_SUCCESS: Int = 2
         private const val CHANNEL_UPDATES = "update-channel"
         private const val CHANNEL_INSTALLS = "install-channel"
+        private const val CHANNEL_INSTALL_SUCCESS = "install-success-channel"
     }
 
     init {
@@ -45,6 +47,10 @@ class NotificationManager @Inject constructor(
                 .setName(s(R.string.notification_channel_installs_title))
                 .setDescription(s(R.string.notification_channel_installs_description))
                 .build(),
+            NotificationChannelCompat.Builder(CHANNEL_INSTALL_SUCCESS, IMPORTANCE_LOW)
+                .setName(s(R.string.notification_channel_install_success_title))
+                .setDescription(s(R.string.notification_channel_install_success_description))
+                .build(),
         )
         nm.createNotificationChannelsCompat(channels)
     }
@@ -74,6 +80,31 @@ class NotificationManager @Inject constructor(
         .setOngoing(true)
         .setProgress(100, progress ?: 0, progress == null)
 
+    // TODO pass in bigText with apps and their version changes
+    fun showAppUpdatesAvailableNotification(numUpdates: Int) {
+        val n = getAppUpdatesAvailableNotification(numUpdates).build()
+        if (checkSelfPermission(context, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
+            // TODO different ID
+            nm.notify(NOTIFICATION_ID_REPO_UPDATE, n)
+        }
+    }
+
+    private fun getAppUpdatesAvailableNotification(numUpdates: Int): NotificationCompat.Builder {
+        val title = context.resources.getQuantityString(
+            R.plurals.notification_summary_app_updates,
+            numUpdates, numUpdates,
+        )
+        val text = context.getString(R.string.notification_title_summary_app_update_available)
+        // TODO different channel
+        return NotificationCompat.Builder(context, CHANNEL_UPDATES)
+            .setSmallIcon(R.drawable.ic_notification)
+            .setPriority(PRIORITY_HIGH)
+            .setContentTitle(title)
+            .setContentText(text)
+            .setOngoing(false)
+            .setAutoCancel(true)
+    }
+
     fun showAppInstallNotification(installNotificationState: InstallNotificationState) {
         // TODO we may need some throttling when many apps download at the same time
         val n = getAppInstallNotification(installNotificationState).build()
@@ -103,29 +134,23 @@ class NotificationManager @Inject constructor(
         nm.cancel(NOTIFICATION_ID_APP_INSTALLS)
     }
 
-    // TODO pass in bigText with apps and their version changes
-    fun showAppUpdatesAvailableNotification(numUpdates: Int) {
-        val n = getAppUpdatesAvailableNotification(numUpdates).build()
+    fun showInstallSuccessNotification(installNotificationState: InstallNotificationState) {
+        val n = getInstallSuccessNotification(installNotificationState).build()
         if (checkSelfPermission(context, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
-            // TODO different ID
-            nm.notify(NOTIFICATION_ID_REPO_UPDATE, n)
+            nm.notify(NOTIFICATION_ID_APP_INSTALL_SUCCESS, n)
         }
     }
 
-    private fun getAppUpdatesAvailableNotification(numUpdates: Int): NotificationCompat.Builder {
-        val title = context.resources.getQuantityString(
-            R.plurals.notification_summary_app_updates,
-            numUpdates, numUpdates,
-        )
-        val text = context.getString(R.string.notification_title_summary_app_update_available)
-        // TODO different channel
-        return NotificationCompat.Builder(context, CHANNEL_UPDATES)
+    fun getInstallSuccessNotification(state: InstallNotificationState): NotificationCompat.Builder {
+        val pi = state.getPendingIntent(context)
+        val builder = NotificationCompat.Builder(context, CHANNEL_INSTALL_SUCCESS)
             .setSmallIcon(R.drawable.ic_notification)
-            .setPriority(PRIORITY_HIGH)
-            .setContentTitle(title)
-            .setContentText(text)
-            .setOngoing(false)
+            .setCategory(CATEGORY_SERVICE)
+            .setContentTitle(state.getSuccessTitle(context))
+            .setStyle(BigTextStyle().bigText(state.getSuccessBigText()))
+            .setContentIntent(pi)
             .setAutoCancel(true)
+        return builder
     }
 
     private fun s(@StringRes id: Int): String {
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index 5bf199402..b34963870 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -56,6 +56,46 @@ class AppInstallManager @Inject constructor(
     private val apps = MutableStateFlow<Map<String, InstallState>>(emptyMap())
     private val jobs = ConcurrentHashMap<String, Job>()
     val appInstallStates = apps.asStateFlow()
+    val installNotificationState: InstallNotificationState
+        get() {
+            val appStates = mutableListOf<AppState>()
+            var numBytesDownloaded = 0L
+            var numTotalBytes = 0L
+            // go throw all apps that have active state
+            apps.value.toMap().forEach { packageName, state ->
+                // assign a category to each in progress state
+                val appStateCategory = when (state) {
+                    is InstallState.Installing, is InstallState.PreApproved,
+                    is InstallState.Starting -> AppStateCategory.INSTALLING
+                    is InstallState.Downloading -> {
+                        numBytesDownloaded += state.downloadedBytes
+                        numTotalBytes += state.totalBytes
+                        AppStateCategory.INSTALLING
+                    }
+                    is InstallState.Installed -> AppStateCategory.INSTALLED
+                    is InstallState.UserConfirmationNeeded -> AppStateCategory.NEEDS_CONFIRMATION
+                    else -> null
+                }
+                // track app state for in progress apps
+                val appState = appStateCategory?.let {
+                    // all states that get a category above must be InstallStateWithInfo
+                    state as InstallStateWithInfo
+                    AppState(
+                        packageName = packageName,
+                        category = it,
+                        name = state.name,
+                        installVersionName = state.versionName,
+                        currentVersionName = state.currentVersionName,
+                    )
+                }
+                if (appState != null) appStates.add(appState)
+            }
+            return InstallNotificationState(
+                apps = appStates,
+                numBytesDownloaded = numBytesDownloaded,
+                numTotalBytes = numTotalBytes,
+            )
+        }
 
     fun getAppFlow(packageName: String): Flow<InstallState> {
         return apps.map { it[packageName] ?: InstallState.Unknown }
@@ -290,43 +330,7 @@ class AppInstallManager @Inject constructor(
     }
 
     private fun onStatesUpdated() {
-        val appStates = mutableListOf<AppState>()
-        var numBytesDownloaded = 0L
-        var numTotalBytes = 0L
-        // go throw all apps that have active state
-        apps.value.toMap().forEach { packageName, state ->
-            // assign a category to each in progress state
-            val appStateCategory = when (state) {
-                is InstallState.Installing, is InstallState.PreApproved,
-                is InstallState.Starting -> AppStateCategory.INSTALLING
-                is InstallState.Downloading -> {
-                    numBytesDownloaded += state.downloadedBytes
-                    numTotalBytes += state.totalBytes
-                    AppStateCategory.INSTALLING
-                }
-                is InstallState.Installed -> AppStateCategory.INSTALLED
-                is InstallState.UserConfirmationNeeded -> AppStateCategory.NEEDS_CONFIRMATION
-                else -> null
-            }
-            // track app state for in progress apps
-            val appState = appStateCategory?.let {
-                // all states that get a category above must be InstallStateWithInfo
-                state as InstallStateWithInfo
-                AppState(
-                    packageName = packageName,
-                    category = it,
-                    name = state.name,
-                    installVersionName = state.versionName,
-                    currentVersionName = state.currentVersionName,
-                )
-            }
-            if (appState != null) appStates.add(appState)
-        }
-        val notificationState = InstallNotificationState(
-            apps = appStates,
-            numBytesDownloaded = numBytesDownloaded,
-            numTotalBytes = numTotalBytes,
-        )
+        val notificationState = installNotificationState
         val serviceIntent = Intent(context, AppInstallService::class.java)
         // stop foreground service, if no app is installing and it is still running
         if (!notificationState.isInstallingSomeApp && AppInstallService.isServiceRunning) {
@@ -335,7 +339,11 @@ class AppInstallManager @Inject constructor(
         if (notificationState.isInProgress) {
             // start foreground service if at least one app is installing and not already running
             if (notificationState.isInstallingSomeApp && !AppInstallService.isServiceRunning) {
-                context.startService(serviceIntent)
+                try {
+                    context.startService(serviceIntent)
+                } catch (e: Exception) {
+                    log.error { "Couldn't start service: $e ${e.message}" }
+                }
             }
             notificationManager.showAppInstallNotification(notificationState)
         } else {
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
index 681afa8e5..790cc50d3 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
@@ -37,12 +37,16 @@ class AppInstallService : Service() {
     ): Int {
         log.info { "onStartCommand" }
         val notificationState = InstallNotificationState()
-        ServiceCompat.startForeground(
-            this,
-            NotificationManager.NOTIFICATION_ID_APP_INSTALLS,
-            notificationManager.getAppInstallNotification(notificationState).build(),
-            if (SDK_INT >= 30) FOREGROUND_SERVICE_TYPE_MANIFEST else 0,
-        )
+        try {
+            ServiceCompat.startForeground(
+                this,
+                NotificationManager.NOTIFICATION_ID_APP_INSTALLS,
+                notificationManager.getAppInstallNotification(notificationState).build(),
+                if (SDK_INT >= 30) FOREGROUND_SERVICE_TYPE_MANIFEST else 0,
+            )
+        } catch (e: Exception) {
+            log.error(e) { "Error starting foreground service: " }
+        }
         return super.onStartCommand(intent, flags, startId)
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
index 6719c4bc3..61cb95c39 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
@@ -43,6 +43,8 @@ data class InstallNotificationState(
      */
     private val isUpdatingApps: Boolean = apps.all { it.currentVersionName != null }
 
+    val numInstalled: Int get() = apps.count { it.category == AppStateCategory.INSTALLED }
+
     fun getTitle(context: Context): String {
         val titleRes = if (isUpdatingApps) {
             R.plurals.notification_updating_title
@@ -97,6 +99,24 @@ data class InstallNotificationState(
         return sb.toString()
     }
 
+    fun getSuccessTitle(context: Context): String {
+        return context.resources.getQuantityString(
+            R.plurals.notification_update_success_title,
+            numInstalled,
+            numInstalled,
+        )
+    }
+
+    fun getSuccessBigText(): String {
+        val sb = StringBuilder()
+        apps.forEach { appState ->
+            if (appState.category == AppStateCategory.INSTALLED) {
+                sb.append(appState.displayStr).append("\n")
+            }
+        }
+        return sb.toString()
+    }
+
     fun getPendingIntent(context: Context): PendingIntent {
         val i = Intent(ACTION_MY_APPS).apply {
             setClass(context, MainActivity::class.java)
diff --git a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
index 6ce22d0b7..a8d346755 100644
--- a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
@@ -31,6 +31,7 @@ import mu.KotlinLogging
 import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppVersion
+import org.fdroid.ui.utils.isAppInForeground
 import org.fdroid.utils.IoDispatcher
 import java.io.File
 import javax.inject.Inject
@@ -94,10 +95,15 @@ class SessionInstallManager @Inject constructor(
         isUpdate: Boolean,
         version: AppVersion
     ): PreApprovalResult {
-        return if (isUpdate && canDoAutoUpdate(version)) {
+        return if (!context.isAppInForeground()) {
+            log.info { "App not in foreground, pre-approval not supported." }
+            PreApprovalResult.NotSupported
+        } else if (isUpdate && canDoAutoUpdate(version)) {
             // should not be needed, so we say not supported
+            log.info { "Can do auto-update pre-approval not needed." }
             PreApprovalResult.NotSupported
         } else if (SDK_INT >= 34) {
+            log.info { "Requesting pre-approval..." }
             try {
                 preapproval(app, icon)
             } catch (e: Exception) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index aea9b3075..38d6ba881 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -27,6 +27,7 @@ fun MyAppsPresenter(
     val sortOrder = sortOrderFlow.collectAsState().value
     val processedPackageNames = mutableSetOf<String>()
 
+    // TODO process updates first
     val installingApps = appInstallStates.mapNotNull { (packageName, state) ->
         if (state is InstallStateWithInfo) {
             processedPackageNames.add(packageName)
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index 18a950b95..5d597358c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -82,7 +82,9 @@ class MyAppsViewModel @Inject constructor(
     }
 
     fun updateAll() {
-        updatesManager.updateAll()
+        scope.launch {
+            updatesManager.updateAll()
+        }
     }
 
     fun search(query: String) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
index 236cbd25e..aa79993ef 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
@@ -1,10 +1,14 @@
 package org.fdroid.ui.utils
 
+import android.app.ActivityManager
+import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
 import android.content.Context
 import android.content.Intent
+import android.os.PowerManager
 import android.text.format.DateUtils
 import android.util.Log
 import androidx.compose.ui.platform.UriHandler
+import androidx.core.content.ContextCompat
 import java.text.Normalizer
 import java.text.Normalizer.Form.NFKD
 
@@ -43,3 +47,21 @@ fun Long.asRelativeTimeString(): String {
         DateUtils.FORMAT_ABBREV_ALL
     ).toString()
 }
+
+fun canStartForegroundService(context: Context): Boolean {
+    val powerManager = ContextCompat.getSystemService(context, PowerManager::class.java)
+        ?: return false
+    return powerManager.isIgnoringBatteryOptimizations(context.packageName) ||
+        context.isAppInForeground()
+}
+
+fun Context.isAppInForeground(): Boolean {
+    val activityManager = ContextCompat.getSystemService(this, ActivityManager::class.java)
+    val runningAppProcesses = activityManager?.runningAppProcesses ?: return false
+    for (appProcess in runningAppProcesses) {
+        if (appProcess.importance == IMPORTANCE_FOREGROUND &&
+            appProcess.processName == packageName
+        ) return true
+    }
+    return false
+}
diff --git a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
new file mode 100644
index 000000000..b8f8c7d3c
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
@@ -0,0 +1,132 @@
+package org.fdroid.updates
+
+import android.content.Context
+import android.content.pm.ServiceInfo
+import android.os.Build.VERSION.SDK_INT
+import android.util.Log
+import androidx.annotation.VisibleForTesting
+import androidx.hilt.work.HiltWorker
+import androidx.work.Constraints
+import androidx.work.CoroutineWorker
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.ForegroundInfo
+import androidx.work.NetworkType
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import mu.KotlinLogging
+import org.fdroid.NotificationManager
+import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_APP_INSTALLS
+import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_REPO_UPDATE
+import org.fdroid.install.AppInstallManager
+import org.fdroid.install.InstallNotificationState
+import org.fdroid.ui.utils.canStartForegroundService
+import java.util.concurrent.TimeUnit
+
+@HiltWorker
+class AppUpdateWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted workerParams: WorkerParameters,
+    private val nm: NotificationManager,
+    private val updatesManager: UpdatesManager,
+    private val appInstallManager: AppInstallManager,
+) : CoroutineWorker(appContext, workerParams) {
+
+    companion object {
+        private val TAG = AppUpdateWorker::class.simpleName
+
+        @VisibleForTesting
+        internal const val UNIQUE_WORK_NAME_APP_UPDATE = "autoAppUpdate"
+
+        @JvmStatic
+        fun scheduleOrCancel(context: Context) {
+            val workManager = WorkManager.getInstance(context)
+            val doAutoUpdates = true // TODO check settings, if auto-updates is on, metered network
+            if (doAutoUpdates) {
+                Log.i(TAG, "scheduleOrCancel: enqueueUniquePeriodicWork")
+                val constraints = Constraints.Builder()
+                    .setRequiresBatteryNotLow(true)
+                    .setRequiresStorageNotLow(true)
+                    .setRequiresDeviceIdle(true)
+                    .setRequiredNetworkType(NetworkType.UNMETERED)
+                    .build()
+                val workRequest = PeriodicWorkRequestBuilder<AppUpdateWorker>(
+                    repeatInterval = TimeUnit.HOURS.toMillis(24),
+                    repeatIntervalTimeUnit = TimeUnit.MILLISECONDS,
+                    flexTimeInterval = 60,
+                    flexTimeIntervalUnit = TimeUnit.MINUTES,
+                )
+                    .setConstraints(constraints)
+                    .build()
+                workManager.enqueueUniquePeriodicWork(
+                    uniqueWorkName = UNIQUE_WORK_NAME_APP_UPDATE,
+                    existingPeriodicWorkPolicy = ExistingPeriodicWorkPolicy.UPDATE,
+                    request = workRequest,
+                )
+            } else {
+                Log.w(TAG, "Not scheduling job due to settings!")
+                workManager.cancelUniqueWork(UNIQUE_WORK_NAME_APP_UPDATE)
+            }
+        }
+    }
+
+    private val log = KotlinLogging.logger { }
+
+    override suspend fun doWork(): Result {
+        log.info {
+            if (SDK_INT >= 31) {
+                "doWork $this stopReason: ${this.stopReason} runAttemptCount: $runAttemptCount"
+            } else {
+                "doWork $this runAttemptCount: $runAttemptCount"
+            }
+        }
+        try {
+            if (canStartForegroundService(applicationContext)) setForeground(getForegroundInfo())
+        } catch (e: Exception) {
+            log.error(e) { "Error while running setForeground: " }
+        }
+        return try {
+            // Updating apps will try start a foreground service
+            // and it will "share" the same notification.
+            // This is easier than trying to tell the [AppInstallManager]
+            // not to start a foreground service in this specific case.
+            updatesManager.updateAll().forEach { job ->
+                job.join()
+            }
+            // show success notification, if at least one app got installed
+            val notificationState = appInstallManager.installNotificationState
+            if (notificationState.numInstalled > 0) {
+                nm.showInstallSuccessNotification(notificationState)
+            }
+            Result.success()
+        } catch (e: Exception) {
+            log.error(e) { "Error updating apps: " }
+            if (runAttemptCount <= 3) {
+                Result.retry()
+            } else {
+                log.warn { "Not retrying, already tried $runAttemptCount times." }
+                Result.failure()
+            }
+        } finally {
+            log.info {
+                if (SDK_INT >= 31) "finished doWork $this (stopReason: ${this.stopReason})"
+                else "finished doWork $this"
+            }
+        }
+    }
+
+    override suspend fun getForegroundInfo(): ForegroundInfo {
+        val n = nm.getAppInstallNotification(InstallNotificationState()).build()
+        return if (SDK_INT >= 29) {
+            ForegroundInfo(
+                NOTIFICATION_ID_APP_INSTALLS,
+                n,
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
+            )
+        } else {
+            ForegroundInfo(NOTIFICATION_ID_REPO_UPDATE, n)
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index b984f5846..ac4a2fbd6 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -2,8 +2,10 @@ package org.fdroid.updates
 
 import androidx.core.os.LocaleListCompat
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
@@ -65,10 +67,11 @@ class UpdatesManager @Inject constructor(
         _numUpdates.value = updates.size
     }
 
-    fun updateAll() {
+    suspend fun updateAll(): List<Job> {
+        val appsToUpdate = updates.value ?: updates.first() ?: return emptyList()
         val concurrencyLimit = min(Runtime.getRuntime().availableProcessors(), 8)
         val semaphore = Semaphore(concurrencyLimit)
-        updates.value?.forEach { update ->
+        return appsToUpdate.map { update ->
             // launch a new co-routine for each app to update
             coroutineScope.launch {
                 // suspend here until we get a permit from the semaphore (there's free workers)
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 2689ed80a..79f28bc1b 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -62,6 +62,9 @@
     <string name="size_colon">Size: %1$s</string>
     <string name="signer_colon">Signer: %1$s</string>
     <string name="architectures_colon">Architectures: %1$s</string>
+
+    <string name="notification_channel_install_success_title">Automatically installed apps</string>
+    <string name="notification_channel_install_success_description">Displays a notification after apps were installed automatically.</string>
     <plurals name="notification_installing_title">
         <item quantity="one">Installing %1$d app…</item>
         <item quantity="other">Installing %1$d apps…</item>
@@ -70,6 +73,10 @@
         <item quantity="one">Updating %1$d app…</item>
         <item quantity="other">Updating %1$d apps…</item>
     </plurals>
+    <plurals name="notification_update_success_title">
+        <item quantity="one">%1$d app updated</item>
+        <item quantity="other">%1$d apps updated</item>
+    </plurals>
     <string name="notification_installing_section_installing">Installing:</string>
     <string name="notification_installing_section_confirmation">Needs user confirmation:</string>
     <string name="notification_installing_section_installed">Installed:</string>

From 3d135c75180a729be0bd61ca5c1f8cbc6671fed0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 9 Oct 2025 14:00:13 -0300
Subject: [PATCH 067/180] Show notification about available updates

---
 .../kotlin/org/fdroid/NotificationManager.kt  | 58 +++++++++++++------
 .../install/InstallNotificationState.kt       | 14 -----
 .../org/fdroid/repo/RepoUpdateManager.kt      | 20 ++++---
 .../org/fdroid/repo/RepoUpdateWorker.kt       | 20 ++++++-
 .../org/fdroid/updates/AppUpdateWorker.kt     |  1 +
 .../fdroid/updates/UpdateNotificationState.kt | 29 ++++++++++
 .../org/fdroid/updates/UpdatesManager.kt      | 12 ++++
 next/src/main/res/values/strings-next.xml     |  2 +
 8 files changed, 115 insertions(+), 41 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt

diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
index 1c00eec80..a7eac058c 100644
--- a/next/src/main/kotlin/org/fdroid/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -1,7 +1,11 @@
 package org.fdroid
 
 import android.Manifest.permission.POST_NOTIFICATIONS
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_IMMUTABLE
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
+import android.content.Intent
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import androidx.annotation.StringRes
 import androidx.core.app.NotificationChannelCompat
@@ -10,17 +14,22 @@ import androidx.core.app.NotificationCompat.BigTextStyle
 import androidx.core.app.NotificationCompat.CATEGORY_SERVICE
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.NotificationManagerCompat.IMPORTANCE_DEFAULT
 import androidx.core.app.NotificationManagerCompat.IMPORTANCE_LOW
 import androidx.core.content.ContextCompat.checkSelfPermission
 import dagger.hilt.android.qualifiers.ApplicationContext
+import mu.KotlinLogging
 import org.fdroid.install.InstallNotificationState
 import org.fdroid.next.R
+import org.fdroid.ui.IntentRouter.Companion.ACTION_MY_APPS
+import org.fdroid.updates.UpdateNotificationState
 import javax.inject.Inject
 
 class NotificationManager @Inject constructor(
     @param:ApplicationContext private val context: Context,
 ) {
 
+    private val log = KotlinLogging.logger {}
     private val nm = NotificationManagerCompat.from(context)
     private var lastRepoUpdateNotification = 0L
 
@@ -28,9 +37,11 @@ class NotificationManager @Inject constructor(
         const val NOTIFICATION_ID_REPO_UPDATE: Int = 0
         const val NOTIFICATION_ID_APP_INSTALLS: Int = 1
         const val NOTIFICATION_ID_APP_INSTALL_SUCCESS: Int = 2
+        const val NOTIFICATION_ID_APP_UPDATES_AVAILABLE: Int = 3
         private const val CHANNEL_UPDATES = "update-channel"
         private const val CHANNEL_INSTALLS = "install-channel"
         private const val CHANNEL_INSTALL_SUCCESS = "install-success-channel"
+        private const val CHANNEL_UPDATES_AVAILABLE = "updates-available-channel"
     }
 
     init {
@@ -51,6 +62,10 @@ class NotificationManager @Inject constructor(
                 .setName(s(R.string.notification_channel_install_success_title))
                 .setDescription(s(R.string.notification_channel_install_success_description))
                 .build(),
+            NotificationChannelCompat.Builder(CHANNEL_UPDATES_AVAILABLE, IMPORTANCE_DEFAULT)
+                .setName(s(R.string.notification_channel_updates_available_title))
+                .setDescription(s(R.string.notification_channel_updates_available_description))
+                .build(),
         )
         nm.createNotificationChannelsCompat(channels)
     }
@@ -80,31 +95,32 @@ class NotificationManager @Inject constructor(
         .setOngoing(true)
         .setProgress(100, progress ?: 0, progress == null)
 
-    // TODO pass in bigText with apps and their version changes
-    fun showAppUpdatesAvailableNotification(numUpdates: Int) {
-        val n = getAppUpdatesAvailableNotification(numUpdates).build()
+    fun showAppUpdatesAvailableNotification(notificationState: UpdateNotificationState) {
+        val n = getAppUpdatesAvailableNotification(notificationState).build()
         if (checkSelfPermission(context, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
-            // TODO different ID
-            nm.notify(NOTIFICATION_ID_REPO_UPDATE, n)
+            nm.notify(NOTIFICATION_ID_APP_UPDATES_AVAILABLE, n)
         }
     }
 
-    private fun getAppUpdatesAvailableNotification(numUpdates: Int): NotificationCompat.Builder {
-        val title = context.resources.getQuantityString(
-            R.plurals.notification_summary_app_updates,
-            numUpdates, numUpdates,
-        )
-        val text = context.getString(R.string.notification_title_summary_app_update_available)
-        // TODO different channel
-        return NotificationCompat.Builder(context, CHANNEL_UPDATES)
+    private fun getAppUpdatesAvailableNotification(
+        state: UpdateNotificationState,
+    ): NotificationCompat.Builder {
+        val pi = getMyAppsPendingIntent(context)
+        return NotificationCompat.Builder(context, CHANNEL_UPDATES_AVAILABLE)
             .setSmallIcon(R.drawable.ic_notification)
             .setPriority(PRIORITY_HIGH)
-            .setContentTitle(title)
-            .setContentText(text)
+            .setContentTitle(state.getTitle(context))
+            .setContentIntent(pi)
+            .setStyle(BigTextStyle().bigText(state.getBigText()))
             .setOngoing(false)
             .setAutoCancel(true)
     }
 
+    fun cancelAppUpdatesAvailableNotification() {
+        log.info { "cancel app updates available notification" }
+        nm.cancel(NOTIFICATION_ID_APP_UPDATES_AVAILABLE)
+    }
+
     fun showAppInstallNotification(installNotificationState: InstallNotificationState) {
         // TODO we may need some throttling when many apps download at the same time
         val n = getAppInstallNotification(installNotificationState).build()
@@ -114,7 +130,7 @@ class NotificationManager @Inject constructor(
     }
 
     fun getAppInstallNotification(state: InstallNotificationState): NotificationCompat.Builder {
-        val pi = state.getPendingIntent(context)
+        val pi = getMyAppsPendingIntent(context)
         val builder = NotificationCompat.Builder(context, CHANNEL_INSTALLS)
             .setSmallIcon(R.drawable.ic_notification)
             .setCategory(CATEGORY_SERVICE)
@@ -142,7 +158,7 @@ class NotificationManager @Inject constructor(
     }
 
     fun getInstallSuccessNotification(state: InstallNotificationState): NotificationCompat.Builder {
-        val pi = state.getPendingIntent(context)
+        val pi = getMyAppsPendingIntent(context)
         val builder = NotificationCompat.Builder(context, CHANNEL_INSTALL_SUCCESS)
             .setSmallIcon(R.drawable.ic_notification)
             .setCategory(CATEGORY_SERVICE)
@@ -153,6 +169,14 @@ class NotificationManager @Inject constructor(
         return builder
     }
 
+    private fun getMyAppsPendingIntent(context: Context): PendingIntent {
+        val i = Intent(ACTION_MY_APPS).apply {
+            setClass(context, MainActivity::class.java)
+        }
+        val flags = FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
+        return PendingIntent.getActivity(context, 0, i, flags)
+    }
+
     private fun s(@StringRes id: Int): String {
         return context.getString(id)
     }
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
index 61cb95c39..e5e74c270 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
@@ -1,14 +1,8 @@
 package org.fdroid.install
 
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_IMMUTABLE
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
-import android.content.Intent
 import androidx.annotation.StringRes
-import org.fdroid.MainActivity
 import org.fdroid.next.R
-import org.fdroid.ui.IntentRouter.Companion.ACTION_MY_APPS
 import kotlin.math.roundToInt
 
 data class InstallNotificationState(
@@ -116,14 +110,6 @@ data class InstallNotificationState(
         }
         return sb.toString()
     }
-
-    fun getPendingIntent(context: Context): PendingIntent {
-        val i = Intent(ACTION_MY_APPS).apply {
-            setClass(context, MainActivity::class.java)
-        }
-        val flags = FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
-        return PendingIntent.getActivity(context, 0, i, flags)
-    }
 }
 
 data class AppState(
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index 443c91c83..56d96c423 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -8,6 +8,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
+import mu.KotlinLogging
 import org.fdroid.CompatibilityChecker
 import org.fdroid.CompatibilityCheckerImpl
 import org.fdroid.NotificationManager
@@ -119,6 +120,7 @@ class RepoUpdateManager(
         notificationManager = notificationManager,
     )
 
+    private val log = KotlinLogging.logger { }
     private val isUpdateNotificationEnabled = true
     private val _isUpdating = MutableStateFlow(false)
     val isUpdating = _isUpdating.asStateFlow()
@@ -132,10 +134,8 @@ class RepoUpdateManager(
     }
 
     @WorkerThread
-    fun updateRepos() {
-        if (isUpdating.value) {
-            Log.w(TAG, "Already updating repositories: updateRepos()")
-        }
+    suspend fun updateRepos() {
+        if (isUpdating.value) log.warn { "Already updating repositories: updateRepos()" }
         // TODO
 //            if (timeSinceLastCheck < MIN_UPDATE_INTERVAL_MILLIS) {
 //                Log.i(TAG, "Not updating, only $timeSinceLastCheck ms since last check.")
@@ -172,7 +172,12 @@ class RepoUpdateManager(
             // TODO fdroidPrefs.lastUpdateCheck = System.currentTimeMillis()
             if (repoErrors.isNotEmpty()) showRepoErrors(repoErrors)
             if (reposUpdated) {
-                updatesManager.loadUpdates()
+                updatesManager.loadUpdates().join()
+                val numUpdates = updatesManager.numUpdates.value
+                if (numUpdates > 0) {
+                    val states = updatesManager.notificationStates
+                    notificationManager.showAppUpdatesAvailableNotification(states)
+                }
             }
         } finally {
             notificationManager.cancelUpdateRepoNotification()
@@ -182,9 +187,8 @@ class RepoUpdateManager(
 
     @WorkerThread
     fun updateRepo(repoId: Long): IndexUpdateResult {
-        if (isUpdating.value) {
-            Log.w(TAG, "Already updating repositories: updateRepo($repoId)")
-        }
+        if (isUpdating.value) log.warn { "Already updating repositories: updateRepo($repoId)" }
+
         val repo = repoManager.getRepository(repoId) ?: return IndexUpdateResult.NotFound
         _isUpdating.value = true
         return try {
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
index 846d9c344..aa18aa70d 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
@@ -97,7 +97,13 @@ class RepoUpdateWorker @AssistedInject constructor(
     private val log = KotlinLogging.logger { }
 
     override suspend fun doWork(): Result {
-        log.info { "Starting RepoUpdateWorker... $runAttemptCount" }
+        log.info {
+            if (SDK_INT >= 31) {
+                "Starting RepoUpdateWorker... $this stopReason: ${this.stopReason} $runAttemptCount"
+            } else {
+                "Starting RepoUpdateWorker... $this $runAttemptCount"
+            }
+        }
         try {
             setForeground(getForegroundInfo())
         } catch (e: Exception) {
@@ -110,7 +116,17 @@ class RepoUpdateWorker @AssistedInject constructor(
             Result.success()
         } catch (e: Exception) {
             log.error(e) { "Error updating repos" }
-            Result.failure()
+            if (runAttemptCount <= 3) {
+                Result.retry()
+            } else {
+                log.warn { "Not retrying, already tried $runAttemptCount times." }
+                Result.failure()
+            }
+        } finally {
+            log.info {
+                if (SDK_INT >= 31) "finished doWork $this (stopReason: ${this.stopReason})"
+                else "finished doWork $this"
+            }
         }
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
index b8f8c7d3c..70ca1a9b8 100644
--- a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
@@ -88,6 +88,7 @@ class AppUpdateWorker @AssistedInject constructor(
             log.error(e) { "Error while running setForeground: " }
         }
         return try {
+            nm.cancelAppUpdatesAvailableNotification()
             // Updating apps will try start a foreground service
             // and it will "share" the same notification.
             // This is easier than trying to tell the [AppInstallManager]
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt b/next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
new file mode 100644
index 000000000..36baea962
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
@@ -0,0 +1,29 @@
+package org.fdroid.updates
+
+import android.content.Context
+import org.fdroid.next.R
+
+data class UpdateNotificationState(
+    private val updates: List<AppUpdate>,
+) {
+    fun getTitle(context: Context) = context.resources.getQuantityString(
+        R.plurals.notification_summary_app_updates,
+        updates.size, updates.size,
+    )
+
+    fun getBigText(): String {
+        return StringBuilder().apply {
+            updates.forEach { update ->
+                append("• ${update.name}")
+                append(" ${update.currentVersionName} → ${update.updateVersionName}\n")
+            }
+        }.toString()
+    }
+}
+
+data class AppUpdate(
+    val packageName: String,
+    val name: String,
+    val currentVersionName: String,
+    val updateVersionName: String,
+)
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index ac4a2fbd6..3854942af 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -37,6 +37,18 @@ class UpdatesManager @Inject constructor(
     private val _numUpdates = MutableStateFlow(0)
     val numUpdates = _numUpdates.asStateFlow()
 
+    val notificationStates: UpdateNotificationState
+        get() = UpdateNotificationState(
+            updates = updates.value?.map { update ->
+                AppUpdate(
+                    packageName = update.packageName,
+                    name = update.name,
+                    currentVersionName = update.installedVersionName,
+                    updateVersionName = update.update.versionName,
+                )
+            } ?: emptyList()
+        )
+
     init {
         loadUpdates()
     }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 79f28bc1b..f56fa4c17 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -65,6 +65,8 @@
 
     <string name="notification_channel_install_success_title">Automatically installed apps</string>
     <string name="notification_channel_install_success_description">Displays a notification after apps were installed automatically.</string>
+    <string name="notification_channel_updates_available_title">Informs about available app updates</string>
+    <string name="notification_channel_updates_available_description">Displays a notification after repositories were updated and app updates were found.</string>
     <plurals name="notification_installing_title">
         <item quantity="one">Installing %1$d app…</item>
         <item quantity="other">Installing %1$d apps…</item>

From 98f0345268bf7d082bc0455efdbe3061cfa05136 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 10 Oct 2025 10:43:34 -0300
Subject: [PATCH 068/180] Implement ACRA crash reports

---
 gradle/libs.versions.toml                     |   1 +
 next/build.gradle.kts                         |   6 +
 next/src/main/AndroidManifest.xml             |   6 +
 next/src/main/kotlin/org/fdroid/App.kt        |  45 +++++++
 next/src/main/kotlin/org/fdroid/ui/About.kt   |   8 ++
 .../kotlin/org/fdroid/ui/CrashActivity.kt     | 126 ++++++++++++++++++
 next/src/main/res/drawable/ic_crash.xml       |  12 ++
 next/src/main/res/values/strings-next.xml     |   8 ++
 8 files changed, 212 insertions(+)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt
 create mode 100644 next/src/main/res/drawable/ic_crash.xml

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6062f661b..a830b2841 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -152,6 +152,7 @@ jmdns = { module = "org.jmdns:jmdns", version.ref = "jmdns" }
 zxing-core = { module = "com.google.zxing:core", version.ref = "zxingCore" }
 acra-mail = { module = "ch.acra:acra-mail", version.ref = "acra" }
 acra-dialog = { module = "ch.acra:acra-dialog", version.ref = "acra" }
+acra-notification = { module = "ch.acra:acra-notification", version.ref = "acra" }
 adapterdelegates4 = { module = "com.hannesdorfmann:adapterdelegates4", version.ref = "adapterdelegates4" }
 bcprov-jdk15to18 = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "bouncycastle" }
 bcpkix-jdk15to18 = { module = "org.bouncycastle:bcpkix-jdk15to18", version.ref = "bouncycastle" }
diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 1be24544c..b43288b9c 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -22,6 +22,9 @@ android {
     }
 
     buildTypes {
+        all {
+            buildConfigField("String", "ACRA_REPORT_EMAIL", "\"t+fdroidnext@grobox.de\"")
+        }
         release {
             isMinifyEnabled = false
             proguardFiles(
@@ -83,6 +86,9 @@ dependencies {
     implementation(libs.logback.android)
     implementation(libs.microutils.kotlin.logging)
 
+    implementation(libs.acra.mail)
+    implementation(libs.acra.dialog)
+
     implementation(libs.hilt.android)
     implementation(libs.androidx.hilt.navigation.compose)
     ksp(libs.hilt.android.compiler)
diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
index 13803d9ab..16fa2c41b 100644
--- a/next/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -67,6 +67,12 @@
                 <data android:pathPattern="/.*/packages/.*" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="org.fdroid.ui.CrashActivity"
+            android:excludeFromRecents="true"
+            android:finishOnTaskLaunch="true"
+            android:launchMode="singleInstance"
+            android:process=":acra" />
 
         <service
             android:name="org.fdroid.install.AppInstallService"
diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index 5473ea481..e4e165516 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -17,12 +17,22 @@ import coil3.request.Options
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.HiltAndroidApp
+import org.acra.ACRA
+import org.acra.ReportField
+import org.acra.config.dialog
+import org.acra.config.mailSender
+import org.acra.data.StringFormat.JSON
+import org.acra.ktx.initAcra
 import org.fdroid.download.DownloadRequest
 import org.fdroid.download.LocalIconFetcher
 import org.fdroid.download.PackageName
 import org.fdroid.download.coil.DownloadRequestFetcher
 import org.fdroid.next.BuildConfig
+import org.fdroid.next.BuildConfig.APPLICATION_ID
+import org.fdroid.next.BuildConfig.VERSION_NAME
+import org.fdroid.next.R
 import org.fdroid.repo.RepoUpdateWorker
+import org.fdroid.ui.CrashActivity
 import org.fdroid.updates.AppUpdateWorker
 import javax.inject.Inject
 
@@ -40,12 +50,47 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
             .setWorkerFactory(workerFactory)
             .build()
 
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base)
+        initAcra {
+            reportFormat = JSON
+            reportContent = listOf(
+                ReportField.USER_COMMENT,
+                ReportField.PACKAGE_NAME,
+                ReportField.APP_VERSION_NAME,
+                ReportField.ANDROID_VERSION,
+                ReportField.PRODUCT,
+                ReportField.BRAND,
+                ReportField.PHONE_MODEL,
+                ReportField.DISPLAY,
+                ReportField.TOTAL_MEM_SIZE,
+                ReportField.AVAILABLE_MEM_SIZE,
+                ReportField.CUSTOM_DATA,
+                ReportField.STACK_TRACE_HASH,
+                ReportField.STACK_TRACE,
+            )
+            reportSendFailureToast = getString(R.string.crash_report_error)
+            sendReportsInDevMode = true
+            dialog {
+                reportDialogClass = CrashActivity::class.java
+            }
+            mailSender {
+                mailTo = BuildConfig.ACRA_REPORT_EMAIL
+                subject = "$APPLICATION_ID $VERSION_NAME: Crash Report"
+                reportFileName = "ACRA-report.stacktrace.json"
+            }
+        }
+    }
+
     @OptIn(ExperimentalComposeRuntimeApi::class)
     override fun onCreate() {
         super.onCreate()
         if (BuildConfig.DEBUG) {
             Composer.setDiagnosticStackTraceMode(ComposeStackTraceMode.SourceInformation)
         }
+        // bail out here if we are the ACRA process to not initialize anything in crash process
+        if (ACRA.isACRASenderServiceProcess()) return
+
         RepoUpdateWorker.scheduleOrCancel(applicationContext)
         AppUpdateWorker.scheduleOrCancel(applicationContext)
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
index 777b1e155..f997e510f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -3,6 +3,7 @@ package org.fdroid.ui
 import android.content.res.Configuration
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -114,6 +115,13 @@ fun AboutHeader(modifier: Modifier = Modifier) {
             modifier = Modifier
                 .padding(top = 16.dp)
                 .alpha(0.75f)
+                .combinedClickable(
+                    onClick = { },
+                    onLongClick = {
+                        // intentional crash for testing crash reporter, could be moved elsewhere
+                        error("BOOOM!")
+                    },
+                )
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt b/next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt
new file mode 100644
index 000000000..39ebf4b62
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt
@@ -0,0 +1,126 @@
+package org.fdroid.ui
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeContentPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.acra.dialog.CrashReportDialogHelper
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+
+class CrashActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        val helper = CrashReportDialogHelper(this, intent)
+        setContent {
+            FDroidContent {
+                CrashContent(
+                    onCancel = {
+                        helper.cancelReports()
+                        finishAfterTransition()
+                    },
+                    onSend = { comment, userEmail ->
+                        helper.sendCrash(comment, userEmail)
+                        finishAfterTransition()
+                    },
+                    modifier = Modifier.safeContentPadding()
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun CrashContent(
+    onCancel: () -> Unit,
+    onSend: (String, String) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val scrollState = rememberScrollState()
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.SpaceBetween,
+        modifier = modifier
+            .fillMaxSize()
+            .padding(horizontal = 16.dp)
+            .verticalScroll(scrollState)
+    ) {
+        Image(
+            painter = painterResource(id = R.drawable.ic_crash),
+            colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
+            contentDescription = null, // decorative element
+            modifier = Modifier
+                .fillMaxWidth(0.5f)
+                .aspectRatio(1f)
+                .padding(vertical = 16.dp)
+        )
+        val textFieldState = rememberTextFieldState()
+        Column(verticalArrangement = spacedBy(16.dp)) {
+            Text(
+                text = stringResource(R.string.crash_dialog_title),
+                style = MaterialTheme.typography.titleLarge,
+                modifier = Modifier.align(Alignment.CenterHorizontally)
+            )
+            Text(
+                text = stringResource(R.string.crash_report_text),
+                style = MaterialTheme.typography.bodyLarge,
+                modifier = Modifier
+            )
+            TextField(
+                state = textFieldState,
+                placeholder = { Text(stringResource(R.string.crash_report_comment_hint)) },
+                modifier = Modifier.fillMaxWidth()
+            )
+        }
+        Row(
+            horizontalArrangement = Arrangement.SpaceEvenly,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 16.dp)
+        ) {
+            OutlinedButton(onClick = onCancel) {
+                Text(stringResource(R.string.cancel))
+            }
+            Button(onClick = {
+                onSend(textFieldState.text.toString(), "")
+            }) {
+                Text(stringResource(R.string.crash_report_button_send))
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        CrashContent({}, { _, _ -> })
+    }
+}
diff --git a/next/src/main/res/drawable/ic_crash.xml b/next/src/main/res/drawable/ic_crash.xml
new file mode 100644
index 000000000..6cd8e1bf1
--- /dev/null
+++ b/next/src/main/res/drawable/ic_crash.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M2.613,1.236A1.25,1.25 0,0 0,1.602 3.266L5.205,7.93C5.078,8.263 5.002,8.621 5.002,9L5.002,13L5.002,15.865L5.002,16C5.002,17.662 6.34,19 8.002,19L40.002,19C41.664,19 43.002,17.662 43.002,16L43.002,12L43.002,9.135L43.002,9C43.002,8.62 42.925,8.26 42.797,7.926L46.398,3.266A1.25,1.25 0,0 0,45.35 1.238A1.25,1.25 0,0 0,44.42 1.736L40.988,6.178C40.678,6.07 40.35,6 40.002,6L8.002,6C7.653,6 7.324,6.069 7.014,6.178L3.58,1.736A1.25,1.25 0,0 0,2.613 1.236zM14.375,9.75A3.375,3.375 0,0 1,17.75 13.125A3.375,3.375 0,0 1,14.375 16.5A3.375,3.375 0,0 1,11 13.125A3.375,3.375 0,0 1,14.375 9.75zM33.875,9.75A3.375,3.375 0,0 1,37.25 13.125A3.375,3.375 0,0 1,33.875 16.5A3.375,3.375 0,0 1,30.5 13.125A3.375,3.375 0,0 1,33.875 9.75z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M8.002,20C7.794,20 7.592,20.021 7.396,20.061C6.027,20.337 5.002,21.53 5.002,22.971L5.002,23L5.002,42.779L5.002,42.805L5.002,42.996C5.002,44.658 6.34,45.996 8.002,45.996L40.002,45.996C41.664,45.996 43.002,44.658 43.002,42.996L43.002,22.996L43.002,22.971C43.002,21.53 41.977,20.337 40.607,20.061C40.412,20.021 40.21,20 40.002,20L8.002,20zM13.561,24L19.604,24L23.949,29.934L28.498,24L34.406,24L26.768,32.828L34.711,42.025L28.668,42.025L23.916,35.77L19.197,42.025L13.289,42.025L21.098,32.951L13.561,24z" />
+</vector>
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index f56fa4c17..132d27037 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -88,4 +88,12 @@
     <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
     <string name="got_it">Got it</string>
 
+    <string name="crash_report_text">An unexpected error occurred.
+        This is not your fault.
+        Would you like to e-mail the details to help us fix the issue?
+    </string>
+    <string name="crash_report_comment_hint">Tell us what happened right before the crash</string>
+    <string name="crash_report_button_send">Send report</string>
+    <string name="crash_report_error">Could not send report. No email program found :(</string>
+
 </resources>

From 43259b59894295ca5591b84627043fa12c05c816 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 10 Oct 2025 11:18:29 -0300
Subject: [PATCH 069/180] Implement logcat export

---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    | 11 ++-
 .../src/main/kotlin/org/fdroid/ui/Settings.kt | 57 ------------
 .../kotlin/org/fdroid/ui/settings/Settings.kt | 88 +++++++++++++++++++
 .../fdroid/ui/settings/SettingsViewModel.kt   | 57 ++++++++++++
 4 files changed, 155 insertions(+), 58 deletions(-)
 delete mode 100644 next/src/main/kotlin/org/fdroid/ui/Settings.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 8eddc1394..8bf395cc0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -47,6 +47,8 @@ import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.lists.AppListViewModel
 import org.fdroid.ui.repositories.Repositories
 import org.fdroid.ui.repositories.RepositoriesViewModel
+import org.fdroid.ui.settings.Settings
+import org.fdroid.ui.settings.SettingsViewModel
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
@@ -217,7 +219,14 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                     }
                 }
                 entry(NavigationKey.Settings) {
-                    Settings { backStack.removeLastOrNull() }
+                    val viewModel = hiltViewModel<SettingsViewModel>()
+                    Settings(
+                        onSaveLogcat = {
+                            viewModel.onSaveLogcat(it)
+                            backStack.removeLastOrNull()
+                        },
+                        onBackClicked = { backStack.removeLastOrNull() },
+                    )
                 }
                 entry(NavigationKey.About) {
                     About { backStack.removeLastOrNull() }
diff --git a/next/src/main/kotlin/org/fdroid/ui/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/Settings.kt
deleted file mode 100644
index 77c3d4e67..000000000
--- a/next/src/main/kotlin/org/fdroid/ui/Settings.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.fdroid.ui
-
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewScreenSizes
-import androidx.compose.ui.unit.dp
-import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
-
-@Composable
-@OptIn(ExperimentalMaterial3Api::class)
-fun Settings(onBackClicked: () -> Unit) {
-    Scaffold(
-        topBar = {
-            TopAppBar(
-                navigationIcon = {
-                    IconButton(onClick = onBackClicked) {
-                        Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
-                            contentDescription = stringResource(R.string.back),
-                        )
-                    }
-                },
-                title = {
-                    Text(stringResource(R.string.menu_settings))
-                },
-            )
-        },
-    ) { paddingValues ->
-        Text(
-            stringResource(R.string.menu_settings),
-            modifier = Modifier
-                .padding(paddingValues)
-                .padding(16.dp)
-        )
-    }
-}
-
-@Preview
-@PreviewScreenSizes
-@Composable
-fun SettingsPreview() {
-    FDroidContent {
-        Settings { }
-    }
-}
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
new file mode 100644
index 000000000..1f4edc7f5
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -0,0 +1,88 @@
+package org.fdroid.ui.settings
+
+import android.content.Context
+import android.net.Uri
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Save
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+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.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun Settings(onSaveLogcat: (Uri?) -> Unit, onBackClicked: () -> Unit) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                navigationIcon = {
+                    IconButton(onClick = onBackClicked) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            contentDescription = stringResource(R.string.back),
+                        )
+                    }
+                },
+                title = {
+                    Text(stringResource(R.string.menu_settings))
+                },
+            )
+        },
+    ) { paddingValues ->
+        // TODO use implementation("me.zhanghai.compose.preference:preference:2.1.0")
+        val launcher = rememberLauncherForActivityResult(CreateDocument("text/plain")) {
+            onSaveLogcat(it)
+        }
+        val context = LocalContext.current
+        Button(
+            onClick = { launcher.launch(getLogName(context)) },
+            modifier = Modifier
+                .padding(paddingValues)
+                .padding(16.dp)
+        ) {
+            Icon(Icons.Default.Save, null)
+            Spacer(modifier = Modifier.width(ButtonDefaults.IconSpacing))
+            Text(
+                text = stringResource(R.string.pref_export_log_title),
+            )
+        }
+    }
+}
+
+private fun getLogName(context: Context): String {
+    val sdf = SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'", Locale.US).apply {
+        timeZone = TimeZone.getTimeZone("UTC")
+    }
+    val time = sdf.format(Date())
+    return "${context.packageName}-$time.txt"
+}
+
+@Preview
+@Composable
+fun SettingsPreview() {
+    FDroidContent {
+        Settings({}) { }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
new file mode 100644
index 000000000..32a789ea8
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
@@ -0,0 +1,57 @@
+package org.fdroid.ui.settings
+
+import android.app.Application
+import android.net.Uri
+import android.os.Process
+import android.widget.Toast
+import android.widget.Toast.LENGTH_SHORT
+import androidx.annotation.StringRes
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.application
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import mu.KotlinLogging
+import org.fdroid.next.R
+import java.io.IOException
+import java.lang.Runtime.getRuntime
+import javax.inject.Inject
+
+@HiltViewModel
+class SettingsViewModel @Inject constructor(
+    app: Application,
+) : AndroidViewModel(app) {
+
+    private val log = KotlinLogging.logger {}
+
+    fun onSaveLogcat(uri: Uri?) = viewModelScope.launch(Dispatchers.IO) {
+        if (uri == null) {
+            sendToast(R.string.export_log_error)
+            return@launch
+        }
+        // support for --pid was introduced in SDK 24
+        val command = "logcat -d --pid=" + Process.myPid() + " *:V"
+        try {
+            application.contentResolver.openOutputStream(uri, "wt")?.use { outputStream ->
+                getRuntime().exec(command).inputStream.use { inputStream ->
+                    // first log command, so we see if it is correct, e.g. has our own pid
+                    outputStream.write("$command\n\n".toByteArray())
+                    inputStream.copyTo(outputStream)
+                }
+            } ?: throw IOException("OutputStream was null")
+            sendToast(R.string.export_log_success)
+        } catch (e: Exception) {
+            log.error(e) { "Error saving logcat " }
+            sendToast(R.string.export_log_error)
+        }
+    }
+
+    private suspend fun sendToast(@StringRes s: Int, duration: Int = LENGTH_SHORT) {
+        withContext(Dispatchers.Main) {
+            Toast.makeText(application, s, duration).show()
+        }
+    }
+
+}

From c4cbf5abbc06ddbd4501ea9af064001aa915bc3a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 10 Oct 2025 17:26:50 -0300
Subject: [PATCH 070/180] Initial implementation of repo list re-ordering

---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  36 ++-
 .../fdroid/ui/repositories/Repositories.kt    |  33 +--
 .../ui/repositories/RepositoriesList.kt       |  80 +++++--
 .../ui/repositories/RepositoriesPresenter.kt  |  21 ++
 .../ui/repositories/RepositoriesViewModel.kt  |  60 ++++-
 .../fdroid/ui/repositories/RepositoryInfo.kt  |  14 ++
 .../fdroid/ui/repositories/RepositoryRow.kt   |   3 +-
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  15 ++
 .../kotlin/org/fdroid/utils/DragDropState.kt  | 224 ++++++++++++++++++
 9 files changed, 424 insertions(+), 62 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/utils/DragDropState.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 8bf395cc0..56fbe3044 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -47,6 +47,9 @@ import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.lists.AppListViewModel
 import org.fdroid.ui.repositories.Repositories
 import org.fdroid.ui.repositories.RepositoriesViewModel
+import org.fdroid.ui.repositories.RepositoryInfo
+import org.fdroid.ui.repositories.RepositoryItem
+import org.fdroid.ui.repositories.RepositoryModel
 import org.fdroid.ui.settings.Settings
 import org.fdroid.ui.settings.SettingsViewModel
 
@@ -190,18 +193,29 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                     },
                 ) {
                     val viewModel = hiltViewModel<RepositoriesViewModel>()
-                    val repos = viewModel.repos.collectAsStateWithLifecycle(null).value
-                    Repositories(
-                        repositories = repos,
-                        currentRepositoryId = if (isBigScreen) {
+                    val info = object : RepositoryInfo {
+                        override val model: RepositoryModel =
+                            viewModel.model.collectAsStateWithLifecycle().value
+
+                        override val currentRepositoryId: Long? = if (isBigScreen) {
                             (backStack.last() as? NavigationKey.RepoDetails)?.repoId
-                        } else null,
-                        onRepositorySelected = {
-                            viewModel.setVisibleRepository(it)
-                            backStack.add(NavigationKey.RepoDetails(it.repoId))
-                        },
-                        onAddRepo = viewModel::addRepo,
-                    ) {
+                        } else null
+
+                        override fun onRepositorySelected(repositoryItem: RepositoryItem) {
+                            backStack.add(NavigationKey.RepoDetails(repositoryItem.repoId))
+                        }
+
+                        override fun onAddRepo() = viewModel.addRepo()
+
+                        override fun onRepositoryMoved(fromIndex: Int, toIndex: Int) =
+                            viewModel.onRepositoriesMoved(fromIndex, toIndex)
+
+                        override fun onRepositoriesFinishedMoving(
+                            fromRepoId: Long,
+                            toRepoId: Long,
+                        ) = viewModel.onRepositoriesFinishedMoving(fromRepoId, toRepoId)
+                    }
+                    Repositories(info) {
                         backStack.removeLastOrNull()
                     }
                 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index 29bd0bd99..40701d295 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -7,14 +7,12 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -23,17 +21,12 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.utils.BigLoadingIndicator
+import org.fdroid.ui.utils.getRepositoriesInfo
 
 @Composable
-@OptIn(
-    ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class,
-    ExperimentalMaterial3ExpressiveApi::class
-)
+@OptIn(ExperimentalMaterial3Api::class)
 fun Repositories(
-    repositories: List<RepositoryItem>?,
-    currentRepositoryId: Long?,
-    onRepositorySelected: (RepositoryItem) -> Unit,
-    onAddRepo: () -> Unit,
+    info: RepositoryInfo,
     onBackClicked: () -> Unit,
 ) {
     Scaffold(
@@ -54,7 +47,7 @@ fun Repositories(
         },
         floatingActionButton = {
             FloatingActionButton(
-                onClick = onAddRepo,
+                onClick = info::onAddRepo,
                 modifier = Modifier.padding(16.dp)
             ) {
                 Icon(
@@ -64,13 +57,9 @@ fun Repositories(
             }
         }
     ) { paddingValues ->
-        if (repositories == null) BigLoadingIndicator()
+        if (info.model.repositories == null) BigLoadingIndicator()
         else RepositoriesList(
-            repositories = repositories,
-            currentRepositoryId = currentRepositoryId,
-            onRepositorySelected = {
-                onRepositorySelected(it)
-            },
+            info = info,
             modifier = Modifier
                 .padding(paddingValues),
         )
@@ -84,7 +73,9 @@ fun Repositories(
 @Composable
 fun RepositoriesScaffoldLoadingPreview() {
     FDroidContent {
-        Repositories(null, null, {}, {}) { }
+        val model = RepositoryModel(null)
+        val info = getRepositoriesInfo(model)
+        Repositories(info) {}
     }
 }
 
@@ -111,10 +102,12 @@ fun RepositoriesScaffoldPreview() {
                 timestamp = System.currentTimeMillis(),
                 lastUpdated = null,
                 weight = 2,
-                enabled = true,
+                enabled = false,
                 name = "My second repository",
             ),
         )
-        Repositories(repos, repos[0].repoId, {}, {}) { }
+        val model = RepositoryModel(repos)
+        val info = getRepositoriesInfo(model, repos[0].repoId)
+        Repositories(info) { }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
index 6c48a533b..d203ac08c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
@@ -1,54 +1,92 @@
 package org.fdroid.ui.repositories
 
+import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.dropShadow
+import androidx.compose.ui.graphics.shadow.Shadow
+import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
+import org.fdroid.utils.DraggableItem
+import org.fdroid.utils.dragContainer
+import org.fdroid.utils.rememberDragDropState
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
 fun RepositoriesList(
-    repositories: List<RepositoryItem>,
-    currentRepositoryId: Long?,
-    onRepositorySelected: (RepositoryItem) -> Unit,
+    info: RepositoryInfo,
     modifier: Modifier = Modifier,
 ) {
+    val repositories = info.model.repositories ?: return
+    val currentRepositoryId = info.currentRepositoryId
+    val listState = rememberLazyListState()
+    val dragDropState = rememberDragDropState(
+        lazyListState = listState,
+        onMove = info::onRepositoryMoved,
+        onEnd = { from, to ->
+            from as? Long ?: error("from $from was not a repoId")
+            to as? Long ?: error("to $to was not a repoId")
+            info.onRepositoriesFinishedMoving(from, to)
+        },
+    )
     LazyColumn(
+        state = listState,
         contentPadding = PaddingValues(vertical = 8.dp),
         verticalArrangement = spacedBy(8.dp),
-        modifier = modifier.then(
-            if (currentRepositoryId == null) Modifier
-            else Modifier.selectableGroup()
-        ),
+        modifier = modifier
+            .then(
+                if (repositories.size > 1) Modifier.dragContainer(dragDropState)
+                else Modifier
+            )
+            .then(
+                if (currentRepositoryId == null) Modifier
+                else Modifier.selectableGroup()
+            ),
     ) {
-        items(repositories) { repoItem ->
+        itemsIndexed(
+            items = repositories,
+            key = { _, item -> item.repoId },
+        ) { index, repoItem ->
             val isSelected = currentRepositoryId == repoItem.repoId
             val interactionModifier = if (currentRepositoryId == null) {
                 Modifier.clickable(
-                    onClick = { onRepositorySelected(repoItem) }
+                    onClick = { info.onRepositorySelected(repoItem) }
                 )
             } else {
                 Modifier.selectable(
                     selected = isSelected,
-                    onClick = { onRepositorySelected(repoItem) }
+                    onClick = { info.onRepositorySelected(repoItem) }
+                )
+            }
+            DraggableItem(dragDropState, index) { isDragging ->
+                val elevation by animateDpAsState(if (isDragging) 4.dp else 0.dp)
+                RepositoryRow(
+                    repoItem = repoItem,
+                    isSelected = isSelected,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .then(interactionModifier)
+                        .let {
+                            if (isDragging) it.dropShadow(
+                                shape = RoundedCornerShape(4.dp),
+                                shadow = Shadow(
+                                    radius = 8.dp,
+                                    offset = DpOffset(x = elevation, elevation)
+                                )
+                            ) else it
+                        }
                 )
             }
-            RepositoryRow(
-                repoItem = repoItem,
-                isSelected = isSelected,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .then(interactionModifier),
-            )
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
new file mode 100644
index 000000000..1836af7f2
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
@@ -0,0 +1,21 @@
+package org.fdroid.ui.repositories
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
+
+@Composable
+fun RepositoriesPresenter(
+    repositoriesFlow: Flow<List<RepositoryItem>>,
+    repoSortingMapFlow: StateFlow<Map<Long, Int>>,
+): RepositoryModel {
+    val repositories = repositoriesFlow.collectAsState(null).value
+    val repoSortingMap = repoSortingMapFlow.collectAsState().value
+    return RepositoryModel(
+        repositories = repositories?.sortedBy { repo ->
+            // newly added repos will not be in repoSortingMap, so they need fallback
+            repoSortingMap[repo.repoId] ?: repositories.find { it.repoId == repo.repoId }?.weight
+        },
+    )
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index ff06fd579..659defc22 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -3,30 +3,74 @@ package org.fdroid.ui.repositories
 import android.app.Application
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import app.cash.molecule.AndroidUiDispatcher
+import app.cash.molecule.RecompositionMode.ContextClock
+import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
+import mu.KotlinLogging
 import org.fdroid.index.RepoManager
 import javax.inject.Inject
 
 @HiltViewModel
 class RepositoriesViewModel @Inject constructor(
     app: Application,
-    repoManager: RepoManager,
+    private val repoManager: RepoManager,
 ) : AndroidViewModel(app) {
 
+    private val log = KotlinLogging.logger { }
     private val localeList = LocaleListCompat.getDefault()
-    val repos: Flow<List<RepositoryItem>> = repoManager.repositoriesState.map { repos ->
-        repos.map { RepositoryItem(it, localeList) }
+    private val moleculeScope =
+        CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+    private val repos: Flow<List<RepositoryItem>> = repoManager.repositoriesState.map { repos ->
+        repos.mapNotNull {
+            if (it.isArchiveRepo) null
+            else RepositoryItem(it, localeList)
+        }
+    }
+    private val repoSortingMap: MutableStateFlow<Map<Long, Int>>
+
+    init {
+        // just add repos to sortingMap, because they are already pre-sorted by weight
+        val sortingMap = mutableMapOf<Long, Int>()
+        repoManager.getRepositories().forEachIndexed { index, repository ->
+            sortingMap[repository.repoId] = index
+        }
+        repoSortingMap = MutableStateFlow(sortingMap)
     }
 
-    private val _visibleRepositoryItem = MutableStateFlow<RepositoryItem?>(null)
-    val visibleRepositoryItem = _visibleRepositoryItem.asStateFlow()
+    // define below init, because this only defines repoSortingMap
+    val model: StateFlow<RepositoryModel> = moleculeScope.launchMolecule(mode = ContextClock) {
+        RepositoriesPresenter(
+            repositoriesFlow = repos,
+            repoSortingMapFlow = repoSortingMap,
+        )
+    }
 
-    fun setVisibleRepository(repositoryItem: RepositoryItem?) {
-        _visibleRepositoryItem.value = repositoryItem
+    fun onRepositoriesMoved(fromIndex: Int, toIndex: Int) {
+        log.info { "onRepositoriesMoved($fromIndex, $toIndex)" }
+        val repoItems = model.value.repositories ?: error("Model had null repositories")
+        val fromItem = repoItems[fromIndex]
+        val toItem = repoItems[toIndex]
+        repoSortingMap.value = repoSortingMap.value.toMutableMap().apply {
+            replace(fromItem.repoId, toIndex)
+            replace(toItem.repoId, fromIndex)
+        }
+    }
+
+    fun onRepositoriesFinishedMoving(fromRepoId: Long, toRepoId: Long) {
+        log.info { "onRepositoriesFinishedMoving($fromRepoId, $toRepoId)" }
+        val fromRepo = repoManager.getRepository(fromRepoId)
+            ?: error("No repo for repoId $fromRepoId")
+        val toRepo = repoManager.getRepository(toRepoId)
+            ?: error("No repo for repoId $toRepoId")
+        log.info { "  ${fromRepo.address} => ${toRepo.address}" }
+        repoManager.reorderRepositories(fromRepo, toRepo)
     }
 
     fun addRepo() {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
new file mode 100644
index 000000000..2e28ce763
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
@@ -0,0 +1,14 @@
+package org.fdroid.ui.repositories
+
+interface RepositoryInfo {
+    val model: RepositoryModel
+    val currentRepositoryId: Long?
+    fun onRepositorySelected(repositoryItem: RepositoryItem)
+    fun onAddRepo()
+    fun onRepositoryMoved(fromIndex: Int, toIndex: Int)
+    fun onRepositoriesFinishedMoving(fromRepoId: Long, toRepoId: Long)
+}
+
+data class RepositoryModel(
+    val repositories: List<RepositoryItem>?,
+)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
index 08072696b..a3f52bf44 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
@@ -8,7 +8,6 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import org.fdroid.ui.utils.AsyncShimmerImage
 
@@ -39,7 +38,7 @@ fun RepositoryRow(
             containerColor = if (isSelected) {
                 MaterialTheme.colorScheme.surfaceVariant
             } else {
-                Color.Transparent
+                MaterialTheme.colorScheme.background
             }
         ),
         modifier = modifier,
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index c14f40aa6..baa881630 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -19,6 +19,9 @@ import org.fdroid.ui.lists.AppListActions
 import org.fdroid.ui.lists.AppListInfo
 import org.fdroid.ui.lists.AppListModel
 import org.fdroid.ui.lists.AppListType
+import org.fdroid.ui.repositories.RepositoryInfo
+import org.fdroid.ui.repositories.RepositoryItem
+import org.fdroid.ui.repositories.RepositoryModel
 import java.util.concurrent.TimeUnit.DAYS
 
 object Names {
@@ -219,3 +222,15 @@ fun getMyAppsInfo(model: MyAppsModel): MyAppsInfo = object : MyAppsInfo {
     ) {
     }
 }
+
+fun getRepositoriesInfo(
+    model: RepositoryModel,
+    currentRepositoryId: Long? = null,
+): RepositoryInfo = object : RepositoryInfo {
+    override val model: RepositoryModel = model
+    override val currentRepositoryId: Long? = currentRepositoryId
+    override fun onRepositorySelected(repositoryItem: RepositoryItem) {}
+    override fun onAddRepo() {}
+    override fun onRepositoryMoved(fromIndex: Int, toIndex: Int) {}
+    override fun onRepositoriesFinishedMoving(fromRepoId: Long, toRepoId: Long) {}
+}
diff --git a/next/src/main/kotlin/org/fdroid/utils/DragDropState.kt b/next/src/main/kotlin/org/fdroid/utils/DragDropState.kt
new file mode 100644
index 000000000..10249d639
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/utils/DragDropState.kt
@@ -0,0 +1,224 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Taken from (and then modified to provide onEnd callback):
+ * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/LazyColumnDragAndDropDemo.kt;drc=e6d33dd5d0a60001a5784d84123b05308d35f410
+ */
+
+package org.fdroid.utils
+
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
+import androidx.compose.foundation.gestures.scrollBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.lazy.LazyItemScope
+import androidx.compose.foundation.lazy.LazyListItemInfo
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.zIndex
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.launch
+
+@Composable
+fun rememberDragDropState(
+    lazyListState: LazyListState,
+    onMove: (Int, Int) -> Unit,
+    onEnd: (Any, Any) -> Unit
+): DragDropState {
+    val scope = rememberCoroutineScope()
+    val state = remember(lazyListState) {
+        DragDropState(state = lazyListState, onMove = onMove, onEnd = onEnd, scope = scope)
+    }
+    LaunchedEffect(state) {
+        while (true) {
+            val diff = state.scrollChannel.receive()
+            lazyListState.scrollBy(diff)
+        }
+    }
+    return state
+}
+
+class DragDropState internal constructor(
+    private val state: LazyListState,
+    private val scope: CoroutineScope,
+    private val onMove: (Int, Int) -> Unit,
+    private val onEnd: (Any, Any) -> Unit,
+) {
+    private var movedFrom: Int? = null
+    private var movedFromKey: Any? = null
+    private var movedToKey: Any? = null
+    var draggingItemIndex by mutableStateOf<Int?>(null)
+        private set
+
+    internal val scrollChannel = Channel<Float>()
+
+    private var draggingItemDraggedDelta by mutableFloatStateOf(0f)
+    private var draggingItemInitialOffset by mutableIntStateOf(0)
+    internal val draggingItemOffset: Float
+        get() =
+            draggingItemLayoutInfo?.let { item ->
+                draggingItemInitialOffset + draggingItemDraggedDelta - item.offset
+            } ?: 0f
+
+    private val draggingItemLayoutInfo: LazyListItemInfo?
+        get() = state.layoutInfo.visibleItemsInfo.firstOrNull { it.index == draggingItemIndex }
+
+    internal var previousIndexOfDraggedItem by mutableStateOf<Int?>(null)
+        private set
+
+    internal var previousItemOffset = Animatable(0f)
+        private set
+
+    internal fun onDragStart(offset: Offset) {
+        state.layoutInfo.visibleItemsInfo
+            .firstOrNull { item -> offset.y.toInt() in item.offset..(item.offset + item.size) }
+            ?.also {
+                movedFrom = it.index
+                movedFromKey = it.key
+                draggingItemIndex = it.index
+                draggingItemInitialOffset = it.offset
+            }
+    }
+
+    internal fun onDragInterrupted() {
+        if (draggingItemIndex != null) {
+            previousIndexOfDraggedItem = draggingItemIndex
+            val startOffset = draggingItemOffset
+            scope.launch {
+                previousItemOffset.snapTo(startOffset)
+                previousItemOffset.animateTo(
+                    0f,
+                    spring(stiffness = Spring.StiffnessMediumLow, visibilityThreshold = 1f),
+                )
+                previousIndexOfDraggedItem = null
+            }
+        }
+        draggingItemDraggedDelta = 0f
+        draggingItemIndex = null
+        draggingItemInitialOffset = 0
+        movedFrom = null
+        movedFromKey = null
+        movedToKey = null
+    }
+
+    internal fun onDragEnd() {
+        val from = movedFromKey ?: error("Moved from was null")
+        val to = movedToKey ?: from
+        if (from != to) onEnd(from, to)
+        onDragInterrupted()
+    }
+
+    internal fun onDrag(offset: Offset) {
+        draggingItemDraggedDelta += offset.y
+
+        val draggingItem = draggingItemLayoutInfo ?: return
+        val startOffset = draggingItem.offset + draggingItemOffset
+        val endOffset = startOffset + draggingItem.size
+        val middleOffset = startOffset + (endOffset - startOffset) / 2f
+
+        val targetItem =
+            state.layoutInfo.visibleItemsInfo.find { item ->
+                middleOffset.toInt() in item.offset..item.offsetEnd &&
+                    draggingItem.index != item.index
+            }
+        if (targetItem != null) {
+            if (
+                draggingItem.index == state.firstVisibleItemIndex ||
+                targetItem.index == state.firstVisibleItemIndex
+            ) {
+                state.requestScrollToItem(
+                    state.firstVisibleItemIndex,
+                    state.firstVisibleItemScrollOffset,
+                )
+            }
+            onMove.invoke(draggingItem.index, targetItem.index)
+            draggingItemIndex = targetItem.index
+            movedToKey = targetItem.key
+        } else {
+            val overscroll =
+                when {
+                    draggingItemDraggedDelta > 0 ->
+                        (endOffset - state.layoutInfo.viewportEndOffset).coerceAtLeast(0f)
+                    draggingItemDraggedDelta < 0 ->
+                        (startOffset - state.layoutInfo.viewportStartOffset).coerceAtMost(0f)
+                    else -> 0f
+                }
+            if (overscroll != 0f) {
+                scrollChannel.trySend(overscroll)
+            }
+        }
+    }
+
+    private val LazyListItemInfo.offsetEnd: Int
+        get() = this.offset + this.size
+}
+
+fun Modifier.dragContainer(dragDropState: DragDropState): Modifier {
+    return pointerInput(dragDropState) {
+        detectDragGesturesAfterLongPress(
+            onDrag = { change, offset ->
+                change.consume()
+                dragDropState.onDrag(offset = offset)
+            },
+            onDragStart = { offset -> dragDropState.onDragStart(offset) },
+            onDragEnd = { dragDropState.onDragEnd() },
+            onDragCancel = { dragDropState.onDragInterrupted() },
+        )
+    }
+}
+
+@Composable
+fun LazyItemScope.DraggableItem(
+    dragDropState: DragDropState,
+    index: Int,
+    modifier: Modifier = Modifier,
+    content: @Composable ColumnScope.(isDragging: Boolean) -> Unit,
+) {
+    val dragging = index == dragDropState.draggingItemIndex
+    val draggingModifier =
+        if (dragging) {
+            LocalHapticFeedback.current.performHapticFeedback(HapticFeedbackType.LongPress)
+            Modifier
+                .zIndex(1f)
+                .graphicsLayer { translationY = dragDropState.draggingItemOffset }
+        } else if (index == dragDropState.previousIndexOfDraggedItem) {
+            Modifier
+                .zIndex(1f)
+                .graphicsLayer {
+                    translationY = dragDropState.previousItemOffset.value
+                }
+        } else {
+            Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null)
+        }
+    Column(modifier = modifier.then(draggingModifier)) { content(dragging) }
+}

From 6cced040cbefa534090a0a500062ac5c7077ec54 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 13 Oct 2025 10:05:56 -0300
Subject: [PATCH 071/180] Implement repository onboarding

---
 .../org/fdroid/settings/SettingsManager.kt    |  7 ++++
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  2 +
 .../kotlin/org/fdroid/ui/lists/AppList.kt     | 26 ++++++-------
 .../fdroid/ui/repositories/Repositories.kt    | 38 ++++++++++++++++++-
 .../ui/repositories/RepositoriesList.kt       |  6 +--
 .../ui/repositories/RepositoriesPresenter.kt  |  2 +
 .../ui/repositories/RepositoriesViewModel.kt  |  6 +++
 .../fdroid/ui/repositories/RepositoryInfo.kt  |  2 +
 .../fdroid/{ => ui}/utils/DragDropState.kt    |  2 +-
 .../fdroid/{ => ui}/utils/OnboardingCard.kt   |  2 +-
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  1 +
 .../kotlin/org/fdroid/ui/utils/UiUtils.kt     |  5 +++
 12 files changed, 79 insertions(+), 20 deletions(-)
 rename next/src/main/kotlin/org/fdroid/{ => ui}/utils/DragDropState.kt (99%)
 rename next/src/main/kotlin/org/fdroid/{ => ui}/utils/OnboardingCard.kt (98%)

diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index 8be0f4f6b..ba6791bf4 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -16,6 +16,8 @@ class SettingsManager @Inject constructor() {
     val appListSortOrder = _appListSortOrder.asStateFlow()
     private val _showFilterOnboarding = MutableStateFlow(true)
     val showFilterOnboarding = _showFilterOnboarding.asStateFlow()
+    private val _showRepositoriesOnboarding = MutableStateFlow(true)
+    val showRepositoriesOnboarding = _showRepositoriesOnboarding.asStateFlow()
 
     fun saveAppListFilter(sortOrder: AppListSortOrder, filterIncompatible: Boolean) {
         _appListSortOrder.value = sortOrder
@@ -27,4 +29,9 @@ class SettingsManager @Inject constructor() {
         // TODO persist
     }
 
+    fun onRepositoriesOnboardingSeen() {
+        _showRepositoriesOnboarding.value = false
+        // TODO persist
+    }
+
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 56fbe3044..7e4f7b8a7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -201,6 +201,8 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                             (backStack.last() as? NavigationKey.RepoDetails)?.repoId
                         } else null
 
+                        override fun onOnboardingSeen() = viewModel.onOnboardingSeen()
+
                         override fun onRepositorySelected(repositoryItem: RepositoryItem) {
                             backStack.add(NavigationKey.RepoDetails(repositoryItem.repoId))
                         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 08a20b9b7..7fbdcc0aa 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -24,7 +24,6 @@ import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -52,19 +51,16 @@ import com.viktormykhailiv.compose.hints.hintAnchor
 import com.viktormykhailiv.compose.hints.rememberHint
 import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
-import kotlinx.coroutines.FlowPreview
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.utils.BigLoadingIndicator
+import org.fdroid.ui.utils.OnboardingCard
 import org.fdroid.ui.utils.getAppListInfo
-import org.fdroid.utils.OnboardingCard
+import org.fdroid.ui.utils.getHintOverlayColor
 
 @Composable
-@OptIn(
-    ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class,
-    FlowPreview::class
-)
+@OptIn(ExperimentalMaterial3Api::class)
 fun AppList(
     appListInfo: AppListInfo,
     currentPackageName: String?,
@@ -76,21 +72,25 @@ fun AppList(
     val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
 
     val hintController = rememberHintController(
-        overlay = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.8f),
+        overlay = getHintOverlayColor(),
     )
     val hint = rememberHint {
         OnboardingCard(
             title = stringResource(R.string.onboarding_app_list_filter_title),
             message = stringResource(R.string.onboarding_app_list_filter_message),
             modifier = Modifier.padding(horizontal = 32.dp, vertical = 8.dp),
-        ) {
-            appListInfo.actions.onOnboardingSeen()
-            hintController.dismiss()
-        }
+            onGotIt = {
+                appListInfo.actions.onOnboardingSeen()
+                hintController.dismiss()
+            },
+        )
     }
     val hintAnchor = rememberHintAnchorState(hint)
     LaunchedEffect(appListInfo.showOnboarding) {
-        if (appListInfo.showOnboarding) hintController.show(hintAnchor)
+        if (appListInfo.showOnboarding) {
+            hintController.show(hintAnchor)
+            appListInfo.actions.onOnboardingSeen()
+        }
     }
 
     Scaffold(
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index 40701d295..2d244b6c8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -2,6 +2,8 @@ package org.fdroid.ui.repositories
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -14,13 +16,20 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.viktormykhailiv.compose.hints.rememberHint
+import com.viktormykhailiv.compose.hints.rememberHintAnchorState
+import com.viktormykhailiv.compose.hints.rememberHintController
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.next.R
 import org.fdroid.ui.utils.BigLoadingIndicator
+import org.fdroid.ui.utils.OnboardingCard
+import org.fdroid.ui.utils.getHintOverlayColor
 import org.fdroid.ui.utils.getRepositoriesInfo
 
 @Composable
@@ -29,6 +38,30 @@ fun Repositories(
     info: RepositoryInfo,
     onBackClicked: () -> Unit,
 ) {
+    val hintController = rememberHintController(
+        overlay = getHintOverlayColor(),
+    )
+    val hint = rememberHint {
+        Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+            OnboardingCard(
+                title = stringResource(R.string.repo_list_info_title),
+                message = stringResource(R.string.repo_list_info_text),
+                modifier = Modifier
+                    .padding(horizontal = 32.dp, vertical = 8.dp),
+                onGotIt = {
+                    info.onOnboardingSeen()
+                    hintController.dismiss()
+                },
+            )
+        }
+    }
+    val hintAnchor = rememberHintAnchorState(hint)
+    LaunchedEffect(info.model.showOnboarding) {
+        if (info.model.showOnboarding) {
+            hintController.show(hintAnchor)
+            info.onOnboardingSeen()
+        }
+    }
     Scaffold(
         topBar = {
             TopAppBar(
@@ -43,6 +76,7 @@ fun Repositories(
                 title = {
                     Text(stringResource(R.string.app_details_repositories))
                 },
+                // TODO show when repos were last updated
             )
         },
         floatingActionButton = {
@@ -73,7 +107,7 @@ fun Repositories(
 @Composable
 fun RepositoriesScaffoldLoadingPreview() {
     FDroidContent {
-        val model = RepositoryModel(null)
+        val model = RepositoryModel(null, false)
         val info = getRepositoriesInfo(model)
         Repositories(info) {}
     }
@@ -106,7 +140,7 @@ fun RepositoriesScaffoldPreview() {
                 name = "My second repository",
             ),
         )
-        val model = RepositoryModel(repos)
+        val model = RepositoryModel(repos, false)
         val info = getRepositoriesInfo(model, repos[0].repoId)
         Repositories(info) { }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
index d203ac08c..b22d3d3aa 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
@@ -18,9 +18,9 @@ import androidx.compose.ui.draw.dropShadow
 import androidx.compose.ui.graphics.shadow.Shadow
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
-import org.fdroid.utils.DraggableItem
-import org.fdroid.utils.dragContainer
-import org.fdroid.utils.rememberDragDropState
+import org.fdroid.ui.utils.DraggableItem
+import org.fdroid.ui.utils.dragContainer
+import org.fdroid.ui.utils.rememberDragDropState
 
 @Composable
 fun RepositoriesList(
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
index 1836af7f2..da5a26bc2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.StateFlow
 fun RepositoriesPresenter(
     repositoriesFlow: Flow<List<RepositoryItem>>,
     repoSortingMapFlow: StateFlow<Map<Long, Int>>,
+    showOnboardingFlow: StateFlow<Boolean>,
 ): RepositoryModel {
     val repositories = repositoriesFlow.collectAsState(null).value
     val repoSortingMap = repoSortingMapFlow.collectAsState().value
@@ -17,5 +18,6 @@ fun RepositoriesPresenter(
             // newly added repos will not be in repoSortingMap, so they need fallback
             repoSortingMap[repo.repoId] ?: repositories.find { it.repoId == repo.repoId }?.weight
         },
+        showOnboarding = showOnboardingFlow.collectAsState().value,
     )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 659defc22..23675edc3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -15,12 +15,14 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import mu.KotlinLogging
 import org.fdroid.index.RepoManager
+import org.fdroid.settings.SettingsManager
 import javax.inject.Inject
 
 @HiltViewModel
 class RepositoriesViewModel @Inject constructor(
     app: Application,
     private val repoManager: RepoManager,
+    private val settingsManager: SettingsManager,
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger { }
@@ -34,6 +36,7 @@ class RepositoriesViewModel @Inject constructor(
         }
     }
     private val repoSortingMap: MutableStateFlow<Map<Long, Int>>
+    private val showOnboarding = settingsManager.showRepositoriesOnboarding
 
     init {
         // just add repos to sortingMap, because they are already pre-sorted by weight
@@ -49,6 +52,7 @@ class RepositoriesViewModel @Inject constructor(
         RepositoriesPresenter(
             repositoriesFlow = repos,
             repoSortingMapFlow = repoSortingMap,
+            showOnboardingFlow = showOnboarding,
         )
     }
 
@@ -75,4 +79,6 @@ class RepositoriesViewModel @Inject constructor(
 
     fun addRepo() {
     }
+
+    fun onOnboardingSeen() = settingsManager.onRepositoriesOnboardingSeen()
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
index 2e28ce763..087587f5a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
@@ -3,6 +3,7 @@ package org.fdroid.ui.repositories
 interface RepositoryInfo {
     val model: RepositoryModel
     val currentRepositoryId: Long?
+    fun onOnboardingSeen()
     fun onRepositorySelected(repositoryItem: RepositoryItem)
     fun onAddRepo()
     fun onRepositoryMoved(fromIndex: Int, toIndex: Int)
@@ -11,4 +12,5 @@ interface RepositoryInfo {
 
 data class RepositoryModel(
     val repositories: List<RepositoryItem>?,
+    val showOnboarding: Boolean,
 )
diff --git a/next/src/main/kotlin/org/fdroid/utils/DragDropState.kt b/next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
similarity index 99%
rename from next/src/main/kotlin/org/fdroid/utils/DragDropState.kt
rename to next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
index 10249d639..7e7a843d1 100644
--- a/next/src/main/kotlin/org/fdroid/utils/DragDropState.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
@@ -17,7 +17,7 @@
  * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/LazyColumnDragAndDropDemo.kt;drc=e6d33dd5d0a60001a5784d84123b05308d35f410
  */
 
-package org.fdroid.utils
+package org.fdroid.ui.utils
 
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.Spring
diff --git a/next/src/main/kotlin/org/fdroid/utils/OnboardingCard.kt b/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
similarity index 98%
rename from next/src/main/kotlin/org/fdroid/utils/OnboardingCard.kt
rename to next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
index 5812c1460..3094da1b5 100644
--- a/next/src/main/kotlin/org/fdroid/utils/OnboardingCard.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
@@ -1,4 +1,4 @@
-package org.fdroid.utils
+package org.fdroid.ui.utils
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index baa881630..c8b35afc0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -229,6 +229,7 @@ fun getRepositoriesInfo(
 ): RepositoryInfo = object : RepositoryInfo {
     override val model: RepositoryModel = model
     override val currentRepositoryId: Long? = currentRepositoryId
+    override fun onOnboardingSeen() {}
     override fun onRepositorySelected(repositoryItem: RepositoryItem) {}
     override fun onAddRepo() {}
     override fun onRepositoryMoved(fromIndex: Int, toIndex: Int) {}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
index aa79993ef..4b4d43a64 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
@@ -7,11 +7,16 @@ import android.content.Intent
 import android.os.PowerManager
 import android.text.format.DateUtils
 import android.util.Log
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.UriHandler
 import androidx.core.content.ContextCompat
 import java.text.Normalizer
 import java.text.Normalizer.Form.NFKD
 
+@Composable
+fun getHintOverlayColor() = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.8f)
+
 fun Context.startActivitySafe(i: Intent?) {
     if (i == null) return
     try {

From 89add73442266817ebda6f194cc0f419be68fcef Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 14 Oct 2025 17:46:07 -0300
Subject: [PATCH 072/180] Implement flow for adding new repos

---
 next/build.gradle.kts                         |   2 +
 next/src/main/AndroidManifest.xml             |  28 ++
 .../org/fdroid/repo/RepositoryModule.kt       |  14 +-
 .../main/kotlin/org/fdroid/ui/IntentRouter.kt |   5 +
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  30 ++-
 .../main/kotlin/org/fdroid/ui/Navigation.kt   |   3 +
 .../ui/repositories/RepositoriesViewModel.kt  |   3 -
 .../org/fdroid/ui/repositories/add/AddRepo.kt | 101 ++++++++
 .../ui/repositories/add/AddRepoErrorScreen.kt | 128 ++++++++++
 .../ui/repositories/add/AddRepoIntro.kt       | 241 ++++++++++++++++++
 .../repositories/add/AddRepoPreviewScreen.kt  | 144 +++++++++++
 .../repositories/add/AddRepoProgressScreen.kt |  46 ++++
 .../ui/repositories/add/AddRepoViewModel.kt   |  42 +++
 .../ui/repositories/add/RepoPreviewHeader.kt  | 204 +++++++++++++++
 ...FDroidOutlineButton.kt => FDroidButton.kt} |  25 ++
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  13 +
 next/src/main/res/values/strings-next.xml     |   1 +
 .../java/org/fdroid/ui/IntentRouterTest.kt    |  21 +-
 18 files changed, 1041 insertions(+), 10 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
 rename next/src/main/kotlin/org/fdroid/ui/utils/{FDroidOutlineButton.kt => FDroidButton.kt} (68%)

diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index b43288b9c..6d634fe14 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -88,6 +88,8 @@ dependencies {
 
     implementation(libs.acra.mail)
     implementation(libs.acra.dialog)
+    implementation("com.journeyapps:zxing-android-embedded:4.3.0") { isTransitive = false }
+    implementation(libs.zxing.core)
 
     implementation(libs.hilt.android)
     implementation(libs.androidx.hilt.navigation.compose)
diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
index 16fa2c41b..07ac48a10 100644
--- a/next/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -66,6 +66,29 @@
                 <data android:pathPrefix="/packages/" />
                 <data android:pathPattern="/.*/packages/.*" />
             </intent-filter>
+
+            <!-- Repo URLs -->
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="fdroid.link" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="fdroidrepos" />
+                <data
+                    android:scheme="FDROIDREPOS"
+                    tools:ignore="AppLinkUrlError" />
+            </intent-filter>
         </activity>
         <activity
             android:name="org.fdroid.ui.CrashActivity"
@@ -73,6 +96,11 @@
             android:finishOnTaskLaunch="true"
             android:launchMode="singleInstance"
             android:process=":acra" />
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:ignore="DiscouragedApi"
+            tools:replace="screenOrientation" />
 
         <service
             android:name="org.fdroid.install.AppInstallService"
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt b/next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
index 57cce1808..353aae642 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
@@ -6,6 +6,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import org.fdroid.CompatibilityChecker
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.DownloaderFactory
 import org.fdroid.download.HttpManager
@@ -21,8 +22,13 @@ object RepositoryModule {
         @ApplicationContext context: Context,
         db: FDroidDatabase,
         downloaderFactory: DownloaderFactory,
-        httpManager: HttpManager
-    ): RepoManager {
-        return RepoManager(context, db, downloaderFactory, httpManager)
-    }
+        httpManager: HttpManager,
+        compatibilityChecker: CompatibilityChecker,
+    ): RepoManager = RepoManager(
+        context = context,
+        db = db,
+        downloaderFactory = downloaderFactory,
+        httpManager = httpManager,
+        compatibilityChecker = compatibilityChecker,
+    )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
index 9ad1c4ed7..c3cd7ecc6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
@@ -43,6 +43,11 @@ class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Inten
             } else if (uri.path?.matches(packagesUrlRegex) == true) {
                 val packageName = uri.lastPathSegment ?: return
                 backStack.add(NavigationKey.AppDetails(packageName))
+            } else if (uri.scheme == "fdroidrepos" ||
+                uri.scheme == "FDROIDREPOS" ||
+                (uri.scheme == "https" && uri.host == "fdroid.link")
+            ) {
+                backStack.add(NavigationKey.AddRepo(uri.toString()))
             }
         } else if (ACTION_MY_APPS == intent.action) {
             if (backStack.lastOrNull() !is NavigationKey.MyApps) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 7e4f7b8a7..c43f990a8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -50,6 +50,8 @@ import org.fdroid.ui.repositories.RepositoriesViewModel
 import org.fdroid.ui.repositories.RepositoryInfo
 import org.fdroid.ui.repositories.RepositoryItem
 import org.fdroid.ui.repositories.RepositoryModel
+import org.fdroid.ui.repositories.add.AddRepo
+import org.fdroid.ui.repositories.add.AddRepoViewModel
 import org.fdroid.ui.settings.Settings
 import org.fdroid.ui.settings.SettingsViewModel
 
@@ -207,7 +209,9 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                             backStack.add(NavigationKey.RepoDetails(repositoryItem.repoId))
                         }
 
-                        override fun onAddRepo() = viewModel.addRepo()
+                        override fun onAddRepo() {
+                            backStack.add(NavigationKey.AddRepo())
+                        }
 
                         override fun onRepositoryMoved(fromIndex: Int, toIndex: Int) =
                             viewModel.onRepositoriesMoved(fromIndex, toIndex)
@@ -234,6 +238,30 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                         Text("This will basically be the repo details screen from latest client")
                     }
                 }
+                entry<NavigationKey.AddRepo> { navKey ->
+                    val viewModel = hiltViewModel<AddRepoViewModel>()
+                    LaunchedEffect(navKey) {
+                        if (navKey.uri != null) {
+                            viewModel.onFetchRepo(navKey.uri)
+                        }
+                    }
+                    AddRepo(
+                        state = viewModel.state.collectAsStateWithLifecycle().value,
+                        onFetchRepo = viewModel::onFetchRepo,
+                        onAddRepo = viewModel::addFetchedRepository,
+                        onExistingRepo = { repoId ->
+                            backStack.removeLastOrNull()
+                            backStack.add(NavigationKey.RepoDetails(repoId))
+                        },
+                        onRepoAdded = { title, repoId ->
+                            backStack.removeLastOrNull()
+                            backStack.add(NavigationKey.RepoDetails(repoId))
+                            val type = AppListType.Repository(title, repoId)
+                            backStack.add(NavigationKey.AppList(type))
+                        },
+                        onBackClicked = { backStack.removeLastOrNull() },
+                    )
+                }
                 entry(NavigationKey.Settings) {
                     val viewModel = hiltViewModel<SettingsViewModel>()
                     Settings(
diff --git a/next/src/main/kotlin/org/fdroid/ui/Navigation.kt b/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
index d4da1af53..8f621ff7d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
@@ -33,6 +33,9 @@ sealed interface NavigationKey : NavKey {
     @Serializable
     data class RepoDetails(val repoId: Long) : NavigationKey
 
+    @Serializable
+    data class AddRepo(val uri: String? = null) : NavigationKey
+
     @Serializable
     data object Settings : NavigationKey
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 23675edc3..690350a2d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -77,8 +77,5 @@ class RepositoriesViewModel @Inject constructor(
         repoManager.reorderRepositories(fromRepo, toRepo)
     }
 
-    fun addRepo() {
-    }
-
     fun onOnboardingSeen() = settingsManager.onRepositoriesOnboardingSeen()
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
new file mode 100644
index 000000000..c9bc1e4b2
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
@@ -0,0 +1,101 @@
+package org.fdroid.ui.repositories.add
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.core.os.LocaleListCompat
+import org.fdroid.index.IndexUpdateResult
+import org.fdroid.next.R
+import org.fdroid.repo.AddRepoError
+import org.fdroid.repo.AddRepoState
+import org.fdroid.repo.Added
+import org.fdroid.repo.Adding
+import org.fdroid.repo.FetchResult
+import org.fdroid.repo.Fetching
+import org.fdroid.repo.None
+import org.fdroid.repo.RepoUpdateWorker
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AddRepo(
+    state: AddRepoState,
+    onFetchRepo: (String) -> Unit,
+    onAddRepo: () -> Unit,
+    onExistingRepo: (Long) -> Unit,
+    onRepoAdded: (String, Long) -> Unit,
+    onBackClicked: () -> Unit,
+) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                navigationIcon = {
+                    IconButton(onClick = onBackClicked) {
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.back))
+                    }
+                },
+                title = {
+                    Text(
+                        text = if (state is Fetching) {
+                            when (state.fetchResult) {
+                                is FetchResult.IsNewMirror,
+                                is FetchResult.IsExistingMirror -> {
+                                    stringResource(R.string.repo_add_mirror)
+                                }
+                                else -> stringResource(R.string.repo_add_new_title)
+                            }
+                        } else {
+                            stringResource(R.string.repo_add_new_title)
+                        },
+                    )
+                },
+            )
+        },
+    ) { paddingValues ->
+        when (state) {
+            None -> AddRepoIntroContent(onFetchRepo, Modifier.padding(paddingValues))
+            is Fetching -> {
+                if (state.receivedRepo == null) {
+                    AddRepoProgressScreen(
+                        text = stringResource(R.string.repo_state_fetching),
+                        modifier = Modifier.padding(paddingValues)
+                    )
+                } else {
+                    AddRepoPreviewScreen(
+                        state = state,
+                        onAddRepo = onAddRepo,
+                        onExistingRepo = onExistingRepo,
+                        modifier = Modifier.padding(paddingValues),
+                    )
+                }
+            }
+            Adding -> AddRepoProgressScreen(
+                text = stringResource(R.string.repo_state_adding),
+                modifier = Modifier.padding(paddingValues)
+            )
+            is Added -> {
+                val context = LocalContext.current
+                LaunchedEffect(state) {
+                    if (state.updateResult is IndexUpdateResult.Error) {
+                        // try updating newly added repo again
+                        RepoUpdateWorker.updateNow(context, state.repo.repoId)
+                    }
+                    // tell UI that repo got added, so it can show info on it
+                    val name = state.repo.getName(LocaleListCompat.getDefault()) ?: "Unknown Repo"
+                    onRepoAdded(name, state.repo.repoId)
+                }
+            }
+            is AddRepoError -> AddRepoErrorScreen(state, Modifier.padding(paddingValues))
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
new file mode 100644
index 000000000..e62f10078
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
@@ -0,0 +1,128 @@
+package org.fdroid.ui.repositories.add
+
+import android.content.Context
+import android.os.Build.VERSION.SDK_INT
+import android.os.UserManager
+import android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.repo.AddRepoError
+import org.fdroid.repo.AddRepoError.ErrorType.INVALID_FINGERPRINT
+import org.fdroid.repo.AddRepoError.ErrorType.INVALID_INDEX
+import org.fdroid.repo.AddRepoError.ErrorType.IO_ERROR
+import org.fdroid.repo.AddRepoError.ErrorType.IS_ARCHIVE_REPO
+import org.fdroid.repo.AddRepoError.ErrorType.UNKNOWN_SOURCES_DISALLOWED
+import java.io.IOException
+
+@Composable
+fun AddRepoErrorScreen(state: AddRepoError, modifier: Modifier = Modifier) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(16.dp, CenterVertically),
+        horizontalAlignment = CenterHorizontally,
+        modifier = modifier
+            .padding(16.dp)
+            .fillMaxSize(),
+    ) {
+        Image(
+            imageVector = Icons.Default.Error,
+            contentDescription = null,
+            colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.error),
+            modifier = Modifier.size(48.dp),
+        )
+        val title = when (state.errorType) {
+            INVALID_FINGERPRINT -> stringResource(R.string.bad_fingerprint)
+            UNKNOWN_SOURCES_DISALLOWED -> {
+                if (LocalInspectionMode.current) {
+                    stringResource(R.string.has_disallow_install_unknown_sources)
+                } else {
+                    getDisallowInstallUnknownSourcesErrorMessage(LocalContext.current)
+                }
+            }
+            INVALID_INDEX -> stringResource(R.string.repo_invalid)
+            IO_ERROR -> stringResource(R.string.repo_io_error)
+            IS_ARCHIVE_REPO -> stringResource(R.string.repo_error_adding_archive)
+        }
+        Text(
+            text = title,
+            style = MaterialTheme.typography.headlineSmall,
+            textAlign = TextAlign.Center,
+        )
+        if (state.exception != null) Text(
+            text = state.exception.toString(),
+            style = MaterialTheme.typography.bodyLarge,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+    }
+}
+
+fun getDisallowInstallUnknownSourcesErrorMessage(context: Context): String {
+    val userManager = context.getSystemService(Context.USER_SERVICE) as UserManager
+    return if (SDK_INT >= 29 &&
+        userManager.hasUserRestriction(DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY)
+    ) {
+        context.getString(R.string.has_disallow_install_unknown_sources_globally)
+    } else {
+        context.getString(R.string.has_disallow_install_unknown_sources)
+    }
+}
+
+@Preview
+@Composable
+fun AddRepoErrorInvalidFingerprintPreview() {
+    FDroidContent {
+        AddRepoErrorScreen(AddRepoError(INVALID_FINGERPRINT))
+    }
+}
+
+@Preview
+@Composable
+fun AddRepoErrorIoErrorPreview() {
+    FDroidContent {
+        AddRepoErrorScreen(AddRepoError(IO_ERROR, IOException("foo bar")))
+    }
+}
+
+@Preview
+@Composable
+fun AddRepoErrorInvalidIndexPreview() {
+    FDroidContent {
+        AddRepoErrorScreen(AddRepoError(INVALID_INDEX, RuntimeException("foo bar")))
+    }
+}
+
+@Preview
+@Composable
+fun AddRepoErrorUnknownSourcesPreview() {
+    FDroidContent {
+        AddRepoErrorScreen(AddRepoError(UNKNOWN_SOURCES_DISALLOWED))
+    }
+}
+
+@Preview
+@Composable
+fun AddRepoErrorArchivePreview() {
+    FDroidContent {
+        AddRepoErrorScreen(AddRepoError(IS_ARCHIVE_REPO))
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
new file mode 100644
index 000000000..e0b39a3e1
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
@@ -0,0 +1,241 @@
+package org.fdroid.ui.repositories.add
+
+import android.Manifest.permission.CAMERA
+import android.content.Intent
+import android.content.pm.PackageManager.PERMISSION_GRANTED
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import android.net.Uri
+import android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.SpaceBetween
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.filled.ArrowDropUp
+import androidx.compose.material.icons.filled.ContentPaste
+import androidx.compose.material.icons.filled.QrCode
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat.checkSelfPermission
+import com.google.zxing.client.android.Intents.Scan.MIXED_SCAN
+import com.google.zxing.client.android.Intents.Scan.SCAN_TYPE
+import com.journeyapps.barcodescanner.ScanContract
+import com.journeyapps.barcodescanner.ScanOptions
+import com.journeyapps.barcodescanner.ScanOptions.QR_CODE
+import kotlinx.coroutines.launch
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.repo.None
+import org.fdroid.ui.utils.FDroidButton
+import org.fdroid.ui.utils.FDroidOutlineButton
+
+@Composable
+fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modifier) {
+    val scrollState = rememberScrollState()
+    val context = LocalContext.current
+    val isPreview = LocalInspectionMode.current
+    var showPermissionWarning by remember { mutableStateOf(isPreview) }
+    val startForResult = rememberLauncherForActivityResult(ScanContract()) { result ->
+        if (result.contents != null) {
+            onFetchRepo(result.contents)
+        }
+    }
+
+    fun startScanning() {
+        startForResult.launch(ScanOptions().apply {
+            setPrompt("")
+            setBeepEnabled(true)
+            setOrientationLocked(false)
+            setDesiredBarcodeFormats(QR_CODE)
+            addExtra(SCAN_TYPE, MIXED_SCAN)
+        })
+    }
+
+    val permissionLauncher = rememberLauncherForActivityResult(
+        contract = RequestPermission()
+    ) { isGranted: Boolean ->
+        showPermissionWarning = !isGranted
+        if (isGranted) startScanning()
+    }
+    Column(
+        verticalArrangement = spacedBy(16.dp),
+        horizontalAlignment = CenterHorizontally,
+        modifier = modifier
+            .imePadding()
+            .fillMaxSize()
+            .verticalScroll(scrollState)
+            .padding(16.dp),
+    ) {
+        Text(
+            text = stringResource(R.string.repo_intro),
+            style = MaterialTheme.typography.bodyLarge,
+        )
+        FDroidButton(
+            stringResource(R.string.repo_scan_qr_code),
+            imageVector = Icons.Filled.QrCode,
+            onClick = {
+                if (checkSelfPermission(context, CAMERA) == PERMISSION_GRANTED) {
+                    startScanning()
+                } else {
+                    permissionLauncher.launch(CAMERA)
+                }
+            },
+        )
+        AnimatedVisibility(showPermissionWarning) {
+            Card(
+                colors = CardDefaults.cardColors(
+                    containerColor = MaterialTheme.colorScheme.inverseSurface,
+                ),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clickable {
+                        val intent = Intent(ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                            data = Uri.fromParts("package", context.packageName, null)
+                        }
+                        context.startActivity(intent)
+                    }
+            ) {
+                Text(
+                    modifier = Modifier.padding(8.dp),
+                    text = stringResource(R.string.permission_camera_denied),
+                    textAlign = TextAlign.Center,
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+            }
+        }
+        var manualExpanded by rememberSaveable { mutableStateOf(isPreview) }
+        Row(
+            horizontalArrangement = SpaceBetween,
+            verticalAlignment = CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .heightIn(min = ButtonDefaults.MinHeight)
+                .clickable { manualExpanded = !manualExpanded },
+        ) {
+            Text(
+                text = stringResource(R.string.repo_enter_url),
+                style = MaterialTheme.typography.bodyMedium,
+                // avoid occupying the whole row
+                modifier = Modifier.weight(1f),
+            )
+            Icon(
+                imageVector = if (manualExpanded) {
+                    Icons.Default.ArrowDropUp
+                } else {
+                    Icons.Default.ArrowDropDown
+                },
+                contentDescription = null,
+            )
+        }
+        val textState = remember { mutableStateOf(TextFieldValue()) }
+        val focusRequester = remember { FocusRequester() }
+        val coroutineScope = rememberCoroutineScope()
+        AnimatedVisibility(visible = manualExpanded) {
+            Column(
+                horizontalAlignment = Alignment.End,
+                verticalArrangement = spacedBy(16.dp),
+            ) {
+                TextField(
+                    value = textState.value,
+                    minLines = 2,
+                    onValueChange = { textState.value = it },
+                    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Go),
+                    keyboardActions = KeyboardActions(
+                        onGo = {
+                            onFetchRepo(textState.value.text)
+                        },
+                    ),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .focusRequester(focusRequester)
+                        .onGloballyPositioned {
+                            focusRequester.requestFocus()
+                            coroutineScope.launch {
+                                scrollState.animateScrollTo(scrollState.maxValue)
+                            }
+                        },
+                )
+                Row(
+                    horizontalArrangement = spacedBy(16.dp),
+                    verticalAlignment = CenterVertically,
+                ) {
+                    val clipboardManager = LocalClipboardManager.current
+                    FDroidOutlineButton(
+                        stringResource(id = R.string.paste),
+                        imageVector = Icons.Default.ContentPaste,
+                        onClick = {
+                            if (clipboardManager.hasText()) {
+                                textState.value =
+                                    TextFieldValue(clipboardManager.getText()?.text ?: "")
+                            }
+                        },
+                    )
+                    Spacer(modifier = Modifier.weight(1f))
+                    FDroidButton(
+                        text = stringResource(R.string.repo_add_add),
+                        onClick = { onFetchRepo(textState.value.text) },
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+@Preview
+private fun Preview() {
+    FDroidContent {
+        AddRepo(None, {}, {}, {}, { _, _ -> }) {}
+    }
+}
+
+@Composable
+@Preview(uiMode = UI_MODE_NIGHT_YES, widthDp = 720, heightDp = 360)
+private fun PreviewNight() {
+    FDroidContent {
+        AddRepo(None, {}, {}, {}, { _, _ -> }) {}
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
new file mode 100644
index 000000000..5ce937603
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
@@ -0,0 +1,144 @@
+package org.fdroid.ui.repositories.add
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.LinearWavyProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
+import org.fdroid.database.MinimalApp
+import org.fdroid.download.getDownloadRequest
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.index.v2.FileV2
+import org.fdroid.next.R
+import org.fdroid.repo.FetchResult.IsNewRepoAndNewMirror
+import org.fdroid.repo.FetchResult.IsNewRepository
+import org.fdroid.repo.Fetching
+import org.fdroid.ui.lists.AppListItem
+import org.fdroid.ui.lists.AppListRow
+import org.fdroid.ui.utils.getRepository
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+fun AddRepoPreviewScreen(
+    state: Fetching,
+    modifier: Modifier = Modifier,
+    onAddRepo: () -> Unit,
+    onExistingRepo: (Long) -> Unit,
+) {
+    val localeList = LocaleListCompat.getDefault()
+    LazyColumn(
+        contentPadding = PaddingValues(horizontal = 8.dp),
+        verticalArrangement = spacedBy(8.dp),
+        modifier = modifier
+            .fillMaxWidth()
+    ) {
+        item {
+            RepoPreviewHeader(
+                state = state,
+                onAddRepo = onAddRepo,
+                onExistingRepo = onExistingRepo,
+                modifier = Modifier
+                    .padding(top = 16.dp)
+                    .padding(horizontal = 8.dp),
+                localeList = localeList,
+            )
+        }
+        if (state.fetchResult == null ||
+            state.fetchResult is IsNewRepository ||
+            state.fetchResult is IsNewRepoAndNewMirror
+        ) {
+            item {
+                Row(
+                    verticalAlignment = CenterVertically,
+                    horizontalArrangement = spacedBy(8.dp),
+                    modifier = Modifier
+                        .padding(top = 8.dp)
+                        .padding(horizontal = 8.dp),
+                ) {
+                    Text(
+                        text = stringResource(R.string.repo_preview_included_apps),
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
+                    Text(
+                        text = state.apps.size.toString(),
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
+                    if (!state.done) {
+                        LinearWavyProgressIndicator(modifier = Modifier.weight(1f))
+                    }
+                }
+            }
+            items(items = state.apps, key = { it.packageName }) { app ->
+                val repo = state.receivedRepo ?: error("no repo")
+                val item = AppListItem(
+                    repoId = repo.repoId,
+                    packageName = app.packageName,
+                    name = app.name ?: "Unknown app",
+                    summary = app.summary ?: "",
+                    iconDownloadRequest = app.getIcon(localeList)?.getDownloadRequest(repo),
+                    lastUpdated = 1L,
+                    isCompatible = true,
+                )
+                AppListRow(
+                    item = item,
+                    isSelected = false,
+                    modifier = Modifier
+                        .animateItem()
+                        .padding(horizontal = 8.dp)
+                        .fillMaxWidth()
+                )
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    val address = "https://example.org"
+    val repo = getRepository(address)
+    val app1 = object : MinimalApp {
+        override val repoId = 0L
+        override val packageName = "org.example"
+        override val name: String = "App 1 with a long name"
+        override val summary: String = "Summary of App1 which can also be a bit longer"
+        override fun getIcon(localeList: LocaleListCompat): FileV2? = null
+    }
+    val app2 = object : MinimalApp {
+        override val repoId = 0L
+        override val packageName = "com.example"
+        override val name: String = "App 2 with a name that is even longer than the first app"
+        override val summary: String =
+            "Summary of App2 which can also be a bit longer, even longer than other apps."
+
+        override fun getIcon(localeList: LocaleListCompat): FileV2? = null
+    }
+    val app3 = object : MinimalApp {
+        override val repoId = 0L
+        override val packageName = "net.example"
+        override val name: String = "App 3"
+        override val summary: String = "short summary"
+
+        override fun getIcon(localeList: LocaleListCompat): FileV2? = null
+    }
+    FDroidContent(pureBlack = true) {
+        AddRepoPreviewScreen(
+            Fetching(address, repo, listOf(app1, app2, app3), IsNewRepository),
+            onAddRepo = { },
+            onExistingRepo = {},
+        )
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
new file mode 100644
index 000000000..9b1693cef
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
@@ -0,0 +1,46 @@
+package org.fdroid.ui.repositories.add
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.CircularWavyProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun AddRepoProgressScreen(text: String, modifier: Modifier = Modifier) {
+    Column(
+        verticalArrangement = spacedBy(16.dp, CenterVertically),
+        horizontalAlignment = CenterHorizontally,
+        modifier = modifier
+            .padding(16.dp)
+            .fillMaxSize(),
+    ) {
+        Text(
+            text = text,
+            style = MaterialTheme.typography.headlineSmall,
+        )
+        CircularWavyProgressIndicator(modifier = Modifier.size(64.dp))
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent(pureBlack = true) {
+        AddRepoProgressScreen(stringResource(R.string.repo_state_fetching))
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
new file mode 100644
index 000000000..1de9e87f3
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
@@ -0,0 +1,42 @@
+package org.fdroid.ui.repositories.add
+
+import android.app.Application
+import androidx.core.net.toUri
+import androidx.lifecycle.AndroidViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.StateFlow
+import mu.KotlinLogging
+import org.fdroid.index.RepoManager
+import org.fdroid.repo.AddRepoState
+import javax.inject.Inject
+
+@HiltViewModel
+class AddRepoViewModel @Inject constructor(
+    app: Application,
+    private val repoManager: RepoManager,
+) : AndroidViewModel(app) {
+
+    private val log = KotlinLogging.logger { }
+    val state: StateFlow<AddRepoState> = repoManager.addRepoState
+
+    override fun onCleared() {
+        log.info { "onCleared() abort adding repository" }
+        repoManager.abortAddingRepository()
+    }
+
+    fun onFetchRepo(uriStr: String) {
+        val uri = uriStr.trim().toUri()
+        if (repoManager.isSwapUri(uri)) {
+            // TODO full only
+        } else {
+            repoManager.abortAddingRepository()
+            // TODO support proxy
+            repoManager.fetchRepositoryPreview(uri.toString(), proxy = null)
+        }
+    }
+
+    fun addFetchedRepository() {
+        log.info { "addFetchedRepository()" }
+        repoManager.addFetchedRepository()
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
new file mode 100644
index 000000000..ff337af7c
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
@@ -0,0 +1,204 @@
+package org.fdroid.ui.repositories.add
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Alignment.Companion.End
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
+import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.next.R
+import org.fdroid.repo.FetchResult.IsExistingMirror
+import org.fdroid.repo.FetchResult.IsExistingRepository
+import org.fdroid.repo.FetchResult.IsNewMirror
+import org.fdroid.repo.FetchResult.IsNewRepoAndNewMirror
+import org.fdroid.repo.FetchResult.IsNewRepository
+import org.fdroid.repo.Fetching
+import org.fdroid.ui.repositories.RepoIcon
+import org.fdroid.ui.utils.FDroidButton
+import org.fdroid.ui.utils.asRelativeTimeString
+import org.fdroid.ui.utils.getRepository
+
+@Composable
+fun RepoPreviewHeader(
+    state: Fetching,
+    onAddRepo: () -> Unit,
+    onExistingRepo: (Long) -> Unit,
+    modifier: Modifier = Modifier,
+    localeList: LocaleListCompat,
+) {
+    val repo = state.receivedRepo ?: error("repo was null")
+    val isDevPreview = LocalInspectionMode.current
+
+    val buttonText = when (state.fetchResult) {
+        is IsNewRepository -> stringResource(R.string.repo_add_new_title)
+        is IsNewRepoAndNewMirror -> stringResource(R.string.repo_add_repo_and_mirror)
+        is IsNewMirror -> stringResource(R.string.repo_add_mirror)
+        is IsExistingRepository, is IsExistingMirror -> stringResource(R.string.repo_view_repo)
+        else -> error("Unexpected fetch state: ${state.fetchResult}")
+    }
+    val buttonAction: () -> Unit = when (val res = state.fetchResult) {
+        is IsNewRepository, is IsNewRepoAndNewMirror, is IsNewMirror -> onAddRepo
+        is IsExistingRepository -> {
+            { onExistingRepo(res.existingRepoId) }
+        }
+        is IsExistingMirror -> {
+            { onExistingRepo(res.existingRepoId) }
+        }
+        else -> error("Unexpected fetch state: ${state.fetchResult}")
+    }
+
+    val warningText: String? = when (state.fetchResult) {
+        is IsNewRepository -> null
+        is IsNewRepoAndNewMirror -> stringResource(
+            R.string.repo_and_mirror_add_both_info,
+            state.fetchUrl
+        )
+        is IsNewMirror -> stringResource(R.string.repo_mirror_add_info, state.fetchUrl)
+        is IsExistingRepository -> stringResource(R.string.repo_exists)
+        is IsExistingMirror -> stringResource(R.string.repo_mirror_exists, state.fetchUrl)
+        else -> error("Unexpected fetch state: ${state.fetchResult}")
+    }
+
+    Column(
+        verticalArrangement = spacedBy(16.dp),
+        modifier = modifier.fillMaxWidth(),
+    ) {
+        Row(
+            horizontalArrangement = spacedBy(16.dp),
+            verticalAlignment = CenterVertically,
+        ) {
+            RepoIcon(repo, Modifier.size(48.dp))
+            Column(horizontalAlignment = Alignment.Start) {
+                Text(
+                    text = repo.getName(localeList) ?: "Unknown Repository",
+                    maxLines = 1,
+                    fontWeight = FontWeight.Bold,
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+                Text(
+                    text = repo.address.replaceFirst("https://", ""),
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+                Text(
+                    text = repo.timestamp.asRelativeTimeString(),
+                    style = MaterialTheme.typography.bodyMedium,
+                )
+            }
+        }
+
+        if (warningText != null) Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(MaterialTheme.colorScheme.inverseSurface),
+            contentAlignment = Alignment.Center,
+        ) {
+            Text(
+                modifier = Modifier
+                    .padding(8.dp),
+                text = warningText,
+                textAlign = TextAlign.Center,
+                style = MaterialTheme.typography.bodyLarge,
+                color = MaterialTheme.colorScheme.inverseOnSurface,
+            )
+        }
+
+        FDroidButton(
+            text = buttonText,
+            onClick = buttonAction,
+            modifier = Modifier.align(End),
+        )
+
+        val description = if (isDevPreview) {
+            LoremIpsum(42).values.joinToString(" ")
+        } else {
+            repo.getDescription(localeList)
+        }
+        if (description != null) Text(
+            // repos are still messing up their line breaks
+            text = description.replace("\n", " "),
+            style = MaterialTheme.typography.bodyMedium,
+        )
+    }
+}
+
+@Composable
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, widthDp = 720, heightDp = 360)
+fun RepoPreviewScreenNewMirrorPreview() {
+    val repo = getRepository("https://example.org")
+    FDroidContent {
+        RepoPreviewHeader(
+            Fetching("https://mirror.example.org", repo, emptyList(), IsNewMirror(0L)),
+            onAddRepo = { },
+            onExistingRepo = {},
+            localeList = LocaleListCompat.getDefault(),
+        )
+    }
+}
+
+@Composable
+@Preview
+fun RepoPreviewScreenNewRepoAndNewMirrorPreview() {
+    val repo = getRepository("https://example.org")
+    FDroidContent {
+        RepoPreviewHeader(
+            state = Fetching(
+                fetchUrl = "https://mirror.example.org",
+                receivedRepo = repo,
+                apps = emptyList(),
+                fetchResult = IsNewRepoAndNewMirror,
+            ),
+            onAddRepo = { },
+            onExistingRepo = {},
+            localeList = LocaleListCompat.getDefault(),
+        )
+    }
+}
+
+@Preview
+@Composable
+fun RepoPreviewScreenExistingRepoPreview() {
+    val address = "https://example.org"
+    val repo = getRepository(address)
+    FDroidContent {
+        RepoPreviewHeader(
+            Fetching(address, repo, emptyList(), IsExistingRepository(0L)),
+            onAddRepo = { },
+            onExistingRepo = {},
+            localeList = LocaleListCompat.getDefault(),
+        )
+    }
+}
+
+@Preview
+@Composable
+fun RepoPreviewScreenExistingMirrorPreview() {
+    val repo = getRepository("https://example.org")
+    FDroidContent {
+        RepoPreviewHeader(
+            Fetching("https://mirror.example.org", repo, emptyList(), IsExistingMirror(0L)),
+            onAddRepo = { },
+            onExistingRepo = {},
+            localeList = LocaleListCompat.getDefault(),
+        )
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/FDroidOutlineButton.kt b/next/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt
similarity index 68%
rename from next/src/main/kotlin/org/fdroid/ui/utils/FDroidOutlineButton.kt
rename to next/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt
index a4bfdf8b3..66300a6ee 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/FDroidOutlineButton.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -15,6 +16,30 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 
+@Composable
+fun FDroidButton(
+    text: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    imageVector: ImageVector? = null,
+) {
+    Button(
+        onClick = onClick,
+        shape = RoundedCornerShape(32.dp),
+        modifier = modifier.heightIn(min = ButtonDefaults.MinHeight)
+    ) {
+        if (imageVector != null) {
+            Icon(
+                imageVector = imageVector,
+                contentDescription = text,
+                modifier = Modifier.size(ButtonDefaults.IconSize),
+            )
+            Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
+        }
+        Text(text = text)
+    }
+}
+
 @Composable
 fun FDroidOutlineButton(
     text: String,
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index c8b35afc0..abfb4dc80 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -5,6 +5,8 @@ import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppPrefs
+import org.fdroid.database.Repository
+import org.fdroid.index.IndexFormatVersion
 import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
@@ -235,3 +237,14 @@ fun getRepositoriesInfo(
     override fun onRepositoryMoved(fromIndex: Int, toIndex: Int) {}
     override fun onRepositoriesFinishedMoving(fromRepoId: Long, toRepoId: Long) {}
 }
+
+fun getRepository(address: String = "https://example.org/repo") = Repository(
+    repoId = 42L,
+    address = address,
+    timestamp = 42L,
+    formatVersion = IndexFormatVersion.ONE,
+    certificate = "010203",
+    version = 20001L,
+    weight = 42,
+    lastUpdated = 1337,
+)
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 132d27037..b514f5f6d 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -87,6 +87,7 @@
     <string name="onboarding_app_list_filter_title">Filter</string>
     <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
     <string name="got_it">Got it</string>
+    <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
 
     <string name="crash_report_text">An unexpected error occurred.
         This is not your fault.
diff --git a/next/src/test/java/org/fdroid/ui/IntentRouterTest.kt b/next/src/test/java/org/fdroid/ui/IntentRouterTest.kt
index 68a6196f3..2b87a9bef 100644
--- a/next/src/test/java/org/fdroid/ui/IntentRouterTest.kt
+++ b/next/src/test/java/org/fdroid/ui/IntentRouterTest.kt
@@ -5,8 +5,8 @@ import android.content.Intent.ACTION_SHOW_APP_INFO
 import android.content.Intent.ACTION_VIEW
 import android.content.Intent.CATEGORY_BROWSABLE
 import android.content.Intent.EXTRA_PACKAGE_NAME
-import androidx.compose.runtime.mutableStateListOf
 import androidx.core.net.toUri
+import androidx.navigation3.runtime.NavBackStack
 import androidx.navigation3.runtime.NavKey
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -18,7 +18,7 @@ import kotlin.test.assertEquals
 @RunWith(RobolectricTestRunner::class)
 class IntentRouterTest {
 
-    private val backstack = mutableStateListOf<NavKey>()
+    private val backstack: NavBackStack<NavKey> = NavBackStack()
     private val intentRouter = IntentRouter(backstack)
 
     @Test
@@ -85,4 +85,21 @@ class IntentRouterTest {
         assertEquals(0, backstack.size)
     }
 
+    @Test
+    fun testRepoUris() {
+        listOf(
+            "fdroidrepos://example.org/repo",
+            "FDROIDREPOS://example.org/repo",
+            "https://fdroid.link/#repo=https://f-droid.org/repo",
+            "https://fdroid.link/#foo/bar",
+        ).forEach { uri ->
+            val i = Intent(ACTION_VIEW).apply {
+                data = uri.toUri()
+            }
+            intentRouter.accept(i)
+            assertEquals(1, backstack.size)
+            assertEquals(NavigationKey.AddRepo(uri), backstack.removeLastOrNull())
+        }
+    }
+
 }

From e1e8e64e6164b676f69de33e9d260349b81e9a05 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 14 Oct 2025 18:19:37 -0300
Subject: [PATCH 073/180] Change package name and namespace

---
 next/build.gradle.kts                                       | 4 ++--
 next/src/main/kotlin/org/fdroid/App.kt                      | 6 ++----
 next/src/main/kotlin/org/fdroid/NotificationManager.kt      | 1 -
 next/src/main/kotlin/org/fdroid/db/InitialData.kt           | 2 +-
 next/src/main/kotlin/org/fdroid/download/DownloadModule.kt  | 2 +-
 .../kotlin/org/fdroid/install/InstallNotificationState.kt   | 2 +-
 next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt   | 2 +-
 next/src/main/kotlin/org/fdroid/ui/About.kt                 | 4 ++--
 next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt         | 2 +-
 next/src/main/kotlin/org/fdroid/ui/Main.kt                  | 2 +-
 next/src/main/kotlin/org/fdroid/ui/Navigation.kt            | 2 +-
 next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt  | 2 +-
 next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt | 2 +-
 next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt           | 2 +-
 next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt  | 2 +-
 .../main/kotlin/org/fdroid/ui/categories/CategoryChip.kt    | 2 +-
 .../main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt   | 2 +-
 .../main/kotlin/org/fdroid/ui/categories/CategoryList.kt    | 2 +-
 next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt  | 2 +-
 next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt    | 2 +-
 .../main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt   | 2 +-
 .../src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt | 2 +-
 .../src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt | 2 +-
 .../kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt     | 2 +-
 .../main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt | 2 +-
 next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt   | 2 +-
 next/src/main/kotlin/org/fdroid/ui/details/Versions.kt      | 2 +-
 .../kotlin/org/fdroid/ui/discover/AppSearchInputField.kt    | 2 +-
 next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt   | 2 +-
 next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt     | 2 +-
 next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt         | 2 +-
 next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt      | 2 +-
 .../src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt | 2 +-
 next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt      | 2 +-
 next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt    | 2 +-
 next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt | 2 +-
 .../main/kotlin/org/fdroid/ui/repositories/Repositories.kt  | 2 +-
 .../main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt   | 2 +-
 .../org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt    | 2 +-
 .../kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt   | 2 +-
 .../org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt  | 2 +-
 .../org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt | 2 +-
 .../org/fdroid/ui/repositories/add/RepoPreviewHeader.kt     | 2 +-
 next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt     | 2 +-
 .../main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt | 2 +-
 .../main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt    | 2 +-
 next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt  | 2 +-
 .../kotlin/org/fdroid/updates/UpdateNotificationState.kt    | 2 +-
 48 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 6d634fe14..033985995 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 }
 
 android {
-    namespace = "org.fdroid.next"
+    namespace = "org.fdroid"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        applicationId = "org.fdroid.next"
+        applicationId = "org.fdroid.basic"
         minSdk = 24
         targetSdk = 36
         versionCode = 1
diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index e4e165516..d06451bc7 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -23,14 +23,12 @@ import org.acra.config.dialog
 import org.acra.config.mailSender
 import org.acra.data.StringFormat.JSON
 import org.acra.ktx.initAcra
+import org.fdroid.BuildConfig.APPLICATION_ID
+import org.fdroid.BuildConfig.VERSION_NAME
 import org.fdroid.download.DownloadRequest
 import org.fdroid.download.LocalIconFetcher
 import org.fdroid.download.PackageName
 import org.fdroid.download.coil.DownloadRequestFetcher
-import org.fdroid.next.BuildConfig
-import org.fdroid.next.BuildConfig.APPLICATION_ID
-import org.fdroid.next.BuildConfig.VERSION_NAME
-import org.fdroid.next.R
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.ui.CrashActivity
 import org.fdroid.updates.AppUpdateWorker
diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
index a7eac058c..de31369a1 100644
--- a/next/src/main/kotlin/org/fdroid/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -20,7 +20,6 @@ import androidx.core.content.ContextCompat.checkSelfPermission
 import dagger.hilt.android.qualifiers.ApplicationContext
 import mu.KotlinLogging
 import org.fdroid.install.InstallNotificationState
-import org.fdroid.next.R
 import org.fdroid.ui.IntentRouter.Companion.ACTION_MY_APPS
 import org.fdroid.updates.UpdateNotificationState
 import javax.inject.Inject
diff --git a/next/src/main/kotlin/org/fdroid/db/InitialData.kt b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
index 331f57b83..ca08b6f72 100644
--- a/next/src/main/kotlin/org/fdroid/db/InitialData.kt
+++ b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
@@ -5,11 +5,11 @@ import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
-import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.FDroidFixture
 import org.fdroid.database.InitialRepository
 import org.fdroid.database.RepositoryDao
+import org.fdroid.repo.RepoUpdateWorker
 import java.io.File
 
 class InitialData(val context: Context) : FDroidFixture {
diff --git a/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt b/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
index 43c24b733..487d2b9c9 100644
--- a/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
+++ b/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
@@ -4,7 +4,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.fdroid.next.BuildConfig
+import org.fdroid.BuildConfig
 import javax.inject.Singleton
 
 @Module
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
index e5e74c270..e2387f3f4 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
@@ -2,7 +2,7 @@ package org.fdroid.install
 
 import android.content.Context
 import androidx.annotation.StringRes
-import org.fdroid.next.R
+import org.fdroid.R
 import kotlin.math.roundToInt
 
 data class InstallNotificationState(
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index 56d96c423..3d4ac4135 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -12,6 +12,7 @@ import mu.KotlinLogging
 import org.fdroid.CompatibilityChecker
 import org.fdroid.CompatibilityCheckerImpl
 import org.fdroid.NotificationManager
+import org.fdroid.R
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.download.DownloaderFactory
@@ -20,7 +21,6 @@ import org.fdroid.index.IndexUpdateResult
 import org.fdroid.index.RepoManager
 import org.fdroid.index.RepoUpdater
 import org.fdroid.index.v1.IndexV1Updater
-import org.fdroid.next.R
 import org.fdroid.updates.UpdatesManager
 import java.io.File
 import javax.inject.Inject
diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
index f997e510f..dd12018c1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -32,9 +32,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.BuildConfig.VERSION_NAME
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.BuildConfig.VERSION_NAME
-import org.fdroid.next.R
 import org.fdroid.ui.utils.openUriSafe
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt b/next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt
index 39ebf4b62..55077c7a2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt
@@ -31,8 +31,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.acra.dialog.CrashReportDialogHelper
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 
 class CrashActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index c43f990a8..520cf620c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -29,10 +29,10 @@ import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
+import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
-import org.fdroid.next.R
 import org.fdroid.ui.apps.MyApps
 import org.fdroid.ui.apps.MyAppsInfo
 import org.fdroid.ui.apps.MyAppsViewModel
diff --git a/next/src/main/kotlin/org/fdroid/ui/Navigation.kt b/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
index 8f621ff7d..6ab5f2960 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
@@ -9,7 +9,7 @@ import androidx.compose.material.icons.filled.Settings
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation3.runtime.NavKey
 import kotlinx.serialization.Serializable
-import org.fdroid.next.R
+import org.fdroid.R
 import org.fdroid.ui.icons.PackageVariant
 import org.fdroid.ui.lists.AppListType
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
index 681560d27..1ec6b3e27 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
@@ -12,9 +12,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.Names
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
index 6e500f047..3083e853b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
@@ -17,10 +17,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
-import org.fdroid.next.R
 import org.fdroid.ui.utils.AsyncShimmerImage
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 5ac43c812..25f3ce1d2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -50,11 +50,11 @@ import androidx.lifecycle.Lifecycle.State.STARTED
 import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.navigation3.runtime.NavKey
+import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppListSortOrder.LAST_UPDATED
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
-import org.fdroid.next.R
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.lists.TopSearchBar
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index 9fdbcb6fc..ec33956ca 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -29,9 +29,9 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.getPreviewVersion
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
index d4a065b54..24a20eb19 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
@@ -14,8 +14,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 
 @Composable
 fun CategoryChip(
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
index 6e8c8eaf6..d0078a622 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
@@ -1,7 +1,7 @@
 package org.fdroid.ui.categories
 
 import androidx.annotation.StringRes
-import org.fdroid.next.R
+import org.fdroid.R
 
 data class CategoryGroup(
     val id: String,
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index 2c7a95a00..3cf6af493 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -14,8 +14,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.lists.AppListType
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
index 014074b19..c36c76277 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
@@ -22,8 +22,8 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.testApp
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index 3f57238f0..31475de36 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -68,9 +68,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
 import org.fdroid.LocaleChooser.getBestLocale
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
-import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.icons.License
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index f319f5c5b..66339ff33 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -55,9 +55,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import coil3.compose.AsyncImage
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
-import org.fdroid.next.R
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.startActivitySafe
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
index 08092ca8d..f8417a712 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
-import org.fdroid.next.R
+import org.fdroid.R
 import org.fdroid.ui.utils.openUriSafe
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
index 546acb9ac..115cca8c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
@@ -16,8 +16,8 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.utils.testApp
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
index ff4fd4910..c575966f3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import org.fdroid.next.R
+import org.fdroid.R
 import org.fdroid.ui.utils.startActivitySafe
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
index 6a523ad04..54a4871b9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
@@ -19,8 +19,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.utils.testApp
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
index 6899a86b1..2caf9b876 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
@@ -31,10 +31,10 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
+import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.IndexFormatVersion.TWO
-import org.fdroid.next.R
 import org.fdroid.ui.repositories.RepoIcon
 import org.fdroid.ui.utils.FDroidOutlineButton
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index eee8789d5..569ab07a8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -32,10 +32,10 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
+import org.fdroid.R
 import org.fdroid.database.AppVersion
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.v2.PackageVersion
-import org.fdroid.next.R
 import org.fdroid.ui.utils.FDroidOutlineButton
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.testApp
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
index 204499eab..1a4974020 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
@@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
-import org.fdroid.next.R
+import org.fdroid.R
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, FlowPreview::class)
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index ea5e3a529..81927dad0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -30,8 +30,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.categories.CategoryItem
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 7fc618359..1eaedc12e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -36,8 +36,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
 import kotlinx.coroutines.launch
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.MainOverFlowMenu
 import org.fdroid.ui.NavigationKey
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 7fbdcc0aa..f970d2598 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -51,9 +51,9 @@ import com.viktormykhailiv.compose.hints.hintAnchor
 import com.viktormykhailiv.compose.hints.rememberHint
 import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
+import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.OnboardingCard
 import org.fdroid.ui.utils.getAppListInfo
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
index 838f99483..97c0d9cd6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
@@ -13,8 +13,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.utils.AsyncShimmerImage
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index afb6d56cb..546f85ef5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -20,11 +20,11 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
-import org.fdroid.next.R
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.repositories.RepositoryItem
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index 485f96e4a..19a402f1e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -34,9 +34,9 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.icons.PackageVariant
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt b/next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
index 45c772b30..dd0e5570c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
@@ -22,7 +22,7 @@ import androidx.compose.ui.res.stringResource
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
-import org.fdroid.next.R
+import org.fdroid.R
 import org.fdroid.ui.discover.AppSearchInputField
 import org.fdroid.ui.discover.SEARCH_THRESHOLD
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
index f0cfd9e2d..f85bc9644 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
@@ -4,9 +4,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.core.os.LocaleListCompat
+import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.download.getDownloadRequest
-import org.fdroid.next.R
 import org.fdroid.ui.utils.AsyncShimmerImage
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index 2d244b6c8..225fd4231 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -25,8 +25,8 @@ import androidx.compose.ui.unit.dp
 import com.viktormykhailiv.compose.hints.rememberHint
 import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.OnboardingCard
 import org.fdroid.ui.utils.getHintOverlayColor
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
index c9bc1e4b2..0f5688b5a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
@@ -15,8 +15,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.core.os.LocaleListCompat
+import org.fdroid.R
 import org.fdroid.index.IndexUpdateResult
-import org.fdroid.next.R
 import org.fdroid.repo.AddRepoError
 import org.fdroid.repo.AddRepoState
 import org.fdroid.repo.Added
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
index e62f10078..562eb5d6e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
@@ -25,8 +25,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.repo.AddRepoError
 import org.fdroid.repo.AddRepoError.ErrorType.INVALID_FINGERPRINT
 import org.fdroid.repo.AddRepoError.ErrorType.INVALID_INDEX
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
index e0b39a3e1..e7b5705c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
@@ -66,8 +66,8 @@ import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
 import com.journeyapps.barcodescanner.ScanOptions.QR_CODE
 import kotlinx.coroutines.launch
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.repo.None
 import org.fdroid.ui.utils.FDroidButton
 import org.fdroid.ui.utils.FDroidOutlineButton
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
index 5ce937603..275d5070c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
@@ -18,11 +18,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
+import org.fdroid.R
 import org.fdroid.database.MinimalApp
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.v2.FileV2
-import org.fdroid.next.R
 import org.fdroid.repo.FetchResult.IsNewRepoAndNewMirror
 import org.fdroid.repo.FetchResult.IsNewRepository
 import org.fdroid.repo.Fetching
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
index 9b1693cef..01ee331a4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
@@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
index ff337af7c..c7df4589e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
@@ -24,8 +24,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import org.fdroid.repo.FetchResult.IsExistingMirror
 import org.fdroid.repo.FetchResult.IsExistingRepository
 import org.fdroid.repo.FetchResult.IsNewMirror
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index 1f4edc7f5..8be2c58d9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -24,8 +24,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
index 32a789ea8..e377c4ad4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mu.KotlinLogging
-import org.fdroid.next.R
+import org.fdroid.R
 import java.io.IOException
 import java.lang.Runtime.getRuntime
 import javax.inject.Inject
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt b/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
index da279d3b4..c157c18a0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
@@ -23,8 +23,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.SubcomposeAsyncImage
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 
 @Composable
 fun AsyncShimmerImage(
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt b/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
index 3094da1b5..d337d8e2e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
@@ -13,8 +13,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.next.R
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt b/next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
index 36baea962..6b734fa2f 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
@@ -1,7 +1,7 @@
 package org.fdroid.updates
 
 import android.content.Context
-import org.fdroid.next.R
+import org.fdroid.R
 
 data class UpdateNotificationState(
     private val updates: List<AppUpdate>,

From 38c969176a712c060f720f09fc179551ad380ba2 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 17 Oct 2025 11:36:24 -0300
Subject: [PATCH 074/180] Fix some bugs with repo list re-ordering

---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  4 +-
 .../ui/repositories/RepositoriesList.kt       |  6 +-
 .../ui/repositories/RepositoriesPresenter.kt  |  8 +--
 .../ui/repositories/RepositoriesViewModel.kt  | 56 +++++++++++--------
 .../fdroid/ui/repositories/RepositoryInfo.kt  |  2 +-
 .../org/fdroid/ui/utils/DragDropState.kt      | 31 +++++-----
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  2 +-
 7 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 520cf620c..2d2e5ce7d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -213,8 +213,8 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                             backStack.add(NavigationKey.AddRepo())
                         }
 
-                        override fun onRepositoryMoved(fromIndex: Int, toIndex: Int) =
-                            viewModel.onRepositoriesMoved(fromIndex, toIndex)
+                        override fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long) =
+                            viewModel.onRepositoriesMoved(fromRepoId, toRepoId)
 
                         override fun onRepositoriesFinishedMoving(
                             fromRepoId: Long,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
index b22d3d3aa..e530633b2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
@@ -32,7 +32,11 @@ fun RepositoriesList(
     val listState = rememberLazyListState()
     val dragDropState = rememberDragDropState(
         lazyListState = listState,
-        onMove = info::onRepositoryMoved,
+        onMove = { from, to ->
+            from as? Long ?: error("from $from was not a repoId")
+            to as? Long ?: error("to $to was not a repoId")
+            info.onRepositoryMoved(from, to)
+        },
         onEnd = { from, to ->
             from as? Long ?: error("from $from was not a repoId")
             to as? Long ?: error("to $to was not a repoId")
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
index da5a26bc2..ac5c50375 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
@@ -2,21 +2,19 @@ package org.fdroid.ui.repositories
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 
 @Composable
 fun RepositoriesPresenter(
-    repositoriesFlow: Flow<List<RepositoryItem>>,
+    repositoriesFlow: StateFlow<List<RepositoryItem>?>,
     repoSortingMapFlow: StateFlow<Map<Long, Int>>,
     showOnboardingFlow: StateFlow<Boolean>,
 ): RepositoryModel {
-    val repositories = repositoriesFlow.collectAsState(null).value
+    val repositories = repositoriesFlow.collectAsState().value
     val repoSortingMap = repoSortingMapFlow.collectAsState().value
     return RepositoryModel(
         repositories = repositories?.sortedBy { repo ->
-            // newly added repos will not be in repoSortingMap, so they need fallback
-            repoSortingMap[repo.repoId] ?: repositories.find { it.repoId == repo.repoId }?.weight
+            repoSortingMap[repo.repoId] ?: repoSortingMap.size
         },
         showOnboarding = showOnboardingFlow.collectAsState().value,
     )
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 690350a2d..81e74fe55 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -9,11 +9,12 @@ import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import mu.KotlinLogging
+import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
 import org.fdroid.settings.SettingsManager
 import javax.inject.Inject
@@ -29,22 +30,16 @@ class RepositoriesViewModel @Inject constructor(
     private val localeList = LocaleListCompat.getDefault()
     private val moleculeScope =
         CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
-    private val repos: Flow<List<RepositoryItem>> = repoManager.repositoriesState.map { repos ->
-        repos.mapNotNull {
-            if (it.isArchiveRepo) null
-            else RepositoryItem(it, localeList)
-        }
-    }
-    private val repoSortingMap: MutableStateFlow<Map<Long, Int>>
+    private val repos = MutableStateFlow<List<RepositoryItem>?>(null)
+    private val repoSortingMap = MutableStateFlow<Map<Long, Int>>(emptyMap())
     private val showOnboarding = settingsManager.showRepositoriesOnboarding
 
     init {
-        // just add repos to sortingMap, because they are already pre-sorted by weight
-        val sortingMap = mutableMapOf<Long, Int>()
-        repoManager.getRepositories().forEachIndexed { index, repository ->
-            sortingMap[repository.repoId] = index
+        viewModelScope.launch {
+            repoManager.repositoriesState.collect {
+                onRepositoriesChanged(it)
+            }
         }
-        repoSortingMap = MutableStateFlow(sortingMap)
     }
 
     // define below init, because this only defines repoSortingMap
@@ -56,14 +51,31 @@ class RepositoriesViewModel @Inject constructor(
         )
     }
 
-    fun onRepositoriesMoved(fromIndex: Int, toIndex: Int) {
-        log.info { "onRepositoriesMoved($fromIndex, $toIndex)" }
-        val repoItems = model.value.repositories ?: error("Model had null repositories")
-        val fromItem = repoItems[fromIndex]
-        val toItem = repoItems[toIndex]
-        repoSortingMap.value = repoSortingMap.value.toMutableMap().apply {
-            replace(fromItem.repoId, toIndex)
-            replace(toItem.repoId, fromIndex)
+    private fun onRepositoriesChanged(repositories: List<Repository>) {
+        log.info("onRepositoriesChanged(${repositories.size})")
+        repos.update {
+            repositories.mapNotNull {
+                if (it.isArchiveRepo) null
+                else RepositoryItem(it, localeList)
+            }
+        }
+        repoSortingMap.update {
+            // just add repos to sortingMap, because they are already pre-sorted by weight
+            mutableMapOf<Long, Int>().apply {
+                repositories.forEachIndexed { index, repository ->
+                    this[repository.repoId] = index
+                }
+            }
+        }
+    }
+
+    fun onRepositoriesMoved(fromRepoId: Long, toRepoId: Long) {
+        log.info { "onRepositoriesMoved($fromRepoId, $toRepoId)" }
+        repoSortingMap.update {
+            repoSortingMap.value.toMutableMap().apply {
+                val toIndex = get(toRepoId) ?: error("No position for toRepoId $toRepoId")
+                replace(toRepoId, replace(fromRepoId, toIndex)!!)
+            }
         }
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
index 087587f5a..01c194fb8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
@@ -6,7 +6,7 @@ interface RepositoryInfo {
     fun onOnboardingSeen()
     fun onRepositorySelected(repositoryItem: RepositoryItem)
     fun onAddRepo()
-    fun onRepositoryMoved(fromIndex: Int, toIndex: Int)
+    fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long)
     fun onRepositoriesFinishedMoving(fromRepoId: Long, toRepoId: Long)
 }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt b/next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
index 7e7a843d1..dd9a4b3c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
@@ -49,10 +49,14 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 
+// We are not passing indexes like in upstream code, because in larger lists these weren't correct
+// so we pass [Any] for the item key instead.
+// Hopefully, dragging items will be natively supported soon, so we can remove this entire file.
+
 @Composable
 fun rememberDragDropState(
     lazyListState: LazyListState,
-    onMove: (Int, Int) -> Unit,
+    onMove: (Any, Any) -> Unit,
     onEnd: (Any, Any) -> Unit
 ): DragDropState {
     val scope = rememberCoroutineScope()
@@ -71,12 +75,11 @@ fun rememberDragDropState(
 class DragDropState internal constructor(
     private val state: LazyListState,
     private val scope: CoroutineScope,
-    private val onMove: (Int, Int) -> Unit,
+    private val onMove: (Any, Any) -> Unit,
     private val onEnd: (Any, Any) -> Unit,
 ) {
-    private var movedFrom: Int? = null
-    private var movedFromKey: Any? = null
-    private var movedToKey: Any? = null
+    private var movedFrom: LazyListItemInfo? = null
+    private var movedTo: LazyListItemInfo? = null
     var draggingItemIndex by mutableStateOf<Int?>(null)
         private set
 
@@ -103,8 +106,7 @@ class DragDropState internal constructor(
         state.layoutInfo.visibleItemsInfo
             .firstOrNull { item -> offset.y.toInt() in item.offset..(item.offset + item.size) }
             ?.also {
-                movedFrom = it.index
-                movedFromKey = it.key
+                movedFrom = it
                 draggingItemIndex = it.index
                 draggingItemInitialOffset = it.offset
             }
@@ -127,14 +129,13 @@ class DragDropState internal constructor(
         draggingItemIndex = null
         draggingItemInitialOffset = 0
         movedFrom = null
-        movedFromKey = null
-        movedToKey = null
+        movedTo = null
     }
 
     internal fun onDragEnd() {
-        val from = movedFromKey ?: error("Moved from was null")
-        val to = movedToKey ?: from
-        if (from != to) onEnd(from, to)
+        val from = movedFrom ?: error("Moved from was null")
+        val to = movedTo ?: from
+        if (from.key != to.key && from.index != to.index) onEnd(from.key, to.key)
         onDragInterrupted()
     }
 
@@ -161,9 +162,9 @@ class DragDropState internal constructor(
                     state.firstVisibleItemScrollOffset,
                 )
             }
-            onMove.invoke(draggingItem.index, targetItem.index)
+            onMove(draggingItem.key, targetItem.key)
             draggingItemIndex = targetItem.index
-            movedToKey = targetItem.key
+            movedTo = targetItem
         } else {
             val overscroll =
                 when {
@@ -218,7 +219,7 @@ fun LazyItemScope.DraggableItem(
                     translationY = dragDropState.previousItemOffset.value
                 }
         } else {
-            Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null)
+            Modifier // not animating here as this caused strange item jumps
         }
     Column(modifier = modifier.then(draggingModifier)) { content(dragging) }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index abfb4dc80..6ac6ef648 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -234,7 +234,7 @@ fun getRepositoriesInfo(
     override fun onOnboardingSeen() {}
     override fun onRepositorySelected(repositoryItem: RepositoryItem) {}
     override fun onAddRepo() {}
-    override fun onRepositoryMoved(fromIndex: Int, toIndex: Int) {}
+    override fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long) {}
     override fun onRepositoriesFinishedMoving(fromRepoId: Long, toRepoId: Long) {}
 }
 

From 9dffdd9242dd934328ad842752e70ce3f50bfa3d Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 15 Oct 2025 17:39:12 -0300
Subject: [PATCH 075/180] Implement repo details page

---
 .../org/fdroid/settings/SettingsManager.kt    |   7 +
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  31 ++--
 .../org/fdroid/ui/details/AntiFeatures.kt     |   1 +
 .../org/fdroid/ui/details/AppDetails.kt       |   1 +
 .../kotlin/org/fdroid/ui/details/Versions.kt  |   1 +
 .../ui/repositories/details/BasicAuth.kt      |  77 +++++++++
 .../ui/repositories/details/DeleteDialog.kt   |  37 +++++
 .../repositories/details/OfficialMirrors.kt   | 119 ++++++++++++++
 .../ui/repositories/details/QrCodeDialog.kt   |  59 +++++++
 .../ui/repositories/details/RepoDetails.kt    | 134 +++++++++++++++
 .../details/RepoDetailsContent.kt             |  96 +++++++++++
 .../repositories/details/RepoDetailsHeader.kt | 115 +++++++++++++
 .../repositories/details/RepoDetailsInfo.kt   | 128 +++++++++++++++
 .../details/RepoDetailsPresenter.kt           |  34 ++++
 .../details/RepoDetailsViewModel.kt           | 147 +++++++++++++++++
 .../ui/repositories/details/RepoSettings.kt   | 110 +++++++++++++
 .../ui/repositories/details/UserMirrors.kt    | 152 ++++++++++++++++++
 .../{details => utils}/ExpandableSection.kt   |   2 +-
 .../org/fdroid/ui/utils/FDroidSwitchRow.kt    |  66 ++++++++
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  56 +++++++
 .../kotlin/org/fdroid/ui/utils/UiUtils.kt     |  43 +++++
 next/src/main/res/values/strings-next.xml     |   3 +
 22 files changed, 1405 insertions(+), 14 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
 rename next/src/main/kotlin/org/fdroid/ui/{details => utils}/ExpandableSection.kt (98%)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt

diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index ba6791bf4..473d092f1 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -18,6 +18,8 @@ class SettingsManager @Inject constructor() {
     val showFilterOnboarding = _showFilterOnboarding.asStateFlow()
     private val _showRepositoriesOnboarding = MutableStateFlow(true)
     val showRepositoriesOnboarding = _showRepositoriesOnboarding.asStateFlow()
+    private val _showRepoDetailsOnboarding = MutableStateFlow(true)
+    val showRepoDetailsOnboarding = _showRepoDetailsOnboarding.asStateFlow()
 
     fun saveAppListFilter(sortOrder: AppListSortOrder, filterIncompatible: Boolean) {
         _appListSortOrder.value = sortOrder
@@ -34,4 +36,9 @@ class SettingsManager @Inject constructor() {
         // TODO persist
     }
 
+    fun onRepoDetailsOnboardingSeen() {
+        _showRepoDetailsOnboarding.value = false
+        // TODO persist
+    }
+
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 2d2e5ce7d..6405e02f6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -2,11 +2,6 @@ package org.fdroid.ui
 
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.LocalActivity
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement.spacedBy
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.safeDrawingPadding
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
@@ -52,6 +47,9 @@ import org.fdroid.ui.repositories.RepositoryItem
 import org.fdroid.ui.repositories.RepositoryModel
 import org.fdroid.ui.repositories.add.AddRepo
 import org.fdroid.ui.repositories.add.AddRepoViewModel
+import org.fdroid.ui.repositories.details.RepoDetails
+import org.fdroid.ui.repositories.details.RepoDetailsInfo
+import org.fdroid.ui.repositories.details.RepoDetailsViewModel
 import org.fdroid.ui.settings.Settings
 import org.fdroid.ui.settings.SettingsViewModel
 
@@ -227,15 +225,22 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 }
                 entry<NavigationKey.RepoDetails>(
                     metadata = ListDetailSceneStrategy.detailPane("repos")
-                ) {
-                    Column(
-                        verticalArrangement = spacedBy(16.dp),
-                        modifier = Modifier
-                            .background(MaterialTheme.colorScheme.background)
-                            .safeDrawingPadding(),
+                ) { navKey ->
+                    val viewModel = hiltViewModel<RepoDetailsViewModel>()
+                    LaunchedEffect(navKey) {
+                        viewModel.setRepoId(navKey.repoId)
+                    }
+                    RepoDetails(
+                        info = object : RepoDetailsInfo {
+                            override val model = viewModel.model.collectAsStateWithLifecycle().value
+                            override val actions = viewModel
+                        },
+                        onShowAppsClicked = { title, repoId ->
+                            val type = AppListType.Repository(title, repoId)
+                            backStack.add(NavigationKey.AppList(type))
+                        },
                     ) {
-                        Text("Repo ${it.repoId}")
-                        Text("This will basically be the repo details screen from latest client")
+                        backStack.removeLastOrNull()
                     }
                 }
                 entry<NavigationKey.AddRepo> { navKey ->
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
index c36c76277..3255d2b8c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
@@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.testApp
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index 31475de36..87e0a48d9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -77,6 +77,7 @@ import org.fdroid.ui.icons.License
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.BigLoadingIndicator
+import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.testApp
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index 569ab07a8..88a392b3c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -36,6 +36,7 @@ import org.fdroid.R
 import org.fdroid.database.AppVersion
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.v2.PackageVersion
+import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.FDroidOutlineButton
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.testApp
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
new file mode 100644
index 000000000..5405dc15f
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
@@ -0,0 +1,77 @@
+package org.fdroid.ui.repositories.details
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Save
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.FDroidOutlineButton
+
+@Composable
+fun BasicAuth(
+    username: String,
+    modifier: Modifier = Modifier,
+    onEditCredentials: (String, String) -> Unit,
+) {
+    val usernameState = rememberTextFieldState(initialText = username)
+    val passwordState = rememberTextFieldState()
+    var showSaveButton by remember { mutableStateOf(true) }
+    Column(
+        verticalArrangement = spacedBy(8.dp),
+        modifier = modifier
+            .fillMaxWidth()
+            .imePadding()
+    ) {
+        Text(
+            text = stringResource(R.string.repo_basic_auth_title),
+            style = MaterialTheme.typography.titleMedium,
+        )
+        TextField(
+            state = usernameState,
+            label = { Text(stringResource(R.string.repo_basicauth_username)) }
+        )
+        TextField(
+            state = passwordState,
+            label = { Text(stringResource(R.string.repo_basicauth_password)) }
+        )
+        AnimatedVisibility(showSaveButton, Modifier.align(Alignment.End)) {
+            FDroidOutlineButton(
+                text = stringResource(R.string.repo_basicauth_edit),
+                onClick = {
+                    val username = usernameState.text.toString()
+                    val password = passwordState.text.toString()
+                    onEditCredentials(username, password)
+                    showSaveButton = false
+                },
+                imageVector = Icons.Default.Save,
+            )
+        }
+    }
+}
+
+@Composable
+@Preview
+fun BasicAuthCardPreview() {
+    FDroidContent {
+        BasicAuth("username", Modifier.padding(16.dp)) { _, _ -> }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt
new file mode 100644
index 000000000..e93c8f1cd
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt
@@ -0,0 +1,37 @@
+package org.fdroid.ui.repositories.details
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import org.fdroid.R
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun DeleteDialog(onDismissDialog: () -> Unit, onDelete: () -> Unit) {
+    AlertDialog(
+        title = {
+            Text(text = stringResource(R.string.repo_confirm_delete_title))
+        },
+        text = {
+            Text(text = stringResource(R.string.repo_confirm_delete_body))
+        },
+        onDismissRequest = onDismissDialog,
+        confirmButton = {
+            TextButton(onClick = onDelete) {
+                Text(
+                    text = stringResource(R.string.delete),
+                    color = MaterialTheme.colorScheme.error,
+                )
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismissDialog) {
+                Text(stringResource(android.R.string.cancel))
+            }
+        }
+    )
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
new file mode 100644
index 000000000..0f742da86
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
@@ -0,0 +1,119 @@
+package org.fdroid.ui.repositories.details
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.selection.toggleable
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Public
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.download.Mirror
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.ExpandableSection
+
+@Composable
+fun OfficialMirrors(
+    mirrors: List<OfficialMirrorItem>,
+    setMirrorEnabled: (Mirror, Boolean) -> Unit,
+) {
+    ExpandableSection(
+        icon = rememberVectorPainter(Icons.Default.Public),
+        title = stringResource(R.string.repo_official_mirrors),
+        modifier = Modifier.padding(horizontal = 16.dp),
+    ) {
+        Column {
+            mirrors.forEach { m ->
+                OfficialMirrorRow(
+                    item = m,
+                    setMirrorEnabled = { m, enabled ->
+                        setMirrorEnabled(m, enabled)
+                    },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun OfficialMirrorRow(
+    item: OfficialMirrorItem,
+    setMirrorEnabled: (Mirror, Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        leadingContent = {
+            Text(
+                text = item.emoji,
+                modifier = Modifier.width(20.dp),
+            )
+        },
+        headlineContent = {
+            Text(item.url)
+        },
+        trailingContent = {
+            Switch(
+                checked = item.isEnabled,
+                onCheckedChange = null,
+            )
+        },
+        colors = ListItemDefaults.colors(MaterialTheme.colorScheme.background),
+        modifier = modifier.toggleable(
+            value = item.isEnabled,
+            role = Role.Switch,
+            onValueChange = { checked -> setMirrorEnabled(item.mirror, checked) },
+        ),
+    )
+}
+
+@Preview
+@Composable
+fun OfficialMirrorsPreview() {
+    FDroidContent {
+        val mirrors = listOf(
+            OfficialMirrorItem(
+                mirror = Mirror(baseUrl = "https://mirror.example.com/fdroid/repo"),
+                isEnabled = true,
+                isRepoAddress = true,
+            ),
+            OfficialMirrorItem(
+                mirror = Mirror("https://mirror.example.com/foo/bar/fdroid/repo", "de"),
+                isEnabled = false,
+                isRepoAddress = false,
+            ),
+            OfficialMirrorItem(
+                mirror = Mirror("https://foobar.onion"),
+                isEnabled = true,
+                isRepoAddress = false,
+            ),
+            OfficialMirrorItem(
+                mirror = Mirror(
+                    "https://mirror.example.org/with/a/very/long/url/that/wraps/repo",
+                    "fr"
+                ),
+                isEnabled = true,
+                isRepoAddress = false,
+            ),
+            OfficialMirrorItem(
+                mirror = Mirror("https://mirror.example.net/repo"),
+                isEnabled = false,
+                isRepoAddress = false,
+            ),
+        ).sorted()
+        OfficialMirrors(
+            mirrors = mirrors,
+            setMirrorEnabled = { _, _ -> },
+        )
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt
new file mode 100644
index 000000000..814fae819
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt
@@ -0,0 +1,59 @@
+package org.fdroid.ui.repositories.details
+
+import android.graphics.Bitmap
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.LoadingIndicator
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.produceState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun QrCodeDialog(onDismissDialog: () -> Unit, generateQrCode: suspend () -> Bitmap?) {
+    val qrCodeBitmap: ImageBitmap? by produceState(null) {
+        value = generateQrCode()?.asImageBitmap()
+    }
+    AlertDialog(
+        title = {
+            Text(text = stringResource(R.string.share_repository))
+        },
+        text = {
+            val bitmap = qrCodeBitmap
+            Box(
+                contentAlignment = Alignment.Center,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .heightIn(min = 128.dp)
+            ) {
+                if (bitmap == null) {
+                    LoadingIndicator()
+                } else {
+                    Image(
+                        bitmap = bitmap,
+                        contentDescription = stringResource(R.string.swap_scan_qr)
+                    )
+                }
+            }
+        },
+        onDismissRequest = onDismissDialog,
+        confirmButton = {
+            TextButton(onClick = onDismissDialog) {
+                Text(stringResource(R.string.ok))
+            }
+        },
+    )
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
new file mode 100644
index 000000000..0459b8b49
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -0,0 +1,134 @@
+package org.fdroid.ui.repositories.details
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.QrCode
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.viktormykhailiv.compose.hints.rememberHint
+import com.viktormykhailiv.compose.hints.rememberHintAnchorState
+import com.viktormykhailiv.compose.hints.rememberHintController
+import org.fdroid.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.BigLoadingIndicator
+import org.fdroid.ui.utils.OnboardingCard
+import org.fdroid.ui.utils.getHintOverlayColor
+import org.fdroid.ui.utils.getRepoDetailsInfo
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
+fun RepoDetails(
+    info: RepoDetailsInfo,
+    onShowAppsClicked: (String, Long) -> Unit,
+    onBack: () -> Unit,
+) {
+    val context = LocalContext.current
+    val repo = info.model.repo
+
+    val hintController = rememberHintController(
+        overlay = getHintOverlayColor(),
+    )
+    val hint = rememberHint {
+        Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+            OnboardingCard(
+                title = stringResource(R.string.repo_details),
+                message = stringResource(R.string.repo_details_info_text),
+                modifier = Modifier.padding(horizontal = 32.dp, vertical = 8.dp),
+                onGotIt = {
+                    info.actions.onOnboardingSeen()
+                    hintController.dismiss()
+                },
+            )
+        }
+    }
+    val hintAnchor = rememberHintAnchorState(hint)
+    LaunchedEffect(info.model.showOnboarding) {
+        if (info.model.showOnboarding) {
+            hintController.show(hintAnchor)
+            info.actions.onOnboardingSeen()
+        }
+    }
+
+    var qrCodeDialog by remember { mutableStateOf(false) }
+    var deleteDialog by remember { mutableStateOf(false) }
+    if (repo != null && qrCodeDialog) QrCodeDialog({ qrCodeDialog = false }) {
+        info.actions.generateQrCode(repo)
+    }
+    if (repo != null && deleteDialog) DeleteDialog({ deleteDialog = false }) {
+        info.actions.deleteRepository(repo.repoId)
+        deleteDialog = false
+        onBack()
+    }
+    Scaffold(topBar = {
+        TopAppBar(
+            navigationIcon = {
+                IconButton(onClick = onBack) {
+                    Icon(
+                        imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                        contentDescription = stringResource(R.string.back),
+                    )
+                }
+            },
+            title = {
+                Text(stringResource(R.string.repo_details))
+            },
+            actions = {
+                if (repo == null) return@TopAppBar
+                IconButton(onClick = { info.model.shareRepo(context) }) {
+                    Icon(
+                        imageVector = Icons.Default.Share,
+                        contentDescription = stringResource(R.string.share_repository)
+                    )
+                }
+                IconButton(onClick = { qrCodeDialog = true }) {
+                    Icon(
+                        imageVector = Icons.Default.QrCode,
+                        contentDescription = stringResource(R.string.show_repository_qr)
+                    )
+                }
+                IconButton(onClick = { deleteDialog = true }) {
+                    Icon(
+                        imageVector = Icons.Default.Delete,
+                        contentDescription = stringResource(R.string.delete)
+                    )
+                }
+            })
+    }) { paddingValues ->
+        if (repo == null) BigLoadingIndicator()
+        else RepoDetailsContent(
+            info = info,
+            onShowAppsClicked = onShowAppsClicked,
+            modifier = Modifier.padding(paddingValues)
+        )
+    }
+}
+
+@Preview
+@Composable
+fun RepoDetailsScreenPreview() {
+    FDroidContent {
+        RepoDetails(getRepoDetailsInfo(), { _, _ -> }, {})
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
new file mode 100644
index 000000000..035ab0161
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
@@ -0,0 +1,96 @@
+package org.fdroid.ui.repositories.details
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Fingerprint
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.database.Repository
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.ExpandableSection
+import org.fdroid.ui.utils.getRepoDetailsInfo
+
+@Composable
+fun RepoDetailsContent(
+    info: RepoDetailsInfo,
+    onShowAppsClicked: (String, Long) -> Unit,
+    modifier: Modifier,
+) {
+    val repo = info.model.repo as Repository
+    val context = LocalContext.current
+    Column(
+        verticalArrangement = spacedBy(16.dp),
+        modifier = modifier
+            .fillMaxWidth()
+            .verticalScroll(rememberScrollState()),
+    ) {
+        RepoDetailsHeader(repo, info.model.numberApps, onShowAppsClicked)
+        if (info.model.showOfficialMirrors) {
+            OfficialMirrors(
+                mirrors = info.model.officialMirrors,
+                setMirrorEnabled = { m, e ->
+                    info.actions.setMirrorEnabled(repo.repoId, m, e)
+                },
+            )
+        }
+        if (info.model.showUserMirrors) {
+            UserMirrors(
+                mirrors = info.model.userMirrors,
+                setMirrorEnabled = { m, e ->
+                    info.actions.setMirrorEnabled(repo.repoId, m, e)
+                },
+                onShareMirror = { mirror ->
+                    mirror.share(context, repo.fingerprint)
+                },
+                onDeleteMirror = { info.actions.deleteUserMirror(repo.repoId, it) },
+            )
+        }
+        FingerprintExpandable(repo.fingerprint)
+        RepoSettings(
+            repo = repo,
+            archiveState = info.model.archiveState,
+            onToggleArchiveClicked = info.actions::setArchiveRepoEnabled,
+            onCredentialsUpdated = info.actions::updateUsernameAndPassword,
+        )
+    }
+}
+
+@Composable
+private fun FingerprintExpandable(
+    fingerprint: String,
+) {
+    ExpandableSection(
+        icon = rememberVectorPainter(Icons.Default.Fingerprint),
+        title = stringResource(R.string.repo_fingerprint),
+        modifier = Modifier.padding(horizontal = 16.dp),
+    ) {
+        Text(
+            text = fingerprint,
+            fontFamily = FontFamily.Monospace,
+            style = MaterialTheme.typography.bodyMedium,
+            modifier = Modifier.padding(8.dp),
+        )
+    }
+}
+
+@Composable
+@Preview
+private fun Preview() {
+    FDroidContent {
+        RepoDetails(getRepoDetailsInfo(), { _, _ -> }, {})
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
new file mode 100644
index 000000000..37e5909ca
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
@@ -0,0 +1,115 @@
+package org.fdroid.ui.repositories.details
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
+import org.fdroid.R
+import org.fdroid.database.Repository
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.repositories.RepoIcon
+import org.fdroid.ui.utils.FDroidOutlineButton
+import org.fdroid.ui.utils.asRelativeTimeString
+import org.fdroid.ui.utils.getRepository
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun RepoDetailsHeader(
+    repo: Repository,
+    numberOfApps: Int?,
+    onShowAppsClicked: (String, Long) -> Unit,
+) {
+    val localeList = LocaleListCompat.getDefault()
+    val name = repo.getName(LocaleListCompat.getDefault()) ?: "Unknown Repo"
+    val description = repo.getDescription(localeList)?.replace("\n", " ")
+
+    val lastIndexTime = if (repo.timestamp < 0) {
+        stringResource(R.string.repositories_last_update_never)
+    } else {
+        repo.timestamp.asRelativeTimeString()
+    }
+    val lastIndexUpdate = stringResource(R.string.repo_last_update_index, lastIndexTime)
+
+    val lastUpdatedTime = repo.lastUpdated?.asRelativeTimeString()
+        ?: stringResource(R.string.repositories_last_update_never)
+    val lastUpdated = stringResource(R.string.repo_last_update_check, lastUpdatedTime)
+
+    Column(
+        verticalArrangement = spacedBy(8.dp),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+    ) {
+        Row(
+            horizontalArrangement = spacedBy(8.dp),
+        ) {
+            RepoIcon(repo, Modifier.size(64.dp))
+            Column(horizontalAlignment = Alignment.Start) {
+                Text(
+                    text = name,
+                    maxLines = 1,
+                    fontWeight = FontWeight.Bold,
+                    style = MaterialTheme.typography.headlineMediumEmphasized,
+                )
+                Text(
+                    text = repo.address
+                        .replaceFirst("https://", "")
+                        .replaceFirst("/repo", ""),
+                    style = MaterialTheme.typography.bodyMedium,
+                )
+                if (numberOfApps != null) Text(
+                    text = pluralStringResource(
+                        R.plurals.repo_num_apps_text,
+                        numberOfApps,
+                        numberOfApps,
+                    ),
+                    style = MaterialTheme.typography.bodySmall,
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+                Text(
+                    text = lastIndexUpdate,
+                    style = MaterialTheme.typography.bodySmall,
+                )
+                Text(
+                    text = lastUpdated,
+                    style = MaterialTheme.typography.bodySmall,
+                )
+            }
+        }
+        if (repo.enabled) FDroidOutlineButton(
+            stringResource(R.string.repo_num_apps_button),
+            onClick = { onShowAppsClicked(name, repo.repoId) },
+            modifier = Modifier.fillMaxWidth(),
+        )
+        if (description?.isNotBlank() == true) {
+            Text(
+                text = description,
+                style = MaterialTheme.typography.bodyMedium,
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        RepoDetailsHeader(getRepository(), 45) { _, _ -> }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
new file mode 100644
index 000000000..af5010b72
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
@@ -0,0 +1,128 @@
+package org.fdroid.ui.repositories.details
+
+import android.content.Context
+import android.content.Intent
+import android.content.Intent.ACTION_SEND
+import android.content.Intent.EXTRA_TEXT
+import android.graphics.Bitmap
+import org.fdroid.R
+import org.fdroid.database.Repository
+import org.fdroid.download.Mirror
+import org.fdroid.ui.utils.flagEmoji
+import org.fdroid.ui.utils.generateQrBitmap
+
+interface RepoDetailsInfo {
+    val model: RepoDetailsModel
+    val actions: RepoDetailsActions
+}
+
+interface RepoDetailsActions {
+    fun deleteRepository(repoId: Long)
+    fun updateUsernameAndPassword(repoId: Long, username: String, password: String)
+    fun setMirrorEnabled(repoId: Long, mirror: Mirror, enabled: Boolean)
+    fun deleteUserMirror(repoId: Long, mirror: Mirror)
+    fun setArchiveRepoEnabled(enabled: Boolean)
+    fun onOnboardingSeen()
+    suspend fun generateQrCode(repo: Repository): Bitmap? {
+        if (repo.address.startsWith("content://") || repo.address.startsWith("file://")) {
+            // no need to show a QR Code, it is not shareable
+            return null
+        }
+        return generateQrBitmap(repo.shareUri)
+    }
+}
+
+data class RepoDetailsModel(
+    val repo: Repository?,
+    val numberApps: Int?,
+    val officialMirrors: List<OfficialMirrorItem>,
+    val userMirrors: List<UserMirrorItem>,
+    val archiveState: ArchiveState,
+    val showOnboarding: Boolean,
+) {
+    /**
+     * The repo's address is currently also an official mirror.
+     * So if there is only one mirror, this is the address => don't show this section.
+     * If there are 2 or more official mirrors, it makes sense to allow users
+     * to disable the canonical address.
+     */
+    val showOfficialMirrors: Boolean = officialMirrors.size >= 2
+
+    val showUserMirrors: Boolean = userMirrors.isNotEmpty()
+
+    fun shareRepo(context: Context) {
+        require(repo != null) { "repo was null when sharing it" }
+        val intent = Intent(ACTION_SEND).apply {
+            type = "text/plain"
+            putExtra(EXTRA_TEXT, repo.shareUri)
+        }
+        val chooserTitle = context.getString(R.string.share_repository)
+        context.startActivity(
+            Intent.createChooser(intent, chooserTitle)
+        )
+    }
+}
+
+data class OfficialMirrorItem(
+    val mirror: Mirror,
+    val isEnabled: Boolean,
+    val isRepoAddress: Boolean,
+) : MirrorItem(mirror.baseUrl), Comparable<OfficialMirrorItem> {
+
+    private val isOnion = mirror.isOnion()
+
+    val emoji: String = if (isOnion) {
+        "🧅"
+    } else if (mirror.countryCode == null) {
+        if (isRepoAddress) "⭐" else ""
+    } else {
+        mirror.countryCode?.flagEmoji ?: ""
+    }
+
+    override fun compareTo(other: OfficialMirrorItem): Int {
+        return if (isRepoAddress && !other.isRepoAddress) -1
+        else if (!isRepoAddress && other.isRepoAddress) 1
+        else if (isOnion && !other.isOnion) 1
+        else if (!isOnion && other.isOnion) -1
+        else if (isOnion) mirror.baseUrl.compareTo(other.mirror.baseUrl)
+        else if (mirror.countryCode == other.mirror.countryCode) {
+            mirror.baseUrl.compareTo(other.mirror.baseUrl)
+        } else {
+            val countryCode = mirror.countryCode ?: ""
+            val otherCountryCode = other.mirror.countryCode ?: ""
+            countryCode.compareTo(otherCountryCode)
+        }
+    }
+}
+
+data class UserMirrorItem(
+    val mirror: Mirror,
+    val isEnabled: Boolean,
+) : MirrorItem(mirror.baseUrl) {
+    fun share(context: Context, fingerprint: String) {
+        val uri = mirror.getFDroidLinkUrl(fingerprint)
+        val intent = Intent(Intent.ACTION_SEND).apply {
+            type = "text/plain"
+            putExtra(Intent.EXTRA_TEXT, uri)
+        }
+        context.startActivity(
+            Intent.createChooser(intent, context.getString(R.string.share_mirror))
+        )
+    }
+}
+
+abstract class MirrorItem(baseUrl: String) {
+    val url: String = baseUrl
+        .removePrefix("https://")
+        .removePrefix("http://")
+        .removeSuffix("/fdroid/repo")
+        .removeSuffix("/repo")
+        .removeSuffix("/")
+}
+
+enum class ArchiveState {
+    ENABLED,
+    DISABLED,
+    LOADING,
+    UNKNOWN,
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
new file mode 100644
index 000000000..11d7fd8c4
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
@@ -0,0 +1,34 @@
+package org.fdroid.ui.repositories.details
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
+import org.fdroid.database.Repository
+
+@Composable
+fun RepoDetailsPresenter(
+    repoFlow: Flow<Repository?>,
+    numAppsFlow: Flow<Int?>,
+    archiveStateFlow: StateFlow<ArchiveState>,
+    showOnboardingFlow: StateFlow<Boolean>,
+): RepoDetailsModel {
+    val repo = repoFlow.collectAsState(null).value
+    return RepoDetailsModel(
+        repo = repo,
+        numberApps = numAppsFlow.collectAsState(null).value,
+        officialMirrors = repo?.allOfficialMirrors?.map { mirror ->
+            val disabledMirrors = repo.disabledMirrors
+            OfficialMirrorItem(
+                mirror = mirror,
+                isEnabled = !disabledMirrors.contains(mirror.baseUrl),
+                isRepoAddress = repo.address == mirror.baseUrl,
+            )
+        }?.sorted() ?: emptyList(),
+        userMirrors = repo?.allUserMirrors?.map { mirror ->
+            UserMirrorItem(mirror, !repo.disabledMirrors.contains(mirror.baseUrl))
+        } ?: emptyList(),
+        archiveState = archiveStateFlow.collectAsState().value,
+        showOnboarding = showOnboardingFlow.collectAsState().value,
+    )
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
new file mode 100644
index 000000000..462e2b593
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
@@ -0,0 +1,147 @@
+package org.fdroid.ui.repositories.details
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.application
+import androidx.lifecycle.viewModelScope
+import app.cash.molecule.AndroidUiDispatcher
+import app.cash.molecule.RecompositionMode.ContextClock
+import app.cash.molecule.launchMolecule
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.getAndUpdate
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import mu.KotlinLogging
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.database.Repository
+import org.fdroid.download.Mirror
+import org.fdroid.index.RepoManager
+import org.fdroid.repo.RepoUpdateWorker
+import org.fdroid.settings.SettingsManager
+import org.fdroid.ui.repositories.details.ArchiveState.UNKNOWN
+import org.fdroid.utils.IoDispatcher
+import javax.inject.Inject
+
+@HiltViewModel
+class RepoDetailsViewModel @Inject constructor(
+    app: Application,
+    private val db: FDroidDatabase,
+    private val repoManager: RepoManager,
+    private val settingsManager: SettingsManager,
+    @param:IoDispatcher private val ioScope: CoroutineScope,
+) : AndroidViewModel(app), RepoDetailsActions {
+
+    private val log = KotlinLogging.logger {}
+    private val moleculeScope =
+        CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+
+    private val repoIdFlow = MutableStateFlow<Long?>(null)
+    private val repoFlow = MutableStateFlow<Repository?>(null)
+    private val numAppsFlow: Flow<Int?> = repoFlow.map { repo ->
+        if (repo != null) {
+            db.getAppDao().getNumberOfAppsInRepository(repo.repoId)
+        } else null
+    }.flowOn(Dispatchers.IO).distinctUntilChanged()
+    private val archiveStateFlow = MutableStateFlow(UNKNOWN)
+    private val showOnboarding = settingsManager.showRepoDetailsOnboarding
+
+    val model: StateFlow<RepoDetailsModel> = moleculeScope.launchMolecule(mode = ContextClock) {
+        RepoDetailsPresenter(
+            repoFlow = repoFlow,
+            numAppsFlow = numAppsFlow,
+            archiveStateFlow = archiveStateFlow,
+            showOnboardingFlow = showOnboarding,
+        )
+    }
+
+    fun setRepoId(repoId: Long) {
+        val oldValue = repoIdFlow.getAndUpdate { repoId }
+        if (oldValue != null) {
+            log.warn { "setRepoId($repoId) was called more than once" }
+            return
+        }
+
+        viewModelScope.launch {
+            repoManager.repositoriesState.collect { repos ->
+                val repo = repos.find { it.repoId == repoId }
+                onRepoChanged(repo)
+            }
+        }
+    }
+
+    private fun onRepoChanged(repo: Repository?) {
+        repoFlow.update { repo }
+        archiveStateFlow.update { repo?.archiveState() ?: UNKNOWN }
+    }
+
+    override fun deleteRepository(repoId: Long) {
+        ioScope.launch {
+            repoManager.deleteRepository(repoId)
+        }
+    }
+
+    override fun updateUsernameAndPassword(repoId: Long, username: String, password: String) {
+        ioScope.launch {
+            repoManager.updateUsernameAndPassword(repoId, username, password)
+            withContext(Dispatchers.Main) {
+                RepoUpdateWorker.updateNow(application, repoId)
+            }
+        }
+    }
+
+    override fun setMirrorEnabled(repoId: Long, mirror: Mirror, enabled: Boolean) {
+        ioScope.launch {
+            repoManager.setMirrorEnabled(repoId, mirror, enabled)
+        }
+    }
+
+    override fun deleteUserMirror(repoId: Long, mirror: Mirror) {
+        ioScope.launch {
+            repoManager.deleteUserMirror(repoId, mirror)
+        }
+    }
+
+    override fun setArchiveRepoEnabled(enabled: Boolean) {
+        ioScope.launch {
+            val repo = repoFlow.value ?: return@launch
+            archiveStateFlow.value = ArchiveState.LOADING
+            try {
+                // TODO support proxy
+                val repoId = repoManager.setArchiveRepoEnabled(repo, enabled, null)
+                archiveStateFlow.value = enabled.toArchiveState()
+                if (enabled && repoId != null) withContext(Dispatchers.Main) {
+                    RepoUpdateWorker.updateNow(application, repoId)
+                }
+            } catch (e: Exception) {
+                log.error(e) { "Error toggling archive repo: " }
+                archiveStateFlow.value = repo.archiveState()
+            }
+        }
+    }
+
+    override fun onOnboardingSeen() = settingsManager.onRepoDetailsOnboardingSeen()
+
+    private fun Repository.archiveState(): ArchiveState {
+        val isEnabled = repoManager.getRepositories().find { r ->
+            r.isArchiveRepo && r.certificate == certificate
+        }?.enabled
+        return when (isEnabled) {
+            true -> ArchiveState.ENABLED
+            false -> ArchiveState.DISABLED
+            null -> UNKNOWN
+        }
+    }
+
+    private fun Boolean.toArchiveState(): ArchiveState {
+        return if (this) ArchiveState.ENABLED else ArchiveState.DISABLED
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
new file mode 100644
index 000000000..9214e5a8b
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
@@ -0,0 +1,110 @@
+package org.fdroid.ui.repositories.details
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.LinearWavyProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.database.Repository
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.ExpandableSection
+import org.fdroid.ui.utils.FDroidOutlineButton
+import org.fdroid.ui.utils.FDroidSwitchRow
+import org.fdroid.ui.utils.getRepository
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun RepoSettings(
+    repo: Repository,
+    archiveState: ArchiveState,
+    onToggleArchiveClicked: (Boolean) -> Unit,
+    onCredentialsUpdated: (Long, String, String) -> Unit,
+) {
+    ExpandableSection(
+        icon = rememberVectorPainter(Icons.Default.Settings),
+        title = stringResource(R.string.menu_settings),
+        modifier = Modifier.padding(horizontal = 16.dp),
+    ) {
+        Column(verticalArrangement = spacedBy(16.dp)) {
+            when (archiveState) {
+                ArchiveState.UNKNOWN -> {
+                    Column(
+                        verticalArrangement = spacedBy(8.dp),
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Text(stringResource(R.string.repo_archive_unknown))
+                        FDroidOutlineButton(
+                            text = stringResource(R.string.repo_archive_check),
+                            onClick = { onToggleArchiveClicked(true) },
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                    }
+                }
+                ArchiveState.LOADING -> {
+                    LinearWavyProgressIndicator(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(vertical = 24.dp),
+                    )
+                }
+                else -> {
+                    FDroidSwitchRow(
+                        text = stringResource(R.string.repo_archive_toggle_description),
+                        checked = archiveState == ArchiveState.ENABLED,
+                        enabled = true,
+                        onCheckedChange = onToggleArchiveClicked,
+                    )
+                }
+            }
+            val username = repo.username
+            if (username != null && username.isNotBlank()) {
+                BasicAuth(username) { username, password ->
+                    onCredentialsUpdated(repo.repoId, username, password)
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun PreviewUnknown() {
+    FDroidContent {
+        RepoSettings(getRepository(), ArchiveState.UNKNOWN, {}) { _, _, _ -> }
+    }
+}
+
+@Preview
+@Composable
+private fun PreviewLoading() {
+    FDroidContent {
+        RepoSettings(getRepository(), ArchiveState.LOADING, {}) { _, _, _ -> }
+    }
+}
+
+@Preview
+@Composable
+private fun PreviewEnabled() {
+    FDroidContent {
+        RepoSettings(getRepository(), ArchiveState.ENABLED, {}) { _, _, _ -> }
+    }
+}
+
+@Preview
+@Composable
+private fun PreviewDisabled() {
+    FDroidContent {
+        RepoSettings(getRepository(), ArchiveState.DISABLED, {}) { _, _, _ -> }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
new file mode 100644
index 000000000..cafcd81eb
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
@@ -0,0 +1,152 @@
+package org.fdroid.ui.repositories.details
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.selection.toggleable
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Dns
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.download.Mirror
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.ExpandableSection
+import org.fdroid.ui.utils.FDroidOutlineButton
+
+@Composable
+fun UserMirrors(
+    mirrors: List<UserMirrorItem>,
+    setMirrorEnabled: (Mirror, Boolean) -> Unit,
+    onShareMirror: (UserMirrorItem) -> Unit,
+    onDeleteMirror: (Mirror) -> Unit,
+) {
+    var showDeleteDialog by remember { mutableStateOf<Mirror?>(null) }
+    if (showDeleteDialog != null) AlertDialog(
+        title = {
+            Text(text = stringResource(R.string.repo_confirm_delete_mirror_title))
+        },
+        text = {
+            Text(text = stringResource(R.string.repo_confirm_delete_mirror_body))
+        },
+        onDismissRequest = { showDeleteDialog = null },
+        confirmButton = {
+            TextButton(onClick = {
+                onDeleteMirror(showDeleteDialog!!)
+                showDeleteDialog = null
+            }) {
+                Text(
+                    text = stringResource(R.string.delete),
+                    color = MaterialTheme.colorScheme.error,
+                )
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = { showDeleteDialog = null }) {
+                Text(stringResource(android.R.string.cancel))
+            }
+        }
+    )
+    ExpandableSection(
+        icon = rememberVectorPainter(Icons.Default.Dns),
+        title = stringResource(R.string.repo_user_mirrors),
+        modifier = Modifier.padding(horizontal = 16.dp),
+    ) {
+        Column {
+            mirrors.forEach { m ->
+                UserMirrorRow(
+                    item = m,
+                    setMirrorEnabled = setMirrorEnabled,
+                    onShareMirror = onShareMirror,
+                    onDeleteMirror = { showDeleteDialog = m.mirror },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun UserMirrorRow(
+    item: UserMirrorItem,
+    setMirrorEnabled: (Mirror, Boolean) -> Unit,
+    onShareMirror: (UserMirrorItem) -> Unit,
+    onDeleteMirror: (Mirror) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        headlineContent = {
+            Text(item.url)
+        },
+        supportingContent = {
+            Row(
+                horizontalArrangement = spacedBy(16.dp),
+            ) {
+                FDroidOutlineButton(
+                    text = stringResource(R.string.menu_share),
+                    imageVector = Icons.Default.Share,
+                    onClick = { onShareMirror(item) },
+                )
+                FDroidOutlineButton(
+                    text = stringResource(R.string.delete),
+                    imageVector = Icons.Default.Delete,
+                    onClick = { onDeleteMirror(item.mirror) },
+                    color = MaterialTheme.colorScheme.error,
+                )
+            }
+        },
+        trailingContent = {
+            Switch(
+                checked = item.isEnabled,
+                onCheckedChange = null,
+            )
+        },
+        colors = ListItemDefaults.colors(MaterialTheme.colorScheme.background),
+        modifier = modifier.toggleable(
+            value = item.isEnabled,
+            role = Role.Switch,
+            onValueChange = { checked -> setMirrorEnabled(item.mirror, checked) },
+        ),
+    )
+}
+
+@Preview
+@Composable
+fun UserMirrorsPreview() {
+    FDroidContent {
+        val mirrors = listOf(
+            UserMirrorItem(Mirror("https://mirror.example.com/fdroid/repo"), true),
+            UserMirrorItem(
+                Mirror(
+                    "https://mirror.example.org/with/a/very/long/url/that/wraps/repo",
+                    "fr"
+                ), true
+            ),
+            UserMirrorItem(Mirror("https://mirror.example.com/foo/bar/fdroid/repo"), false),
+        )
+        UserMirrors(
+            mirrors = mirrors,
+            setMirrorEnabled = { _, _ -> },
+            onShareMirror = { },
+            onDeleteMirror = { },
+        )
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt b/next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
similarity index 98%
rename from next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt
rename to next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
index c59a7c93c..cfebae557 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/ExpandableSection.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
@@ -1,4 +1,4 @@
-package org.fdroid.ui.details
+package org.fdroid.ui.utils
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.clickable
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt b/next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
new file mode 100644
index 000000000..1ee1b475f
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
@@ -0,0 +1,66 @@
+package org.fdroid.ui.utils
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.selection.toggleable
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun FDroidSwitchRow(
+    text: String,
+    leadingContent: (@Composable () -> Unit)? = null,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit = {},
+    enabled: Boolean = true,
+    verticalPadding: Dp = 8.dp,
+) {
+    Row(
+        horizontalArrangement = spacedBy(8.dp),
+        verticalAlignment = CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .toggleable(
+                value = checked,
+                enabled = enabled,
+                role = Role.Switch,
+                onValueChange = onCheckedChange,
+            )
+            // add padding after toggleable to have a larger touch area
+            .padding(vertical = verticalPadding),
+    ) {
+        leadingContent?.invoke()
+        Text(
+            text = text,
+            style = MaterialTheme.typography.bodyMedium,
+            modifier = Modifier.weight(1f),
+        )
+        Switch(
+            checked = checked,
+            onCheckedChange = null,
+            enabled = enabled,
+        )
+    }
+}
+
+@Composable
+@Preview
+fun FDroidSwitchRowPreview() {
+    FDroidContent {
+        FDroidSwitchRow(
+            text = "Important setting",
+            checked = true,
+        )
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 6ac6ef648..e808928a3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -6,6 +6,7 @@ import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppPrefs
 import org.fdroid.database.Repository
+import org.fdroid.download.Mirror
 import org.fdroid.index.IndexFormatVersion
 import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
@@ -24,6 +25,12 @@ import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.repositories.RepositoryInfo
 import org.fdroid.ui.repositories.RepositoryItem
 import org.fdroid.ui.repositories.RepositoryModel
+import org.fdroid.ui.repositories.details.ArchiveState
+import org.fdroid.ui.repositories.details.OfficialMirrorItem
+import org.fdroid.ui.repositories.details.RepoDetailsActions
+import org.fdroid.ui.repositories.details.RepoDetailsInfo
+import org.fdroid.ui.repositories.details.RepoDetailsModel
+import org.fdroid.ui.repositories.details.UserMirrorItem
 import java.util.concurrent.TimeUnit.DAYS
 
 object Names {
@@ -238,6 +245,53 @@ fun getRepositoriesInfo(
     override fun onRepositoriesFinishedMoving(fromRepoId: Long, toRepoId: Long) {}
 }
 
+fun getRepoDetailsInfo(
+    model: RepoDetailsModel = RepoDetailsModel(
+        repo = getRepository(),
+        numberApps = 42,
+        officialMirrors = listOf(
+            OfficialMirrorItem(
+                mirror = Mirror(baseUrl = "https://mirror.example.com/fdroid/repo"),
+                isEnabled = true,
+                isRepoAddress = true,
+            ),
+            OfficialMirrorItem(
+                mirror = Mirror("https://mirror.example.com/foo/bar/fdroid/repo", "de"),
+                isEnabled = false,
+                isRepoAddress = false,
+            ),
+        ),
+        userMirrors = listOf(
+            UserMirrorItem(Mirror("https://mirror.example.com/fdroid/repo"), true),
+            UserMirrorItem(Mirror("https://mirror.example.com/foo/bar/fdroid/repo"), false),
+        ),
+        archiveState = ArchiveState.LOADING,
+        showOnboarding = false,
+    ),
+) = object : RepoDetailsInfo {
+    override val model = model
+    override val actions: RepoDetailsActions = object : RepoDetailsActions {
+        override fun deleteRepository(repoId: Long) {}
+        override fun updateUsernameAndPassword(
+            repoId: Long,
+            username: String,
+            password: String,
+        ) {
+        }
+
+        override fun setMirrorEnabled(
+            repoId: Long,
+            mirror: Mirror,
+            enabled: Boolean,
+        ) {
+        }
+
+        override fun deleteUserMirror(repoId: Long, mirror: Mirror) {}
+        override fun setArchiveRepoEnabled(enabled: Boolean) {}
+        override fun onOnboardingSeen() {}
+    }
+}
+
 fun getRepository(address: String = "https://example.org/repo") = Repository(
     repoId = 42L,
     address = address,
@@ -247,4 +301,6 @@ fun getRepository(address: String = "https://example.org/repo") = Repository(
     version = 20001L,
     weight = 42,
     lastUpdated = 1337,
+    username = "foo",
+    password = "bar",
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
index 4b4d43a64..2f3617d98 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
@@ -4,6 +4,8 @@ import android.app.ActivityManager
 import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
 import android.content.Context
 import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.Color
 import android.os.PowerManager
 import android.text.format.DateUtils
 import android.util.Log
@@ -11,6 +13,11 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.UriHandler
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.createBitmap
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.qrcode.QRCodeWriter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import java.text.Normalizer
 import java.text.Normalizer.Form.NFKD
 
@@ -44,6 +51,30 @@ fun String.normalize(): String {
     return Normalizer.normalize(this, NFKD).replace(normalizerRegex, "")
 }
 
+/**
+ * Same as the Java function Utils.generateQrBitmap, but using coroutines instead of Single and Disposable.
+ */
+suspend fun generateQrBitmap(qrData: String): Bitmap? = withContext(Dispatchers.Default) {
+    return@withContext try {
+        val bitMatrix = QRCodeWriter().encode(qrData, BarcodeFormat.QR_CODE, 800, 800)
+        val qrCodeWidth = bitMatrix.width
+        val qrCodeHeight = bitMatrix.height
+        val pixels = IntArray(qrCodeWidth * qrCodeHeight)
+        for (y in 0 until qrCodeHeight) {
+            val offset = y * qrCodeWidth
+            for (x in 0 until qrCodeWidth) {
+                pixels[offset + x] = if (bitMatrix.get(x, y)) Color.BLACK else Color.WHITE
+            }
+        }
+        createBitmap(qrCodeWidth, qrCodeHeight).apply {
+            setPixels(pixels, 0, qrCodeWidth, 0, 0, qrCodeWidth, qrCodeHeight)
+        }
+    } catch (e: Exception) {
+        Log.e("generateQrBitmap", "Could not encode QR as bitmap", e)
+        null
+    }
+}
+
 fun Long.asRelativeTimeString(): String {
     return DateUtils.getRelativeTimeSpanString(
         this,
@@ -53,6 +84,18 @@ fun Long.asRelativeTimeString(): String {
     ).toString()
 }
 
+val String.flagEmoji: String?
+    get() {
+        if (this.length != 2) {
+            return null
+        }
+        val chars = this.uppercase().toCharArray()
+        val first = chars[0].code - 0x41 + 0x1F1E6
+        val second = chars[1].code - 0x41 + 0x1F1E6
+        val flagEmoji = String(Character.toChars(first) + Character.toChars(second))
+        return flagEmoji
+    }
+
 fun canStartForegroundService(context: Context): Boolean {
     val powerManager = ContextCompat.getSystemService(context, PowerManager::class.java)
         ?: return false
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index b514f5f6d..40c409b2d 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -88,6 +88,9 @@
     <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
     <string name="got_it">Got it</string>
     <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
+    <string name="repo_basicauth_username">Username</string>
+    <string name="repo_basicauth_password">Password</string>
+    <string name="repo_basicauth_edit">Save Changes</string>
 
     <string name="crash_report_text">An unexpected error occurred.
         This is not your fault.

From e74a54db12db2f6803c74253b29507da7a93df00 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 17 Oct 2025 11:48:34 -0300
Subject: [PATCH 076/180] Fix UI bugs on discover screen

* don't assume we are still loading if there are no new apps
* section should only be shown if they have data
---
 .../org/fdroid/ui/categories/CategoryList.kt     |  2 +-
 .../kotlin/org/fdroid/ui/discover/Discover.kt    | 16 +++++++++-------
 .../org/fdroid/ui/discover/DiscoverPresenter.kt  |  7 +++++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index 3cf6af493..599591990 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -25,7 +25,7 @@ fun CategoryList(
     onNav: (NavKey) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    if (categoryMap != null) Column(
+    if (categoryMap != null && categoryMap.isNotEmpty()) Column(
         modifier = modifier
     ) {
         Text(
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 1eaedc12e..c9f75489e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -137,13 +137,15 @@ fun Discover(
                             .padding(16.dp)
                             .align(Alignment.CenterHorizontally),
                     )
-                    val listNew = AppListType.New(stringResource(R.string.app_list_new))
-                    AppCarousel(
-                        title = listNew.title,
-                        apps = discoverModel.newApps,
-                        onTitleTap = { onListTap(listNew) },
-                        onAppTap = onAppTap,
-                    )
+                    if (discoverModel.newApps.isNotEmpty()) {
+                        val listNew = AppListType.New(stringResource(R.string.app_list_new))
+                        AppCarousel(
+                            title = listNew.title,
+                            apps = discoverModel.newApps,
+                            onTitleTap = { onListTap(listNew) },
+                            onAppTap = onAppTap,
+                        )
+                    }
                     val listRecentlyUpdated = AppListType.RecentlyUpdated(
                         stringResource(R.string.app_list_recently_updated),
                     )
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index a1f8f0f53..375aed4be 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -21,7 +21,10 @@ fun DiscoverPresenter(
     val categories = categoriesFlow.collectAsState(null).value
     val searchResults = searchResultsFlow.collectAsState().value
 
-    return if (newApps.isNullOrEmpty() || recentlyUpdatedApps.isNullOrEmpty()) {
+    // We may not have any new apps, but there should always be recently updated apps,
+    // because those don't have a freshness constraint.
+    // So if we don't have those, we are still loading, have no enabled repo, or this is first start
+    return if (recentlyUpdatedApps.isNullOrEmpty()) {
         val repositories = repositoriesFlow.collectAsState(null).value
         if (newApps == null && recentlyUpdatedApps == null) {
             LoadingDiscoverModel(false)
@@ -35,7 +38,7 @@ fun DiscoverPresenter(
         }
     } else {
         LoadedDiscoverModel(
-            newApps = newApps,
+            newApps = newApps ?: emptyList(),
             recentlyUpdatedApps = recentlyUpdatedApps,
             categories = categories?.groupBy { it.group },
             searchResults = searchResults,

From 670583e05cdf2128190beb04a9567081ef6f0254 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 20 Oct 2025 14:43:22 -0300
Subject: [PATCH 077/180] Implement enabling/disabling of repositories

---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  3 ++
 .../ui/repositories/RepositoriesList.kt       | 42 +++++++++++++++++++
 .../ui/repositories/RepositoriesViewModel.kt  | 15 +++++++
 .../fdroid/ui/repositories/RepositoryInfo.kt  |  1 +
 .../fdroid/ui/repositories/RepositoryRow.kt   |  3 +-
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  1 +
 6 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 6405e02f6..938f2e593 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -207,6 +207,9 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                             backStack.add(NavigationKey.RepoDetails(repositoryItem.repoId))
                         }
 
+                        override fun onRepositoryEnabled(repoId: Long, enabled: Boolean) =
+                            viewModel.onRepositoryEnabled(repoId, enabled)
+
                         override fun onAddRepo() {
                             backStack.add(NavigationKey.AddRepo())
                         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
index e530633b2..6b7346602 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
@@ -11,13 +11,22 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.dropShadow
 import androidx.compose.ui.graphics.shadow.Shadow
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.ui.utils.DraggableItem
 import org.fdroid.ui.utils.dragContainer
 import org.fdroid.ui.utils.rememberDragDropState
@@ -28,6 +37,7 @@ fun RepositoriesList(
     modifier: Modifier = Modifier,
 ) {
     val repositories = info.model.repositories ?: return
+    var showDisableRepoDialog by remember { mutableStateOf<Long?>(null) }
     val currentRepositoryId = info.currentRepositoryId
     val listState = rememberLazyListState()
     val dragDropState = rememberDragDropState(
@@ -77,6 +87,13 @@ fun RepositoriesList(
                 RepositoryRow(
                     repoItem = repoItem,
                     isSelected = isSelected,
+                    onRepoEnabled = { enabled ->
+                        if (enabled) {
+                            info.onRepositoryEnabled(repoItem.repoId, true)
+                        } else {
+                            showDisableRepoDialog = repoItem.repoId
+                        }
+                    },
                     modifier = Modifier
                         .fillMaxWidth()
                         .then(interactionModifier)
@@ -93,4 +110,29 @@ fun RepositoriesList(
             }
         }
     }
+    val repoId = showDisableRepoDialog
+    if (repoId != null) {
+        AlertDialog(
+            text = {
+                Text(text = stringResource(R.string.repo_disable_warning))
+            },
+            onDismissRequest = { showDisableRepoDialog = null },
+            confirmButton = {
+                TextButton(onClick = {
+                    info.onRepositoryEnabled(repoId, false)
+                    showDisableRepoDialog = null
+                }) {
+                    Text(
+                        text = stringResource(R.string.repo_disable_warning_button),
+                        color = MaterialTheme.colorScheme.error,
+                    )
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { showDisableRepoDialog = null }) {
+                    Text(stringResource(android.R.string.cancel))
+                }
+            }
+        )
+    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 81e74fe55..fac56b41d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -3,20 +3,25 @@ package org.fdroid.ui.repositories
 import android.app.Application
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.application
 import androidx.lifecycle.viewModelScope
 import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import mu.KotlinLogging
 import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
+import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.SettingsManager
+import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 
 @HiltViewModel
@@ -24,6 +29,7 @@ class RepositoriesViewModel @Inject constructor(
     app: Application,
     private val repoManager: RepoManager,
     private val settingsManager: SettingsManager,
+    @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger { }
@@ -69,6 +75,15 @@ class RepositoriesViewModel @Inject constructor(
         }
     }
 
+    fun onRepositoryEnabled(repoId: Long, enabled: Boolean) {
+        ioScope.launch {
+            repoManager.setRepositoryEnabled(repoId, enabled)
+            if (enabled) withContext(Dispatchers.Main) {
+                RepoUpdateWorker.updateNow(application, repoId)
+            }
+        }
+    }
+
     fun onRepositoriesMoved(fromRepoId: Long, toRepoId: Long) {
         log.info { "onRepositoriesMoved($fromRepoId, $toRepoId)" }
         repoSortingMap.update {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
index 01c194fb8..53be63b79 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
@@ -5,6 +5,7 @@ interface RepositoryInfo {
     val currentRepositoryId: Long?
     fun onOnboardingSeen()
     fun onRepositorySelected(repositoryItem: RepositoryItem)
+    fun onRepositoryEnabled(repoId: Long, enabled: Boolean)
     fun onAddRepo()
     fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long)
     fun onRepositoriesFinishedMoving(fromRepoId: Long, toRepoId: Long)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
index a3f52bf44..6067d1441 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
@@ -15,6 +15,7 @@ import org.fdroid.ui.utils.AsyncShimmerImage
 fun RepositoryRow(
     repoItem: RepositoryItem,
     isSelected: Boolean,
+    onRepoEnabled: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     ListItem(
@@ -32,7 +33,7 @@ fun RepositoryRow(
             Text(repoItem.address)
         },
         trailingContent = {
-            Switch(repoItem.enabled, onCheckedChange = null)
+            Switch(repoItem.enabled, onCheckedChange = onRepoEnabled)
         },
         colors = ListItemDefaults.colors(
             containerColor = if (isSelected) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index e808928a3..0b6b67946 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -240,6 +240,7 @@ fun getRepositoriesInfo(
     override val currentRepositoryId: Long? = currentRepositoryId
     override fun onOnboardingSeen() {}
     override fun onRepositorySelected(repositoryItem: RepositoryItem) {}
+    override fun onRepositoryEnabled(repoId: Long, enabled: Boolean) {}
     override fun onAddRepo() {}
     override fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long) {}
     override fun onRepositoriesFinishedMoving(fromRepoId: Long, toRepoId: Long) {}

From 05efce1161efd090c883cf035d056c654391c085 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 20 Oct 2025 15:59:01 -0300
Subject: [PATCH 078/180] Add OnboardingManager to remember when onboardings
 were shown

---
 .../org/fdroid/settings/OnboardingManager.kt  | 67 +++++++++++++++++++
 .../org/fdroid/settings/SettingsManager.kt    | 22 ------
 .../org/fdroid/ui/lists/AppListViewModel.kt   |  6 +-
 .../ui/repositories/RepositoriesViewModel.kt  |  8 +--
 .../details/RepoDetailsViewModel.kt           |  8 +--
 5 files changed, 79 insertions(+), 32 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt

diff --git a/next/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt b/next/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt
new file mode 100644
index 000000000..4e8c5e56f
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt
@@ -0,0 +1,67 @@
+package org.fdroid.settings
+
+import android.content.Context
+import android.content.Context.MODE_PRIVATE
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class OnboardingManager @Inject constructor(
+    @param:ApplicationContext private val context: Context,
+) {
+
+    private companion object {
+        const val KEY_FILTER = "appFilter"
+        const val KEY_REPO_LIST = "repoList"
+        const val KEY_REPO_DETAILS = "repoDetails"
+    }
+
+    private val prefs = context.getSharedPreferences("onboarding", MODE_PRIVATE)
+
+    private val _showFilterOnboarding = Onboarding(KEY_FILTER, prefs)
+    val showFilterOnboarding = _showFilterOnboarding.flow
+
+    private val _showRepositoriesOnboarding = Onboarding(KEY_REPO_LIST, prefs)
+    val showRepositoriesOnboarding = _showRepositoriesOnboarding.flow
+
+    private val _showRepoDetailsOnboarding = Onboarding(KEY_REPO_DETAILS, prefs)
+    val showRepoDetailsOnboarding = _showRepoDetailsOnboarding.flow
+
+    fun onFilterOnboardingSeen() {
+        _showFilterOnboarding.onSeen(prefs)
+    }
+
+    fun onRepositoriesOnboardingSeen() {
+        _showRepositoriesOnboarding.onSeen(prefs)
+    }
+
+    fun onRepoDetailsOnboardingSeen() {
+        _showRepoDetailsOnboarding.onSeen(prefs)
+    }
+}
+
+private data class Onboarding(
+    val key: String,
+    private val _flow: MutableStateFlow<Boolean>,
+) {
+    constructor(key: String, prefs: SharedPreferences) : this(
+        key = key,
+        _flow = MutableStateFlow(prefs.getBoolean(key, true)),
+    )
+
+    val flow: StateFlow<Boolean> = _flow.asStateFlow()
+
+    fun onSeen(prefs: SharedPreferences) {
+        _flow.update { false }
+        prefs.edit {
+            putBoolean(key, false)
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index 473d092f1..5e84a69e6 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -14,31 +14,9 @@ class SettingsManager @Inject constructor() {
     val filterIncompatible = _filterIncompatible.asStateFlow()
     private val _appListSortOrder = MutableStateFlow(AppListSortOrder.LAST_UPDATED)
     val appListSortOrder = _appListSortOrder.asStateFlow()
-    private val _showFilterOnboarding = MutableStateFlow(true)
-    val showFilterOnboarding = _showFilterOnboarding.asStateFlow()
-    private val _showRepositoriesOnboarding = MutableStateFlow(true)
-    val showRepositoriesOnboarding = _showRepositoriesOnboarding.asStateFlow()
-    private val _showRepoDetailsOnboarding = MutableStateFlow(true)
-    val showRepoDetailsOnboarding = _showRepoDetailsOnboarding.asStateFlow()
 
     fun saveAppListFilter(sortOrder: AppListSortOrder, filterIncompatible: Boolean) {
         _appListSortOrder.value = sortOrder
         _filterIncompatible.value = filterIncompatible
     }
-
-    fun onFilterOnboardingSeen() {
-        _showFilterOnboarding.value = false
-        // TODO persist
-    }
-
-    fun onRepositoriesOnboardingSeen() {
-        _showRepositoriesOnboarding.value = false
-        // TODO persist
-    }
-
-    fun onRepoDetailsOnboardingSeen() {
-        _showRepoDetailsOnboarding.value = false
-        // TODO persist
-    }
-
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 546f85ef5..59beb9b5c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -25,6 +25,7 @@ import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getDownloadRequest
 import org.fdroid.index.RepoManager
+import org.fdroid.settings.OnboardingManager
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.repositories.RepositoryItem
@@ -39,6 +40,7 @@ class AppListViewModel @Inject constructor(
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
     private val settingsManager: SettingsManager,
+    private val onboardingManager: OnboardingManager,
 ) : AndroidViewModel(app), AppListActions {
 
     private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
@@ -72,7 +74,7 @@ class AppListViewModel @Inject constructor(
     private val filterIncompatible = MutableStateFlow(settingsManager.filterIncompatible.value)
     private val filteredCategoryIds = MutableStateFlow<Set<String>>(emptySet())
     private val filteredRepositoryIds = MutableStateFlow<Set<Long>>(emptySet())
-    val showOnboarding = settingsManager.showFilterOnboarding
+    val showOnboarding = onboardingManager.showFilterOnboarding
 
     val appListModel: StateFlow<AppListModel> = scope.launchMolecule(mode = ContextClock) {
         AppListPresenter(
@@ -181,5 +183,5 @@ class AppListViewModel @Inject constructor(
         this.query.value = query
     }
 
-    override fun onOnboardingSeen() = settingsManager.onFilterOnboardingSeen()
+    override fun onOnboardingSeen() = onboardingManager.onFilterOnboardingSeen()
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index fac56b41d..90c923490 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -20,7 +20,7 @@ import mu.KotlinLogging
 import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
 import org.fdroid.repo.RepoUpdateWorker
-import org.fdroid.settings.SettingsManager
+import org.fdroid.settings.OnboardingManager
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 
@@ -28,7 +28,7 @@ import javax.inject.Inject
 class RepositoriesViewModel @Inject constructor(
     app: Application,
     private val repoManager: RepoManager,
-    private val settingsManager: SettingsManager,
+    private val onboardingManager: OnboardingManager,
     @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
 
@@ -38,7 +38,7 @@ class RepositoriesViewModel @Inject constructor(
         CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
     private val repos = MutableStateFlow<List<RepositoryItem>?>(null)
     private val repoSortingMap = MutableStateFlow<Map<Long, Int>>(emptyMap())
-    private val showOnboarding = settingsManager.showRepositoriesOnboarding
+    private val showOnboarding = onboardingManager.showRepositoriesOnboarding
 
     init {
         viewModelScope.launch {
@@ -104,5 +104,5 @@ class RepositoriesViewModel @Inject constructor(
         repoManager.reorderRepositories(fromRepo, toRepo)
     }
 
-    fun onOnboardingSeen() = settingsManager.onRepositoriesOnboardingSeen()
+    fun onOnboardingSeen() = onboardingManager.onRepositoriesOnboardingSeen()
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
index 462e2b593..85c112b54 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
@@ -26,7 +26,7 @@ import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
 import org.fdroid.index.RepoManager
 import org.fdroid.repo.RepoUpdateWorker
-import org.fdroid.settings.SettingsManager
+import org.fdroid.settings.OnboardingManager
 import org.fdroid.ui.repositories.details.ArchiveState.UNKNOWN
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
@@ -36,7 +36,7 @@ class RepoDetailsViewModel @Inject constructor(
     app: Application,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
-    private val settingsManager: SettingsManager,
+    private val onboardingManager: OnboardingManager,
     @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app), RepoDetailsActions {
 
@@ -52,7 +52,7 @@ class RepoDetailsViewModel @Inject constructor(
         } else null
     }.flowOn(Dispatchers.IO).distinctUntilChanged()
     private val archiveStateFlow = MutableStateFlow(UNKNOWN)
-    private val showOnboarding = settingsManager.showRepoDetailsOnboarding
+    private val showOnboarding = onboardingManager.showRepoDetailsOnboarding
 
     val model: StateFlow<RepoDetailsModel> = moleculeScope.launchMolecule(mode = ContextClock) {
         RepoDetailsPresenter(
@@ -128,7 +128,7 @@ class RepoDetailsViewModel @Inject constructor(
         }
     }
 
-    override fun onOnboardingSeen() = settingsManager.onRepoDetailsOnboardingSeen()
+    override fun onOnboardingSeen() = onboardingManager.onRepoDetailsOnboardingSeen()
 
     private fun Repository.archiveState(): ArchiveState {
         val isEnabled = repoManager.getRepositories().find { r ->

From 4b8ff9678f8848d92beb3c18d30ebb2cb294ddfb Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 21 Oct 2025 11:12:26 -0300
Subject: [PATCH 079/180] Support repos on file:// URIs

---
 .../main/kotlin/org/fdroid/db/InitialData.kt  |  3 +-
 .../fdroid/download/DownloaderFactoryImpl.kt  | 17 ++-----
 .../kotlin/org/fdroid/download/ImageModel.kt  | 42 ++++++++++++++++
 .../fdroid/download/LocalFileDownloader.kt    | 49 +++++++++++++++++++
 .../org/fdroid/install/AppInstallManager.kt   |  9 ++--
 .../org/fdroid/ui/apps/InstalledAppRow.kt     |  3 +-
 .../org/fdroid/ui/apps/InstallingAppRow.kt    |  2 +-
 .../kotlin/org/fdroid/ui/apps/MyAppItem.kt    |  8 +--
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |  6 +--
 .../org/fdroid/ui/apps/UpdatableAppRow.kt     |  3 +-
 .../org/fdroid/ui/details/AppDetailsItem.kt   | 21 ++++----
 .../fdroid/ui/details/AppDetailsViewModel.kt  |  9 +---
 .../org/fdroid/ui/discover/AppCarousel.kt     |  2 +-
 .../org/fdroid/ui/discover/AppDiscoverItem.kt |  4 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |  7 ++-
 .../kotlin/org/fdroid/ui/lists/AppListItem.kt |  4 +-
 .../kotlin/org/fdroid/ui/lists/AppListRow.kt  |  2 +-
 .../org/fdroid/ui/lists/AppListViewModel.kt   |  4 +-
 .../org/fdroid/ui/repositories/RepoIcon.kt    |  4 +-
 .../fdroid/ui/repositories/RepositoryItem.kt  |  7 ++-
 .../repositories/add/AddRepoPreviewScreen.kt  |  4 +-
 .../org/fdroid/updates/UpdatesManager.kt      |  8 +--
 22 files changed, 146 insertions(+), 72 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/download/ImageModel.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt

diff --git a/next/src/main/kotlin/org/fdroid/db/InitialData.kt b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
index ca08b6f72..6d451fefc 100644
--- a/next/src/main/kotlin/org/fdroid/db/InitialData.kt
+++ b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
@@ -15,7 +15,7 @@ import java.io.File
 class InitialData(val context: Context) : FDroidFixture {
     override fun prePopulateDb(db: FDroidDatabase) {
         addPreloadedRepositories(db, context.packageName)
-        RepoUpdateWorker.Companion.updateNow(context)
+        RepoUpdateWorker.updateNow(context)
     }
 
     @OptIn(ExperimentalSerializationApi::class)
@@ -24,7 +24,6 @@ class InitialData(val context: Context) : FDroidFixture {
             Json.decodeFromStream<List<DefaultRepository>>(inputStream)
         }
         addRepositories(db.getRepositoryDao(), defaultRepos)
-        // TODO support file:/// Uri for repo and test additional_repos.json
         // "system" can be removed when minSdk is 28
         for (root in listOf("/system", "/system_ext", "/product", "/vendor")) {
             val romReposFile = File("$root/etc/$packageName/additional_repos.json")
diff --git a/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt b/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
index 86453cd9b..911ff342a 100644
--- a/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
+++ b/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
@@ -1,5 +1,6 @@
 package org.fdroid.download
 
+import android.content.ContentResolver.SCHEME_FILE
 import android.net.Uri
 import org.fdroid.IndexFile
 import org.fdroid.database.Repository
@@ -36,21 +37,13 @@ class DownloaderFactoryImpl @Inject constructor(
             tryFirstMirror = tryFirst,
         )
         val v1OrUnknown = repo.formatVersion == null || repo.formatVersion == IndexFormatVersion.ONE
-        return if (v1OrUnknown) {
+        return if (uri.scheme == SCHEME_FILE) {
+            LocalFileDownloader(uri, indexFile, destFile)
+        } else if (v1OrUnknown) {
+            @Suppress("DEPRECATION") // v1 only
             HttpDownloader(httpManager, request, destFile)
         } else {
             HttpDownloaderV2(httpManager, request, destFile)
         }
     }
 }
-
-// TODO move to a better place
-fun IndexFile.getDownloadRequest(repository: Repository?): DownloadRequest? {
-    return DownloadRequest(
-        indexFile = this,
-        mirrors = repository?.getMirrors() ?: return null,
-        proxy = null,
-        username = repository.username,
-        password = repository.password,
-    )
-}
diff --git a/next/src/main/kotlin/org/fdroid/download/ImageModel.kt b/next/src/main/kotlin/org/fdroid/download/ImageModel.kt
new file mode 100644
index 000000000..59181ef1a
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/download/ImageModel.kt
@@ -0,0 +1,42 @@
+package org.fdroid.download
+
+import android.net.Uri
+import androidx.core.net.toUri
+import org.fdroid.IndexFile
+import org.fdroid.database.Repository
+
+fun IndexFile.getImageModel(repository: Repository?): Any? {
+    if (repository == null) return null
+    val address = repository.address
+    if (address.startsWith("content://") || address.startsWith("file://")) {
+        return getUri(address, this)
+    }
+    return DownloadRequest(
+        indexFile = this,
+        mirrors = repository.getMirrors(),
+        proxy = null, // TODO proxy support
+        username = repository.username,
+        password = repository.password,
+    )
+}
+
+fun getUri(repoAddress: String, indexFile: IndexFile): Uri {
+    val pathElements = indexFile.name.split("/")
+    if (repoAddress.startsWith("content://")) {
+        // This is a hack that won't work with most ContentProviders
+        // as they don't expose the path in the Uri.
+        // However, it works for local file storage.
+        val result = StringBuilder(repoAddress)
+        for (element in pathElements) {
+            result.append("%2F")
+            result.append(element)
+        }
+        return result.toString().toUri()
+    } else { // Normal URL
+        val result = repoAddress.toUri().buildUpon()
+        for (element in pathElements) {
+            result.appendPath(element)
+        }
+        return result.build()
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt b/next/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt
new file mode 100644
index 000000000..1f04ca17a
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt
@@ -0,0 +1,49 @@
+package org.fdroid.download
+
+import android.net.Uri
+import org.fdroid.IndexFile
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.InputStream
+
+/**
+ * "Downloads" files from `file:///` [Uri]s.  Even though it is
+ * obviously unnecessary to download a file that is locally available, this
+ * class is here so that the whole security-sensitive installation process is
+ * the same, no matter where the files are downloaded from.  Also, for things
+ * like icons and graphics, it makes sense to have them copied to the cache so
+ * that they are available even after removable storage is no longer present.
+ */
+class LocalFileDownloader(
+    uri: Uri,
+    indexFile: IndexFile,
+    destFile: File,
+) : Downloader(indexFile, destFile) {
+    private val sourceFile: File = File(uri.path ?: error("Uri had no path"))
+
+    override fun getInputStream(resumable: Boolean): InputStream = sourceFile.inputStream()
+
+    override fun close() {}
+
+    @Deprecated("Only for v1 repos")
+    override fun hasChanged(): Boolean = true
+
+    override fun totalDownloadSize(): Long = sourceFile.length()
+
+    override fun download() {
+        if (!sourceFile.exists()) {
+            throw FileNotFoundException("$sourceFile does not exist")
+        }
+        var resumable = false
+        val contentLength = sourceFile.length()
+        val fileLength = outputFile.length()
+        if (fileLength > contentLength) {
+            outputFile.delete()
+        } else if (fileLength == contentLength && outputFile.isFile()) {
+            return // already have it!
+        } else if (fileLength > 0) {
+            resumable = true
+        }
+        downloadFromStream(resumable)
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index b34963870..f19c14bd1 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.ACTION_DELETE
 import android.graphics.Bitmap
-import android.net.Uri
 import androidx.activity.result.ActivityResult
 import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
@@ -36,6 +35,7 @@ import org.fdroid.database.AppVersion
 import org.fdroid.database.Repository
 import org.fdroid.download.DownloadRequest
 import org.fdroid.download.DownloaderFactory
+import org.fdroid.download.getUri
 import org.fdroid.getCacheKey
 import org.fdroid.utils.IoDispatcher
 import java.io.File
@@ -107,9 +107,10 @@ class AppInstallManager @Inject constructor(
         version: AppVersion,
         currentVersionName: String?,
         repo: Repository,
-        iconDownloadRequest: DownloadRequest?,
+        iconModel: Any?,
     ): InstallState {
         val packageName = appMetadata.packageName
+        val iconDownloadRequest = iconModel as? DownloadRequest
         val job = scope.async {
             installInt(appMetadata, version, currentVersionName, repo, iconDownloadRequest)
         }
@@ -178,8 +179,8 @@ class AppInstallManager @Inject constructor(
                 coroutineContext.ensureActive()
                 // download file
                 val file = File(context.cacheDir, version.file.sha256)
-                val downloader =
-                    downloaderFactory.create(repo, Uri.EMPTY, version.file, file)
+                val uri = getUri(repo.address, version.file)
+                val downloader = downloaderFactory.create(repo, uri, version.file, file)
                 val now = System.currentTimeMillis()
                 downloader.setListener { bytesRead, totalBytes ->
                     coroutineContext.ensureActive()
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
index 1ec6b3e27..29bc27041 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
+import org.fdroid.download.DownloadRequest
 import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
@@ -28,7 +29,7 @@ fun InstalledAppRow(
         ListItem(
             leadingContent = {
                 AsyncShimmerImage(
-                    model = PackageName(app.packageName, app.iconDownloadRequest),
+                    model = PackageName(app.packageName, app.iconModel as? DownloadRequest),
                     error = painterResource(R.drawable.ic_repo_app_default),
                     contentDescription = null,
                     modifier = Modifier.size(48.dp),
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
index 3083e853b..305dc5ad2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
@@ -33,7 +33,7 @@ fun InstallingAppRow(
         ListItem(
             leadingContent = {
                 AsyncShimmerImage(
-                    model = PackageName(app.packageName, app.iconDownloadRequest, false),
+                    model = PackageName(app.packageName, app.iconModel, false),
                     error = painterResource(R.drawable.ic_repo_app_default),
                     contentDescription = null,
                     modifier = Modifier.size(48.dp),
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
index 4200d8657..af1176d3f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
@@ -8,7 +8,7 @@ sealed class MyAppItem {
     abstract val packageName: String
     abstract val name: String
     abstract val lastUpdated: Long
-    abstract val iconDownloadRequest: DownloadRequest?
+    abstract val iconModel: Any?
 }
 
 data class InstallingAppItem(
@@ -17,7 +17,7 @@ data class InstallingAppItem(
 ) : MyAppItem() {
     override val name: String = installState.name
     override val lastUpdated: Long = installState.lastUpdated
-    override val iconDownloadRequest: DownloadRequest? = installState.iconDownloadRequest
+    override val iconModel: DownloadRequest? = installState.iconDownloadRequest
 }
 
 data class AppUpdateItem(
@@ -27,7 +27,7 @@ data class AppUpdateItem(
     val installedVersionName: String,
     val update: PackageVersion,
     val whatsNew: String?,
-    override val iconDownloadRequest: DownloadRequest? = null,
+    override val iconModel: Any? = null,
 ) : MyAppItem() {
     override val lastUpdated: Long = update.added
 }
@@ -37,5 +37,5 @@ data class InstalledAppItem(
     override val name: String,
     val installedVersionName: String,
     override val lastUpdated: Long,
-    override val iconDownloadRequest: DownloadRequest? = null,
+    override val iconModel: Any? = null,
 ) : MyAppItem()
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index 5d597358c..6cf2f6809 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -20,7 +20,7 @@ import mu.KotlinLogging
 import org.fdroid.database.AppListItem
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
-import org.fdroid.download.getDownloadRequest
+import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallState
@@ -55,8 +55,8 @@ class MyAppsViewModel @Inject constructor(
                 name = app.name ?: "Unknown app",
                 installedVersionName = app.installedVersionName ?: "???",
                 lastUpdated = app.lastUpdated,
-                iconDownloadRequest = repoManager.getRepository(app.repoId)?.let { repo ->
-                    app.getIcon(localeList)?.getDownloadRequest(repo)
+                iconModel = repoManager.getRepository(app.repoId)?.let { repo ->
+                    app.getIcon(localeList)?.getImageModel(repo)
                 },
             )
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index ec33956ca..e4302fdbb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
+import org.fdroid.download.DownloadRequest
 import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
@@ -53,7 +54,7 @@ fun UpdatableAppRow(
                     )
                 }) {
                     AsyncShimmerImage(
-                        model = PackageName(app.packageName, app.iconDownloadRequest),
+                        model = PackageName(app.packageName, app.iconModel as? DownloadRequest),
                         error = painterResource(R.drawable.ic_repo_app_default),
                         contentDescription = null,
                         modifier = Modifier.size(48.dp),
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 1667c2bd0..786e70eea 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -10,8 +10,7 @@ import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppPrefs
 import org.fdroid.database.AppVersion
 import org.fdroid.database.Repository
-import org.fdroid.download.DownloadRequest
-import org.fdroid.download.getDownloadRequest
+import org.fdroid.download.getImageModel
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.install.InstallState
@@ -35,9 +34,9 @@ data class AppDetailsItem(
     val name: String,
     val summary: String? = null,
     val description: String? = null,
-    val icon: DownloadRequest? = null,
-    val featureGraphic: DownloadRequest? = null,
-    val phoneScreenshots: List<DownloadRequest> = emptyList(),
+    val icon: Any? = null,
+    val featureGraphic: Any? = null,
+    val phoneScreenshots: List<Any> = emptyList(),
     val categories: List<CategoryItem>? = null,
     val versions: List<PackageVersion>? = null,
     val installedVersion: PackageVersion? = null,
@@ -90,10 +89,10 @@ data class AppDetailsItem(
         name = dbApp.name ?: "Unknown App",
         summary = dbApp.summary,
         description = getHtmlDescription(dbApp.getDescription(localeList)),
-        icon = dbApp.getIcon(localeList)?.getDownloadRequest(repository),
-        featureGraphic = dbApp.getFeatureGraphic(localeList)?.getDownloadRequest(repository),
+        icon = dbApp.getIcon(localeList)?.getImageModel(repository),
+        featureGraphic = dbApp.getFeatureGraphic(localeList)?.getImageModel(repository),
         phoneScreenshots = dbApp.getPhoneScreenshots(localeList).mapNotNull {
-            it.getDownloadRequest(repository)
+            it.getImageModel(repository)
         },
         categories = dbApp.metadata.categories?.mapNotNull { categoryId ->
             val category = repository.getCategories()[categoryId] ?: return@mapNotNull null
@@ -189,7 +188,7 @@ data class AppDetailsItem(
 }
 
 class AppDetailsActions(
-    val installAction: (AppMetadata, AppVersion, DownloadRequest?) -> Unit,
+    val installAction: (AppMetadata, AppVersion, Any?) -> Unit,
     val requestUserConfirmation: (String, InstallState.UserConfirmationNeeded) -> Unit,
     /**
      * A workaround for Android 10, 11, 12 and 13 where tapping outside the confirmation dialog
@@ -218,7 +217,7 @@ enum class MainButtonState {
 
 data class AntiFeature(
     val id: String,
-    val icon: DownloadRequest? = null,
+    val icon: Any? = null,
     val name: String = id,
     val reason: String? = null,
 )
@@ -231,7 +230,7 @@ private fun AppVersion?.getAntiFeatures(
         val antiFeature = repository.getAntiFeatures()[key] ?: return@mapNotNull null
         AntiFeature(
             id = key,
-            icon = antiFeature.getIcon(localeList)?.getDownloadRequest(repository),
+            icon = antiFeature.getIcon(localeList)?.getImageModel(repository),
             name = antiFeature.getName(localeList) ?: key,
             reason = getAntiFeatureReason(key, localeList),
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 68fdc4024..7f42890d9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -24,7 +24,6 @@ import org.fdroid.UpdateChecker
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppVersion
 import org.fdroid.database.FDroidDatabase
-import org.fdroid.download.DownloadRequest
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
@@ -82,18 +81,14 @@ class AppDetailsViewModel @Inject constructor(
     }
 
     @UiThread
-    fun install(
-        appMetadata: AppMetadata,
-        version: AppVersion,
-        iconDownloadRequest: DownloadRequest?,
-    ) {
+    fun install(appMetadata: AppMetadata, version: AppVersion, iconModel: Any?) {
         scope.launch(Dispatchers.Main) {
             val result = appInstallManager.install(
                 appMetadata = appMetadata,
                 version = version,
                 currentVersionName = packageInfoFlow.value?.packageInfo?.versionName,
                 repo = repoManager.getRepository(version.repoId) ?: return@launch, // TODO
-                iconDownloadRequest = iconDownloadRequest,
+                iconModel = iconModel,
             )
             if (result is InstallState.Installed) {
                 // to reload packageInfoFlow with fresh packageInfo
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
index b6ce13048..8086f1a0e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
@@ -74,7 +74,7 @@ fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
             .clickable { onAppTap(app) },
     ) {
         AsyncShimmerImage(
-            model = app.iconDownloadRequest,
+            model = app.imageModel,
             contentDescription = null,
             contentScale = ContentScale.Fit,
             modifier = Modifier
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
index 48fe22e85..5c989ee5e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
@@ -1,10 +1,8 @@
 package org.fdroid.ui.discover
 
-import org.fdroid.download.DownloadRequest
-
 class AppDiscoverItem(
     val packageName: String,
     val name: String,
-    val iconDownloadRequest: DownloadRequest? = null,
+    val imageModel: Any? = null,
     val lastUpdated: Long = -1,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 27e2e10ca..1edc84c44 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -22,7 +22,7 @@ import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.database.AppOverviewItem
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
-import org.fdroid.download.getDownloadRequest
+import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListItem
@@ -114,8 +114,7 @@ class DiscoverViewModel @Inject constructor(
                         summary = it.summary.getBestLocale(localeList) ?: "",
                         lastUpdated = it.lastUpdated,
                         isCompatible = true, // doesn't matter here, as we don't filter
-                        iconDownloadRequest = it.getIcon(localeList)
-                            ?.getDownloadRequest(repository),
+                        iconModel = it.getIcon(localeList)?.getImageModel(repository),
                         categoryIds = it.categories?.toSet(),
                     )
                 }
@@ -146,6 +145,6 @@ class DiscoverViewModel @Inject constructor(
         packageName = packageName,
         name = getName(localeList) ?: "Unknown App",
         lastUpdated = lastUpdated,
-        iconDownloadRequest = getIcon(localeList)?.getDownloadRequest(repository),
+        imageModel = getIcon(localeList)?.getImageModel(repository),
     )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
index 042fae7f1..d6aa606f4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
@@ -1,7 +1,5 @@
 package org.fdroid.ui.lists
 
-import org.fdroid.download.DownloadRequest
-
 data class AppListItem(
     val repoId: Long,
     val packageName: String,
@@ -9,6 +7,6 @@ data class AppListItem(
     val summary: String,
     val lastUpdated: Long,
     val isCompatible: Boolean,
-    val iconDownloadRequest: DownloadRequest? = null,
+    val iconModel: Any? = null,
     val categoryIds: Set<String>? = null,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
index 97c0d9cd6..092b3849d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
@@ -28,7 +28,7 @@ fun AppListRow(
         supportingContent = { Text(item.summary) },
         leadingContent = {
             AsyncShimmerImage(
-                model = item.iconDownloadRequest,
+                model = item.iconModel,
                 error = painterResource(R.drawable.ic_repo_app_default),
                 contentDescription = null,
                 modifier = Modifier.size(48.dp),
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 59beb9b5c..89078f9a7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -23,7 +23,7 @@ import kotlinx.coroutines.launch
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
-import org.fdroid.download.getDownloadRequest
+import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.settings.OnboardingManager
 import org.fdroid.settings.SettingsManager
@@ -119,7 +119,7 @@ class AppListViewModel @Inject constructor(
                 summary = it.getSummary(localeList) ?: "Unknown",
                 lastUpdated = it.lastUpdated,
                 isCompatible = it.isCompatible,
-                iconDownloadRequest = it.getIcon(localeList)?.getDownloadRequest(repository),
+                iconModel = it.getIcon(localeList)?.getImageModel(repository),
                 categoryIds = it.categories?.toSet(),
             )
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
index f85bc9644..a131b349b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
@@ -6,13 +6,13 @@ import androidx.compose.ui.res.painterResource
 import androidx.core.os.LocaleListCompat
 import org.fdroid.R
 import org.fdroid.database.Repository
-import org.fdroid.download.getDownloadRequest
+import org.fdroid.download.getImageModel
 import org.fdroid.ui.utils.AsyncShimmerImage
 
 @Composable
 fun RepoIcon(repo: Repository, modifier: Modifier = Modifier) {
     AsyncShimmerImage(
-        model = repo.getIcon(LocaleListCompat.getDefault())?.getDownloadRequest(repo),
+        model = repo.getIcon(LocaleListCompat.getDefault())?.getImageModel(repo),
         contentDescription = null,
         error = painterResource(R.drawable.ic_repo_app_default),
         modifier = modifier,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
index e9eca64c7..381bc2b57 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
@@ -2,14 +2,13 @@ package org.fdroid.ui.repositories
 
 import androidx.core.os.LocaleListCompat
 import org.fdroid.database.Repository
-import org.fdroid.download.DownloadRequest
-import org.fdroid.download.getDownloadRequest
+import org.fdroid.download.getImageModel
 
 data class RepositoryItem(
     val repoId: Long,
     val address: String,
     val name: String,
-    val icon: DownloadRequest? = null,
+    val icon: Any? = null,
     val timestamp: Long,
     val lastUpdated: Long?,
     val weight: Int,
@@ -19,7 +18,7 @@ data class RepositoryItem(
         repoId = repo.repoId,
         address = repo.address,
         name = repo.getName(localeList) ?: "Unknown Repo",
-        icon = repo.getIcon(localeList)?.getDownloadRequest(repo),
+        icon = repo.getIcon(localeList)?.getImageModel(repo),
         timestamp = repo.timestamp,
         lastUpdated = repo.lastUpdated,
         weight = repo.weight,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
index 275d5070c..b13e15546 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
 import org.fdroid.R
 import org.fdroid.database.MinimalApp
-import org.fdroid.download.getDownloadRequest
+import org.fdroid.download.getImageModel
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.v2.FileV2
 import org.fdroid.repo.FetchResult.IsNewRepoAndNewMirror
@@ -88,7 +88,7 @@ fun AddRepoPreviewScreen(
                     packageName = app.packageName,
                     name = app.name ?: "Unknown app",
                     summary = app.summary ?: "",
-                    iconDownloadRequest = app.getIcon(localeList)?.getDownloadRequest(repo),
+                    iconModel = app.getIcon(localeList)?.getImageModel(repo),
                     lastUpdated = 1L,
                     isCompatible = true,
                 )
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 3854942af..ec513581a 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -13,7 +13,7 @@ import mu.KotlinLogging
 import org.fdroid.database.AppVersion
 import org.fdroid.database.DbUpdateChecker
 import org.fdroid.database.FDroidDatabase
-import org.fdroid.download.getDownloadRequest
+import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
 import org.fdroid.ui.apps.AppUpdateItem
@@ -66,8 +66,8 @@ class UpdatesManager @Inject constructor(
                     installedVersionName = update.installedVersionName,
                     update = update.update,
                     whatsNew = update.update.getWhatsNew(localeList),
-                    iconDownloadRequest = repoManager.getRepository(update.repoId)?.let { repo ->
-                        update.getIcon(localeList)?.getDownloadRequest(repo)
+                    iconModel = repoManager.getRepository(update.repoId)?.let { repo ->
+                        update.getIcon(localeList)?.getImageModel(repo)
                     },
                 )
             }
@@ -102,7 +102,7 @@ class UpdatesManager @Inject constructor(
             version = update.update as AppVersion,
             currentVersionName = update.installedVersionName,
             repo = repoManager.getRepository(update.repoId) ?: return,
-            iconDownloadRequest = update.iconDownloadRequest
+            iconModel = update.iconModel
         )
     }
 }

From 2be99156af0f39b864577656d88e1aa6411c8523 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 21 Oct 2025 12:08:21 -0300
Subject: [PATCH 080/180] Allow changing (preferred) repo in app details

---
 .../org/fdroid/ui/details/AppDetailsHeader.kt |  4 ++--
 .../org/fdroid/ui/details/AppDetailsItem.kt   |  2 ++
 .../fdroid/ui/details/AppDetailsViewModel.kt  | 14 +++++++++++
 .../org/fdroid/ui/details/DetailsPresenter.kt | 24 +++++++++++++------
 .../org/fdroid/ui/details/RepoChooser.kt      |  4 ++--
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  2 ++
 6 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 66339ff33..b235f7113 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -160,8 +160,8 @@ fun AppDetailsHeader(
         repos = item.repositories,
         currentRepoId = item.app.repoId,
         preferredRepoId = item.preferredRepoId,
-        onRepoChanged = {},
-        onPreferredRepoChanged = {},
+        onRepoChanged = item.actions.onRepoChanged,
+        onPreferredRepoChanged = item.actions.onPreferredRepoChanged,
         modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
     )
     // check user confirmation ON_RESUME to work around Android bug
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 786e70eea..b912b5995 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -199,6 +199,8 @@ class AppDetailsActions(
     val checkUserConfirmation: (String, InstallState.UserConfirmationNeeded) -> Unit,
     val cancelInstall: (String) -> Unit,
     val onUninstallResult: (String, ActivityResult) -> Unit,
+    val onRepoChanged: (Long) -> Unit,
+    val onPreferredRepoChanged: (Long) -> Unit,
     val allowBetaVersions: () -> Unit,
     val ignoreAllUpdates: (() -> Unit)? = null,
     val ignoreThisUpdate: (() -> Unit)? = null,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 7f42890d9..4884a53c8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mu.KotlinLogging
@@ -44,6 +45,7 @@ class AppDetailsViewModel @Inject constructor(
 ) : AndroidViewModel(app) {
     private val log = KotlinLogging.logger { }
     private val packageInfoFlow = MutableStateFlow<AppInfo?>(null)
+    private val currentRepoIdFlow = MutableStateFlow<Long?>(null)
 
     val appDetails: StateFlow<AppDetailsItem?> = viewModelScope.launchMolecule(
         context = Dispatchers.IO, mode = Immediate,
@@ -55,6 +57,7 @@ class AppDetailsViewModel @Inject constructor(
             appInstallManager = appInstallManager,
             viewModel = this,
             packageInfoFlow = packageInfoFlow,
+            currentRepoIdFlow = currentRepoIdFlow,
         )
     }
 
@@ -136,6 +139,17 @@ class AppDetailsViewModel @Inject constructor(
         }
     }
 
+    @UiThread
+    fun onRepoChanged(repoId: Long) {
+        currentRepoIdFlow.update { repoId }
+    }
+
+    @UiThread
+    fun onPreferredRepoChanged(repoId: Long) {
+        val packageName = packageInfoFlow.value?.packageName ?: error("Had not package name")
+        repoManager.setPreferredRepoId(packageName, repoId)
+    }
+
     override fun onCleared() {
         val packageName = packageInfoFlow.value?.packageName
         log.info { "App details screen left: $packageName" }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 9f4c96e26..d86e4d899 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -31,15 +31,17 @@ fun DetailsPresenter(
     appInstallManager: AppInstallManager,
     viewModel: AppDetailsViewModel,
     packageInfoFlow: StateFlow<AppInfo?>,
+    currentRepoIdFlow: StateFlow<Long?>,
 ): AppDetailsItem? {
     val packagePair = packageInfoFlow.collectAsState().value ?: return null
     val packageName = packagePair.packageName
-    val app = db.getAppDao().getApp(packageName).asFlow().collectAsState(null).value
-        ?: return null
+    val currentRepoId = currentRepoIdFlow.collectAsState().value
+    val app = if (currentRepoId == null) {
+        db.getAppDao().getApp(packageName).asFlow().collectAsState(null).value
+    } else {
+        db.getAppDao().getApp(currentRepoId, packageName)
+    } ?: return null
     val repo = repoManager.getRepository(app.repoId) ?: return null
-    val preferredRepoId = remember(packageName) {
-        app.repoId // DB loads preferred repo first, so we remember it
-    }
     val repositories = remember(packageName) {
         db.getAppDao().getRepositoryIdsForApp(packageName).mapNotNull { repoId ->
             repoManager.getRepository(repoId)
@@ -48,9 +50,15 @@ fun DetailsPresenter(
     val installState =
         appInstallManager.getAppFlow(packageName).collectAsState(InstallState.Unknown).value
 
-    val versions =
-        db.getVersionDao().getAppVersions(packageName).asFlow().collectAsState(null).value
+    val versions = if (currentRepoId == null) {
+        db.getVersionDao().getAppVersions(packageName)
+    } else {
+        db.getVersionDao().getAppVersions(currentRepoId, packageName)
+    }.asFlow().collectAsState(null).value
     val appPrefs = db.getAppPrefsDao().getAppPrefs(packageName).asFlow().collectAsState(null).value
+    val preferredRepoId = remember(packageName, appPrefs) {
+        appPrefs?.preferredRepoId ?: app.repoId // DB loads preferred repo first, so we remember it
+    }
     val suggestedVersion = if (versions == null || appPrefs == null) {
         null
     } else {
@@ -109,6 +117,8 @@ fun DetailsPresenter(
             checkUserConfirmation = viewModel::checkUserConfirmation,
             cancelInstall = viewModel::cancelInstall,
             onUninstallResult = viewModel::onUninstallResult,
+            onRepoChanged = viewModel::onRepoChanged,
+            onPreferredRepoChanged = viewModel::onPreferredRepoChanged,
             allowBetaVersions = viewModel::allowBetaUpdates,
             ignoreAllUpdates = if (installedVersionCode == null) {
                 null
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
index 2caf9b876..06ac40f71 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
@@ -43,7 +43,7 @@ fun RepoChooser(
     repos: List<Repository>,
     currentRepoId: Long,
     preferredRepoId: Long,
-    onRepoChanged: (Repository) -> Unit,
+    onRepoChanged: (Long) -> Unit,
     onPreferredRepoChanged: (Long) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -116,7 +116,7 @@ fun RepoChooser(
                         repo = repo,
                         isPreferred = repo.repoId == preferredRepoId,
                         onClick = {
-                            onRepoChanged(repo)
+                            onRepoChanged(repo.repoId)
                             expanded = false
                         },
                         modifier = modifier,
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 0b6b67946..9db68795e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -132,6 +132,8 @@ val testApp = AppDetailsItem(
         checkUserConfirmation = { _, _ -> },
         cancelInstall = {},
         onUninstallResult = { _, _ -> },
+        onRepoChanged = {},
+        onPreferredRepoChanged = {},
         allowBetaVersions = {},
         ignoreAllUpdates = {},
         ignoreThisUpdate = {},

From 5a5620324ce0b9713202de15c3f6b0ac445ddbb1 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 22 Oct 2025 11:20:50 -0300
Subject: [PATCH 081/180] Implement screenshot pager popup to see screenshots
 in full size

---
 .../org/fdroid/ui/details/AntiFeatures.kt     |  6 +-
 .../org/fdroid/ui/details/AppDetails.kt       | 35 +------
 .../fdroid/ui/details/AppDetailsViewModel.kt  | 13 +++
 .../org/fdroid/ui/details/Screenshots.kt      | 96 +++++++++++++++++++
 .../org/fdroid/ui/utils/AsyncShimmerImage.kt  |  5 +-
 5 files changed, 117 insertions(+), 38 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
index 3255d2b8c..5c2679534 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
@@ -31,7 +31,7 @@ import org.fdroid.ui.utils.testApp
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 fun AntiFeatures(
-    item: AppDetailsItem,
+    antiFeatures: List<AntiFeature>,
 ) {
     ElevatedCard(
         colors = CardDefaults.elevatedCardColors(
@@ -47,7 +47,7 @@ fun AntiFeatures(
             modifier = Modifier.padding(horizontal = 16.dp),
         ) {
             Column {
-                item.antiFeatures?.forEach { antiFeature ->
+                antiFeatures.forEach { antiFeature ->
                     ListItem(
                         leadingContent = {
                             AsyncShimmerImage(
@@ -87,6 +87,6 @@ fun AntiFeatures(
 @Composable
 fun AntiFeaturesPreview() {
     FDroidContent {
-        AntiFeatures(testApp)
+        AntiFeatures(testApp.antiFeatures!!)
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index 87e0a48d9..eefd8a52d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -5,11 +5,8 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
@@ -19,10 +16,8 @@ import androidx.compose.material.icons.filled.ChangeHistory
 import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.CurrencyBitcoin
 import androidx.compose.material.icons.filled.EditNote
-import androidx.compose.material.icons.filled.Error
 import androidx.compose.material.icons.filled.Groups
 import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Image
 import androidx.compose.material.icons.filled.Link
 import androidx.compose.material.icons.filled.Mail
 import androidx.compose.material.icons.filled.OndemandVideo
@@ -40,8 +35,6 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
-import androidx.compose.material3.carousel.rememberCarouselState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -51,10 +44,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
@@ -75,7 +66,6 @@ import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.icons.License
 import org.fdroid.ui.lists.AppListType
-import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.testApp
@@ -201,32 +191,11 @@ fun AppDetails(
             }
             // Anti-features
             if (!item.antiFeatures.isNullOrEmpty()) {
-                AntiFeatures(item)
+                AntiFeatures(item.antiFeatures)
             }
             // Screenshots
             if (item.phoneScreenshots.isNotEmpty()) {
-                val carouselState = rememberCarouselState { item.phoneScreenshots.size }
-                HorizontalUncontainedCarousel(
-                    state = carouselState,
-                    itemWidth = 120.dp,
-                    itemSpacing = 4.dp,
-                    contentPadding = PaddingValues(horizontal = 16.dp),
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(240.dp)
-                        .padding(vertical = 8.dp)
-                ) { index ->
-                    AsyncShimmerImage(
-                        model = item.phoneScreenshots[index],
-                        contentDescription = "",
-                        contentScale = ContentScale.Fit,
-                        placeholder = rememberVectorPainter(Icons.Default.Image),
-                        error = rememberVectorPainter(Icons.Default.Error),
-                        modifier = Modifier
-                            .size(120.dp, 240.dp)
-                            .clip(MaterialTheme.shapes.medium),
-                    )
-                }
+                Screenshots(item.phoneScreenshots)
             }
             // Donate card
             if (item.showDonate) ElevatedCard(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 4884a53c8..06c1a7d5b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -8,9 +8,11 @@ import android.content.pm.PackageManager.GET_SIGNATURES
 import androidx.activity.result.ActivityResult
 import androidx.annotation.UiThread
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.application
 import androidx.lifecycle.viewModelScope
 import app.cash.molecule.RecompositionMode.Immediate
 import app.cash.molecule.launchMolecule
+import coil3.SingletonImageLoader
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -25,6 +27,8 @@ import org.fdroid.UpdateChecker
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppVersion
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.download.DownloadRequest
+import org.fdroid.getCacheKey
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
@@ -156,6 +160,15 @@ class AppDetailsViewModel @Inject constructor(
         packageName?.let {
             appInstallManager.cleanUp(it)
         }
+        // remove screenshots from disk cache to not fill it up quickly with large images
+        val diskCache = SingletonImageLoader.get(application).diskCache
+        if (diskCache != null) scope.launch {
+            appDetails.value?.phoneScreenshots?.forEach { screenshot ->
+                if (screenshot is DownloadRequest) {
+                    diskCache.remove(screenshot.getCacheKey())
+                }
+            }
+        }
     }
 
     @UiThread
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt b/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
new file mode 100644
index 000000000..01ca50a4a
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
@@ -0,0 +1,96 @@
+package org.fdroid.ui.details
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.ModalBottomSheetProperties
+import androidx.compose.material3.Surface
+import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
+import androidx.compose.material3.carousel.rememberCarouselState
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.testApp
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun Screenshots(phoneScreenshots: List<Any>) {
+    val carouselState = rememberCarouselState { phoneScreenshots.size }
+    var showScreenshot by remember { mutableStateOf<Int?>(null) }
+    val screenshotIndex = showScreenshot
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    if (screenshotIndex != null) ModalBottomSheet(
+        onDismissRequest = { showScreenshot = null },
+        sheetState = sheetState,
+        properties = ModalBottomSheetProperties(),
+    ) {
+        val pagerState = rememberPagerState(
+            initialPage = screenshotIndex,
+            pageCount = { phoneScreenshots.size },
+        )
+        Surface {
+            HorizontalPager(state = pagerState) { page ->
+                AsyncShimmerImage(
+                    model = phoneScreenshots[page],
+                    contentDescription = "",
+                    contentScale = ContentScale.Fit,
+                    placeholder = rememberVectorPainter(Icons.Default.Image),
+                    error = rememberVectorPainter(Icons.Default.Error),
+                    modifier = Modifier.fillMaxSize()
+                )
+            }
+        }
+    }
+    HorizontalUncontainedCarousel(
+        state = carouselState,
+        itemWidth = 120.dp,
+        itemSpacing = 2.dp,
+        contentPadding = PaddingValues(horizontal = 16.dp),
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(240.dp)
+            .padding(vertical = 8.dp)
+    ) { index ->
+        AsyncShimmerImage(
+            model = phoneScreenshots[index],
+            contentDescription = "",
+            contentScale = ContentScale.Fit,
+            placeholder = rememberVectorPainter(Icons.Default.Image),
+            error = rememberVectorPainter(Icons.Default.Error),
+            modifier = Modifier
+                .size(120.dp, 240.dp)
+                .clickable {
+                    showScreenshot = index
+                }
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        Screenshots(testApp.phoneScreenshots)
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt b/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
index c157c18a0..5634e4c46 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
@@ -17,6 +17,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.ColorFilter.Companion.tint
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
@@ -43,7 +44,7 @@ fun AsyncShimmerImage(
                 Image(
                     painter = placeholder,
                     contentDescription = contentDescription,
-                    colorFilter = colorFilter,
+                    colorFilter = colorFilter ?: tint(MaterialTheme.colorScheme.onSurface),
                     contentScale = contentScale,
                     modifier = Modifier
                         .matchParentSize()
@@ -54,7 +55,7 @@ fun AsyncShimmerImage(
                 Image(
                     painter = error,
                     contentDescription = contentDescription,
-                    colorFilter = colorFilter,
+                    colorFilter = colorFilter ?: tint(MaterialTheme.colorScheme.onSurface),
                     contentScale = contentScale,
                     modifier = Modifier.matchParentSize(),
                 )

From 198bd20a69cc991271e1f13eecf69af7048c743e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 22 Oct 2025 11:56:17 -0300
Subject: [PATCH 082/180] Show time of last update on repo list screen

---
 .../org/fdroid/ui/repositories/Repositories.kt       | 12 ++++++++----
 .../fdroid/ui/repositories/RepositoriesPresenter.kt  | 10 ++++++++++
 .../fdroid/ui/repositories/RepositoriesViewModel.kt  |  1 +
 .../org/fdroid/ui/repositories/RepositoryInfo.kt     |  1 +
 .../org/fdroid/ui/repositories/RepositoryRow.kt      | 10 +++++++++-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index 225fd4231..f41e94fb9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -9,6 +9,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -33,7 +34,7 @@ import org.fdroid.ui.utils.getHintOverlayColor
 import org.fdroid.ui.utils.getRepositoriesInfo
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun Repositories(
     info: RepositoryInfo,
     onBackClicked: () -> Unit,
@@ -76,7 +77,10 @@ fun Repositories(
                 title = {
                     Text(stringResource(R.string.app_details_repositories))
                 },
-                // TODO show when repos were last updated
+                subtitle = {
+                    val lastUpdated = info.model.lastCheckForUpdate
+                    Text(stringResource(R.string.repo_last_update_check, lastUpdated))
+                }
             )
         },
         floatingActionButton = {
@@ -107,7 +111,7 @@ fun Repositories(
 @Composable
 fun RepositoriesScaffoldLoadingPreview() {
     FDroidContent {
-        val model = RepositoryModel(null, false)
+        val model = RepositoryModel(null, false, "never")
         val info = getRepositoriesInfo(model)
         Repositories(info) {}
     }
@@ -140,7 +144,7 @@ fun RepositoriesScaffoldPreview() {
                 name = "My second repository",
             ),
         )
-        val model = RepositoryModel(repos, false)
+        val model = RepositoryModel(repos, false, "42min. ago")
         val info = getRepositoriesInfo(model, repos[0].repoId)
         Repositories(info) { }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
index ac5c50375..f1cf4aef5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
@@ -1,21 +1,31 @@
 package org.fdroid.ui.repositories
 
+import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.StateFlow
+import org.fdroid.R
+import org.fdroid.ui.utils.asRelativeTimeString
 
 @Composable
 fun RepositoriesPresenter(
+    context: Context,
     repositoriesFlow: StateFlow<List<RepositoryItem>?>,
     repoSortingMapFlow: StateFlow<Map<Long, Int>>,
     showOnboardingFlow: StateFlow<Boolean>,
 ): RepositoryModel {
     val repositories = repositoriesFlow.collectAsState().value
     val repoSortingMap = repoSortingMapFlow.collectAsState().value
+    val lastUpdated = repositories?.maxBy { it.lastUpdated ?: 0 }?.lastUpdated
     return RepositoryModel(
         repositories = repositories?.sortedBy { repo ->
             repoSortingMap[repo.repoId] ?: repoSortingMap.size
         },
         showOnboarding = showOnboardingFlow.collectAsState().value,
+        lastCheckForUpdate = if (lastUpdated == null || lastUpdated <= 0) {
+            context.getString(R.string.repositories_last_update_never)
+        } else {
+            lastUpdated.asRelativeTimeString()
+        }
     )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 90c923490..3e9ab484b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -51,6 +51,7 @@ class RepositoriesViewModel @Inject constructor(
     // define below init, because this only defines repoSortingMap
     val model: StateFlow<RepositoryModel> = moleculeScope.launchMolecule(mode = ContextClock) {
         RepositoriesPresenter(
+            context = application,
             repositoriesFlow = repos,
             repoSortingMapFlow = repoSortingMap,
             showOnboardingFlow = showOnboarding,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
index 53be63b79..8f3e2cf4b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
@@ -14,4 +14,5 @@ interface RepositoryInfo {
 data class RepositoryModel(
     val repositories: List<RepositoryItem>?,
     val showOnboarding: Boolean,
+    val lastCheckForUpdate: String,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
index 6067d1441..bd3cbc85a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
@@ -8,8 +8,11 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.asRelativeTimeString
 
 @Composable
 fun RepositoryRow(
@@ -30,7 +33,12 @@ fun RepositoryRow(
             Text(repoItem.name)
         },
         supportingContent = {
-            Text(repoItem.address)
+            val lastUpdated = if (repoItem.lastUpdated == null || repoItem.lastUpdated <= 0) {
+                stringResource(R.string.repositories_last_update_never)
+            } else {
+                repoItem.timestamp.asRelativeTimeString()
+            }
+            Text(stringResource(R.string.last_updated, lastUpdated))
         },
         trailingContent = {
             Switch(repoItem.enabled, onCheckedChange = onRepoEnabled)

From 8ad960cba8d8d135ac70f28c1ff3e1208b451ec2 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 22 Oct 2025 15:18:26 -0300
Subject: [PATCH 083/180] Fix issues with onboarding hints

Also use opportunity to re-format Main.kt
---
 gradle/libs.versions.toml                  |   2 +-
 next/src/main/kotlin/org/fdroid/ui/Main.kt | 422 +++++++++++----------
 2 files changed, 215 insertions(+), 209 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a830b2841..28d7108f5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ glide = "5.0.5"
 glideCompose = "1.0.0-beta08"
 coilCompose = "3.3.0"
 molecule = "2.2.0"
-hints = "1.1.1"
+hints = "2.0.1"
 
 androidxCoreKtx = "1.17.0"
 androidxAppcompat = "1.7.1"
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 938f2e593..982405b44 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -18,12 +18,14 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
 import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
+import com.viktormykhailiv.compose.hints.HintHost
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
@@ -75,215 +77,219 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
         windowAdaptiveInfo.windowSizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND)
     }
     val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>(directive = directive)
-    FDroidContent {
-        NavDisplay(
-            backStack = backStack,
-            sceneStrategy = listDetailStrategy,
-            entryDecorators = listOf(
-                rememberSaveableStateHolderNavEntryDecorator(),
-                rememberViewModelStoreNavEntryDecorator(),
-            ),
-            entryProvider = entryProvider {
-                entry<NavigationKey.Discover>(
-                    metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                        Text(stringResource(R.string.no_app_selected))
-                    },
-                ) {
-                    val viewModel = hiltViewModel<DiscoverViewModel>()
-                    val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
-                    Discover(
-                        discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
-                        onListTap = {
-                            backStack.add(NavigationKey.AppList(it))
-                        },
-                        onAppTap = {
-                            backStack.add(NavigationKey.AppDetails(it.packageName))
-                        },
-                        onNav = { backStack.add(it) },
-                        numUpdates = numUpdates,
-                        isBigScreen = isBigScreen,
-                        onSearch = viewModel::search,
-                        onSearchCleared = viewModel::onSearchCleared,
-                        modifier = Modifier,
-                    )
-                }
-                entry<NavigationKey.MyApps>(
-                    metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                        Text(stringResource(R.string.no_app_selected))
-                    },
-                ) {
-                    val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
-                    val myAppsInfo = object : MyAppsInfo {
-                        override val model =
-                            myAppsViewModel.myAppsModel.collectAsStateWithLifecycle().value
 
-                        override fun refresh() = myAppsViewModel.refresh()
-                        override fun updateAll() = myAppsViewModel.updateAll()
-                        override fun changeSortOrder(sort: AppListSortOrder) =
-                            myAppsViewModel.changeSortOrder(sort)
-
-                        override fun search(query: String) = myAppsViewModel.search(query)
-                        override fun confirmAppInstall(
-                            packageName: String,
-                            state: InstallState.UserConfirmationNeeded,
-                        ) = myAppsViewModel.confirmAppInstall(packageName, state)
-                    }
-                    MyApps(
-                        myAppsInfo = myAppsInfo,
-                        currentPackageName = if (isBigScreen) {
-                            (backStack.last() as? NavigationKey.AppDetails)?.packageName
-                        } else null,
-                        onAppItemClick = {
-                            backStack.add(NavigationKey.AppDetails(it))
-                        },
-                        onNav = { backStack.add(it) },
-                        isBigScreen = isBigScreen,
-                    )
-                }
-                entry<NavigationKey.AppDetails>(
-                    metadata = ListDetailSceneStrategy.detailPane("appdetails")
-                ) {
-                    val appDetailsViewModel = hiltViewModel<AppDetailsViewModel>()
-                    LaunchedEffect(it.packageName) {
-                        appDetailsViewModel.setAppDetails(it.packageName)
-                    }
-                    AppDetails(
-                        item = appDetailsViewModel.appDetails.collectAsStateWithLifecycle().value,
-                        onNav = { navKey -> backStack.add(navKey) },
-                        onBackNav = if (isBigScreen) null else {
-                            { backStack.removeLastOrNull() }
-                        },
-                        modifier = Modifier,
-                    )
-                }
-                entry<NavigationKey.AppList>(
-                    metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                        Text(stringResource(R.string.no_app_selected))
-                    },
-                ) {
-                    val appListViewModel = hiltViewModel<AppListViewModel>()
-                    LaunchedEffect(it.type) {
-                        appListViewModel.load(it.type)
-                    }
-                    val appListInfo = object : AppListInfo {
-                        override val model =
-                            appListViewModel.appListModel.collectAsStateWithLifecycle().value
-                        override val actions: AppListActions = appListViewModel
-                        override val list: AppListType =
-                            appListViewModel.currentList.collectAsStateWithLifecycle().value
-                        override val showFilters: Boolean =
-                            appListViewModel.showFilters.collectAsStateWithLifecycle().value
-                        override val showOnboarding: Boolean =
-                            appListViewModel.showOnboarding.collectAsStateWithLifecycle().value
-                    }
-                    AppList(
-                        appListInfo = appListInfo,
-                        currentPackageName = if (isBigScreen) {
-                            (backStack.last() as? NavigationKey.AppDetails)?.packageName
-                        } else null,
-                        onBackClicked = { backStack.removeLastOrNull() },
-                        modifier = Modifier,
-                    ) { packageName ->
-                        backStack.add(NavigationKey.AppDetails(packageName))
-                    }
-                }
-                entry<NavigationKey.Repos>(
-                    metadata = ListDetailSceneStrategy.listPane("repos") {
-                        Text(text = stringResource(R.string.no_repository_selected))
-                    },
-                ) {
-                    val viewModel = hiltViewModel<RepositoriesViewModel>()
-                    val info = object : RepositoryInfo {
-                        override val model: RepositoryModel =
-                            viewModel.model.collectAsStateWithLifecycle().value
-
-                        override val currentRepositoryId: Long? = if (isBigScreen) {
-                            (backStack.last() as? NavigationKey.RepoDetails)?.repoId
-                        } else null
-
-                        override fun onOnboardingSeen() = viewModel.onOnboardingSeen()
-
-                        override fun onRepositorySelected(repositoryItem: RepositoryItem) {
-                            backStack.add(NavigationKey.RepoDetails(repositoryItem.repoId))
-                        }
-
-                        override fun onRepositoryEnabled(repoId: Long, enabled: Boolean) =
-                            viewModel.onRepositoryEnabled(repoId, enabled)
-
-                        override fun onAddRepo() {
-                            backStack.add(NavigationKey.AddRepo())
-                        }
-
-                        override fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long) =
-                            viewModel.onRepositoriesMoved(fromRepoId, toRepoId)
-
-                        override fun onRepositoriesFinishedMoving(
-                            fromRepoId: Long,
-                            toRepoId: Long,
-                        ) = viewModel.onRepositoriesFinishedMoving(fromRepoId, toRepoId)
-                    }
-                    Repositories(info) {
-                        backStack.removeLastOrNull()
-                    }
-                }
-                entry<NavigationKey.RepoDetails>(
-                    metadata = ListDetailSceneStrategy.detailPane("repos")
-                ) { navKey ->
-                    val viewModel = hiltViewModel<RepoDetailsViewModel>()
-                    LaunchedEffect(navKey) {
-                        viewModel.setRepoId(navKey.repoId)
-                    }
-                    RepoDetails(
-                        info = object : RepoDetailsInfo {
-                            override val model = viewModel.model.collectAsStateWithLifecycle().value
-                            override val actions = viewModel
-                        },
-                        onShowAppsClicked = { title, repoId ->
-                            val type = AppListType.Repository(title, repoId)
-                            backStack.add(NavigationKey.AppList(type))
-                        },
-                    ) {
-                        backStack.removeLastOrNull()
-                    }
-                }
-                entry<NavigationKey.AddRepo> { navKey ->
-                    val viewModel = hiltViewModel<AddRepoViewModel>()
-                    LaunchedEffect(navKey) {
-                        if (navKey.uri != null) {
-                            viewModel.onFetchRepo(navKey.uri)
-                        }
-                    }
-                    AddRepo(
-                        state = viewModel.state.collectAsStateWithLifecycle().value,
-                        onFetchRepo = viewModel::onFetchRepo,
-                        onAddRepo = viewModel::addFetchedRepository,
-                        onExistingRepo = { repoId ->
-                            backStack.removeLastOrNull()
-                            backStack.add(NavigationKey.RepoDetails(repoId))
-                        },
-                        onRepoAdded = { title, repoId ->
-                            backStack.removeLastOrNull()
-                            backStack.add(NavigationKey.RepoDetails(repoId))
-                            val type = AppListType.Repository(title, repoId)
-                            backStack.add(NavigationKey.AppList(type))
-                        },
-                        onBackClicked = { backStack.removeLastOrNull() },
-                    )
-                }
-                entry(NavigationKey.Settings) {
-                    val viewModel = hiltViewModel<SettingsViewModel>()
-                    Settings(
-                        onSaveLogcat = {
-                            viewModel.onSaveLogcat(it)
-                            backStack.removeLastOrNull()
-                        },
-                        onBackClicked = { backStack.removeLastOrNull() },
-                    )
-                }
-                entry(NavigationKey.About) {
-                    About { backStack.removeLastOrNull() }
-                }
+    val entryProvider: (NavKey) -> NavEntry<NavKey> = entryProvider {
+        entry<NavigationKey.Discover>(
+            metadata = ListDetailSceneStrategy.listPane("appdetails") {
+                Text(stringResource(R.string.no_app_selected))
             },
-        )
+        ) {
+            val viewModel = hiltViewModel<DiscoverViewModel>()
+            val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
+            Discover(
+                discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
+                onListTap = {
+                    backStack.add(NavigationKey.AppList(it))
+                },
+                onAppTap = {
+                    backStack.add(NavigationKey.AppDetails(it.packageName))
+                },
+                onNav = { backStack.add(it) },
+                numUpdates = numUpdates,
+                isBigScreen = isBigScreen,
+                onSearch = viewModel::search,
+                onSearchCleared = viewModel::onSearchCleared,
+                modifier = Modifier,
+            )
+        }
+        entry<NavigationKey.MyApps>(
+            metadata = ListDetailSceneStrategy.listPane("appdetails") {
+                Text(stringResource(R.string.no_app_selected))
+            },
+        ) {
+            val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
+            val myAppsInfo = object : MyAppsInfo {
+                override val model = myAppsViewModel.myAppsModel.collectAsStateWithLifecycle().value
+
+                override fun refresh() = myAppsViewModel.refresh()
+                override fun updateAll() = myAppsViewModel.updateAll()
+                override fun changeSortOrder(sort: AppListSortOrder) =
+                    myAppsViewModel.changeSortOrder(sort)
+
+                override fun search(query: String) = myAppsViewModel.search(query)
+                override fun confirmAppInstall(
+                    packageName: String,
+                    state: InstallState.UserConfirmationNeeded,
+                ) = myAppsViewModel.confirmAppInstall(packageName, state)
+            }
+            MyApps(
+                myAppsInfo = myAppsInfo,
+                currentPackageName = if (isBigScreen) {
+                    (backStack.last() as? NavigationKey.AppDetails)?.packageName
+                } else null,
+                onAppItemClick = {
+                    backStack.add(NavigationKey.AppDetails(it))
+                },
+                onNav = { backStack.add(it) },
+                isBigScreen = isBigScreen,
+            )
+        }
+        entry<NavigationKey.AppDetails>(
+            metadata = ListDetailSceneStrategy.detailPane("appdetails")
+        ) {
+            val appDetailsViewModel = hiltViewModel<AppDetailsViewModel>()
+            LaunchedEffect(it.packageName) {
+                appDetailsViewModel.setAppDetails(it.packageName)
+            }
+            AppDetails(
+                item = appDetailsViewModel.appDetails.collectAsStateWithLifecycle().value,
+                onNav = { navKey -> backStack.add(navKey) },
+                onBackNav = if (isBigScreen) null else {
+                    { backStack.removeLastOrNull() }
+                },
+                modifier = Modifier,
+            )
+        }
+        entry<NavigationKey.AppList>(
+            metadata = ListDetailSceneStrategy.listPane("appdetails") {
+                Text(stringResource(R.string.no_app_selected))
+            },
+        ) {
+            val appListViewModel = hiltViewModel<AppListViewModel>()
+            LaunchedEffect(it.type) {
+                appListViewModel.load(it.type)
+            }
+            val appListInfo = object : AppListInfo {
+                override val model =
+                    appListViewModel.appListModel.collectAsStateWithLifecycle().value
+                override val actions: AppListActions = appListViewModel
+                override val list: AppListType =
+                    appListViewModel.currentList.collectAsStateWithLifecycle().value
+                override val showFilters: Boolean =
+                    appListViewModel.showFilters.collectAsStateWithLifecycle().value
+                override val showOnboarding: Boolean =
+                    appListViewModel.showOnboarding.collectAsStateWithLifecycle().value
+            }
+            AppList(
+                appListInfo = appListInfo,
+                currentPackageName = if (isBigScreen) {
+                    (backStack.last() as? NavigationKey.AppDetails)?.packageName
+                } else null,
+                onBackClicked = { backStack.removeLastOrNull() },
+                modifier = Modifier,
+            ) { packageName ->
+                backStack.add(NavigationKey.AppDetails(packageName))
+            }
+        }
+        entry<NavigationKey.Repos>(
+            metadata = ListDetailSceneStrategy.listPane("repos") {
+                Text(text = stringResource(R.string.no_repository_selected))
+            },
+        ) {
+            val viewModel = hiltViewModel<RepositoriesViewModel>()
+            val info = object : RepositoryInfo {
+                override val model: RepositoryModel =
+                    viewModel.model.collectAsStateWithLifecycle().value
+
+                override val currentRepositoryId: Long? = if (isBigScreen) {
+                    (backStack.last() as? NavigationKey.RepoDetails)?.repoId
+                } else null
+
+                override fun onOnboardingSeen() = viewModel.onOnboardingSeen()
+
+                override fun onRepositorySelected(repositoryItem: RepositoryItem) {
+                    backStack.add(NavigationKey.RepoDetails(repositoryItem.repoId))
+                }
+
+                override fun onRepositoryEnabled(repoId: Long, enabled: Boolean) =
+                    viewModel.onRepositoryEnabled(repoId, enabled)
+
+                override fun onAddRepo() {
+                    backStack.add(NavigationKey.AddRepo())
+                }
+
+                override fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long) =
+                    viewModel.onRepositoriesMoved(fromRepoId, toRepoId)
+
+                override fun onRepositoriesFinishedMoving(
+                    fromRepoId: Long,
+                    toRepoId: Long,
+                ) = viewModel.onRepositoriesFinishedMoving(fromRepoId, toRepoId)
+            }
+            Repositories(info) {
+                backStack.removeLastOrNull()
+            }
+        }
+        entry<NavigationKey.RepoDetails>(
+            metadata = ListDetailSceneStrategy.detailPane("repos")
+        ) { navKey ->
+            val viewModel = hiltViewModel<RepoDetailsViewModel>()
+            LaunchedEffect(navKey) {
+                viewModel.setRepoId(navKey.repoId)
+            }
+            RepoDetails(
+                info = object : RepoDetailsInfo {
+                    override val model =
+                        viewModel.model.collectAsStateWithLifecycle().value
+                    override val actions = viewModel
+                },
+                onShowAppsClicked = { title, repoId ->
+                    val type = AppListType.Repository(title, repoId)
+                    backStack.add(NavigationKey.AppList(type))
+                },
+            ) {
+                backStack.removeLastOrNull()
+            }
+        }
+        entry<NavigationKey.AddRepo> { navKey ->
+            val viewModel = hiltViewModel<AddRepoViewModel>()
+            LaunchedEffect(navKey) {
+                if (navKey.uri != null) {
+                    viewModel.onFetchRepo(navKey.uri)
+                }
+            }
+            AddRepo(
+                state = viewModel.state.collectAsStateWithLifecycle().value,
+                onFetchRepo = viewModel::onFetchRepo,
+                onAddRepo = viewModel::addFetchedRepository,
+                onExistingRepo = { repoId ->
+                    backStack.removeLastOrNull()
+                    backStack.add(NavigationKey.RepoDetails(repoId))
+                },
+                onRepoAdded = { title, repoId ->
+                    backStack.removeLastOrNull()
+                    backStack.add(NavigationKey.RepoDetails(repoId))
+                    val type = AppListType.Repository(title, repoId)
+                    backStack.add(NavigationKey.AppList(type))
+                },
+                onBackClicked = { backStack.removeLastOrNull() },
+            )
+        }
+        entry(NavigationKey.Settings) {
+            val viewModel = hiltViewModel<SettingsViewModel>()
+            Settings(
+                onSaveLogcat = {
+                    viewModel.onSaveLogcat(it)
+                    backStack.removeLastOrNull()
+                },
+                onBackClicked = { backStack.removeLastOrNull() },
+            )
+        }
+        entry(NavigationKey.About) {
+            About { backStack.removeLastOrNull() }
+        }
+    }
+    FDroidContent {
+        HintHost {
+            NavDisplay(
+                backStack = backStack,
+                sceneStrategy = listDetailStrategy,
+                entryDecorators = listOf(
+                    rememberSaveableStateHolderNavEntryDecorator(),
+                    rememberViewModelStoreNavEntryDecorator(),
+                ),
+                entryProvider = entryProvider,
+            )
+        }
     }
 }

From 88aae1136242db9ae23a1513b5b91e39492c4b64 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 22 Oct 2025 15:52:19 -0300
Subject: [PATCH 084/180] Fix linkify issue when link is at the end of
 description

---
 .../main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt  | 2 +-
 .../org/fdroid/ui/main/details/HtmlDescriptionTest.kt    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index b912b5995..524025d87 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -242,7 +242,7 @@ private fun AppVersion?.getAntiFeatures(
 @VisibleForTesting
 internal fun getHtmlDescription(description: String?): String? {
     return description?.replace("</?h[1-6]>".toRegex(), "")
-        ?.replace("(\\s)(https://\\S+[^\\s.])([\\s\\n.])".toRegex()) {
+        ?.replace("(\\s)(https://\\S+[^\\s.])([\\s\\n.]|$)".toRegex()) {
             val prefix = it.groups[1]?.value ?: it.value
             val url = it.groups[2]?.value ?: it.value
             val suffix = it.groups[3]?.value ?: it.value
diff --git a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
index 88d3f9c83..ee5889311 100644
--- a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
+++ b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
@@ -23,6 +23,15 @@ class HtmlDescriptionTest {
         assertEquals(expectedDescription, getHtmlDescription(description))
     }
 
+    @Test
+    fun testLinkAtTheVeryEnd() {
+        val description = """
+Project page: https://github.com/lukaspieper/Gcam-Services-Provider"""
+        val expectedDescription = """<br>
+Project page: <a href="https://github.com/lukaspieper/Gcam-Services-Provider">https://github.com/lukaspieper/Gcam-Services-Provider</a>"""
+        assertEquals(expectedDescription, getHtmlDescription(description))
+    }
+
     @Test
     fun testLinkWithDotAtTheEnd() {
         val description = """please visit our website: https://wikimediafoundation.org/."""

From 3cf5af2dffcd987160e4362c9e646a4015eeea5b Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 22 Oct 2025 16:55:06 -0300
Subject: [PATCH 085/180] Add repo refresh action to repo details

---
 .../fdroid/ui/repositories/RepositoryRow.kt   |  2 +-
 .../ui/repositories/details/RepoDetails.kt    | 41 ++++++++++++++++---
 .../repositories/details/RepoDetailsHeader.kt |  4 +-
 next/src/main/res/values/strings-next.xml     |  2 +
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
index bd3cbc85a..57729e1c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
@@ -38,7 +38,7 @@ fun RepositoryRow(
             } else {
                 repoItem.timestamp.asRelativeTimeString()
             }
-            Text(stringResource(R.string.last_updated, lastUpdated))
+            Text(stringResource(R.string.repo_last_update_upstream, lastUpdated))
         },
         trailingContent = {
             Switch(repoItem.enabled, onCheckedChange = onRepoEnabled)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index 0459b8b49..7c3770e41 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -6,8 +6,12 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.QrCode
 import androidx.compose.material.icons.filled.Share
+import androidx.compose.material.icons.filled.Update
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
@@ -32,6 +36,7 @@ import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.OnboardingCard
 import org.fdroid.ui.utils.getHintOverlayColor
@@ -91,9 +96,7 @@ fun RepoDetails(
                     )
                 }
             },
-            title = {
-                Text(stringResource(R.string.repo_details))
-            },
+            title = { },
             actions = {
                 if (repo == null) return@TopAppBar
                 IconButton(onClick = { info.model.shareRepo(context) }) {
@@ -108,10 +111,36 @@ fun RepoDetails(
                         contentDescription = stringResource(R.string.show_repository_qr)
                     )
                 }
-                IconButton(onClick = { deleteDialog = true }) {
+                var menuExpanded by remember { mutableStateOf(false) }
+                IconButton(onClick = { menuExpanded = !menuExpanded }) {
                     Icon(
-                        imageVector = Icons.Default.Delete,
-                        contentDescription = stringResource(R.string.delete)
+                        Icons.Default.MoreVert,
+                        contentDescription = null,
+                    )
+                }
+                DropdownMenu(
+                    expanded = menuExpanded,
+                    onDismissRequest = { menuExpanded = false }
+                ) {
+                    DropdownMenuItem(
+                        text = { Text(stringResource(R.string.repo_force_update)) },
+                        onClick = {
+                            menuExpanded = false
+                            RepoUpdateWorker.updateNow(context, repo.repoId)
+                        },
+                        leadingIcon = {
+                            Icon(Icons.Default.Update, contentDescription = null)
+                        }
+                    )
+                    DropdownMenuItem(
+                        text = { Text(stringResource(R.string.delete)) },
+                        onClick = {
+                            menuExpanded = false
+                            deleteDialog = true
+                        },
+                        leadingIcon = {
+                            Icon(Icons.Default.Delete, contentDescription = null)
+                        }
                     )
                 }
             })
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
index 37e5909ca..2deecf1b2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
@@ -44,11 +44,11 @@ fun RepoDetailsHeader(
     } else {
         repo.timestamp.asRelativeTimeString()
     }
-    val lastIndexUpdate = stringResource(R.string.repo_last_update_index, lastIndexTime)
+    val lastIndexUpdate = stringResource(R.string.repo_last_update_upstream, lastIndexTime)
 
     val lastUpdatedTime = repo.lastUpdated?.asRelativeTimeString()
         ?: stringResource(R.string.repositories_last_update_never)
-    val lastUpdated = stringResource(R.string.repo_last_update_check, lastUpdatedTime)
+    val lastUpdated = stringResource(R.string.last_updated, lastUpdatedTime)
 
     Column(
         verticalArrangement = spacedBy(8.dp),
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 40c409b2d..ead250bba 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -88,9 +88,11 @@
     <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
     <string name="got_it">Got it</string>
     <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
+    <string name="repo_last_update_upstream">Last update: %s</string>
     <string name="repo_basicauth_username">Username</string>
     <string name="repo_basicauth_password">Password</string>
     <string name="repo_basicauth_edit">Save Changes</string>
+    <string name="repo_force_update">Check for updates</string>
 
     <string name="crash_report_text">An unexpected error occurred.
         This is not your fault.

From 66efc03a0479c6f028afeec241fb1696adf12957 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 23 Oct 2025 16:38:00 -0300
Subject: [PATCH 086/180] Implement first settings

and persist things on disk
---
 gradle/libs.versions.toml                     |   2 +
 next/build.gradle.kts                         |   2 +
 next/src/main/AndroidManifest.xml             |   2 +
 next/src/main/kotlin/org/fdroid/App.kt        |   6 +
 .../main/kotlin/org/fdroid/MainActivity.kt    |   6 +-
 .../org/fdroid/repo/RepoUpdateManager.kt      |  19 ++-
 .../org/fdroid/settings/SettingsConstants.kt  |  28 ++++
 .../org/fdroid/settings/SettingsManager.kt    |  61 ++++++--
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   1 +
 .../org/fdroid/ui/lists/AppListViewModel.kt   |   4 +-
 .../ui/repositories/RepositoriesPresenter.kt  |   5 +-
 .../ui/repositories/RepositoriesViewModel.kt  |   3 +
 .../kotlin/org/fdroid/ui/settings/Settings.kt | 131 ++++++++++++++++--
 .../fdroid/ui/settings/SettingsViewModel.kt   |  14 ++
 .../kotlin/org/fdroid/ui/utils/UiUtils.kt     |  10 ++
 next/src/main/res/values/strings-next.xml     |   7 +-
 next/src/main/res/values/themes.xml           |   2 +-
 next/src/main/res/xml/locales_config.xml      |  68 +++++++++
 .../main/res/xml/network_security_config.xml  |   6 +
 19 files changed, 340 insertions(+), 37 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
 create mode 100644 next/src/main/res/xml/locales_config.xml
 create mode 100644 next/src/main/res/xml/network_security_config.xml

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 28d7108f5..c9e9fa4fb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,6 +22,7 @@ glideCompose = "1.0.0-beta08"
 coilCompose = "3.3.0"
 molecule = "2.2.0"
 hints = "2.0.1"
+composePreference = "2.1.0"
 
 androidxCoreKtx = "1.17.0"
 androidxAppcompat = "1.7.1"
@@ -145,6 +146,7 @@ hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", ve
 
 molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
 compose-hints = { module = "com.viktormykhailiv:compose-hints", version.ref = "hints" }
+compose-preference = { module = "me.zhanghai.compose.preference:preference", version.ref = "composePreference" }
 guardianproject-netcipher = { module = "info.guardianproject.netcipher:netcipher", version.ref = "guardianprojectNetcipher" }
 guardianproject-panic = { module = "info.guardianproject.panic:panic", version.ref = "guardianprojectPanic" }
 nanohttpd = { module = "org.nanohttpd:nanohttpd", version.ref = "nanohttpd" }
diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 033985995..2cdefcd3b 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -61,6 +61,7 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.work.runtime.ktx)
     implementation(libs.androidx.hilt.work)
@@ -81,6 +82,7 @@ dependencies {
     implementation(libs.molecule.runtime)
     implementation(libs.coil.compose)
     implementation(libs.compose.hints)
+    implementation(libs.compose.preference)
 
     implementation(libs.slf4j.api)
     implementation(libs.logback.android)
diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
index 07ac48a10..df84ac4c7 100644
--- a/next/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -24,6 +24,8 @@
         android:enableOnBackInvokedCallback="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
+        android:localeConfig="@xml/locales_config"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/Theme.Fdroidclient"
         tools:targetApi="33">
diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index d06451bc7..40eb10adb 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -30,13 +30,18 @@ import org.fdroid.download.LocalIconFetcher
 import org.fdroid.download.PackageName
 import org.fdroid.download.coil.DownloadRequestFetcher
 import org.fdroid.repo.RepoUpdateWorker
+import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.CrashActivity
+import org.fdroid.ui.utils.applyNewTheme
 import org.fdroid.updates.AppUpdateWorker
 import javax.inject.Inject
 
 @HiltAndroidApp
 class App : Application(), Configuration.Provider, SingletonImageLoader.Factory {
 
+    @Inject
+    lateinit var settingsManager: SettingsManager
+
     @Inject
     lateinit var workerFactory: HiltWorkerFactory
 
@@ -86,6 +91,7 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
         if (BuildConfig.DEBUG) {
             Composer.setDiagnosticStackTraceMode(ComposeStackTraceMode.SourceInformation)
         }
+        applyNewTheme(settingsManager.theme)
         // bail out here if we are the ACRA process to not initialize anything in crash process
         if (ACRA.isACRASenderServiceProcess()) return
 
diff --git a/next/src/main/kotlin/org/fdroid/MainActivity.kt b/next/src/main/kotlin/org/fdroid/MainActivity.kt
index c821e7e10..7b9227d76 100644
--- a/next/src/main/kotlin/org/fdroid/MainActivity.kt
+++ b/next/src/main/kotlin/org/fdroid/MainActivity.kt
@@ -4,16 +4,18 @@ import android.Manifest.permission.POST_NOTIFICATIONS
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import dagger.hilt.android.AndroidEntryPoint
 import org.fdroid.ui.Main
 
+// Using [AppCompatActivity] and not [ComponentActivity] seems to be needed
+// for automatic theme changes when calling AppCompatDelegate.setDefaultNightMode()
 @AndroidEntryPoint
-class MainActivity : ComponentActivity() {
+class MainActivity : AppCompatActivity() {
 
     val requestPermissionLauncher = registerForActivityResult(RequestPermission()) { isGranted ->
     }
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index 3d4ac4135..3384014af 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -21,17 +21,22 @@ import org.fdroid.index.IndexUpdateResult
 import org.fdroid.index.RepoManager
 import org.fdroid.index.RepoUpdater
 import org.fdroid.index.v1.IndexV1Updater
+import org.fdroid.settings.SettingsManager
 import org.fdroid.updates.UpdatesManager
 import java.io.File
 import javax.inject.Inject
+import javax.inject.Singleton
 
 private val TAG = RepoUpdateManager::class.java.simpleName
+private const val MIN_UPDATE_INTERVAL_MILLIS = 15_000
 
+@Singleton
 class RepoUpdateManager(
     private val context: Context,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
     private val updatesManager: UpdatesManager,
+    private val settingsManager: SettingsManager,
     private val downloaderFactory: DownloaderFactory,
     private val notificationManager: NotificationManager,
     private val compatibilityChecker: CompatibilityChecker = CompatibilityCheckerImpl(
@@ -109,6 +114,7 @@ class RepoUpdateManager(
         db: FDroidDatabase,
         repositoryManager: RepoManager,
         updatesManager: UpdatesManager,
+        settingsManager: SettingsManager,
         downloaderFactory: DownloaderFactory,
         notificationManager: NotificationManager,
     ) : this(
@@ -116,6 +122,7 @@ class RepoUpdateManager(
         db = db,
         repoManager = repositoryManager,
         updatesManager = updatesManager,
+        settingsManager = settingsManager,
         downloaderFactory = downloaderFactory,
         notificationManager = notificationManager,
     )
@@ -136,11 +143,11 @@ class RepoUpdateManager(
     @WorkerThread
     suspend fun updateRepos() {
         if (isUpdating.value) log.warn { "Already updating repositories: updateRepos()" }
-        // TODO
-//            if (timeSinceLastCheck < MIN_UPDATE_INTERVAL_MILLIS) {
-//                Log.i(TAG, "Not updating, only $timeSinceLastCheck ms since last check.")
-//                return
-//            }
+        val timeSinceLastCheck = System.currentTimeMillis() - settingsManager.lastRepoUpdate
+        if (timeSinceLastCheck < MIN_UPDATE_INTERVAL_MILLIS) {
+            log.info { "Not updating, only $timeSinceLastCheck ms since last check." }
+            return
+        }
         _isUpdating.value = true
         try {
             var reposUpdated = false
@@ -169,7 +176,7 @@ class RepoUpdateManager(
                 }
             }
             db.getRepositoryDao().walCheckpoint()
-            // TODO fdroidPrefs.lastUpdateCheck = System.currentTimeMillis()
+            settingsManager.lastRepoUpdate = System.currentTimeMillis()
             if (repoErrors.isNotEmpty()) showRepoErrors(repoErrors)
             if (reposUpdated) {
                 updatesManager.loadUpdates().join()
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
new file mode 100644
index 000000000..e926da449
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -0,0 +1,28 @@
+package org.fdroid.settings
+
+import org.fdroid.database.AppListSortOrder
+
+object SettingsConstants {
+
+    const val PREF_KEY_LAST_UPDATE_CHECK = "lastUpdateCheck"
+    const val PREF_DEFAULT_LAST_UPDATE_CHECK = -1L
+
+    const val PREF_KEY_THEME = "theme"
+    const val PREF_DEFAULT_THEME = "followSystem"
+
+    const val PREF_KEY_SHOW_INCOMPATIBLE = "incompatibleVersions"
+    const val PREF_DEFAULT_SHOW_INCOMPATIBLE = true
+
+    const val PREF_KEY_APP_LIST_SORT_ORDER = "appListSortOrder"
+    const val PREF_DEFAULT_APP_LIST_SORT_ORDER = "lastUpdated"
+    fun getAppListSortOrder(s: String?) = when (s) {
+        "name" -> AppListSortOrder.NAME
+        else -> AppListSortOrder.LAST_UPDATED
+    }
+
+    fun AppListSortOrder.toSettings() = when (this) {
+        AppListSortOrder.LAST_UPDATED -> "lastUpdated"
+        AppListSortOrder.NAME -> "name"
+    }
+
+}
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index 5e84a69e6..ccf00d99d 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -1,22 +1,67 @@
 package org.fdroid.settings
 
+import android.content.Context
+import android.content.Context.MODE_PRIVATE
+import androidx.core.content.edit
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import me.zhanghai.compose.preference.createPreferenceFlow
+import mu.KotlinLogging
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_APP_LIST_SORT_ORDER
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SHOW_INCOMPATIBLE
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
+import org.fdroid.settings.SettingsConstants.PREF_KEY_APP_LIST_SORT_ORDER
+import org.fdroid.settings.SettingsConstants.PREF_KEY_LAST_UPDATE_CHECK
+import org.fdroid.settings.SettingsConstants.PREF_KEY_SHOW_INCOMPATIBLE
+import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
+import org.fdroid.settings.SettingsConstants.getAppListSortOrder
+import org.fdroid.settings.SettingsConstants.toSettings
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SettingsManager @Inject constructor() {
+class SettingsManager @Inject constructor(
+    @param:ApplicationContext private val context: Context,
+) {
 
-    // TODO read these values from persistent storage
-    private val _filterIncompatible = MutableStateFlow(false)
-    val filterIncompatible = _filterIncompatible.asStateFlow()
-    private val _appListSortOrder = MutableStateFlow(AppListSortOrder.LAST_UPDATED)
-    val appListSortOrder = _appListSortOrder.asStateFlow()
+    private val log = KotlinLogging.logger {}
+
+    private val prefs by lazy {
+        context.getSharedPreferences("${context.packageName}_preferences", MODE_PRIVATE)
+    }
+
+    /**
+     * This is mutable, so the settings UI can make changes to it.
+     */
+    val prefsFlow by lazy { createPreferenceFlow(prefs) }
+    val theme get() = prefs.getString(PREF_KEY_THEME, PREF_DEFAULT_THEME)!!
+    val themeFlow = prefsFlow.map { it.get<String>(PREF_KEY_THEME) }
+    var lastRepoUpdate: Long
+        get() = prefs.getLong(PREF_KEY_LAST_UPDATE_CHECK, PREF_DEFAULT_LAST_UPDATE_CHECK)
+        set(value) {
+            prefs.edit { putLong(PREF_KEY_LAST_UPDATE_CHECK, value) }
+            _lastRepoUpdateFlow.update { value }
+        }
+    private val _lastRepoUpdateFlow = MutableStateFlow(lastRepoUpdate)
+    val lastRepoUpdateFlow = _lastRepoUpdateFlow.asStateFlow()
+
+    val filterIncompatible: Boolean
+        get() = !prefs.getBoolean(PREF_KEY_SHOW_INCOMPATIBLE, PREF_DEFAULT_SHOW_INCOMPATIBLE)
+    val appListSortOrder: AppListSortOrder
+        get() {
+            val s = prefs.getString(PREF_KEY_APP_LIST_SORT_ORDER, PREF_DEFAULT_APP_LIST_SORT_ORDER)
+            return getAppListSortOrder(s)
+        }
 
     fun saveAppListFilter(sortOrder: AppListSortOrder, filterIncompatible: Boolean) {
-        _appListSortOrder.value = sortOrder
-        _filterIncompatible.value = filterIncompatible
+        prefs.edit {
+            putBoolean(PREF_KEY_SHOW_INCOMPATIBLE, !filterIncompatible)
+            putString(PREF_KEY_APP_LIST_SORT_ORDER, sortOrder.toSettings())
+        }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 982405b44..ebc4dec24 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -268,6 +268,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
         entry(NavigationKey.Settings) {
             val viewModel = hiltViewModel<SettingsViewModel>()
             Settings(
+                prefsFlow = viewModel.prefsFlow,
                 onSaveLogcat = {
                     viewModel.onSaveLogcat(it)
                     backStack.removeLastOrNull()
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 89078f9a7..561aab9f5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -70,8 +70,8 @@ class AppListViewModel @Inject constructor(
     private val _showFilters = savedStateHandle.getMutableStateFlow("showFilters", false)
     val showFilters = _showFilters.asStateFlow()
 
-    private val sortBy = MutableStateFlow(settingsManager.appListSortOrder.value)
-    private val filterIncompatible = MutableStateFlow(settingsManager.filterIncompatible.value)
+    private val sortBy = MutableStateFlow(settingsManager.appListSortOrder)
+    private val filterIncompatible = MutableStateFlow(settingsManager.filterIncompatible)
     private val filteredCategoryIds = MutableStateFlow<Set<String>>(emptySet())
     private val filteredRepositoryIds = MutableStateFlow<Set<Long>>(emptySet())
     val showOnboarding = onboardingManager.showFilterOnboarding
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
index f1cf4aef5..4ee029571 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
@@ -13,16 +13,17 @@ fun RepositoriesPresenter(
     repositoriesFlow: StateFlow<List<RepositoryItem>?>,
     repoSortingMapFlow: StateFlow<Map<Long, Int>>,
     showOnboardingFlow: StateFlow<Boolean>,
+    lastUpdateFlow: StateFlow<Long>,
 ): RepositoryModel {
     val repositories = repositoriesFlow.collectAsState().value
     val repoSortingMap = repoSortingMapFlow.collectAsState().value
-    val lastUpdated = repositories?.maxBy { it.lastUpdated ?: 0 }?.lastUpdated
+    val lastUpdated = lastUpdateFlow.collectAsState().value
     return RepositoryModel(
         repositories = repositories?.sortedBy { repo ->
             repoSortingMap[repo.repoId] ?: repoSortingMap.size
         },
         showOnboarding = showOnboardingFlow.collectAsState().value,
-        lastCheckForUpdate = if (lastUpdated == null || lastUpdated <= 0) {
+        lastCheckForUpdate = if (lastUpdated <= 0) {
             context.getString(R.string.repositories_last_update_never)
         } else {
             lastUpdated.asRelativeTimeString()
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 3e9ab484b..a053195c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -21,6 +21,7 @@ import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.OnboardingManager
+import org.fdroid.settings.SettingsManager
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 
@@ -28,6 +29,7 @@ import javax.inject.Inject
 class RepositoriesViewModel @Inject constructor(
     app: Application,
     private val repoManager: RepoManager,
+    private val settingsManager: SettingsManager,
     private val onboardingManager: OnboardingManager,
     @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
@@ -55,6 +57,7 @@ class RepositoriesViewModel @Inject constructor(
             repositoriesFlow = repos,
             repoSortingMapFlow = repoSortingMap,
             showOnboardingFlow = showOnboarding,
+            lastUpdateFlow = settingsManager.lastRepoUpdateFlow,
         )
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index 8be2c58d9..86000fd31 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -1,31 +1,52 @@
 package org.fdroid.ui.settings
 
 import android.content.Context
+import android.content.Intent
 import android.net.Uri
+import android.os.Build.VERSION.SDK_INT
+import android.provider.Settings.ACTION_APP_LOCALE_SETTINGS
+import android.provider.Settings.ACTION_APP_NOTIFICATION_SETTINGS
+import android.provider.Settings.EXTRA_APP_PACKAGE
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.BrightnessMedium
+import androidx.compose.material.icons.filled.Notifications
 import androidx.compose.material.icons.filled.Save
-import androidx.compose.material3.Button
+import androidx.compose.material.icons.filled.Translate
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 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
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.flow.MutableStateFlow
+import me.zhanghai.compose.preference.MapPreferences
+import me.zhanghai.compose.preference.Preferences
+import me.zhanghai.compose.preference.ProvidePreferenceLocals
+import me.zhanghai.compose.preference.listPreference
+import me.zhanghai.compose.preference.preference
+import me.zhanghai.compose.preference.preferenceCategory
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
+import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -33,7 +54,11 @@ import java.util.TimeZone
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-fun Settings(onSaveLogcat: (Uri?) -> Unit, onBackClicked: () -> Unit) {
+fun Settings(
+    prefsFlow: MutableStateFlow<Preferences>,
+    onSaveLogcat: (Uri?) -> Unit,
+    onBackClicked: () -> Unit,
+) {
     Scaffold(
         topBar = {
             TopAppBar(
@@ -51,22 +76,98 @@ fun Settings(onSaveLogcat: (Uri?) -> Unit, onBackClicked: () -> Unit) {
             )
         },
     ) { paddingValues ->
-        // TODO use implementation("me.zhanghai.compose.preference:preference:2.1.0")
         val launcher = rememberLauncherForActivityResult(CreateDocument("text/plain")) {
             onSaveLogcat(it)
         }
         val context = LocalContext.current
-        Button(
-            onClick = { launcher.launch(getLogName(context)) },
-            modifier = Modifier
-                .padding(paddingValues)
-                .padding(16.dp)
-        ) {
-            Icon(Icons.Default.Save, null)
-            Spacer(modifier = Modifier.width(ButtonDefaults.IconSpacing))
-            Text(
-                text = stringResource(R.string.pref_export_log_title),
-            )
+        val res = LocalResources.current
+        ProvidePreferenceLocals(prefsFlow) {
+            LazyColumn(
+                modifier = Modifier
+                    .padding(paddingValues)
+                    .fillMaxSize()
+            ) {
+                preferenceCategory(
+                    key = "pref_category_display",
+                    title = { Text(stringResource(R.string.display)) },
+                )
+                val themeToString = { value: String ->
+                    AnnotatedString(
+                        when (value) {
+                            "light" -> res.getString(R.string.theme_light)
+                            "dark" -> res.getString(R.string.theme_dark)
+                            "followSystem" -> res.getString(R.string.theme_follow_system)
+                            else -> error("Unknown value: $value")
+                        }
+                    )
+
+                }
+                listPreference(
+                    key = PREF_KEY_THEME,
+                    values = listOf(
+                        "light",
+                        "dark",
+                        "followSystem",
+                    ),
+                    valueToText = themeToString,
+                    defaultValue = PREF_DEFAULT_THEME,
+                    title = { Text(text = stringResource(R.string.theme)) },
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Default.BrightnessMedium,
+                            contentDescription = null,
+                        )
+                    },
+                    summary = { Text(text = "${themeToString(it)}") },
+                )
+                if (SDK_INT >= 26) preference(
+                    key = "notifications",
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Default.Notifications,
+                            contentDescription = null,
+                        )
+                    },
+                    title = { Text(stringResource(R.string.notification_title)) },
+                    summary = { Text(stringResource(R.string.notification_summary)) },
+                    onClick = {
+                        val intent = Intent(ACTION_APP_NOTIFICATION_SETTINGS).apply {
+                            putExtra(EXTRA_APP_PACKAGE, context.packageName)
+                        }
+                        context.startActivity(intent)
+                    },
+                )
+                if (SDK_INT >= 33) preference(
+                    key = "languages",
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Default.Translate,
+                            contentDescription = null,
+                        )
+                    },
+                    title = { Text(stringResource(R.string.pref_language)) },
+                    summary = { Text(stringResource(R.string.pref_language_summary)) },
+                    onClick = {
+                        val intent = Intent(ACTION_APP_LOCALE_SETTINGS).apply {
+                            setData(Uri.fromParts("package", context.packageName, null))
+                        }
+                        context.startActivity(intent)
+                    },
+                )
+                item {
+                    OutlinedButton(
+                        onClick = { launcher.launch(getLogName(context)) },
+                        modifier = Modifier
+                            .padding(16.dp)
+                    ) {
+                        Icon(Icons.Default.Save, null)
+                        Spacer(modifier = Modifier.width(ButtonDefaults.IconSpacing))
+                        Text(
+                            text = stringResource(R.string.pref_export_log_title),
+                        )
+                    }
+                }
+            }
         }
     }
 }
@@ -83,6 +184,6 @@ private fun getLogName(context: Context): String {
 @Composable
 fun SettingsPreview() {
     FDroidContent {
-        Settings({}) { }
+        Settings(MutableStateFlow(MapPreferences()), {}, { })
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
index e377c4ad4..6386e25e2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
@@ -11,10 +11,13 @@ import androidx.lifecycle.application
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mu.KotlinLogging
 import org.fdroid.R
+import org.fdroid.settings.SettingsManager
+import org.fdroid.ui.utils.applyNewTheme
 import java.io.IOException
 import java.lang.Runtime.getRuntime
 import javax.inject.Inject
@@ -22,9 +25,20 @@ import javax.inject.Inject
 @HiltViewModel
 class SettingsViewModel @Inject constructor(
     app: Application,
+    private val settingsManager: SettingsManager,
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger {}
+    val prefsFlow = settingsManager.prefsFlow
+
+    init {
+        viewModelScope.launch {
+            // react to theme changes right away
+            settingsManager.themeFlow.drop(1).collect {
+                if (it != null) applyNewTheme(it)
+            }
+        }
+    }
 
     fun onSaveLogcat(uri: Uri?) = viewModelScope.launch(Dispatchers.IO) {
         if (uri == null) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
index 2f3617d98..f84009734 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
@@ -9,6 +9,7 @@ import android.graphics.Color
 import android.os.PowerManager
 import android.text.format.DateUtils
 import android.util.Log
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.UriHandler
@@ -33,6 +34,15 @@ fun Context.startActivitySafe(i: Intent?) {
     }
 }
 
+fun applyNewTheme(theme: String) {
+    val mode = when (theme) {
+        "light" -> AppCompatDelegate.MODE_NIGHT_NO
+        "dark" -> AppCompatDelegate.MODE_NIGHT_YES
+        else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+    }
+    AppCompatDelegate.setDefaultNightMode(mode)
+}
+
 fun UriHandler.openUriSafe(uri: String) {
     try {
         openUri(uri)
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index ead250bba..6428110eb 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -63,9 +63,11 @@
     <string name="signer_colon">Signer: %1$s</string>
     <string name="architectures_colon">Architectures: %1$s</string>
 
+    <string name="notification_title">Notifications</string>
+    <string name="notification_summary">Opens system notification settings</string>
     <string name="notification_channel_install_success_title">Automatically installed apps</string>
     <string name="notification_channel_install_success_description">Displays a notification after apps were installed automatically.</string>
-    <string name="notification_channel_updates_available_title">Informs about available app updates</string>
+    <string name="notification_channel_updates_available_title">Available app updates</string>
     <string name="notification_channel_updates_available_description">Displays a notification after repositories were updated and app updates were found.</string>
     <plurals name="notification_installing_title">
         <item quantity="one">Installing %1$d app…</item>
@@ -94,6 +96,9 @@
     <string name="repo_basicauth_edit">Save Changes</string>
     <string name="repo_force_update">Check for updates</string>
 
+
+    <string name="pref_language_summary">Opens system language settings</string>
+
     <string name="crash_report_text">An unexpected error occurred.
         This is not your fault.
         Would you like to e-mail the details to help us fix the issue?
diff --git a/next/src/main/res/values/themes.xml b/next/src/main/res/values/themes.xml
index 859ec354d..6e59254a1 100644
--- a/next/src/main/res/values/themes.xml
+++ b/next/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.Fdroidclient" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.Fdroidclient" parent="Theme.AppCompat.DayNight.NoActionBar" />
 </resources>
diff --git a/next/src/main/res/xml/locales_config.xml b/next/src/main/res/xml/locales_config.xml
new file mode 100644
index 000000000..36ffa9cd9
--- /dev/null
+++ b/next/src/main/res/xml/locales_config.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en-US" />
+    <locale android:name="ar" />
+    <locale android:name="ast" />
+    <locale android:name="be" />
+    <locale android:name="bg" />
+    <locale android:name="bn" />
+    <locale android:name="ca" />
+    <locale android:name="cs" />
+    <locale android:name="cy" />
+    <locale android:name="da" />
+    <locale android:name="de" />
+    <locale android:name="el" />
+    <locale android:name="en-GB" />
+    <locale android:name="eo" />
+    <locale android:name="es" />
+    <locale android:name="es-AR" />
+    <locale android:name="et" />
+    <locale android:name="eu" />
+    <locale android:name="fa" />
+    <locale android:name="fi" />
+    <locale android:name="fil" />
+    <locale android:name="fr" />
+    <locale android:name="ga" />
+    <locale android:name="gd" />
+    <locale android:name="gl" />
+    <locale android:name="he" />
+    <locale android:name="hi" />
+    <locale android:name="hi-Latn" />
+    <locale android:name="hr" />
+    <locale android:name="hu" />
+    <locale android:name="id" />
+    <locale android:name="is" />
+    <locale android:name="it" />
+    <locale android:name="ja" />
+    <locale android:name="kn" />
+    <locale android:name="ko" />
+    <locale android:name="lt" />
+    <locale android:name="lv" />
+    <locale android:name="ml" />
+    <locale android:name="nb" />
+    <locale android:name="nl" />
+    <locale android:name="nn" />
+    <locale android:name="pa" />
+    <locale android:name="pl" />
+    <locale android:name="pt" />
+    <locale android:name="pt-BR" />
+    <locale android:name="pt-PT" />
+    <locale android:name="ro" />
+    <locale android:name="ru" />
+    <locale android:name="sc" />
+    <locale android:name="sk" />
+    <locale android:name="sl" />
+    <locale android:name="sq" />
+    <locale android:name="sr" />
+    <locale android:name="sv" />
+    <locale android:name="sw" />
+    <locale android:name="ta" />
+    <locale android:name="th" />
+    <locale android:name="tr" />
+    <locale android:name="uk" />
+    <locale android:name="vi" />
+    <locale android:name="yue" />
+    <locale android:name="zh-CN" />
+    <locale android:name="zh-HK" />
+    <locale android:name="zh-TW" />
+</locale-config>
diff --git a/next/src/main/res/xml/network_security_config.xml b/next/src/main/res/xml/network_security_config.xml
new file mode 100644
index 000000000..f8b53ef87
--- /dev/null
+++ b/next/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">onion</domain>
+    </domain-config>
+</network-security-config>

From 206919f5f083e7ca11cb445b42527567207588f6 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 24 Oct 2025 15:12:54 -0300
Subject: [PATCH 087/180] Improve handling of incompatible apps and versions

---
 .../org/fdroid/ui/details/AppDetails.kt       | 10 +--
 .../org/fdroid/ui/details/AppDetailsHeader.kt |  2 +-
 .../org/fdroid/ui/details/AppDetailsItem.kt   | 29 +++++--
 .../fdroid/ui/details/AppDetailsWarnings.kt   | 83 ++++++++++++-------
 .../org/fdroid/ui/details/DetailsPresenter.kt | 40 ++++++---
 .../kotlin/org/fdroid/ui/details/Versions.kt  | 51 +++++-------
 .../org/fdroid/ui/utils/PreviewUtils.kt       | 36 +++++++-
 next/src/main/res/values/strings-next.xml     |  5 +-
 8 files changed, 170 insertions(+), 86 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index eefd8a52d..f4dd75735 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -2,7 +2,6 @@ package org.fdroid.ui.details
 
 import android.util.Log
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -46,7 +45,7 @@ import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.LinkAnnotation
@@ -72,8 +71,7 @@ import org.fdroid.ui.utils.testApp
 
 @Composable
 @OptIn(
-    ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class,
-    ExperimentalSharedTransitionApi::class
+    ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class
 )
 fun AppDetails(
     item: AppDetailsItem?,
@@ -81,7 +79,7 @@ fun AppDetails(
     onBackNav: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
-    val context = LocalContext.current
+    val res = LocalResources.current
     val topAppBarState = rememberTopAppBarState()
     val snackbarHostState = remember { SnackbarHostState() }
     val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(topAppBarState)
@@ -100,7 +98,7 @@ fun AppDetails(
                 Log.i("AppDetails", "Requesting user confirmation... $state")
                 item.actions.requestUserConfirmation(item.app.packageName, state)
             } else if (state is InstallState.Error) {
-                val msg = context.getString(R.string.install_error_notify_title, state.msg ?: "")
+                val msg = res.getString(R.string.install_error_notify_title, state.msg ?: "")
                 snackbarHostState.showSnackbar(msg)
             }
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index b235f7113..ecc1cb14c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -129,7 +129,7 @@ fun AppDetailsHeader(
                 }
             }
             val lastUpdated = item.app.lastUpdated.asRelativeTimeString()
-            val version = item.suggestedVersion ?: item.versions?.first()
+            val version = item.suggestedVersion ?: item.versions?.first()?.version
             val size = version?.size?.let { size ->
                 Formatter.formatFileSize(LocalContext.current, size)
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 524025d87..0c46b198c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -38,7 +38,7 @@ data class AppDetailsItem(
     val featureGraphic: Any? = null,
     val phoneScreenshots: List<Any> = emptyList(),
     val categories: List<CategoryItem>? = null,
-    val versions: List<PackageVersion>? = null,
+    val versions: List<VersionItem>? = null,
     val installedVersion: PackageVersion? = null,
     /**
      * Needed, because the [installedVersion] may not be available, e.g. too old.
@@ -61,7 +61,7 @@ data class AppDetailsItem(
      * compatible signer. This means that the app is installed, but does not receive updates either
      * because the signer in the repo has changed or a wrong repo is set as preferred.
      */
-    val noCompatibleVersions: Boolean = false,
+    val noUpdatesBecauseDifferentSigner: Boolean = false,
     val authorHasMoreThanOneApp: Boolean = false,
 ) {
     constructor(
@@ -71,13 +71,13 @@ data class AppDetailsItem(
         dbApp: App,
         actions: AppDetailsActions,
         installState: InstallState,
-        versions: List<AppVersion>?,
+        versions: List<VersionItem>?,
         installedVersion: AppVersion?,
         installedVersionCode: Long?,
         suggestedVersion: AppVersion?,
         possibleUpdate: AppVersion?,
         appPrefs: AppPrefs?,
-        noCompatibleVersions: Boolean,
+        noUpdatesBecauseDifferentSigner: Boolean,
         authorHasMoreThanOneApp: Boolean,
         localeList: LocaleListCompat,
     ) : this(
@@ -110,8 +110,8 @@ data class AppDetailsItem(
         whatsNew = installedVersion?.getWhatsNew(localeList),
         antiFeatures = installedVersion?.getAntiFeatures(repository, localeList)
             ?: suggestedVersion?.getAntiFeatures(repository, localeList)
-            ?: versions?.first()?.getAntiFeatures(repository, localeList),
-        noCompatibleVersions = noCompatibleVersions,
+            ?: (versions?.first()?.version as? AppVersion).getAntiFeatures(repository, localeList),
+        noUpdatesBecauseDifferentSigner = noUpdatesBecauseDifferentSigner,
         authorHasMoreThanOneApp = authorHasMoreThanOneApp,
     )
 
@@ -155,10 +155,16 @@ data class AppDetailsItem(
             }
         }
 
+    /**
+     * True if all available versions for this app are incompatible with this device.
+     */
+    val isIncompatible: Boolean = versions?.all { !it.isCompatible } ?: false
+
     /**
      * True if this app has warnings, we need to show to the user.
      */
-    val showWarnings: Boolean get() = oldTargetSdk || noCompatibleVersions
+    val showWarnings: Boolean
+        get() = isIncompatible || oldTargetSdk || noUpdatesBecauseDifferentSigner
 
     /**
      * True if the targetSdk of the suggested version is so old
@@ -210,6 +216,15 @@ class AppDetailsActions(
     val shareIntent: Intent? = null,
 )
 
+data class VersionItem(
+    val version: PackageVersion,
+    val isInstalled: Boolean,
+    val isSuggested: Boolean,
+    val isCompatible: Boolean,
+    val isSignerCompatible: Boolean,
+    val showInstallButton: Boolean,
+)
+
 enum class MainButtonState {
     NONE,
     INSTALL,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
index 54a4871b9..593e8af3c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
@@ -9,7 +9,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.WarningAmber
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ElevatedCard
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -27,37 +26,45 @@ import org.fdroid.ui.utils.testApp
 fun AppDetailsWarnings(
     item: AppDetailsItem,
 ) {
+    val (color, stringRes) = when {
+        // app is outright incompatible
+        item.isIncompatible -> Pair(
+            MaterialTheme.colorScheme.errorContainer,
+            R.string.app_no_compatible_versions,
+        )
+        // app is installed, but can't receive updates, because current repo has different signer
+        item.noUpdatesBecauseDifferentSigner -> Pair(
+            MaterialTheme.colorScheme.errorContainer,
+            R.string.app_no_compatible_signer,
+        )
+        // app targets old targetSdk, not a deal breaker, but worth flagging, no auto-update
+        item.oldTargetSdk -> Pair(
+            MaterialTheme.colorScheme.inverseSurface,
+            R.string.app_no_auto_update,
+        )
+        else -> return
+    }
     ElevatedCard(
-        colors = CardDefaults.elevatedCardColors(
-            containerColor = MaterialTheme.colorScheme.errorContainer,
-        ),
-        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
+        colors = CardDefaults.elevatedCardColors(containerColor = color),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(8.dp),
     ) {
-        Column {
-            if (item.noCompatibleVersions) Row(
-                horizontalArrangement = spacedBy(8.dp),
-                verticalAlignment = CenterVertically,
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            ) {
-                Icon(Icons.Default.WarningAmber, "")
-                Text(
-                    text = stringResource(R.string.app_no_compatible_versions),
-                    style = MaterialTheme.typography.bodyLarge,
-                )
-            }
-            if (item.noCompatibleVersions && item.oldTargetSdk) HorizontalDivider()
-            if (item.oldTargetSdk) Row(
-                horizontalArrangement = spacedBy(8.dp),
-                verticalAlignment = CenterVertically,
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            ) {
-                Icon(Icons.Default.WarningAmber, "")
-                Text(
-                    stringResource(R.string.app_no_auto_update),
-                    style = MaterialTheme.typography.bodyLarge,
-                )
-            }
-        }
+        WarningRow(
+            text = stringResource(stringRes),
+        )
+    }
+}
+
+@Composable
+private fun WarningRow(text: String) {
+    Row(
+        horizontalArrangement = spacedBy(8.dp),
+        verticalAlignment = CenterVertically,
+        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+    ) {
+        Icon(Icons.Default.WarningAmber, null)
+        Text(text, style = MaterialTheme.typography.bodyLarge)
     }
 }
 
@@ -70,3 +77,19 @@ fun AppDetailsWarningsPreview() {
         }
     }
 }
+
+@Preview
+@Composable
+private fun IncompatiblePreview() {
+    FDroidContent {
+        Column {
+            AppDetailsWarnings(
+                testApp.copy(
+                    versions = listOf(
+                        testApp.versions!!.first().copy(isCompatible = false),
+                    ),
+                )
+            )
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index d86e4d899..a421e264b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -35,6 +35,7 @@ fun DetailsPresenter(
 ): AppDetailsItem? {
     val packagePair = packageInfoFlow.collectAsState().value ?: return null
     val packageName = packagePair.packageName
+    val packageInfo = packagePair.packageInfo
     val currentRepoId = currentRepoIdFlow.collectAsState().value
     val app = if (currentRepoId == null) {
         db.getAppDao().getApp(packageName).asFlow().collectAsState(null).value
@@ -59,12 +60,17 @@ fun DetailsPresenter(
     val preferredRepoId = remember(packageName, appPrefs) {
         appPrefs?.preferredRepoId ?: app.repoId // DB loads preferred repo first, so we remember it
     }
+
+    @Suppress("DEPRECATION") // so far we had issues with the new way of getting sigs
+    val installedSigner = packageInfo?.signatures?.get(0)?.let {
+        sha256(it.toByteArray())
+    }
     val suggestedVersion = if (versions == null || appPrefs == null) {
         null
     } else {
         updateChecker.getSuggestedVersion(
             versions = versions,
-            preferredSigner = app.metadata.preferredSigner,
+            preferredSigner = installedSigner ?: app.metadata.preferredSigner,
             releaseChannels = appPrefs.releaseChannels,
             preferencesGetter = { appPrefs },
         )
@@ -79,16 +85,13 @@ fun DetailsPresenter(
             preferencesGetter = null, // ignoring existing preferences to include ignored versions
         )
     }
-    val installedVersionCode = packagePair.packageInfo?.let {
-        getLongVersionCode(packagePair.packageInfo)
+    val installedVersionCode = packageInfo?.let {
+        getLongVersionCode(packageInfo)
     }
-    val installedVersion = packagePair.packageInfo?.let {
+    val installedVersion = packageInfo?.let {
         versions?.find { it.versionCode == installedVersionCode }
     }
-    val installedSigner = packagePair.packageInfo?.signatures?.get(0)?.let {
-        sha256(it.toByteArray())
-    }
-    val noCompatibleVersions = if (packagePair.packageInfo != null && versions != null) {
+    val noUpdatesBecauseDifferentSigner = if (packageInfo != null && versions != null) {
         // return true of no version has same signer
         versions.none { version ->
             version.manifest.signer?.sha256?.get(0) == installedSigner
@@ -134,7 +137,7 @@ fun DetailsPresenter(
                 viewModel::ignoreThisUpdate
             },
             shareApk = null, // TODO
-            uninstallIntent = packagePair.packageInfo?.let {
+            uninstallIntent = packageInfo?.let {
                 Intent(Intent.ACTION_DELETE).apply {
                     setData(Uri.fromParts("package", it.packageName, null))
                     putExtra(Intent.EXTRA_RETURN_RESULT, true)
@@ -144,13 +147,28 @@ fun DetailsPresenter(
             shareIntent = getShareIntent(repo, packageName, app.name ?: ""),
         ),
         installState = installState,
-        versions = versions,
+        versions = versions?.map { version ->
+            val signerCompatible = installedSigner == null ||
+                version.signer?.sha256?.first() == installedSigner
+            VersionItem(
+                version = version,
+                isInstalled = installedVersion == version,
+                isSuggested = suggestedVersion == version,
+                isCompatible = version.isCompatible,
+                isSignerCompatible = signerCompatible,
+                showInstallButton = if (!signerCompatible || installState.showProgress) {
+                    false
+                } else {
+                    (installedVersion?.versionCode ?: 0) < version.versionCode
+                },
+            )
+        },
         installedVersion = installedVersion,
         installedVersionCode = installedVersionCode,
         suggestedVersion = suggestedVersion,
         possibleUpdate = possibleUpdate,
         appPrefs = appPrefs,
-        noCompatibleVersions = noCompatibleVersions,
+        noUpdatesBecauseDifferentSigner = noUpdatesBecauseDifferentSigner,
         authorHasMoreThanOneApp = authorHasMoreThanOneApp,
         localeList = locales,
     )
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index 88a392b3c..5f1a786e3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -35,7 +35,6 @@ import kotlinx.coroutines.launch
 import org.fdroid.R
 import org.fdroid.database.AppVersion
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.index.v2.PackageVersion
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.FDroidOutlineButton
 import org.fdroid.ui.utils.asRelativeTimeString
@@ -53,21 +52,9 @@ fun Versions(
         modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
     ) {
         Column(modifier = Modifier) {
-            item.versions?.forEach { version ->
+            item.versions?.forEach { versionItem ->
                 Version(
-                    version = version,
-                    isInstalled = item.installedVersion == version,
-                    isSuggested = item.suggestedVersion == version,
-                    isInstallable = if (item.installState.showProgress) {
-                        false
-                    } else {
-                        if (item.installedVersion == null) {
-                            true
-                        } else {
-                            // TODO take compatibility and signer into account
-                            item.installedVersion.versionCode < version.versionCode
-                        }
-                    },
+                    item = versionItem,
                     installAction = { version: AppVersion ->
                         item.actions.installAction(item.app, version, item.icon)
                     },
@@ -80,10 +67,7 @@ fun Versions(
 
 @Composable
 fun Version(
-    version: PackageVersion,
-    isInstalled: Boolean,
-    isSuggested: Boolean,
-    isInstallable: Boolean,
+    item: VersionItem,
     installAction: (AppVersion) -> Unit,
     scrollUp: suspend () -> Unit,
 ) {
@@ -110,7 +94,7 @@ fun Version(
             Row {
                 Column(modifier = Modifier.weight(1f)) {
                     Text(
-                        text = version.versionName,
+                        text = item.version.versionName,
                         style = MaterialTheme.typography.titleMedium,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
@@ -118,14 +102,14 @@ fun Version(
                     Text(
                         text = stringResource(
                             R.string.added_x_ago,
-                            version.added.asRelativeTimeString(),
+                            item.version.added.asRelativeTimeString(),
                         ),
                         style = MaterialTheme.typography.bodyMedium,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
                     )
                 }
-                if (isInstalled) Badge(
+                if (item.isInstalled) Badge(
                     containerColor = MaterialTheme.colorScheme.primary,
                     modifier = Modifier.padding(start = 8.dp)
                 ) {
@@ -134,7 +118,7 @@ fun Version(
                         modifier = Modifier.padding(2.dp)
                     )
                 }
-                if (isSuggested) Badge(
+                if (item.isSuggested) Badge(
                     containerColor = MaterialTheme.colorScheme.secondary,
                     modifier = Modifier.padding(start = 8.dp)
                 ) {
@@ -151,7 +135,18 @@ fun Version(
                 verticalAlignment = Alignment.CenterVertically,
             ) {
                 Column(modifier = Modifier.weight(1f)) {
-                    version.size?.let { size ->
+                    if (!item.isCompatible || !item.isSignerCompatible) Text(
+                        text = if (!item.isCompatible) {
+                            stringResource(R.string.app_details_incompatible_version)
+                        } else {
+                            stringResource(R.string.app_details_incompatible_signer)
+                        },
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.error,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                    item.version.size?.let { size ->
                         Text(
                             text = stringResource(
                                 R.string.size_colon,
@@ -162,7 +157,7 @@ fun Version(
                             overflow = TextOverflow.Ellipsis,
                         )
                     }
-                    version.packageManifest.nativecode?.let { nativeCode ->
+                    item.version.packageManifest.nativecode?.let { nativeCode ->
                         if (nativeCode.isNotEmpty()) {
                             Text(
                                 text = stringResource(
@@ -175,7 +170,7 @@ fun Version(
                             )
                         }
                     }
-                    version.signer?.let { signer ->
+                    item.version.signer?.let { signer ->
                         Text(
                             text = stringResource(
                                 R.string.signer_colon,
@@ -187,12 +182,12 @@ fun Version(
                         )
                     }
                 }
-                if (isInstallable) {
+                if (item.showInstallButton) {
                     val coroutineScope = rememberCoroutineScope()
                     FDroidOutlineButton(
                         text = stringResource(R.string.menu_install),
                         onClick = {
-                            installAction(version as AppVersion)
+                            installAction(item.version as AppVersion)
                             coroutineScope.launch {
                                 scrollUp()
                             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 9db68795e..c606324b5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -18,6 +18,7 @@ import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.details.AntiFeature
 import org.fdroid.ui.details.AppDetailsActions
 import org.fdroid.ui.details.AppDetailsItem
+import org.fdroid.ui.details.VersionItem
 import org.fdroid.ui.lists.AppListActions
 import org.fdroid.ui.lists.AppListInfo
 import org.fdroid.ui.lists.AppListModel
@@ -174,10 +175,41 @@ val testApp = AppDetailsItem(
         "and in the long run the SABR video protocol needs to be implemented, " +
         "but TeamNewPipe members are currently busy so any help would be greatly appreciated! " +
         "https://github.com/TeamNewPipe/NewPipe/issues/12248",
+    noUpdatesBecauseDifferentSigner = true,
     authorHasMoreThanOneApp = true,
     versions = listOf(
-        testVersion1,
-        testVersion2,
+        VersionItem(
+            testVersion1,
+            isInstalled = false,
+            isSuggested = true,
+            isCompatible = true,
+            isSignerCompatible = true,
+            showInstallButton = true,
+        ),
+        VersionItem(
+            testVersion1,
+            isInstalled = false,
+            isSuggested = false,
+            isCompatible = true,
+            isSignerCompatible = false,
+            showInstallButton = false,
+        ),
+        VersionItem(
+            testVersion2,
+            isInstalled = false,
+            isSuggested = false,
+            isCompatible = false,
+            isSignerCompatible = true,
+            showInstallButton = true,
+        ),
+        VersionItem(
+            testVersion2,
+            isInstalled = true,
+            isSuggested = false,
+            isCompatible = true,
+            isSignerCompatible = true,
+            showInstallButton = false,
+        ),
     ),
     installedVersion = testVersion2,
     suggestedVersion = null,
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 6428110eb..f9f14e9d7 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -56,12 +56,15 @@
     <string name="anti_features_title">This app has anti-features</string>
     <string name="developer_contact">Developer contact</string>
     <string name="copy_link">Copy link</string>
-    <string name="app_no_compatible_versions">Can not update this app, because no compatible versions available in repository.</string>
+    <string name="app_no_compatible_versions">This app is not compatible with your device.</string>
+    <string name="app_no_compatible_signer">Can not update this app, because no compatible versions available in repository.</string>
     <string name="app_no_auto_update">Auto-update not available, because app targets old version of Android.</string>
     <string name="added_x_ago">Added %1$s</string>
     <string name="size_colon">Size: %1$s</string>
     <string name="signer_colon">Signer: %1$s</string>
     <string name="architectures_colon">Architectures: %1$s</string>
+    <string name="app_details_incompatible_version">Incompatible • Installation likely to fail</string>
+    <string name="app_details_incompatible_signer">Signature mismatch, can\'t install</string>
 
     <string name="notification_title">Notifications</string>
     <string name="notification_summary">Opens system notification settings</string>

From 306b9133c51ff90c004a907c1e9707ab149adf14 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 24 Oct 2025 15:38:36 -0300
Subject: [PATCH 088/180] Improve repo list for many repos

* hide top bar when scrolling down
* hide FAB while scrolling and don't overlay last item
---
 .../fdroid/ui/repositories/Repositories.kt    | 49 +++++++++++++++----
 .../ui/repositories/RepositoriesList.kt       |  4 +-
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index f41e94fb9..4b0e6c775 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -2,9 +2,11 @@ package org.fdroid.ui.repositories
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
@@ -16,10 +18,16 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults.enterAlwaysScrollBehavior
+import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -63,6 +71,21 @@ fun Repositories(
             info.onOnboardingSeen()
         }
     }
+    val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
+    val listState = rememberLazyListState()
+    val showFab by remember {
+        derivedStateOf {
+            val firstVisibleItemIndex = listState.firstVisibleItemIndex
+            val firstVisibleItemScrollOffset = listState.firstVisibleItemScrollOffset
+            if (firstVisibleItemIndex == 0 && firstVisibleItemScrollOffset == 0) {
+                true
+            } else if (listState.isScrollInProgress) {
+                false
+            } else {
+                listState.canScrollForward
+            }
+        }
+    }
     Scaffold(
         topBar = {
             TopAppBar(
@@ -80,24 +103,30 @@ fun Repositories(
                 subtitle = {
                     val lastUpdated = info.model.lastCheckForUpdate
                     Text(stringResource(R.string.repo_last_update_check, lastUpdated))
-                }
+                },
+                scrollBehavior = scrollBehavior,
             )
         },
         floatingActionButton = {
-            FloatingActionButton(
-                onClick = info::onAddRepo,
-                modifier = Modifier.padding(16.dp)
-            ) {
-                Icon(
-                    imageVector = Icons.Default.Add,
-                    contentDescription = stringResource(R.string.menu_add_repo),
-                )
+            AnimatedVisibility(showFab) {
+                FloatingActionButton(
+                    onClick = info::onAddRepo,
+                    modifier = Modifier
+                        .padding(16.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Add,
+                        contentDescription = stringResource(R.string.menu_add_repo),
+                    )
+                }
             }
-        }
+        },
+        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         if (info.model.repositories == null) BigLoadingIndicator()
         else RepositoriesList(
             info = info,
+            listState = listState,
             modifier = Modifier
                 .padding(paddingValues),
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
index 6b7346602..7ece1866b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
@@ -6,8 +6,8 @@ import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -35,11 +35,11 @@ import org.fdroid.ui.utils.rememberDragDropState
 fun RepositoriesList(
     info: RepositoryInfo,
     modifier: Modifier = Modifier,
+    listState: LazyListState,
 ) {
     val repositories = info.model.repositories ?: return
     var showDisableRepoDialog by remember { mutableStateOf<Long?>(null) }
     val currentRepositoryId = info.currentRepositoryId
-    val listState = rememberLazyListState()
     val dragDropState = rememberDragDropState(
         lazyListState = listState,
         onMove = { from, to ->

From 2c45cc103987cf0dad9a3d265425c55ea3e2b580 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 24 Oct 2025 16:11:10 -0300
Subject: [PATCH 089/180] Allow saving crash reports as file

This is useful for when the user has no email program set up and wants to process the crash report differently.

The crash activity was also refactored a bit at this opportunity.
---
 next/src/main/AndroidManifest.xml             |  5 +-
 next/src/main/kotlin/org/fdroid/App.kt        |  2 +-
 .../main/kotlin/org/fdroid/ui/crash/Crash.kt  | 78 +++++++++++++++++++
 .../org/fdroid/ui/crash/CrashActivity.kt      | 56 +++++++++++++
 .../CrashContent.kt}                          | 41 ++--------
 .../kotlin/org/fdroid/ui/settings/Settings.kt | 16 +---
 .../src/main/kotlin/org/fdroid/utils/Utils.kt | 13 ++++
 next/src/main/res/values/strings-next.xml     |  3 +
 8 files changed, 163 insertions(+), 51 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
 rename next/src/main/kotlin/org/fdroid/ui/{CrashActivity.kt => crash/CrashContent.kt} (72%)

diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
index df84ac4c7..1a473af94 100644
--- a/next/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -93,11 +93,12 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="org.fdroid.ui.CrashActivity"
+            android:name="org.fdroid.ui.crash.CrashActivity"
             android:excludeFromRecents="true"
             android:finishOnTaskLaunch="true"
             android:launchMode="singleInstance"
-            android:process=":acra" />
+            android:process=":acra"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="fullSensor"
diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index 40eb10adb..6b7979613 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -31,7 +31,7 @@ import org.fdroid.download.PackageName
 import org.fdroid.download.coil.DownloadRequestFetcher
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.SettingsManager
-import org.fdroid.ui.CrashActivity
+import org.fdroid.ui.crash.CrashActivity
 import org.fdroid.ui.utils.applyNewTheme
 import org.fdroid.updates.AppUpdateWorker
 import javax.inject.Inject
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt b/next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
new file mode 100644
index 000000000..c869cbc1d
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
@@ -0,0 +1,78 @@
+package org.fdroid.ui.crash
+
+import android.net.Uri
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Save
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import kotlinx.coroutines.launch
+import org.fdroid.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.utils.getLogName
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun Crash(
+    onCancel: () -> Unit,
+    onSend: (String, String) -> Unit,
+    onSave: (Uri, String) -> Boolean,
+    modifier: Modifier = Modifier
+) {
+    val res = LocalResources.current
+    val coroutineScope = rememberCoroutineScope()
+    val textFieldState = rememberTextFieldState()
+    val snackbarHostState = remember { SnackbarHostState() }
+    val launcher = rememberLauncherForActivityResult(CreateDocument("application/json")) {
+        val success = it != null && onSave(it, textFieldState.text.toString())
+        val msg = if (success) res.getString(R.string.crash_report_saved)
+        else res.getString(R.string.crash_report_error_saving)
+        coroutineScope.launch {
+            snackbarHostState.showSnackbar(msg)
+        }
+    }
+    val context = LocalContext.current
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {},
+                actions = {
+                    IconButton(onClick = { launcher.launch("${getLogName(context)}.json") }) {
+                        Icon(
+                            imageVector = Icons.Default.Save,
+                            contentDescription = stringResource(R.string.crash_report_save),
+                        )
+                    }
+                }
+            )
+        },
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        modifier = modifier,
+    ) { paddingValues ->
+        CrashContent(onCancel, onSend, textFieldState, Modifier.padding(paddingValues))
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        Crash({}, { _, _ -> }, { _, _ -> true })
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt b/next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
new file mode 100644
index 000000000..5f3372fba
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
@@ -0,0 +1,56 @@
+package org.fdroid.ui.crash
+
+import android.net.Uri
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import mu.KotlinLogging
+import org.acra.ReportField
+import org.acra.dialog.CrashReportDialogHelper
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import java.io.IOException
+
+class CrashActivity : ComponentActivity() {
+    private val log = KotlinLogging.logger {}
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        val helper = CrashReportDialogHelper(this, intent)
+        setContent {
+            FDroidContent {
+                Crash(
+                    onCancel = {
+                        helper.cancelReports()
+                        finishAfterTransition()
+                    },
+                    onSend = { comment, userEmail ->
+                        helper.sendCrash(comment, userEmail)
+                        finishAfterTransition()
+                    },
+                    onSave = { uri, comment ->
+                        onSave(helper, uri, comment)
+                    },
+                )
+            }
+        }
+    }
+
+    private fun onSave(helper: CrashReportDialogHelper, uri: Uri, comment: String): Boolean {
+        return try {
+            val crashData = helper.reportData.apply {
+                if (comment.isNotBlank()) {
+                    put(ReportField.USER_COMMENT, comment)
+                }
+            }
+            contentResolver.openOutputStream(uri, "wt")?.use { outputStream ->
+                outputStream.write(crashData.toJSON().encodeToByteArray())
+            } ?: throw IOException("Could not open $uri")
+            true
+        } catch (e: Exception) {
+            log.error(e) { "Error saving log: " }
+            false
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt b/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
similarity index 72%
rename from next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt
rename to next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
index 55077c7a2..79c3bdecf 100644
--- a/next/src/main/kotlin/org/fdroid/ui/CrashActivity.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
@@ -1,9 +1,5 @@
-package org.fdroid.ui
+package org.fdroid.ui.crash
 
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Arrangement.spacedBy
@@ -12,10 +8,10 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeContentPadding
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
@@ -30,37 +26,14 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.acra.dialog.CrashReportDialogHelper
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 
-class CrashActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        val helper = CrashReportDialogHelper(this, intent)
-        setContent {
-            FDroidContent {
-                CrashContent(
-                    onCancel = {
-                        helper.cancelReports()
-                        finishAfterTransition()
-                    },
-                    onSend = { comment, userEmail ->
-                        helper.sendCrash(comment, userEmail)
-                        finishAfterTransition()
-                    },
-                    modifier = Modifier.safeContentPadding()
-                )
-            }
-        }
-    }
-}
-
 @Composable
-private fun CrashContent(
+fun CrashContent(
     onCancel: () -> Unit,
     onSend: (String, String) -> Unit,
+    textFieldState: TextFieldState,
     modifier: Modifier = Modifier
 ) {
     val scrollState = rememberScrollState()
@@ -69,6 +42,7 @@ private fun CrashContent(
         verticalArrangement = Arrangement.SpaceBetween,
         modifier = modifier
             .fillMaxSize()
+            .imePadding()
             .padding(horizontal = 16.dp)
             .verticalScroll(scrollState)
     ) {
@@ -81,7 +55,6 @@ private fun CrashContent(
                 .aspectRatio(1f)
                 .padding(vertical = 16.dp)
         )
-        val textFieldState = rememberTextFieldState()
         Column(verticalArrangement = spacedBy(16.dp)) {
             Text(
                 text = stringResource(R.string.crash_dialog_title),
@@ -121,6 +94,6 @@ private fun CrashContent(
 @Composable
 private fun Preview() {
     FDroidContent {
-        CrashContent({}, { _, _ -> })
+        Crash({}, { _, _ -> }, { _, _ -> true })
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index 86000fd31..9b78fcae8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -1,6 +1,5 @@
 package org.fdroid.ui.settings
 
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build.VERSION.SDK_INT
@@ -47,10 +46,7 @@ import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.TimeZone
+import org.fdroid.utils.getLogName
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -156,7 +152,7 @@ fun Settings(
                 )
                 item {
                     OutlinedButton(
-                        onClick = { launcher.launch(getLogName(context)) },
+                        onClick = { launcher.launch("${getLogName(context)}.txt") },
                         modifier = Modifier
                             .padding(16.dp)
                     ) {
@@ -172,14 +168,6 @@ fun Settings(
     }
 }
 
-private fun getLogName(context: Context): String {
-    val sdf = SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'", Locale.US).apply {
-        timeZone = TimeZone.getTimeZone("UTC")
-    }
-    val time = sdf.format(Date())
-    return "${context.packageName}-$time.txt"
-}
-
 @Preview
 @Composable
 fun SettingsPreview() {
diff --git a/next/src/main/kotlin/org/fdroid/utils/Utils.kt b/next/src/main/kotlin/org/fdroid/utils/Utils.kt
index 2862da6bd..6d310cf32 100644
--- a/next/src/main/kotlin/org/fdroid/utils/Utils.kt
+++ b/next/src/main/kotlin/org/fdroid/utils/Utils.kt
@@ -1,7 +1,12 @@
 package org.fdroid.utils
 
+import android.content.Context
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
 
 @OptIn(ExperimentalStdlibApi::class)
 fun sha256(bytes: ByteArray): String {
@@ -13,3 +18,11 @@ fun sha256(bytes: ByteArray): String {
     messageDigest.update(bytes)
     return messageDigest.digest().toHexString()
 }
+
+fun getLogName(context: Context): String {
+    val sdf = SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'", Locale.US).apply {
+        timeZone = TimeZone.getTimeZone("UTC")
+    }
+    val time = sdf.format(Date())
+    return "${context.packageName}-$time"
+}
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index f9f14e9d7..cbdb5c11c 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -109,5 +109,8 @@
     <string name="crash_report_comment_hint">Tell us what happened right before the crash</string>
     <string name="crash_report_button_send">Send report</string>
     <string name="crash_report_error">Could not send report. No email program found :(</string>
+    <string name="crash_report_save">Save crash report as file</string>
+    <string name="crash_report_saved">Saved report to file</string>
+    <string name="crash_report_error_saving">Error saving crash report to file</string>
 
 </resources>

From 08e1d04b7ad6509cb0a9c7e2f2e9e00f3d821710 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 24 Oct 2025 16:36:00 -0300
Subject: [PATCH 090/180] Fix featureGraphic jumping after loading error

---
 .../kotlin/org/fdroid/ui/details/AppDetailsHeader.kt     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index ecc1cb14c..8198f5c98 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Cancel
-import androidx.compose.material.icons.filled.Error
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -35,7 +34,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
@@ -44,7 +42,6 @@ import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -81,6 +78,9 @@ fun AppDetailsHeader(
             onSuccess = {
                 showTopSpacer = false
             },
+            onError = {
+                showTopSpacer = true
+            },
             modifier = Modifier
                 .fillMaxWidth()
                 .heightIn(max = 196.dp)
@@ -97,7 +97,6 @@ fun AppDetailsHeader(
                     )
                 }
                 .padding(bottom = 8.dp),
-            error = rememberVectorPainter(Icons.Default.Error),
         )
     }
     // Header
@@ -105,7 +104,7 @@ fun AppDetailsHeader(
         modifier = Modifier
             .padding(horizontal = 16.dp),
         horizontalArrangement = spacedBy(8.dp),
-        verticalAlignment = Alignment.CenterVertically,
+        verticalAlignment = CenterVertically,
     ) {
         AsyncShimmerImage(
             model = item.icon,

From c22352dd0553e6893bb14e0941b6b8152a4565c6 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 24 Oct 2025 17:37:56 -0300
Subject: [PATCH 091/180] Fix first start detection

---
 next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt   | 4 ++--
 .../kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt    | 8 +++++---
 .../kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt    | 3 +++
 3 files changed, 10 insertions(+), 5 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 c9f75489e..f071cb5fd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -11,9 +11,9 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.FilledTonalButton
 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
@@ -158,7 +158,7 @@ fun Discover(
                     val listAll = AppListType.All(
                         title = stringResource(R.string.app_list_all),
                     )
-                    FilledTonalButton(
+                    OutlinedButton(
                         onClick = { onListTap(listAll) },
                         modifier = Modifier
                             .align(End)
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 375aed4be..a5ed1f129 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.Repository
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
 import org.fdroid.ui.categories.CategoryGroup
 import org.fdroid.ui.categories.CategoryItem
 
@@ -15,6 +16,7 @@ fun DiscoverPresenter(
     categoriesFlow: Flow<List<CategoryItem>>,
     repositoriesFlow: Flow<List<Repository>>,
     searchResultsFlow: StateFlow<SearchResults?>,
+    lastRepoUpdate: Long,
 ): DiscoverModel {
     val newApps = newAppsFlow.collectAsState(null).value
     val recentlyUpdatedApps = recentlyUpdatedAppsFlow.collectAsState(null).value
@@ -26,14 +28,14 @@ fun DiscoverPresenter(
     // So if we don't have those, we are still loading, have no enabled repo, or this is first start
     return if (recentlyUpdatedApps.isNullOrEmpty()) {
         val repositories = repositoriesFlow.collectAsState(null).value
+        val isFirstStart = lastRepoUpdate == PREF_DEFAULT_LAST_UPDATE_CHECK
         if (newApps == null && recentlyUpdatedApps == null) {
-            LoadingDiscoverModel(false)
+            // we don't know yet if this
+            LoadingDiscoverModel(isFirstStart)
         } else if (repositories?.all { !it.enabled } == true) {
             NoEnabledReposDiscoverModel
         } else {
             // apps are empty, if we have enabled repos assume this is first start (still loading)
-            // TODO use more reliable check for first start
-            val isFirstStart = repositories?.find { it.enabled } != null
             LoadingDiscoverModel(isFirstStart)
         }
     } else {
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 1edc84c44..00ea6ae95 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -24,6 +24,7 @@ import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
+import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListItem
 import org.fdroid.ui.utils.normalize
@@ -40,6 +41,7 @@ class DiscoverViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
     updatesManager: UpdatesManager,
+    settingsManager: SettingsManager,
     private val repoManager: RepoManager,
     @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
@@ -79,6 +81,7 @@ class DiscoverViewModel @Inject constructor(
             categoriesFlow = categories,
             repositoriesFlow = repoManager.repositoriesState,
             searchResultsFlow = searchResults,
+            lastRepoUpdate = settingsManager.lastRepoUpdate,
         )
     }
 

From d5df52a2de279050f1fdbcc6ea23fd4fb1fac8e4 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 27 Oct 2025 10:12:18 -0300
Subject: [PATCH 092/180] HACK store lastRepoUpdate as Int, because
 ComposePreference lib can't handle Long

see: https://github.com/zhanghai/ComposePreference/issues/24
---
 .../kotlin/org/fdroid/settings/SettingsConstants.kt   |  2 +-
 .../kotlin/org/fdroid/settings/SettingsManager.kt     | 11 +++++++++--
 .../org/fdroid/ui/discover/DiscoverPresenter.kt       |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
index e926da449..b093f0bbb 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -5,7 +5,7 @@ import org.fdroid.database.AppListSortOrder
 object SettingsConstants {
 
     const val PREF_KEY_LAST_UPDATE_CHECK = "lastUpdateCheck"
-    const val PREF_DEFAULT_LAST_UPDATE_CHECK = -1L
+    const val PREF_DEFAULT_LAST_UPDATE_CHECK = -1
 
     const val PREF_KEY_THEME = "theme"
     const val PREF_DEFAULT_THEME = "followSystem"
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index ccf00d99d..5e5b58203 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -42,9 +42,16 @@ class SettingsManager @Inject constructor(
     val theme get() = prefs.getString(PREF_KEY_THEME, PREF_DEFAULT_THEME)!!
     val themeFlow = prefsFlow.map { it.get<String>(PREF_KEY_THEME) }
     var lastRepoUpdate: Long
-        get() = prefs.getLong(PREF_KEY_LAST_UPDATE_CHECK, PREF_DEFAULT_LAST_UPDATE_CHECK)
+        get() = try {
+            prefs.getInt(PREF_KEY_LAST_UPDATE_CHECK, PREF_DEFAULT_LAST_UPDATE_CHECK)
+                .toLong() * 1000
+        } catch (_: Exception) {
+            // TODO remove Int hack, because preferences library crashes on Long
+            //  see: https://github.com/zhanghai/ComposePreference/issues/24
+            PREF_DEFAULT_LAST_UPDATE_CHECK.toLong()
+        }
         set(value) {
-            prefs.edit { putLong(PREF_KEY_LAST_UPDATE_CHECK, value) }
+            prefs.edit { putInt(PREF_KEY_LAST_UPDATE_CHECK, (value / 1000).toInt()) }
             _lastRepoUpdateFlow.update { value }
         }
     private val _lastRepoUpdateFlow = MutableStateFlow(lastRepoUpdate)
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index a5ed1f129..8b71fbd7b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -28,7 +28,7 @@ fun DiscoverPresenter(
     // So if we don't have those, we are still loading, have no enabled repo, or this is first start
     return if (recentlyUpdatedApps.isNullOrEmpty()) {
         val repositories = repositoriesFlow.collectAsState(null).value
-        val isFirstStart = lastRepoUpdate == PREF_DEFAULT_LAST_UPDATE_CHECK
+        val isFirstStart = lastRepoUpdate < PREF_DEFAULT_LAST_UPDATE_CHECK.toLong()
         if (newApps == null && recentlyUpdatedApps == null) {
             // we don't know yet if this
             LoadingDiscoverModel(isFirstStart)

From 34b1276a99de40b7c1099730d1bc4fe1afa47cca Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 27 Oct 2025 12:21:35 -0300
Subject: [PATCH 093/180] Optimize app details page by remembering expensive
 results

so we avoid producing those results more than once
---
 .../org/fdroid/ui/details/DetailsPresenter.kt | 77 ++++++++++++-------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index a421e264b..dcabc72ac 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -38,7 +38,10 @@ fun DetailsPresenter(
     val packageInfo = packagePair.packageInfo
     val currentRepoId = currentRepoIdFlow.collectAsState().value
     val app = if (currentRepoId == null) {
-        db.getAppDao().getApp(packageName).asFlow().collectAsState(null).value
+        val flow = remember {
+            db.getAppDao().getApp(packageName).asFlow()
+        }
+        flow.collectAsState(null).value
     } else {
         db.getAppDao().getApp(currentRepoId, packageName)
     } ?: return null
@@ -51,39 +54,52 @@ fun DetailsPresenter(
     val installState =
         appInstallManager.getAppFlow(packageName).collectAsState(InstallState.Unknown).value
 
-    val versions = if (currentRepoId == null) {
-        db.getVersionDao().getAppVersions(packageName)
-    } else {
-        db.getVersionDao().getAppVersions(currentRepoId, packageName)
-    }.asFlow().collectAsState(null).value
-    val appPrefs = db.getAppPrefsDao().getAppPrefs(packageName).asFlow().collectAsState(null).value
+    val versionsFlow = remember(currentRepoId) {
+        if (currentRepoId == null) {
+            db.getVersionDao().getAppVersions(app.repoId, packageName).asFlow()
+        } else {
+            db.getVersionDao().getAppVersions(currentRepoId, packageName).asFlow()
+        }
+    }
+    val versions = versionsFlow.collectAsState(null).value
+    val appPrefsFlow = remember(packageName) {
+        db.getAppPrefsDao().getAppPrefs(packageName).asFlow()
+    }
+    val appPrefs = appPrefsFlow.collectAsState(null).value
     val preferredRepoId = remember(packageName, appPrefs) {
         appPrefs?.preferredRepoId ?: app.repoId // DB loads preferred repo first, so we remember it
     }
 
-    @Suppress("DEPRECATION") // so far we had issues with the new way of getting sigs
-    val installedSigner = packageInfo?.signatures?.get(0)?.let {
-        sha256(it.toByteArray())
+    val installedSigner = remember(packageInfo?.packageName) {
+        @Suppress("DEPRECATION") // so far we had issues with the new way of getting sigs
+        packageInfo?.signatures?.get(0)?.let {
+            sha256(it.toByteArray())
+        }
     }
-    val suggestedVersion = if (versions == null || appPrefs == null) {
-        null
-    } else {
-        updateChecker.getSuggestedVersion(
-            versions = versions,
-            preferredSigner = installedSigner ?: app.metadata.preferredSigner,
-            releaseChannels = appPrefs.releaseChannels,
-            preferencesGetter = { appPrefs },
-        )
+    val suggestedVersion = remember(versions, appPrefs, installedSigner) {
+        if (versions == null || appPrefs == null) {
+            null
+        } else {
+            updateChecker.getSuggestedVersion(
+                versions = versions,
+                preferredSigner = installedSigner ?: app.metadata.preferredSigner,
+                releaseChannels = appPrefs.releaseChannels,
+                preferencesGetter = { appPrefs },
+            )
+        }
     }
-    val possibleUpdate = if (versions == null || appPrefs == null) {
-        null
-    } else {
-        updateChecker.getUpdate(
-            versions = versions,
-            allowedSignersGetter = app.metadata.preferredSigner?.let { { setOf(it) } },
-            allowedReleaseChannels = appPrefs.releaseChannels,
-            preferencesGetter = null, // ignoring existing preferences to include ignored versions
-        )
+    val possibleUpdate = remember(versions, appPrefs) {
+        if (versions == null || appPrefs == null) {
+            null
+        } else {
+            updateChecker.getUpdate(
+                versions = versions,
+                allowedSignersGetter = app.metadata.preferredSigner?.let { { setOf(it) } },
+                allowedReleaseChannels = appPrefs.releaseChannels,
+                // ignoring existing preferences to include ignored versions
+                preferencesGetter = null,
+            )
+        }
     }
     val installedVersionCode = packageInfo?.let {
         getLongVersionCode(packageInfo)
@@ -101,7 +117,10 @@ fun DetailsPresenter(
     }
     val authorName = app.authorName
     val authorHasMoreThanOneApp = if (authorName == null) false else {
-        db.getAppDao().hasAuthorMoreThanOneApp(authorName).asFlow().collectAsState(false).value
+        val flow = remember(authorName) {
+            db.getAppDao().hasAuthorMoreThanOneApp(authorName).asFlow()
+        }
+        flow.collectAsState(false).value
     }
     val locales = LocaleListCompat.getDefault()
     Log.d(TAG, "Presenting app details:")

From 43162b0b0795105914cdc132cadde94ffa9cb1cd Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 27 Oct 2025 15:27:44 -0300
Subject: [PATCH 094/180] Add settings for auto app updates

on by default
---
 next/src/main/kotlin/org/fdroid/App.kt        |  2 +-
 .../org/fdroid/settings/SettingsConstants.kt  |  3 +
 .../org/fdroid/settings/SettingsManager.kt    |  4 ++
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  1 +
 .../kotlin/org/fdroid/ui/settings/Settings.kt | 67 ++++++++++++++++---
 .../fdroid/ui/settings/SettingsViewModel.kt   | 10 +++
 .../org/fdroid/updates/AppUpdateWorker.kt     | 14 +++-
 .../org/fdroid/updates/UpdatesManager.kt      | 12 ++++
 next/src/main/res/values/strings-next.xml     |  1 +
 9 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index 6b7979613..4f02367cd 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -96,7 +96,7 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
         if (ACRA.isACRASenderServiceProcess()) return
 
         RepoUpdateWorker.scheduleOrCancel(applicationContext)
-        AppUpdateWorker.scheduleOrCancel(applicationContext)
+        AppUpdateWorker.scheduleOrCancel(applicationContext, settingsManager.autoUpdateApps)
     }
 
     override fun newImageLoader(context: Context): ImageLoader {
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
index b093f0bbb..72ddd7459 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -10,6 +10,9 @@ object SettingsConstants {
     const val PREF_KEY_THEME = "theme"
     const val PREF_DEFAULT_THEME = "followSystem"
 
+    const val PREF_KEY_AUTO_UPDATES = "autoUpdates"
+    const val PREF_DEFAULT_AUTO_UPDATES = true
+
     const val PREF_KEY_SHOW_INCOMPATIBLE = "incompatibleVersions"
     const val PREF_DEFAULT_SHOW_INCOMPATIBLE = true
 
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index 5e5b58203..12c007138 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -12,10 +12,12 @@ import me.zhanghai.compose.preference.createPreferenceFlow
 import mu.KotlinLogging
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_APP_LIST_SORT_ORDER
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SHOW_INCOMPATIBLE
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
 import org.fdroid.settings.SettingsConstants.PREF_KEY_APP_LIST_SORT_ORDER
+import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_LAST_UPDATE_CHECK
 import org.fdroid.settings.SettingsConstants.PREF_KEY_SHOW_INCOMPATIBLE
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
@@ -41,6 +43,8 @@ class SettingsManager @Inject constructor(
     val prefsFlow by lazy { createPreferenceFlow(prefs) }
     val theme get() = prefs.getString(PREF_KEY_THEME, PREF_DEFAULT_THEME)!!
     val themeFlow = prefsFlow.map { it.get<String>(PREF_KEY_THEME) }
+    val autoUpdateApps get() = prefs.getBoolean(PREF_KEY_AUTO_UPDATES, PREF_DEFAULT_AUTO_UPDATES)
+    val autoUpdateAppsFlow get() = prefsFlow.map { it.get<Boolean>(PREF_KEY_AUTO_UPDATES) }
     var lastRepoUpdate: Long
         get() = try {
             prefs.getInt(PREF_KEY_LAST_UPDATE_CHECK, PREF_DEFAULT_LAST_UPDATE_CHECK)
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index ebc4dec24..e570a5528 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -269,6 +269,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
             val viewModel = hiltViewModel<SettingsViewModel>()
             Settings(
                 prefsFlow = viewModel.prefsFlow,
+                nextAppUpdateFlow = viewModel.nextAppUpdateFlow,
                 onSaveLogcat = {
                     viewModel.onSaveLogcat(it)
                     backStack.removeLastOrNull()
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index 9b78fcae8..43f7f9f28 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -19,6 +19,7 @@ import androidx.compose.material.icons.filled.BrightnessMedium
 import androidx.compose.material.icons.filled.Notifications
 import androidx.compose.material.icons.filled.Save
 import androidx.compose.material.icons.filled.Translate
+import androidx.compose.material.icons.filled.Update
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -28,6 +29,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalResources
@@ -35,6 +37,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import me.zhanghai.compose.preference.MapPreferences
 import me.zhanghai.compose.preference.Preferences
@@ -42,16 +45,22 @@ import me.zhanghai.compose.preference.ProvidePreferenceLocals
 import me.zhanghai.compose.preference.listPreference
 import me.zhanghai.compose.preference.preference
 import me.zhanghai.compose.preference.preferenceCategory
+import me.zhanghai.compose.preference.switchPreference
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
+import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
+import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.utils.getLogName
+import java.util.concurrent.TimeUnit
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun Settings(
     prefsFlow: MutableStateFlow<Preferences>,
+    nextAppUpdateFlow: Flow<Long>,
     onSaveLogcat: (Uri?) -> Unit,
     onBackClicked: () -> Unit,
 ) {
@@ -116,6 +125,23 @@ fun Settings(
                     },
                     summary = { Text(text = "${themeToString(it)}") },
                 )
+                if (SDK_INT >= 33) preference(
+                    key = "languages",
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Default.Translate,
+                            contentDescription = null,
+                        )
+                    },
+                    title = { Text(stringResource(R.string.pref_language)) },
+                    summary = { Text(stringResource(R.string.pref_language_summary)) },
+                    onClick = {
+                        val intent = Intent(ACTION_APP_LOCALE_SETTINGS).apply {
+                            setData(Uri.fromParts("package", context.packageName, null))
+                        }
+                        context.startActivity(intent)
+                    },
+                )
                 if (SDK_INT >= 26) preference(
                     key = "notifications",
                     icon = {
@@ -133,21 +159,41 @@ fun Settings(
                         context.startActivity(intent)
                     },
                 )
-                if (SDK_INT >= 33) preference(
-                    key = "languages",
+                preferenceCategory(
+                    key = "pref_category_updates",
+                    title = { Text(stringResource(R.string.updates)) },
+                )
+                switchPreference(
+                    key = PREF_KEY_AUTO_UPDATES,
+                    defaultValue = PREF_DEFAULT_AUTO_UPDATES,
+                    title = {
+                        Text(stringResource(R.string.update_auto_install))
+                    },
                     icon = {
                         Icon(
-                            imageVector = Icons.Default.Translate,
+                            imageVector = Icons.Default.Update,
                             contentDescription = null,
                         )
                     },
-                    title = { Text(stringResource(R.string.pref_language)) },
-                    summary = { Text(stringResource(R.string.pref_language_summary)) },
-                    onClick = {
-                        val intent = Intent(ACTION_APP_LOCALE_SETTINGS).apply {
-                            setData(Uri.fromParts("package", context.packageName, null))
+                    summary = {
+                        val nextUpdate = nextAppUpdateFlow.collectAsState(Long.MAX_VALUE).value
+                        val nextUpdateStr = if (nextUpdate == Long.MAX_VALUE) {
+                            stringResource(
+                                R.string.auto_update_time,
+                                stringResource(R.string.repositories_last_update_never)
+                            )
+                        } else if (nextUpdate - System.currentTimeMillis() <= 0) {
+                            stringResource(R.string.auto_update_time_past)
+                        } else {
+                            stringResource(
+                                R.string.auto_update_time,
+                                nextUpdate.asRelativeTimeString()
+                            )
                         }
-                        context.startActivity(intent)
+                        val s = stringResource(R.string.pref_auto_updates_summary) +
+                            "\n\n" +
+                            nextUpdateStr
+                        Text(s)
                     },
                 )
                 item {
@@ -172,6 +218,7 @@ fun Settings(
 @Composable
 fun SettingsPreview() {
     FDroidContent {
-        Settings(MutableStateFlow(MapPreferences()), {}, { })
+        val nextFLow = MutableStateFlow(System.currentTimeMillis() - TimeUnit.HOURS.toMillis(12))
+        Settings(MutableStateFlow(MapPreferences()), nextFLow, {}, { })
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
index 6386e25e2..1a8583257 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
@@ -18,6 +18,8 @@ import mu.KotlinLogging
 import org.fdroid.R
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.utils.applyNewTheme
+import org.fdroid.updates.AppUpdateWorker
+import org.fdroid.updates.UpdatesManager
 import java.io.IOException
 import java.lang.Runtime.getRuntime
 import javax.inject.Inject
@@ -25,11 +27,13 @@ import javax.inject.Inject
 @HiltViewModel
 class SettingsViewModel @Inject constructor(
     app: Application,
+    updatesManager: UpdatesManager,
     private val settingsManager: SettingsManager,
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger {}
     val prefsFlow = settingsManager.prefsFlow
+    val nextAppUpdateFlow = updatesManager.nextAppUpdateFlow
 
     init {
         viewModelScope.launch {
@@ -38,6 +42,12 @@ class SettingsViewModel @Inject constructor(
                 if (it != null) applyNewTheme(it)
             }
         }
+        viewModelScope.launch {
+            // react to auto-update changes
+            settingsManager.autoUpdateAppsFlow.drop(1).collect { enable ->
+                if (enable != null) AppUpdateWorker.scheduleOrCancel(application, enable)
+            }
+        }
     }
 
     fun onSaveLogcat(uri: Uri?) = viewModelScope.launch(Dispatchers.IO) {
diff --git a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
index 70ca1a9b8..dbb371379 100644
--- a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
@@ -12,10 +12,13 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.ForegroundInfo
 import androidx.work.NetworkType
 import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import mu.KotlinLogging
 import org.fdroid.NotificationManager
 import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_APP_INSTALLS
@@ -41,9 +44,8 @@ class AppUpdateWorker @AssistedInject constructor(
         internal const val UNIQUE_WORK_NAME_APP_UPDATE = "autoAppUpdate"
 
         @JvmStatic
-        fun scheduleOrCancel(context: Context) {
+        fun scheduleOrCancel(context: Context, doAutoUpdates: Boolean) {
             val workManager = WorkManager.getInstance(context)
-            val doAutoUpdates = true // TODO check settings, if auto-updates is on, metered network
             if (doAutoUpdates) {
                 Log.i(TAG, "scheduleOrCancel: enqueueUniquePeriodicWork")
                 val constraints = Constraints.Builder()
@@ -66,10 +68,16 @@ class AppUpdateWorker @AssistedInject constructor(
                     request = workRequest,
                 )
             } else {
-                Log.w(TAG, "Not scheduling job due to settings!")
+                Log.w(TAG, "Cancelling job due to settings!")
                 workManager.cancelUniqueWork(UNIQUE_WORK_NAME_APP_UPDATE)
             }
         }
+
+        fun getAutoUpdateWorkInfo(context: Context): Flow<WorkInfo?> {
+            return WorkManager.getInstance(context).getWorkInfosForUniqueWorkFlow(
+                UNIQUE_WORK_NAME_APP_UPDATE
+            ).map { it.getOrNull(0) }
+        }
     }
 
     private val log = KotlinLogging.logger { }
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index ec513581a..a53069e79 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -1,11 +1,14 @@
 package org.fdroid.updates
 
+import android.content.Context
 import androidx.core.os.LocaleListCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
@@ -24,6 +27,7 @@ import kotlin.math.min
 
 @Singleton
 class UpdatesManager @Inject constructor(
+    @ApplicationContext context: Context,
     private val db: FDroidDatabase,
     private val dbUpdateChecker: DbUpdateChecker,
     private val repoManager: RepoManager,
@@ -37,6 +41,14 @@ class UpdatesManager @Inject constructor(
     private val _numUpdates = MutableStateFlow(0)
     val numUpdates = _numUpdates.asStateFlow()
 
+    /**
+     * The time in milliseconds of the (earliest!) next automatic app update run.
+     * This is [Long.MAX_VALUE], if no time is known.
+     */
+    val nextAppUpdateFlow = AppUpdateWorker.getAutoUpdateWorkInfo(context).map { workInfo ->
+        workInfo?.nextScheduleTimeMillis ?: Long.MAX_VALUE
+    }
+
     val notificationStates: UpdateNotificationState
         get() = UpdateNotificationState(
             updates = updates.value?.map { update ->
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index cbdb5c11c..35f466984 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -101,6 +101,7 @@
 
 
     <string name="pref_language_summary">Opens system language settings</string>
+    <string name="pref_auto_updates_summary">Download and update apps daily when the device isn\'t being used</string>
 
     <string name="crash_report_text">An unexpected error occurred.
         This is not your fault.

From 54e3ad4d8ade52912bd296d867dd3fb705bd5e4a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 27 Oct 2025 18:00:06 -0300
Subject: [PATCH 095/180] Support for SOCKS proxy

adds a new setting and exposes the proxy in all those places where we do network requests
---
 .../org/fdroid/download/DownloadModule.kt     |  11 +-
 .../fdroid/download/DownloaderFactoryImpl.kt  |   6 +-
 .../kotlin/org/fdroid/download/ImageModel.kt  |   5 +-
 .../org/fdroid/settings/SettingsConstants.kt  |   3 +
 .../org/fdroid/settings/SettingsManager.kt    |  14 ++
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   1 +
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |   5 +-
 .../org/fdroid/ui/details/AppDetailsHeader.kt |   1 +
 .../org/fdroid/ui/details/AppDetailsItem.kt   |  23 +++-
 .../fdroid/ui/details/AppDetailsViewModel.kt  |   3 +
 .../org/fdroid/ui/details/DetailsPresenter.kt |   3 +
 .../org/fdroid/ui/details/RepoChooser.kt      |  14 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |  19 ++-
 .../org/fdroid/ui/lists/AppListViewModel.kt   |   6 +-
 .../org/fdroid/ui/repositories/RepoIcon.kt    |   5 +-
 .../ui/repositories/RepositoriesViewModel.kt  |   2 +-
 .../fdroid/ui/repositories/RepositoryItem.kt  |   5 +-
 .../org/fdroid/ui/repositories/add/AddRepo.kt |   3 +
 .../ui/repositories/add/AddRepoIntro.kt       |   4 +-
 .../repositories/add/AddRepoPreviewScreen.kt  |   6 +-
 .../ui/repositories/add/AddRepoViewModel.kt   |   7 +-
 .../ui/repositories/add/RepoPreviewHeader.kt  |   8 +-
 .../details/RepoDetailsContent.kt             |   7 +-
 .../repositories/details/RepoDetailsHeader.kt |   6 +-
 .../repositories/details/RepoDetailsInfo.kt   |   2 +
 .../details/RepoDetailsPresenter.kt           |   3 +
 .../details/RepoDetailsViewModel.kt           |   3 +
 .../org/fdroid/ui/settings/PreferenceProxy.kt | 128 ++++++++++++++++++
 .../kotlin/org/fdroid/ui/settings/Settings.kt |  12 ++
 .../org/fdroid/ui/utils/PreviewUtils.kt       |   2 +
 .../org/fdroid/updates/UpdatesManager.kt      |   5 +-
 next/src/main/res/values/strings-next.xml     |   7 +
 32 files changed, 285 insertions(+), 44 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt

diff --git a/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt b/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
index 487d2b9c9..aa4493c17 100644
--- a/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
+++ b/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
@@ -5,6 +5,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import org.fdroid.BuildConfig
+import org.fdroid.settings.SettingsManager
 import javax.inject.Singleton
 
 @Module
@@ -15,13 +16,13 @@ object DownloadModule {
 
     @Provides
     @Singleton
-    fun provideHttpManager(): HttpManager {
-        return HttpManager(userAgent = USER_AGENT)
+    fun provideHttpManager(settingsManager: SettingsManager): HttpManager {
+        return HttpManager(userAgent = USER_AGENT, proxyConfig = settingsManager.proxyConfig)
     }
 
     @Provides
     @Singleton
-    fun provideDownloaderFactory(httpManager: HttpManager): DownloaderFactory {
-        return DownloaderFactoryImpl(httpManager)
-    }
+    fun provideDownloaderFactory(
+        downloaderFactoryImpl: DownloaderFactoryImpl,
+    ): DownloaderFactory = downloaderFactoryImpl
 }
diff --git a/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt b/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
index 911ff342a..56a139eac 100644
--- a/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
+++ b/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
@@ -5,11 +5,15 @@ import android.net.Uri
 import org.fdroid.IndexFile
 import org.fdroid.database.Repository
 import org.fdroid.index.IndexFormatVersion
+import org.fdroid.settings.SettingsManager
 import java.io.File
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class DownloaderFactoryImpl @Inject constructor(
     private val httpManager: HttpManager,
+    private val settingsManager: SettingsManager,
 ) : DownloaderFactory() {
     override fun create(
         repo: Repository,
@@ -31,7 +35,7 @@ class DownloaderFactoryImpl @Inject constructor(
         val request = DownloadRequest(
             indexFile = indexFile,
             mirrors = mirrors,
-            proxy = null,
+            proxy = settingsManager.proxyConfig,
             username = repo.username,
             password = repo.password,
             tryFirstMirror = tryFirst,
diff --git a/next/src/main/kotlin/org/fdroid/download/ImageModel.kt b/next/src/main/kotlin/org/fdroid/download/ImageModel.kt
index 59181ef1a..df433a0ea 100644
--- a/next/src/main/kotlin/org/fdroid/download/ImageModel.kt
+++ b/next/src/main/kotlin/org/fdroid/download/ImageModel.kt
@@ -2,10 +2,11 @@ package org.fdroid.download
 
 import android.net.Uri
 import androidx.core.net.toUri
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.IndexFile
 import org.fdroid.database.Repository
 
-fun IndexFile.getImageModel(repository: Repository?): Any? {
+fun IndexFile.getImageModel(repository: Repository?, proxyConfig: ProxyConfig?): Any? {
     if (repository == null) return null
     val address = repository.address
     if (address.startsWith("content://") || address.startsWith("file://")) {
@@ -14,7 +15,7 @@ fun IndexFile.getImageModel(repository: Repository?): Any? {
     return DownloadRequest(
         indexFile = this,
         mirrors = repository.getMirrors(),
-        proxy = null, // TODO proxy support
+        proxy = proxyConfig,
         username = repository.username,
         password = repository.password,
     )
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
index 72ddd7459..64987a885 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -13,6 +13,9 @@ object SettingsConstants {
     const val PREF_KEY_AUTO_UPDATES = "autoUpdates"
     const val PREF_DEFAULT_AUTO_UPDATES = true
 
+    const val PREF_KEY_PROXY = "proxy"
+    const val PREF_DEFAULT_PROXY = ""
+
     const val PREF_KEY_SHOW_INCOMPATIBLE = "incompatibleVersions"
     const val PREF_DEFAULT_SHOW_INCOMPATIBLE = true
 
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index 12c007138..15e5e8f90 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.content.Context.MODE_PRIVATE
 import androidx.core.content.edit
 import dagger.hilt.android.qualifiers.ApplicationContext
+import io.ktor.client.engine.ProxyBuilder
+import io.ktor.client.engine.ProxyConfig
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
@@ -14,11 +16,13 @@ import org.fdroid.database.AppListSortOrder
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_APP_LIST_SORT_ORDER
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SHOW_INCOMPATIBLE
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
 import org.fdroid.settings.SettingsConstants.PREF_KEY_APP_LIST_SORT_ORDER
 import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_LAST_UPDATE_CHECK
+import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_KEY_SHOW_INCOMPATIBLE
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
 import org.fdroid.settings.SettingsConstants.getAppListSortOrder
@@ -61,6 +65,16 @@ class SettingsManager @Inject constructor(
     private val _lastRepoUpdateFlow = MutableStateFlow(lastRepoUpdate)
     val lastRepoUpdateFlow = _lastRepoUpdateFlow.asStateFlow()
 
+    val proxyConfig: ProxyConfig?
+        get() {
+            val proxyStr = prefs.getString(PREF_KEY_PROXY, PREF_DEFAULT_PROXY)
+            return if (proxyStr.isNullOrBlank()) null
+            else {
+                val (host, port) = proxyStr.split(':')
+                ProxyBuilder.socks(host, port.toInt())
+            }
+        }
+
     val filterIncompatible: Boolean
         get() = !prefs.getBoolean(PREF_KEY_SHOW_INCOMPATIBLE, PREF_DEFAULT_SHOW_INCOMPATIBLE)
     val appListSortOrder: AppListSortOrder
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index e570a5528..56770d421 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -250,6 +250,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
             }
             AddRepo(
                 state = viewModel.state.collectAsStateWithLifecycle().value,
+                proxyConfig = viewModel.proxyConfig,
                 onFetchRepo = viewModel::onFetchRepo,
                 onAddRepo = viewModel::addFetchedRepository,
                 onExistingRepo = { repoId ->
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index 6cf2f6809..fe3febac7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -24,6 +24,7 @@ import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallState
+import org.fdroid.settings.SettingsManager
 import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
@@ -34,6 +35,7 @@ class MyAppsViewModel @Inject constructor(
     @param:IoDispatcher private val scope: CoroutineScope,
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
+    private val settingsManager: SettingsManager,
     private val appInstallManager: AppInstallManager,
     private val updatesManager: UpdatesManager,
     private val repoManager: RepoManager,
@@ -49,6 +51,7 @@ class MyAppsViewModel @Inject constructor(
     private var installedAppsLiveData =
         db.getAppDao().getInstalledAppListItems(application.packageManager)
     private val installedAppsObserver = Observer<List<AppListItem>> { list ->
+        val proxyConfig = settingsManager.proxyConfig
         installedApps.value = list.map { app ->
             InstalledAppItem(
                 packageName = app.packageName,
@@ -56,7 +59,7 @@ class MyAppsViewModel @Inject constructor(
                 installedVersionName = app.installedVersionName ?: "???",
                 lastUpdated = app.lastUpdated,
                 iconModel = repoManager.getRepository(app.repoId)?.let { repo ->
-                    app.getIcon(localeList)?.getImageModel(repo)
+                    app.getIcon(localeList)?.getImageModel(repo, proxyConfig)
                 },
             )
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 8198f5c98..3cac3bc80 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -159,6 +159,7 @@ fun AppDetailsHeader(
         repos = item.repositories,
         currentRepoId = item.app.repoId,
         preferredRepoId = item.preferredRepoId,
+        proxy = item.proxy,
         onRepoChanged = item.actions.onRepoChanged,
         onPreferredRepoChanged = item.actions.onPreferredRepoChanged,
         modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 0c46b198c..c52aca621 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -5,6 +5,7 @@ import android.os.Build.VERSION.SDK_INT
 import androidx.activity.result.ActivityResult
 import androidx.annotation.VisibleForTesting
 import androidx.core.os.LocaleListCompat
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.database.App
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppPrefs
@@ -63,6 +64,7 @@ data class AppDetailsItem(
      */
     val noUpdatesBecauseDifferentSigner: Boolean = false,
     val authorHasMoreThanOneApp: Boolean = false,
+    val proxy: ProxyConfig?,
 ) {
     constructor(
         repository: Repository,
@@ -80,6 +82,7 @@ data class AppDetailsItem(
         noUpdatesBecauseDifferentSigner: Boolean,
         authorHasMoreThanOneApp: Boolean,
         localeList: LocaleListCompat,
+        proxy: ProxyConfig?,
     ) : this(
         app = dbApp.metadata,
         actions = actions,
@@ -89,10 +92,10 @@ data class AppDetailsItem(
         name = dbApp.name ?: "Unknown App",
         summary = dbApp.summary,
         description = getHtmlDescription(dbApp.getDescription(localeList)),
-        icon = dbApp.getIcon(localeList)?.getImageModel(repository),
-        featureGraphic = dbApp.getFeatureGraphic(localeList)?.getImageModel(repository),
+        icon = dbApp.getIcon(localeList)?.getImageModel(repository, proxy),
+        featureGraphic = dbApp.getFeatureGraphic(localeList)?.getImageModel(repository, proxy),
         phoneScreenshots = dbApp.getPhoneScreenshots(localeList).mapNotNull {
-            it.getImageModel(repository)
+            it.getImageModel(repository, proxy)
         },
         categories = dbApp.metadata.categories?.mapNotNull { categoryId ->
             val category = repository.getCategories()[categoryId] ?: return@mapNotNull null
@@ -108,11 +111,16 @@ data class AppDetailsItem(
         possibleUpdate = possibleUpdate,
         appPrefs = appPrefs,
         whatsNew = installedVersion?.getWhatsNew(localeList),
-        antiFeatures = installedVersion?.getAntiFeatures(repository, localeList)
-            ?: suggestedVersion?.getAntiFeatures(repository, localeList)
-            ?: (versions?.first()?.version as? AppVersion).getAntiFeatures(repository, localeList),
+        antiFeatures = installedVersion?.getAntiFeatures(repository, localeList, proxy)
+            ?: suggestedVersion?.getAntiFeatures(repository, localeList, proxy)
+            ?: (versions?.first()?.version as? AppVersion).getAntiFeatures(
+                repository = repository,
+                localeList = localeList,
+                proxy = proxy,
+            ),
         noUpdatesBecauseDifferentSigner = noUpdatesBecauseDifferentSigner,
         authorHasMoreThanOneApp = authorHasMoreThanOneApp,
+        proxy = proxy,
     )
 
     /**
@@ -242,12 +250,13 @@ data class AntiFeature(
 private fun AppVersion?.getAntiFeatures(
     repository: Repository,
     localeList: LocaleListCompat,
+    proxy: ProxyConfig?,
 ): List<AntiFeature>? {
     return this?.antiFeatureKeys?.mapNotNull { key ->
         val antiFeature = repository.getAntiFeatures()[key] ?: return@mapNotNull null
         AntiFeature(
             id = key,
-            icon = antiFeature.getIcon(localeList)?.getImageModel(repository),
+            icon = antiFeature.getIcon(localeList)?.getImageModel(repository, proxy),
             name = antiFeature.getName(localeList) ?: key,
             reason = getAntiFeatureReason(key, localeList),
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 06c1a7d5b..14fd8b6e7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -33,6 +33,7 @@ import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallState
+import org.fdroid.settings.SettingsManager
 import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
@@ -45,6 +46,7 @@ class AppDetailsViewModel @Inject constructor(
     private val repoManager: RepoManager,
     private val updateChecker: UpdateChecker,
     private val updatesManager: UpdatesManager,
+    private val settingsManager: SettingsManager,
     private val appInstallManager: AppInstallManager,
 ) : AndroidViewModel(app) {
     private val log = KotlinLogging.logger { }
@@ -62,6 +64,7 @@ class AppDetailsViewModel @Inject constructor(
             viewModel = this,
             packageInfoFlow = packageInfoFlow,
             currentRepoIdFlow = currentRepoIdFlow,
+            settingsManager = settingsManager,
         )
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index dcabc72ac..e162d5d2d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -17,6 +17,7 @@ import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallState
+import org.fdroid.settings.SettingsManager
 import org.fdroid.utils.sha256
 
 private const val TAG = "DetailsPresenter"
@@ -28,6 +29,7 @@ fun DetailsPresenter(
     db: FDroidDatabase,
     repoManager: RepoManager,
     updateChecker: UpdateChecker,
+    settingsManager: SettingsManager,
     appInstallManager: AppInstallManager,
     viewModel: AppDetailsViewModel,
     packageInfoFlow: StateFlow<AppInfo?>,
@@ -190,6 +192,7 @@ fun DetailsPresenter(
         noUpdatesBecauseDifferentSigner = noUpdatesBecauseDifferentSigner,
         authorHasMoreThanOneApp = authorHasMoreThanOneApp,
         localeList = locales,
+        proxy = settingsManager.proxyConfig,
     )
 }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
index 06ac40f71..b32beb3d5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.fdroid.ui.theme.FDroidContent
@@ -43,6 +44,7 @@ fun RepoChooser(
     repos: List<Repository>,
     currentRepoId: Long,
     preferredRepoId: Long,
+    proxy: ProxyConfig?,
     onRepoChanged: (Long) -> Unit,
     onPreferredRepoChanged: (Long) -> Unit,
     modifier: Modifier = Modifier,
@@ -79,7 +81,7 @@ fun RepoChooser(
                     }
                 },
                 leadingIcon = {
-                    RepoIcon(repo = currentRepo, modifier = Modifier.size(24.dp))
+                    RepoIcon(repo = currentRepo, proxy = proxy, modifier = Modifier.size(24.dp))
                 },
                 trailingIcon = {
                     if (repos.size > 1) Icon(
@@ -115,6 +117,7 @@ fun RepoChooser(
                     RepoMenuItem(
                         repo = repo,
                         isPreferred = repo.repoId == preferredRepoId,
+                        proxy = proxy,
                         onClick = {
                             onRepoChanged(repo.repoId)
                             expanded = false
@@ -140,6 +143,7 @@ fun RepoChooser(
 private fun RepoMenuItem(
     repo: Repository,
     isPreferred: Boolean,
+    proxy: ProxyConfig?,
     modifier: Modifier = Modifier,
     onClick: () -> Unit
 ) {
@@ -152,7 +156,7 @@ private fun RepoMenuItem(
         },
         modifier = modifier,
         onClick = onClick,
-        leadingIcon = { RepoIcon(repo, Modifier.size(24.dp)) }
+        leadingIcon = { RepoIcon(repo, proxy, Modifier.size(24.dp)) }
     )
 }
 
@@ -172,7 +176,7 @@ private fun getRepoString(repo: Repository, isPreferred: Boolean) = buildAnnotat
 fun RepoChooserSingleRepoPreview() {
     val repo1 = Repository(1L, "1", 1L, TWO, "null", 1L, 1, 1L)
     FDroidContent(pureBlack = true) {
-        RepoChooser(listOf(repo1), 1L, 1L, {}, {})
+        RepoChooser(listOf(repo1), 1L, 1L, null, {}, {})
     }
 }
 
@@ -183,7 +187,7 @@ fun RepoChooserPreview() {
     val repo2 = Repository(2L, "2", 2L, TWO, "null", 2L, 2, 2L)
     val repo3 = Repository(3L, "2", 3L, TWO, "null", 3L, 3, 3L)
     FDroidContent(pureBlack = true) {
-        RepoChooser(listOf(repo1, repo2, repo3), 1L, 1L, {}, {})
+        RepoChooser(listOf(repo1, repo2, repo3), 1L, 1L, null, {}, {})
     }
 }
 
@@ -194,6 +198,6 @@ fun RepoChooserNightPreview() {
     val repo2 = Repository(2L, "2", 2L, TWO, "null", 2L, 2, 2L)
     val repo3 = Repository(3L, "2", 3L, TWO, "null", 3L, 3, 3L)
     FDroidContent(pureBlack = true) {
-        RepoChooser(listOf(repo1, repo2, repo3), 1L, 2L, {}, {})
+        RepoChooser(listOf(repo1, repo2, repo3), 1L, 2L, null, {}, {})
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 00ea6ae95..8436ea34b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -11,6 +11,7 @@ import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
+import io.ktor.client.engine.ProxyConfig
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -41,7 +42,7 @@ class DiscoverViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
     updatesManager: UpdatesManager,
-    settingsManager: SettingsManager,
+    private val settingsManager: SettingsManager,
     private val repoManager: RepoManager,
     @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
@@ -52,15 +53,17 @@ class DiscoverViewModel @Inject constructor(
 
     val numUpdates = updatesManager.numUpdates
     val newApps = db.getAppDao().getNewAppsFlow().map { list ->
+        val proxyConfig = settingsManager.proxyConfig
         list.mapNotNull {
             val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
-            it.toAppDiscoverItem(repository)
+            it.toAppDiscoverItem(repository, proxyConfig)
         }
     }
     val recentlyUpdatedApps = db.getAppDao().getRecentlyUpdatedAppsFlow().map { list ->
+        val proxyConfig = settingsManager.proxyConfig
         list.mapNotNull {
             val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
-            it.toAppDiscoverItem(repository)
+            it.toAppDiscoverItem(repository, proxyConfig)
         }
     }
     private val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
@@ -108,6 +111,7 @@ class DiscoverViewModel @Inject constructor(
         log.info { "Searching for: $query" }
         val timedApps = measureTimedValue {
             try {
+                val proxyConfig = settingsManager.proxyConfig
                 db.getAppDao().getAppSearchItems(query).sortedDescending().mapNotNull {
                     val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
                     AppListItem(
@@ -117,7 +121,7 @@ class DiscoverViewModel @Inject constructor(
                         summary = it.summary.getBestLocale(localeList) ?: "",
                         lastUpdated = it.lastUpdated,
                         isCompatible = true, // doesn't matter here, as we don't filter
-                        iconModel = it.getIcon(localeList)?.getImageModel(repository),
+                        iconModel = it.getIcon(localeList)?.getImageModel(repository, proxyConfig),
                         categoryIds = it.categories?.toSet(),
                     )
                 }
@@ -144,10 +148,13 @@ class DiscoverViewModel @Inject constructor(
         searchResults.value = null
     }
 
-    private fun AppOverviewItem.toAppDiscoverItem(repository: Repository) = AppDiscoverItem(
+    private fun AppOverviewItem.toAppDiscoverItem(
+        repository: Repository,
+        proxyConfig: ProxyConfig?,
+    ) = AppDiscoverItem(
         packageName = packageName,
         name = getName(localeList) ?: "Unknown App",
         lastUpdated = lastUpdated,
-        imageModel = getIcon(localeList)?.getImageModel(repository),
+        imageModel = getIcon(localeList)?.getImageModel(repository, proxyConfig),
     )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 561aab9f5..42f0424ea 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -57,8 +57,9 @@ class AppListViewModel @Inject constructor(
         }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
     private val repositories = repoManager.repositoriesState.map { repositories ->
+        val proxyConfig = settingsManager.proxyConfig
         repositories.mapNotNull {
-            if (it.enabled) RepositoryItem(it, localeList)
+            if (it.enabled) RepositoryItem(it, localeList, proxyConfig)
             else null
         }.sortedBy { it.weight }
     }
@@ -102,6 +103,7 @@ class AppListViewModel @Inject constructor(
     @WorkerThread
     private suspend fun loadApps(type: AppListType): List<AppListItem> {
         val appDao = db.getAppDao()
+        val proxyConfig = settingsManager.proxyConfig
         return when (type) {
             is AppListType.Author -> appDao.getAppsByAuthor(type.authorName)
             is AppListType.Category -> appDao.getAppsByCategory(type.categoryId)
@@ -119,7 +121,7 @@ class AppListViewModel @Inject constructor(
                 summary = it.getSummary(localeList) ?: "Unknown",
                 lastUpdated = it.lastUpdated,
                 isCompatible = it.isCompatible,
-                iconModel = it.getIcon(localeList)?.getImageModel(repository),
+                iconModel = it.getIcon(localeList)?.getImageModel(repository, proxyConfig),
                 categoryIds = it.categories?.toSet(),
             )
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
index a131b349b..e9d893433 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
@@ -4,15 +4,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.core.os.LocaleListCompat
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.download.getImageModel
 import org.fdroid.ui.utils.AsyncShimmerImage
 
 @Composable
-fun RepoIcon(repo: Repository, modifier: Modifier = Modifier) {
+fun RepoIcon(repo: Repository, proxy: ProxyConfig?, modifier: Modifier = Modifier) {
     AsyncShimmerImage(
-        model = repo.getIcon(LocaleListCompat.getDefault())?.getImageModel(repo),
+        model = repo.getIcon(LocaleListCompat.getDefault())?.getImageModel(repo, proxy),
         contentDescription = null,
         error = painterResource(R.drawable.ic_repo_app_default),
         modifier = modifier,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index a053195c4..fe64391ae 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -66,7 +66,7 @@ class RepositoriesViewModel @Inject constructor(
         repos.update {
             repositories.mapNotNull {
                 if (it.isArchiveRepo) null
-                else RepositoryItem(it, localeList)
+                else RepositoryItem(it, localeList, settingsManager.proxyConfig)
             }
         }
         repoSortingMap.update {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
index 381bc2b57..95178cab7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
@@ -1,6 +1,7 @@
 package org.fdroid.ui.repositories
 
 import androidx.core.os.LocaleListCompat
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.database.Repository
 import org.fdroid.download.getImageModel
 
@@ -14,11 +15,11 @@ data class RepositoryItem(
     val weight: Int,
     val enabled: Boolean,
 ) {
-    constructor(repo: Repository, localeList: LocaleListCompat) : this(
+    constructor(repo: Repository, localeList: LocaleListCompat, proxy: ProxyConfig?) : this(
         repoId = repo.repoId,
         address = repo.address,
         name = repo.getName(localeList) ?: "Unknown Repo",
-        icon = repo.getIcon(localeList)?.getImageModel(repo),
+        icon = repo.getIcon(localeList)?.getImageModel(repo, proxy),
         timestamp = repo.timestamp,
         lastUpdated = repo.lastUpdated,
         weight = repo.weight,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
index 0f5688b5a..e663c8bba 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.core.os.LocaleListCompat
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.index.IndexUpdateResult
 import org.fdroid.repo.AddRepoError
@@ -30,6 +31,7 @@ import org.fdroid.repo.RepoUpdateWorker
 @Composable
 fun AddRepo(
     state: AddRepoState,
+    proxyConfig: ProxyConfig?,
     onFetchRepo: (String) -> Unit,
     onAddRepo: () -> Unit,
     onExistingRepo: (Long) -> Unit,
@@ -73,6 +75,7 @@ fun AddRepo(
                 } else {
                     AddRepoPreviewScreen(
                         state = state,
+                        proxyConfig = proxyConfig,
                         onAddRepo = onAddRepo,
                         onExistingRepo = onExistingRepo,
                         modifier = Modifier.padding(paddingValues),
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
index e7b5705c4..de22b8408 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
@@ -228,7 +228,7 @@ fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modi
 @Preview
 private fun Preview() {
     FDroidContent {
-        AddRepo(None, {}, {}, {}, { _, _ -> }) {}
+        AddRepo(None, null, {}, {}, {}, { _, _ -> }) {}
     }
 }
 
@@ -236,6 +236,6 @@ private fun Preview() {
 @Preview(uiMode = UI_MODE_NIGHT_YES, widthDp = 720, heightDp = 360)
 private fun PreviewNight() {
     FDroidContent {
-        AddRepo(None, {}, {}, {}, { _, _ -> }) {}
+        AddRepo(None, null, {}, {}, {}, { _, _ -> }) {}
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
index b13e15546..a32b0d6f3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.database.MinimalApp
 import org.fdroid.download.getImageModel
@@ -34,6 +35,7 @@ import org.fdroid.ui.utils.getRepository
 @Composable
 fun AddRepoPreviewScreen(
     state: Fetching,
+    proxyConfig: ProxyConfig?,
     modifier: Modifier = Modifier,
     onAddRepo: () -> Unit,
     onExistingRepo: (Long) -> Unit,
@@ -48,6 +50,7 @@ fun AddRepoPreviewScreen(
         item {
             RepoPreviewHeader(
                 state = state,
+                proxyConfig = proxyConfig,
                 onAddRepo = onAddRepo,
                 onExistingRepo = onExistingRepo,
                 modifier = Modifier
@@ -88,7 +91,7 @@ fun AddRepoPreviewScreen(
                     packageName = app.packageName,
                     name = app.name ?: "Unknown app",
                     summary = app.summary ?: "",
-                    iconModel = app.getIcon(localeList)?.getImageModel(repo),
+                    iconModel = app.getIcon(localeList)?.getImageModel(repo, proxyConfig),
                     lastUpdated = 1L,
                     isCompatible = true,
                 )
@@ -137,6 +140,7 @@ private fun Preview() {
     FDroidContent(pureBlack = true) {
         AddRepoPreviewScreen(
             Fetching(address, repo, listOf(app1, app2, app3), IsNewRepository),
+            proxyConfig = null,
             onAddRepo = { },
             onExistingRepo = {},
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
index 1de9e87f3..542f634be 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
@@ -8,17 +8,21 @@ import kotlinx.coroutines.flow.StateFlow
 import mu.KotlinLogging
 import org.fdroid.index.RepoManager
 import org.fdroid.repo.AddRepoState
+import org.fdroid.settings.SettingsManager
 import javax.inject.Inject
 
 @HiltViewModel
 class AddRepoViewModel @Inject constructor(
     app: Application,
     private val repoManager: RepoManager,
+    private val settingsManager: SettingsManager,
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger { }
     val state: StateFlow<AddRepoState> = repoManager.addRepoState
 
+    val proxyConfig = settingsManager.proxyConfig
+
     override fun onCleared() {
         log.info { "onCleared() abort adding repository" }
         repoManager.abortAddingRepository()
@@ -30,8 +34,7 @@ class AddRepoViewModel @Inject constructor(
             // TODO full only
         } else {
             repoManager.abortAddingRepository()
-            // TODO support proxy
-            repoManager.fetchRepositoryPreview(uri.toString(), proxy = null)
+            repoManager.fetchRepositoryPreview(uri.toString(), settingsManager.proxyConfig)
         }
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
index c7df4589e..84a66fcb0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.repo.FetchResult.IsExistingMirror
@@ -40,6 +41,7 @@ import org.fdroid.ui.utils.getRepository
 @Composable
 fun RepoPreviewHeader(
     state: Fetching,
+    proxyConfig: ProxyConfig?,
     onAddRepo: () -> Unit,
     onExistingRepo: (Long) -> Unit,
     modifier: Modifier = Modifier,
@@ -86,7 +88,7 @@ fun RepoPreviewHeader(
             horizontalArrangement = spacedBy(16.dp),
             verticalAlignment = CenterVertically,
         ) {
-            RepoIcon(repo, Modifier.size(48.dp))
+            RepoIcon(repo, proxyConfig, Modifier.size(48.dp))
             Column(horizontalAlignment = Alignment.Start) {
                 Text(
                     text = repo.getName(localeList) ?: "Unknown Repository",
@@ -151,6 +153,7 @@ fun RepoPreviewScreenNewMirrorPreview() {
             onAddRepo = { },
             onExistingRepo = {},
             localeList = LocaleListCompat.getDefault(),
+            proxyConfig = null,
         )
     }
 }
@@ -170,6 +173,7 @@ fun RepoPreviewScreenNewRepoAndNewMirrorPreview() {
             onAddRepo = { },
             onExistingRepo = {},
             localeList = LocaleListCompat.getDefault(),
+            proxyConfig = null,
         )
     }
 }
@@ -185,6 +189,7 @@ fun RepoPreviewScreenExistingRepoPreview() {
             onAddRepo = { },
             onExistingRepo = {},
             localeList = LocaleListCompat.getDefault(),
+            proxyConfig = null,
         )
     }
 }
@@ -199,6 +204,7 @@ fun RepoPreviewScreenExistingMirrorPreview() {
             onAddRepo = { },
             onExistingRepo = {},
             localeList = LocaleListCompat.getDefault(),
+            proxyConfig = null,
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
index 035ab0161..75e12929e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
@@ -38,7 +38,12 @@ fun RepoDetailsContent(
             .fillMaxWidth()
             .verticalScroll(rememberScrollState()),
     ) {
-        RepoDetailsHeader(repo, info.model.numberApps, onShowAppsClicked)
+        RepoDetailsHeader(
+            repo = repo,
+            numberOfApps = info.model.numberApps,
+            proxy = info.model.proxy,
+            onShowAppsClicked = onShowAppsClicked,
+        )
         if (info.model.showOfficialMirrors) {
             OfficialMirrors(
                 mirrors = info.model.officialMirrors,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
index 2deecf1b2..5d6f97153 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
@@ -20,6 +20,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.fdroid.ui.theme.FDroidContent
@@ -33,6 +34,7 @@ import org.fdroid.ui.utils.getRepository
 fun RepoDetailsHeader(
     repo: Repository,
     numberOfApps: Int?,
+    proxy: ProxyConfig?,
     onShowAppsClicked: (String, Long) -> Unit,
 ) {
     val localeList = LocaleListCompat.getDefault()
@@ -59,7 +61,7 @@ fun RepoDetailsHeader(
         Row(
             horizontalArrangement = spacedBy(8.dp),
         ) {
-            RepoIcon(repo, Modifier.size(64.dp))
+            RepoIcon(repo, proxy, Modifier.size(64.dp))
             Column(horizontalAlignment = Alignment.Start) {
                 Text(
                     text = name,
@@ -110,6 +112,6 @@ fun RepoDetailsHeader(
 @Composable
 private fun Preview() {
     FDroidContent {
-        RepoDetailsHeader(getRepository(), 45) { _, _ -> }
+        RepoDetailsHeader(getRepository(), 45, null) { _, _ -> }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
index af5010b72..2b68468d2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.Intent.ACTION_SEND
 import android.content.Intent.EXTRA_TEXT
 import android.graphics.Bitmap
+import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
@@ -39,6 +40,7 @@ data class RepoDetailsModel(
     val userMirrors: List<UserMirrorItem>,
     val archiveState: ArchiveState,
     val showOnboarding: Boolean,
+    val proxy: ProxyConfig?,
 ) {
     /**
      * The repo's address is currently also an official mirror.
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
index 11d7fd8c4..fa96d2f29 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
@@ -2,6 +2,7 @@ package org.fdroid.ui.repositories.details
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import io.ktor.client.engine.ProxyConfig
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.Repository
@@ -12,6 +13,7 @@ fun RepoDetailsPresenter(
     numAppsFlow: Flow<Int?>,
     archiveStateFlow: StateFlow<ArchiveState>,
     showOnboardingFlow: StateFlow<Boolean>,
+    proxyConfig: ProxyConfig?,
 ): RepoDetailsModel {
     val repo = repoFlow.collectAsState(null).value
     return RepoDetailsModel(
@@ -30,5 +32,6 @@ fun RepoDetailsPresenter(
         } ?: emptyList(),
         archiveState = archiveStateFlow.collectAsState().value,
         showOnboarding = showOnboardingFlow.collectAsState().value,
+        proxy = proxyConfig,
     )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
index 85c112b54..a79bf0593 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
@@ -27,6 +27,7 @@ import org.fdroid.download.Mirror
 import org.fdroid.index.RepoManager
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.OnboardingManager
+import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.repositories.details.ArchiveState.UNKNOWN
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
@@ -36,6 +37,7 @@ class RepoDetailsViewModel @Inject constructor(
     app: Application,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
+    private val settingsManager: SettingsManager,
     private val onboardingManager: OnboardingManager,
     @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app), RepoDetailsActions {
@@ -60,6 +62,7 @@ class RepoDetailsViewModel @Inject constructor(
             numAppsFlow = numAppsFlow,
             archiveStateFlow = archiveStateFlow,
             showOnboardingFlow = showOnboarding,
+            proxyConfig = settingsManager.proxyConfig,
         )
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt b/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
new file mode 100644
index 000000000..478294700
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
@@ -0,0 +1,128 @@
+package org.fdroid.ui.settings
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material.icons.filled.VpnLock
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
+import me.zhanghai.compose.preference.ProvidePreferenceLocals
+import me.zhanghai.compose.preference.textFieldPreference
+import org.fdroid.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY
+import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
+import java.net.InetSocketAddress
+
+fun LazyListScope.preferenceProxy(
+    proxyState: MutableState<String>,
+    showError: MutableState<Boolean>,
+) {
+    textFieldPreference(
+        key = PREF_KEY_PROXY,
+        defaultValue = PREF_DEFAULT_PROXY,
+        rememberState = { proxyState },
+        icon = {
+            Icon(
+                imageVector = Icons.Default.VpnLock,
+                contentDescription = null,
+            )
+        },
+        title = {
+            Text(stringResource(R.string.pref_proxy_title))
+        },
+        summary = {
+            val value = proxyState.value
+            val s = if (value.isBlank()) {
+                stringResource(R.string.pref_proxy_disabled)
+            } else {
+                stringResource(R.string.pref_proxy_enabled, value)
+            }
+            Text(s)
+        },
+        textToValue = {
+            if (it.isBlank() || isProxyValid(it)) {
+                showError.value = false
+                it
+            } else {
+                showError.value = true
+                // null is currently treated as an error and won't cause an update
+                null
+            }
+        },
+        textField = { value, onValueChange, onOk ->
+            OutlinedTextField(
+                value = value,
+                onValueChange = onValueChange,
+                modifier = Modifier.fillMaxWidth(),
+                keyboardActions = KeyboardActions { onOk() },
+                singleLine = true,
+                trailingIcon = {
+                    if (value.text.isNotBlank()) {
+                        IconButton(onClick = { onValueChange(TextFieldValue("")) }) {
+                            Icon(Icons.Default.Clear, stringResource(R.string.clear))
+                        }
+                    }
+                },
+                isError = showError.value,
+                supportingText = {
+                    val s = if (showError.value) {
+                        stringResource(R.string.pref_proxy_error)
+                    } else {
+                        stringResource(R.string.pref_proxy_hint)
+                    }
+                    Text(s)
+                },
+            )
+        },
+    )
+}
+
+private fun isProxyValid(proxyStr: String): Boolean = try {
+    val (host, port) = proxyStr.split(':')
+    InetSocketAddress.createUnresolved(host, port.toInt())
+    true
+} catch (_: Exception) {
+    false
+}
+
+@Preview
+@Composable
+private fun PreviewDefault() {
+    FDroidContent {
+        ProvidePreferenceLocals {
+            val showProxyError = remember { mutableStateOf(false) }
+            val proxyState = remember { mutableStateOf(PREF_DEFAULT_PROXY) }
+            LazyColumn {
+                preferenceProxy(proxyState, showProxyError)
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun PreviewProxySet() {
+    FDroidContent {
+        ProvidePreferenceLocals {
+            val showProxyError = remember { mutableStateOf(false) }
+            val proxyState = remember { mutableStateOf("127.0.0.1:8000") }
+            LazyColumn {
+                preferenceProxy(proxyState, showProxyError)
+            }
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index 43f7f9f28..97aefe508 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -30,6 +30,8 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalResources
@@ -45,12 +47,15 @@ import me.zhanghai.compose.preference.ProvidePreferenceLocals
 import me.zhanghai.compose.preference.listPreference
 import me.zhanghai.compose.preference.preference
 import me.zhanghai.compose.preference.preferenceCategory
+import me.zhanghai.compose.preference.rememberPreferenceState
 import me.zhanghai.compose.preference.switchPreference
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_AUTO_UPDATES
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
 import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES
+import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.utils.getLogName
@@ -87,6 +92,8 @@ fun Settings(
         val context = LocalContext.current
         val res = LocalResources.current
         ProvidePreferenceLocals(prefsFlow) {
+            val showProxyError = remember { mutableStateOf(false) }
+            val proxyState = rememberPreferenceState(PREF_KEY_PROXY, PREF_DEFAULT_PROXY)
             LazyColumn(
                 modifier = Modifier
                     .padding(paddingValues)
@@ -196,6 +203,11 @@ fun Settings(
                         Text(s)
                     },
                 )
+                preferenceCategory(
+                    key = "pref_category_network",
+                    title = { Text(stringResource(R.string.pref_category_network)) },
+                )
+                preferenceProxy(proxyState, showProxyError)
                 item {
                     OutlinedButton(
                         onClick = { launcher.launch("${getLogName(context)}.txt") },
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index c606324b5..44dda4c3a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -214,6 +214,7 @@ val testApp = AppDetailsItem(
     installedVersion = testVersion2,
     suggestedVersion = null,
     possibleUpdate = testVersion1,
+    proxy = null,
 )
 
 fun getPreviewVersion(versionName: String, size: Long? = null) = object : PackageVersion {
@@ -302,6 +303,7 @@ fun getRepoDetailsInfo(
         ),
         archiveState = ArchiveState.LOADING,
         showOnboarding = false,
+        proxy = null,
     ),
 ) = object : RepoDetailsInfo {
     override val model = model
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index a53069e79..32fe6e48e 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -19,6 +19,7 @@ import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
+import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.apps.AppUpdateItem
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
@@ -30,6 +31,7 @@ class UpdatesManager @Inject constructor(
     @ApplicationContext context: Context,
     private val db: FDroidDatabase,
     private val dbUpdateChecker: DbUpdateChecker,
+    private val settingsManager: SettingsManager,
     private val repoManager: RepoManager,
     private val appInstallManager: AppInstallManager,
     @param:IoDispatcher private val coroutineScope: CoroutineScope,
@@ -70,6 +72,7 @@ class UpdatesManager @Inject constructor(
         val localeList = LocaleListCompat.getDefault()
         val updates = try {
             log.info { "Checking for updates..." }
+            val proxyConfig = settingsManager.proxyConfig
             dbUpdateChecker.getUpdatableApps(onlyFromPreferredRepo = true).map { update ->
                 AppUpdateItem(
                     repoId = update.repoId,
@@ -79,7 +82,7 @@ class UpdatesManager @Inject constructor(
                     update = update.update,
                     whatsNew = update.update.getWhatsNew(localeList),
                     iconModel = repoManager.getRepository(update.repoId)?.let { repo ->
-                        update.getIcon(localeList)?.getImageModel(repo)
+                        update.getIcon(localeList)?.getImageModel(repo, proxyConfig)
                     },
                 )
             }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 35f466984..cc9b64aa9 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -92,6 +92,7 @@
     <string name="onboarding_app_list_filter_title">Filter</string>
     <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
     <string name="got_it">Got it</string>
+    <string name="clear">Clear</string>
     <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
     <string name="repo_last_update_upstream">Last update: %s</string>
     <string name="repo_basicauth_username">Username</string>
@@ -102,6 +103,12 @@
 
     <string name="pref_language_summary">Opens system language settings</string>
     <string name="pref_auto_updates_summary">Download and update apps daily when the device isn\'t being used</string>
+    <string name="pref_category_network">Network</string>
+    <string name="pref_proxy_title">Connect via SOCKS proxy</string>
+    <string name="pref_proxy_disabled">Connect to the internet without proxy</string>
+    <string name="pref_proxy_enabled">Uses proxy %s to connect</string>
+    <string name="pref_proxy_hint">Proxy is expected in host:port format.</string>
+    <string name="pref_proxy_error">Proxy format invalid</string>
 
     <string name="crash_report_text">An unexpected error occurred.
         This is not your fault.

From eec143c5fa32a13dcfb18e8cde44605656699661 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 28 Oct 2025 10:12:18 -0300
Subject: [PATCH 096/180] Don't do a test crash when long tapping the version
 number

in the about screen
---
 next/src/main/kotlin/org/fdroid/ui/About.kt   | 37 +++++++++----------
 .../fdroid/ui/discover/DiscoverViewModel.kt   |  3 ++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
index dd12018c1..52cb4b767 100644
--- a/next/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -3,7 +3,6 @@ package org.fdroid.ui
 import android.content.res.Configuration
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -12,6 +11,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -65,11 +65,13 @@ fun About(onBackClicked: () -> Unit) {
                 .verticalScroll(scrollableState)
         ) {
             AboutHeader(modifier = Modifier.padding(top = 32.dp))
-            Text(
-                text = stringResource(R.string.about_text),
-                style = MaterialTheme.typography.bodyLarge,
-                modifier = Modifier.padding(top = 24.dp),
-            )
+            SelectionContainer {
+                Text(
+                    text = stringResource(R.string.about_text),
+                    style = MaterialTheme.typography.bodyLarge,
+                    modifier = Modifier.padding(top = 24.dp),
+                )
+            }
             Column(modifier = Modifier.padding(top = 24.dp, bottom = 16.dp)) {
                 val uriHandler = LocalUriHandler.current
                 Text(
@@ -109,20 +111,15 @@ fun AboutHeader(modifier: Modifier = Modifier) {
             painter = painterResource(id = R.drawable.ic_launcher),
             contentDescription = null, // decorative element
         )
-        Text(
-            text = "${stringResource(R.string.about_version)} $VERSION_NAME",
-            style = MaterialTheme.typography.bodyLarge,
-            modifier = Modifier
-                .padding(top = 16.dp)
-                .alpha(0.75f)
-                .combinedClickable(
-                    onClick = { },
-                    onLongClick = {
-                        // intentional crash for testing crash reporter, could be moved elsewhere
-                        error("BOOOM!")
-                    },
-                )
-        )
+        SelectionContainer {
+            Text(
+                text = "${stringResource(R.string.about_version)} $VERSION_NAME",
+                style = MaterialTheme.typography.bodyLarge,
+                modifier = Modifier
+                    .padding(top = 16.dp)
+                    .alpha(0.75f)
+            )
+        }
     }
 }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 8436ea34b..3d239a051 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -89,6 +89,9 @@ class DiscoverViewModel @Inject constructor(
     }
 
     suspend fun search(term: String) = withContext(ioScope.coroutineContext) {
+        // we need a way to make the app crash for testing, e.g. the crash reporter
+        if (term == "CrashMe") error("BOOOOOOOOM!!!")
+
         val sanitized = term.replace(Regex.fromLiteral("\""), "")
         val splits = sanitized.split(' ').filter { it.isNotBlank() }
         val query = splits.joinToString(" AND ") { word ->

From 7d1b194fe709f1f9658b48e96bc2600a6b9f892c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 28 Oct 2025 10:23:32 -0300
Subject: [PATCH 097/180] Add preference for checking for app updates

and show time of next update check
---
 next/src/main/kotlin/org/fdroid/App.kt        |   2 +-
 .../org/fdroid/repo/RepoUpdateWorker.kt       |  47 ++++----
 .../org/fdroid/settings/SettingsConstants.kt  |   3 +
 .../org/fdroid/settings/SettingsManager.kt    |  11 +-
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   3 +-
 .../kotlin/org/fdroid/ui/settings/Settings.kt | 113 +++++++++++++-----
 .../org/fdroid/ui/settings/SettingsModel.kt   |  11 ++
 .../fdroid/ui/settings/SettingsViewModel.kt   |  15 ++-
 .../org/fdroid/updates/UpdatesManager.kt      |   9 ++
 next/src/main/res/values/strings-next.xml     |   6 +-
 10 files changed, 164 insertions(+), 56 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt

diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index 4f02367cd..0e66df2f5 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -95,7 +95,7 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
         // bail out here if we are the ACRA process to not initialize anything in crash process
         if (ACRA.isACRASenderServiceProcess()) return
 
-        RepoUpdateWorker.scheduleOrCancel(applicationContext)
+        RepoUpdateWorker.scheduleOrCancel(applicationContext, settingsManager.repoUpdates)
         AppUpdateWorker.scheduleOrCancel(applicationContext, settingsManager.autoUpdateApps)
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
index aa18aa70d..e18465dbe 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
@@ -63,28 +63,33 @@ class RepoUpdateWorker @AssistedInject constructor(
         }
 
         @JvmStatic
-        fun scheduleOrCancel(context: Context) {
+        fun scheduleOrCancel(context: Context, enabled: Boolean) {
             val workManager = WorkManager.getInstance(context)
-            Log.i(TAG, "scheduleOrCancel: enqueueUniquePeriodicWork")
-            val networkType = NetworkType.UNMETERED
-            val constraints = Constraints.Builder()
-                .setRequiresBatteryNotLow(true)
-                .setRequiresStorageNotLow(true)
-                .setRequiredNetworkType(networkType)
-                .build()
-            val workRequest = PeriodicWorkRequestBuilder<RepoUpdateWorker>(
-                repeatInterval = 4,
-                repeatIntervalTimeUnit = TimeUnit.HOURS,
-                flexTimeInterval = 15,
-                flexTimeIntervalUnit = MINUTES,
-            )
-                .setConstraints(constraints)
-                .build()
-            workManager.enqueueUniquePeriodicWork(
-                UNIQUE_WORK_NAME_REPO_AUTO_UPDATE,
-                UPDATE,
-                workRequest,
-            )
+            if (enabled) {
+                Log.i(TAG, "scheduleOrCancel: enqueueUniquePeriodicWork")
+                val networkType = NetworkType.UNMETERED
+                val constraints = Constraints.Builder()
+                    .setRequiresBatteryNotLow(true)
+                    .setRequiresStorageNotLow(true)
+                    .setRequiredNetworkType(networkType)
+                    .build()
+                val workRequest = PeriodicWorkRequestBuilder<RepoUpdateWorker>(
+                    repeatInterval = 4,
+                    repeatIntervalTimeUnit = TimeUnit.HOURS,
+                    flexTimeInterval = 15,
+                    flexTimeIntervalUnit = MINUTES,
+                )
+                    .setConstraints(constraints)
+                    .build()
+                workManager.enqueueUniquePeriodicWork(
+                    UNIQUE_WORK_NAME_REPO_AUTO_UPDATE,
+                    UPDATE,
+                    workRequest,
+                )
+            } else {
+                Log.w(TAG, "Cancelling job due to settings!")
+                workManager.cancelUniqueWork(UNIQUE_WORK_NAME_REPO_AUTO_UPDATE)
+            }
         }
 
         fun getAutoUpdateWorkInfo(context: Context): Flow<WorkInfo?> {
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
index 64987a885..15f7a21e5 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -10,6 +10,9 @@ object SettingsConstants {
     const val PREF_KEY_THEME = "theme"
     const val PREF_DEFAULT_THEME = "followSystem"
 
+    const val PREF_KEY_REPO_UPDATES = "repoUpdates"
+    const val PREF_DEFAULT_REPO_UPDATES = true
+
     const val PREF_KEY_AUTO_UPDATES = "autoUpdates"
     const val PREF_DEFAULT_AUTO_UPDATES = true
 
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index 15e5e8f90..6cf1f638c 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -8,6 +8,7 @@ import io.ktor.client.engine.ProxyBuilder
 import io.ktor.client.engine.ProxyConfig
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import me.zhanghai.compose.preference.createPreferenceFlow
@@ -17,12 +18,14 @@ import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_APP_LIST_SORT_ORDER
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_REPO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SHOW_INCOMPATIBLE
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
 import org.fdroid.settings.SettingsConstants.PREF_KEY_APP_LIST_SORT_ORDER
 import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_LAST_UPDATE_CHECK
 import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
+import org.fdroid.settings.SettingsConstants.PREF_KEY_REPO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_SHOW_INCOMPATIBLE
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
 import org.fdroid.settings.SettingsConstants.getAppListSortOrder
@@ -46,9 +49,13 @@ class SettingsManager @Inject constructor(
      */
     val prefsFlow by lazy { createPreferenceFlow(prefs) }
     val theme get() = prefs.getString(PREF_KEY_THEME, PREF_DEFAULT_THEME)!!
-    val themeFlow = prefsFlow.map { it.get<String>(PREF_KEY_THEME) }
+    val themeFlow = prefsFlow.map { it.get<String>(PREF_KEY_THEME) }.distinctUntilChanged()
+    val repoUpdates get() = prefs.getBoolean(PREF_KEY_REPO_UPDATES, PREF_DEFAULT_REPO_UPDATES)
+    val repoUpdatesFlow
+        get() = prefsFlow.map { it.get<Boolean>(PREF_KEY_REPO_UPDATES) }.distinctUntilChanged()
     val autoUpdateApps get() = prefs.getBoolean(PREF_KEY_AUTO_UPDATES, PREF_DEFAULT_AUTO_UPDATES)
-    val autoUpdateAppsFlow get() = prefsFlow.map { it.get<Boolean>(PREF_KEY_AUTO_UPDATES) }
+    val autoUpdateAppsFlow
+        get() = prefsFlow.map { it.get<Boolean>(PREF_KEY_AUTO_UPDATES) }.distinctUntilChanged()
     var lastRepoUpdate: Long
         get() = try {
             prefs.getInt(PREF_KEY_LAST_UPDATE_CHECK, PREF_DEFAULT_LAST_UPDATE_CHECK)
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 56770d421..b30aec20f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -269,8 +269,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
         entry(NavigationKey.Settings) {
             val viewModel = hiltViewModel<SettingsViewModel>()
             Settings(
-                prefsFlow = viewModel.prefsFlow,
-                nextAppUpdateFlow = viewModel.nextAppUpdateFlow,
+                model = viewModel.model,
                 onSaveLogcat = {
                     viewModel.onSaveLogcat(it)
                     backStack.removeLastOrNull()
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index 97aefe508..239d67305 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -18,12 +18,16 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.BrightnessMedium
 import androidx.compose.material.icons.filled.Notifications
 import androidx.compose.material.icons.filled.Save
+import androidx.compose.material.icons.filled.SystemSecurityUpdate
+import androidx.compose.material.icons.filled.SystemSecurityUpdateWarning
 import androidx.compose.material.icons.filled.Translate
 import androidx.compose.material.icons.filled.Update
+import androidx.compose.material.icons.filled.UpdateDisabled
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -39,10 +43,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import me.zhanghai.compose.preference.MapPreferences
-import me.zhanghai.compose.preference.Preferences
 import me.zhanghai.compose.preference.ProvidePreferenceLocals
 import me.zhanghai.compose.preference.listPreference
 import me.zhanghai.compose.preference.preference
@@ -53,19 +55,21 @@ import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_REPO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
 import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
+import org.fdroid.settings.SettingsConstants.PREF_KEY_REPO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.utils.getLogName
-import java.util.concurrent.TimeUnit
+import java.lang.System.currentTimeMillis
+import java.util.concurrent.TimeUnit.HOURS
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun Settings(
-    prefsFlow: MutableStateFlow<Preferences>,
-    nextAppUpdateFlow: Flow<Long>,
+    model: SettingsModel,
     onSaveLogcat: (Uri?) -> Unit,
     onBackClicked: () -> Unit,
 ) {
@@ -91,7 +95,7 @@ fun Settings(
         }
         val context = LocalContext.current
         val res = LocalResources.current
-        ProvidePreferenceLocals(prefsFlow) {
+        ProvidePreferenceLocals(model.prefsFlow) {
             val showProxyError = remember { mutableStateOf(false) }
             val proxyState = rememberPreferenceState(PREF_KEY_PROXY, PREF_DEFAULT_PROXY)
             LazyColumn(
@@ -112,7 +116,6 @@ fun Settings(
                             else -> error("Unknown value: $value")
                         }
                     )
-
                 }
                 listPreference(
                     key = PREF_KEY_THEME,
@@ -170,36 +173,88 @@ fun Settings(
                     key = "pref_category_updates",
                     title = { Text(stringResource(R.string.updates)) },
                 )
+                switchPreference(
+                    key = PREF_KEY_REPO_UPDATES,
+                    defaultValue = PREF_DEFAULT_REPO_UPDATES,
+                    title = {
+                        Text(stringResource(R.string.pref_repo_updates_title))
+                    },
+                    icon = { repoUpdatesEnabled ->
+                        if (repoUpdatesEnabled) Icon(
+                            imageVector = Icons.Default.SystemSecurityUpdate,
+                            contentDescription = null,
+                        ) else Icon(
+                            imageVector = Icons.Default.SystemSecurityUpdateWarning,
+                            contentDescription = null,
+                            tint = MaterialTheme.colorScheme.error,
+                        )
+                    },
+                    summary = { repoUpdatesEnabled ->
+                        if (repoUpdatesEnabled) {
+                            val nextUpdate =
+                                model.nextRepoUpdateFlow.collectAsState(Long.MAX_VALUE).value
+                            val nextUpdateStr = if (nextUpdate == Long.MAX_VALUE) {
+                                stringResource(
+                                    R.string.auto_update_time,
+                                    stringResource(R.string.repositories_last_update_never)
+                                )
+                            } else if (nextUpdate - currentTimeMillis() <= 0) {
+                                stringResource(R.string.auto_update_time_past)
+                            } else {
+                                stringResource(
+                                    R.string.auto_update_time,
+                                    nextUpdate.asRelativeTimeString()
+                                )
+                            }
+                            val s = stringResource(R.string.pref_repo_updates_summary_enabled) +
+                                "\n\n" + nextUpdateStr
+                            Text(s)
+                        } else {
+                            Text(
+                                text = stringResource(R.string.pref_repo_updates_summary_disabled),
+                                color = MaterialTheme.colorScheme.error,
+                            )
+                        }
+                    },
+                )
                 switchPreference(
                     key = PREF_KEY_AUTO_UPDATES,
                     defaultValue = PREF_DEFAULT_AUTO_UPDATES,
                     title = {
                         Text(stringResource(R.string.update_auto_install))
                     },
-                    icon = {
+                    icon = { autoUpdatesEnabled ->
                         Icon(
-                            imageVector = Icons.Default.Update,
+                            imageVector = if (autoUpdatesEnabled) {
+                                Icons.Default.Update
+                            } else {
+                                Icons.Default.UpdateDisabled
+                            },
                             contentDescription = null,
                         )
                     },
-                    summary = {
-                        val nextUpdate = nextAppUpdateFlow.collectAsState(Long.MAX_VALUE).value
-                        val nextUpdateStr = if (nextUpdate == Long.MAX_VALUE) {
-                            stringResource(
-                                R.string.auto_update_time,
-                                stringResource(R.string.repositories_last_update_never)
-                            )
-                        } else if (nextUpdate - System.currentTimeMillis() <= 0) {
-                            stringResource(R.string.auto_update_time_past)
+                    summary = { autoUpdatesEnabled ->
+                        val s = if (autoUpdatesEnabled) {
+                            val nextUpdate =
+                                model.nextAppUpdateFlow.collectAsState(Long.MAX_VALUE).value
+                            val nextUpdateStr = if (nextUpdate == Long.MAX_VALUE) {
+                                stringResource(
+                                    R.string.auto_update_time,
+                                    stringResource(R.string.repositories_last_update_never)
+                                )
+                            } else if (nextUpdate - currentTimeMillis() <= 0) {
+                                stringResource(R.string.auto_update_time_past)
+                            } else {
+                                stringResource(
+                                    R.string.auto_update_time,
+                                    nextUpdate.asRelativeTimeString()
+                                )
+                            }
+                            stringResource(R.string.pref_auto_updates_summary_enabled) +
+                                "\n\n" + nextUpdateStr
                         } else {
-                            stringResource(
-                                R.string.auto_update_time,
-                                nextUpdate.asRelativeTimeString()
-                            )
+                            stringResource(R.string.pref_auto_updates_summary_disabled)
                         }
-                        val s = stringResource(R.string.pref_auto_updates_summary) +
-                            "\n\n" +
-                            nextUpdateStr
                         Text(s)
                     },
                 )
@@ -230,7 +285,11 @@ fun Settings(
 @Composable
 fun SettingsPreview() {
     FDroidContent {
-        val nextFLow = MutableStateFlow(System.currentTimeMillis() - TimeUnit.HOURS.toMillis(12))
-        Settings(MutableStateFlow(MapPreferences()), nextFLow, {}, { })
+        val model = SettingsModel(
+            prefsFlow = MutableStateFlow(MapPreferences()),
+            nextRepoUpdateFlow = MutableStateFlow(Long.MAX_VALUE),
+            nextAppUpdateFlow = MutableStateFlow(currentTimeMillis() - HOURS.toMillis(12)),
+        )
+        Settings(model, {}, { })
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt
new file mode 100644
index 000000000..33b8d0f8b
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt
@@ -0,0 +1,11 @@
+package org.fdroid.ui.settings
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import me.zhanghai.compose.preference.Preferences
+
+data class SettingsModel(
+    val prefsFlow: MutableStateFlow<Preferences>,
+    val nextRepoUpdateFlow: Flow<Long>,
+    val nextAppUpdateFlow: Flow<Long>,
+)
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
index 1a8583257..e9572c8ef 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mu.KotlinLogging
 import org.fdroid.R
+import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.utils.applyNewTheme
 import org.fdroid.updates.AppUpdateWorker
@@ -32,8 +33,12 @@ class SettingsViewModel @Inject constructor(
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger {}
-    val prefsFlow = settingsManager.prefsFlow
-    val nextAppUpdateFlow = updatesManager.nextAppUpdateFlow
+
+    val model = SettingsModel(
+        prefsFlow = settingsManager.prefsFlow,
+        nextRepoUpdateFlow = updatesManager.nextRepoUpdateFlow,
+        nextAppUpdateFlow = updatesManager.nextAppUpdateFlow,
+    )
 
     init {
         viewModelScope.launch {
@@ -42,6 +47,12 @@ class SettingsViewModel @Inject constructor(
                 if (it != null) applyNewTheme(it)
             }
         }
+        viewModelScope.launch {
+            // react to repo-update changes
+            settingsManager.repoUpdatesFlow.drop(1).collect { enable ->
+                if (enable != null) RepoUpdateWorker.scheduleOrCancel(application, enable)
+            }
+        }
         viewModelScope.launch {
             // react to auto-update changes
             settingsManager.autoUpdateAppsFlow.drop(1).collect { enable ->
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 32fe6e48e..10111dce4 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -19,6 +19,7 @@ import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
+import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.apps.AppUpdateItem
 import org.fdroid.utils.IoDispatcher
@@ -43,6 +44,14 @@ class UpdatesManager @Inject constructor(
     private val _numUpdates = MutableStateFlow(0)
     val numUpdates = _numUpdates.asStateFlow()
 
+    /**
+     * The time in milliseconds of the (earliest!) next repository update run.
+     * This is [Long.MAX_VALUE], if no time is known.
+     */
+    val nextRepoUpdateFlow = RepoUpdateWorker.getAutoUpdateWorkInfo(context).map { workInfo ->
+        workInfo?.nextScheduleTimeMillis ?: Long.MAX_VALUE
+    }
+
     /**
      * The time in milliseconds of the (earliest!) next automatic app update run.
      * This is [Long.MAX_VALUE], if no time is known.
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index cc9b64aa9..5e98f9d6a 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -102,7 +102,11 @@
 
 
     <string name="pref_language_summary">Opens system language settings</string>
-    <string name="pref_auto_updates_summary">Download and update apps daily when the device isn\'t being used</string>
+    <string name="pref_auto_updates_summary_enabled">Download and update apps daily when the device isn\'t being used</string>
+    <string name="pref_auto_updates_summary_disabled">Auto-updates disabled • Apps will need to be updated manually</string>
+    <string name="pref_repo_updates_title">Check for updates</string>
+    <string name="pref_repo_updates_summary_enabled">Automatically ask all repositories for app updates</string>
+    <string name="pref_repo_updates_summary_disabled">Do NOT check for updates • Apps will become outdated</string>
     <string name="pref_category_network">Network</string>
     <string name="pref_proxy_title">Connect via SOCKS proxy</string>
     <string name="pref_proxy_disabled">Connect to the internet without proxy</string>

From 43a9574c4a502f541587d27c6ce8714b86f54ce1 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 29 Oct 2025 12:06:37 -0300
Subject: [PATCH 098/180] Support sharing APK files

---
 next/build.gradle.kts                         |   1 +
 .../org/fdroid/install/ApkFileProviderTest.kt |  71 +++++++++++
 next/src/main/AndroidManifest.xml             |   5 +
 .../org/fdroid/install/ApkFileProvider.kt     | 113 ++++++++++++++++++
 .../org/fdroid/ui/details/AppDetailsItem.kt   |   2 +-
 .../org/fdroid/ui/details/AppDetailsMenu.kt   |   9 +-
 .../org/fdroid/ui/details/DetailsPresenter.kt |   7 +-
 .../org/fdroid/ui/utils/PreviewUtils.kt       |   2 +-
 8 files changed, 206 insertions(+), 4 deletions(-)
 create mode 100644 next/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt

diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 2cdefcd3b..da44dbd42 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -105,6 +105,7 @@ dependencies {
     testImplementation(libs.robolectric)
     testImplementation(libs.slf4j.simple)
 
+    androidTestImplementation(kotlin("test"))
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))
diff --git a/next/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt b/next/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt
new file mode 100644
index 000000000..2247aef09
--- /dev/null
+++ b/next/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt
@@ -0,0 +1,71 @@
+package org.fdroid.install
+
+import android.content.pm.ApplicationInfo.FLAG_SYSTEM
+import android.provider.MediaStore.MediaColumns.DISPLAY_NAME
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import mu.KotlinLogging
+import org.fdroid.install.ApkFileProvider.Companion.getIntent
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import kotlin.test.assertEquals
+import kotlin.test.fail
+
+@RunWith(AndroidJUnit4::class)
+class ApkFileProviderTest {
+
+    private val log = KotlinLogging.logger {}
+    private val context = InstrumentationRegistry.getInstrumentation().targetContext
+    private val pm = context.packageManager
+
+    private val packageInfoList
+        get() = pm.getInstalledPackages(0).filter {
+            val info = it.applicationInfo ?: return@filter false
+            (info.flags and FLAG_SYSTEM) == 0
+        }.sortedBy {
+            val path = it.applicationInfo?.publicSourceDir ?: return@sortedBy Long.MAX_VALUE
+            File(path).length()
+        }.subList(0, 3) // just test with the three smallest apps
+
+    /**
+     * Test whether reading installed APKs via our custom [android.content.ContentProvider] works.
+     * It also only copies max 3 apps so it doesn't take a long time to run.
+     */
+    @Test
+    fun testCopyFromGetUri() {
+        for (packageInfo in packageInfoList) {
+            val applicationInfo = packageInfo.applicationInfo ?: fail()
+            val apk = File(applicationInfo.publicSourceDir)
+            val uri = getIntent(packageInfo.packageName).data ?: fail()
+            val test = FileOutputStream("/dev/null")
+            val numBytesCopied = context.contentResolver.openInputStream(uri)?.use { inputStream ->
+                inputStream.copyTo(test)
+            } ?: fail()
+            assertEquals(apk.length(), numBytesCopied)
+            log.info {
+                "${packageInfo.packageName} read $numBytesCopied bytes from ${apk.absolutePath}"
+            }
+        }
+    }
+
+    /**
+     * Test whether querying the custom [android.content.ContentProvider] for installed APKs
+     * returns the right kind of data.
+     */
+    @Test
+    @Throws(IOException::class)
+    fun testQuery() {
+        for (packageInfo in packageInfoList) {
+            val uri = getIntent(packageInfo.packageName).data ?: fail()
+            context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
+                assertEquals(1, cursor.count)
+                cursor.moveToFirst()
+                val name = cursor.getString(cursor.getColumnIndex(DISPLAY_NAME))
+                assertEquals("${packageInfo.packageName}.apk", name)
+            } ?: fail()
+        }
+    }
+}
diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
index 1a473af94..cf22d92b6 100644
--- a/next/src/main/AndroidManifest.xml
+++ b/next/src/main/AndroidManifest.xml
@@ -114,6 +114,11 @@
             android:name="androidx.work.impl.foreground.SystemForegroundService"
             android:foregroundServiceType="dataSync"
             tools:node="merge" />
+        <provider
+            android:name="org.fdroid.install.ApkFileProvider"
+            android:authorities="${applicationId}.install.ApkFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true" />
         <!-- disable WorkManager initialization, needed for Hilt -->
         <provider
             android:name="androidx.startup.InitializationProvider"
diff --git a/next/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt b/next/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt
new file mode 100644
index 000000000..9ce95c706
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt
@@ -0,0 +1,113 @@
+package org.fdroid.install
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.content.Intent
+import android.content.Intent.ACTION_SEND
+import android.content.Intent.EXTRA_STREAM
+import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.database.Cursor
+import android.database.MatrixCursor
+import android.net.Uri
+import android.os.ParcelFileDescriptor
+import android.os.ParcelFileDescriptor.MODE_READ_ONLY
+import android.provider.MediaStore.MediaColumns
+import androidx.core.net.toUri
+import mu.KotlinLogging
+import org.fdroid.BuildConfig.APPLICATION_ID
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+
+class ApkFileProvider : ContentProvider() {
+
+    companion object {
+        private const val AUTHORITY = "${APPLICATION_ID}.install.ApkFileProvider"
+        private const val MIME_TYPE = "application/vnd.android.package-archive"
+
+        private fun getUri(packageName: String): Uri {
+            return "content://$AUTHORITY/$packageName.apk".toUri()
+        }
+
+        fun getIntent(packageName: String) = Intent(ACTION_SEND).apply {
+            setDataAndType(getUri(packageName), MIME_TYPE)
+            putExtra(EXTRA_STREAM, data)
+            setFlags(FLAG_GRANT_READ_URI_PERMISSION)
+        }
+    }
+
+    private val log = KotlinLogging.logger {}
+
+    override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor? {
+        log.info { "openFile $uri $mode" }
+        if (mode != "r") return null
+
+        val applicationInfo = getApplicationInfo(uri) ?: throw FileNotFoundException()
+        try {
+            val apkFile = File(applicationInfo.publicSourceDir)
+            return ParcelFileDescriptor.open(apkFile, MODE_READ_ONLY)
+        } catch (e: IOException) {
+            throw FileNotFoundException(e.localizedMessage)
+        }
+    }
+
+    override fun query(
+        uri: Uri,
+        projection: Array<out String>?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+        sortOrder: String?,
+    ): Cursor? {
+        val packageName = uri.lastPathSegment ?: return null
+        val applicationInfo = getApplicationInfo(uri) ?: return null
+        // we don't care what they are asking for, just give them this
+        val columns = arrayOf(
+            MediaColumns.DISPLAY_NAME,
+            MediaColumns.MIME_TYPE,
+            MediaColumns.DATA,
+            MediaColumns.SIZE,
+        )
+        return MatrixCursor(columns).apply {
+            try {
+                addRow(
+                    arrayOf<Any?>(
+                        packageName,
+                        MIME_TYPE,
+                        applicationInfo.publicSourceDir,
+                        File(applicationInfo.publicSourceDir).length(),
+                    )
+                )
+            } catch (e: Exception) {
+                log.error(e) { "Error returning cursor: " }
+                return null
+            }
+        }
+    }
+
+    @Throws(PackageManager.NameNotFoundException::class)
+    private fun getApplicationInfo(uri: Uri): ApplicationInfo? {
+        val packageManager = context?.packageManager ?: return null
+        val packageName = uri.lastPathSegment?.removeSuffix(".apk") ?: return null
+        return try {
+            packageManager.getApplicationInfo(packageName, 0)
+        } catch (e: Exception) {
+            log.error(e) { "Error getting ApplicationInfo: " }
+            null
+        }
+    }
+
+    override fun onCreate(): Boolean = true
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int = 0
+    override fun getType(uri: Uri): String = MIME_TYPE
+    override fun getTypeAnonymous(uri: Uri): String = MIME_TYPE
+    override fun insert(uri: Uri, values: ContentValues?): Uri? = null
+
+    override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+    ): Int = 0
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index c52aca621..eaf4bd45f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -218,7 +218,7 @@ class AppDetailsActions(
     val allowBetaVersions: () -> Unit,
     val ignoreAllUpdates: (() -> Unit)? = null,
     val ignoreThisUpdate: (() -> Unit)? = null,
-    val shareApk: (() -> Unit)? = null,
+    val shareApk: Intent? = null,
     val uninstallIntent: Intent? = null,
     val launchIntent: Intent? = null,
     val shareIntent: Intent? = null,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
index 115cca8c4..d42c4f497 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
@@ -1,5 +1,6 @@
 package org.fdroid.ui.details
 
+import android.content.Intent
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
@@ -14,6 +15,8 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import org.fdroid.R
@@ -26,6 +29,8 @@ fun AppDetailsMenu(
     expanded: Boolean,
     onDismiss: () -> Unit,
 ) {
+    val res = LocalResources.current
+    val context = LocalContext.current
     val uninstallLauncher = rememberLauncherForActivityResult(StartActivityForResult()) {
         item.actions.onUninstallResult(item.app.packageName, it)
     }
@@ -88,7 +93,9 @@ fun AppDetailsMenu(
             },
             text = { Text(stringResource(R.string.menu_share_apk)) },
             onClick = {
-                item.actions.shareApk()
+                val s = res.getString(R.string.menu_share_apk)
+                val i = Intent.createChooser(item.actions.shareApk, s)
+                context.startActivity(i)
                 onDismiss()
             },
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index e162d5d2d..1938d9717 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -15,6 +15,7 @@ import org.fdroid.UpdateChecker
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
+import org.fdroid.install.ApkFileProvider
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallState
 import org.fdroid.settings.SettingsManager
@@ -157,7 +158,11 @@ fun DetailsPresenter(
             } else {
                 viewModel::ignoreThisUpdate
             },
-            shareApk = null, // TODO
+            shareApk = if (installedVersionCode == null) {
+                null
+            } else {
+                ApkFileProvider.getIntent(packageName)
+            },
             uninstallIntent = packageInfo?.let {
                 Intent(Intent.ACTION_DELETE).apply {
                     setData(Uri.fromParts("package", it.packageName, null))
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 44dda4c3a..1b7d79615 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -138,7 +138,7 @@ val testApp = AppDetailsItem(
         allowBetaVersions = {},
         ignoreAllUpdates = {},
         ignoreThisUpdate = {},
-        shareApk = {},
+        shareApk = Intent(),
         uninstallIntent = Intent(),
         launchIntent = Intent(),
         shareIntent = Intent(),

From b4b5da6c72397875791eaf5171aa4bbce411d5ac Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 29 Oct 2025 16:58:10 -0300
Subject: [PATCH 099/180] Show repo chooser only if * app is in more than one
 repo, or * app is from a non-default repo

---
 .../kotlin/org/fdroid/db/DatabaseModule.kt    |  6 +-
 .../main/kotlin/org/fdroid/db/InitialData.kt  | 65 +++-------------
 .../kotlin/org/fdroid/repo/RepoPreLoader.kt   | 76 +++++++++++++++++++
 .../org/fdroid/ui/details/AppDetailsItem.kt   |  3 +-
 .../fdroid/ui/details/AppDetailsViewModel.kt  |  3 +
 .../org/fdroid/ui/details/DetailsPresenter.kt | 12 ++-
 6 files changed, 104 insertions(+), 61 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt

diff --git a/next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt b/next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
index 3b44a33fd..80ae0f43a 100644
--- a/next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
+++ b/next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
@@ -15,8 +15,10 @@ import javax.inject.Singleton
 object DatabaseModule {
     @Provides
     @Singleton
-    fun provideFDroidDatabase(@ApplicationContext context: Context): FDroidDatabase {
-        val initialData = InitialData(context)
+    fun provideFDroidDatabase(
+        @ApplicationContext context: Context,
+        initialData: InitialData,
+    ): FDroidDatabase {
         return FDroidDatabaseHolder.getDb(context, "fdroid_db", initialData)
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/db/InitialData.kt b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
index 6d451fefc..0c2b1085a 100644
--- a/next/src/main/kotlin/org/fdroid/db/InitialData.kt
+++ b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
@@ -1,66 +1,21 @@
 package org.fdroid.db
 
 import android.content.Context
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.decodeFromStream
+import dagger.hilt.android.qualifiers.ApplicationContext
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.FDroidFixture
-import org.fdroid.database.InitialRepository
-import org.fdroid.database.RepositoryDao
+import org.fdroid.repo.RepoPreLoader
 import org.fdroid.repo.RepoUpdateWorker
-import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
 
-class InitialData(val context: Context) : FDroidFixture {
+@Singleton
+class InitialData @Inject constructor(
+    @param:ApplicationContext private val context: Context,
+    private val repoPreLoader: RepoPreLoader,
+) : FDroidFixture {
     override fun prePopulateDb(db: FDroidDatabase) {
-        addPreloadedRepositories(db, context.packageName)
+        repoPreLoader.addPreloadedRepositories(db)
         RepoUpdateWorker.updateNow(context)
     }
-
-    @OptIn(ExperimentalSerializationApi::class)
-    private fun addPreloadedRepositories(db: FDroidDatabase, packageName: String) {
-        val defaultRepos = context.assets.open("default_repos.json").use { inputStream ->
-            Json.decodeFromStream<List<DefaultRepository>>(inputStream)
-        }
-        addRepositories(db.getRepositoryDao(), defaultRepos)
-        // "system" can be removed when minSdk is 28
-        for (root in listOf("/system", "/system_ext", "/product", "/vendor")) {
-            val romReposFile = File("$root/etc/$packageName/additional_repos.json")
-            if (romReposFile.isFile) {
-                val romRepos = romReposFile.inputStream().use { inputStream ->
-                    Json.decodeFromStream<List<DefaultRepository>>(inputStream)
-                }
-                addRepositories(db.getRepositoryDao(), romRepos)
-            }
-        }
-    }
-
-    private fun addRepositories(
-        repositoryDao: RepositoryDao,
-        repositories: List<DefaultRepository>
-    ) {
-        repositories.forEach { repository ->
-            val initialRepository = InitialRepository(
-                name = repository.name,
-                address = repository.address,
-                mirrors = repository.mirrors,
-                description = repository.description,
-                certificate = repository.certificate,
-                version = 1,
-                enabled = repository.enabled,
-            )
-            repositoryDao.insert(initialRepository)
-        }
-    }
 }
-
-@Serializable
-data class DefaultRepository(
-    val name: String,
-    val address: String,
-    val mirrors: List<String> = emptyList(),
-    val description: String,
-    val certificate: String,
-    val enabled: Boolean,
-)
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt b/next/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt
new file mode 100644
index 000000000..da07783bd
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt
@@ -0,0 +1,76 @@
+package org.fdroid.repo
+
+import android.content.Context
+import androidx.annotation.WorkerThread
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromStream
+import org.fdroid.database.FDroidDatabase
+import org.fdroid.database.InitialRepository
+import org.fdroid.database.RepositoryDao
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RepoPreLoader @Inject constructor(
+    @param:ApplicationContext private val context: Context,
+) {
+
+    @get:WorkerThread
+    val defaultRepoAddresses: Set<String> by lazy {
+        getDefaultRepos().map { it.address }.toSet()
+    }
+
+    @WorkerThread
+    @OptIn(ExperimentalSerializationApi::class)
+    fun addPreloadedRepositories(db: FDroidDatabase) {
+        addRepositories(db.getRepositoryDao(), getDefaultRepos())
+        // "system" can be removed when minSdk is 28
+        for (root in listOf("/system", "/system_ext", "/product", "/vendor")) {
+            val romReposFile = File("$root/etc/${context.packageName}/additional_repos.json")
+            if (romReposFile.isFile) {
+                val romRepos = romReposFile.inputStream().use { inputStream ->
+                    Json.decodeFromStream<List<DefaultRepository>>(inputStream)
+                }
+                addRepositories(db.getRepositoryDao(), romRepos)
+            }
+        }
+    }
+
+    @WorkerThread
+    @OptIn(ExperimentalSerializationApi::class)
+    private fun getDefaultRepos() = context.assets.open("default_repos.json").use { inputStream ->
+        Json.decodeFromStream<List<DefaultRepository>>(inputStream)
+    }
+
+    private fun addRepositories(
+        repositoryDao: RepositoryDao,
+        repositories: List<DefaultRepository>
+    ) {
+        repositories.forEach { repository ->
+            val initialRepository = InitialRepository(
+                name = repository.name,
+                address = repository.address,
+                mirrors = repository.mirrors,
+                description = repository.description,
+                certificate = repository.certificate,
+                version = 1,
+                enabled = repository.enabled,
+            )
+            repositoryDao.insert(initialRepository)
+        }
+    }
+}
+
+@Serializable
+data class DefaultRepository(
+    val name: String,
+    val address: String,
+    val mirrors: List<String> = emptyList(),
+    val description: String,
+    val certificate: String,
+    val enabled: Boolean,
+)
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index eaf4bd45f..aebd5cc35 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -28,8 +28,7 @@ data class AppDetailsItem(
      */
     val preferredRepoId: Long = app.repoId,
     /**
-     * A list of [Repository]s the app is in. If this is empty, the list doesn't matter,
-     * because the user only has one repo.
+     * A list of [Repository]s the app is in. If this is empty, we don't want to show the list.
      */
     val repositories: List<Repository> = emptyList(),
     val name: String,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 14fd8b6e7..2dc9540fb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -33,6 +33,7 @@ import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallState
+import org.fdroid.repo.RepoPreLoader
 import org.fdroid.settings.SettingsManager
 import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
@@ -44,6 +45,7 @@ class AppDetailsViewModel @Inject constructor(
     @param:IoDispatcher private val scope: CoroutineScope,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
+    private val repoPreLoader: RepoPreLoader,
     private val updateChecker: UpdateChecker,
     private val updatesManager: UpdatesManager,
     private val settingsManager: SettingsManager,
@@ -59,6 +61,7 @@ class AppDetailsViewModel @Inject constructor(
         DetailsPresenter(
             db = db,
             repoManager = repoManager,
+            repoPreLoader = repoPreLoader,
             updateChecker = updateChecker,
             appInstallManager = appInstallManager,
             viewModel = this,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 1938d9717..590aa817a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -18,6 +18,7 @@ import org.fdroid.index.RepoManager
 import org.fdroid.install.ApkFileProvider
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallState
+import org.fdroid.repo.RepoPreLoader
 import org.fdroid.settings.SettingsManager
 import org.fdroid.utils.sha256
 
@@ -29,6 +30,7 @@ private const val TAG = "DetailsPresenter"
 fun DetailsPresenter(
     db: FDroidDatabase,
     repoManager: RepoManager,
+    repoPreLoader: RepoPreLoader,
     updateChecker: UpdateChecker,
     settingsManager: SettingsManager,
     appInstallManager: AppInstallManager,
@@ -50,9 +52,15 @@ fun DetailsPresenter(
     } ?: return null
     val repo = repoManager.getRepository(app.repoId) ?: return null
     val repositories = remember(packageName) {
-        db.getAppDao().getRepositoryIdsForApp(packageName).mapNotNull { repoId ->
+        val repos = db.getAppDao().getRepositoryIdsForApp(packageName).mapNotNull { repoId ->
             repoManager.getRepository(repoId)
         }
+        // show repo chooser only if
+        // * app is in more than one repo, or
+        // * app is from a non-default repo
+        if (repos.size > 1) repos
+        else if (repo.address in repoPreLoader.defaultRepoAddresses) emptyList()
+        else repos
     }
     val installState =
         appInstallManager.getAppFlow(packageName).collectAsState(InstallState.Unknown).value
@@ -134,7 +142,7 @@ fun DetailsPresenter(
     return AppDetailsItem(
         repository = repo,
         preferredRepoId = preferredRepoId,
-        repositories = repositories, // TODO maybe use emptyList() when only in F-Droid repo
+        repositories = repositories,
         dbApp = app,
         actions = AppDetailsActions(
             installAction = viewModel::install,

From ee89b59bb01e0724a386bbdcebae3c863b957a1c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 30 Oct 2025 12:09:49 -0300
Subject: [PATCH 100/180] Improve presentation of install errors

we now show a dialog with collapsed technical error message instead of a snackbar and the "Installing" section of My apps also shows installation errors.
---
 .../org/fdroid/install/AppInstallManager.kt   | 19 ++++++++-
 .../kotlin/org/fdroid/install/InstallState.kt | 19 ++++++++-
 .../fdroid/install/SessionInstallManager.kt   |  9 ++--
 .../org/fdroid/ui/apps/InstallingAppRow.kt    | 23 ++++++++++
 .../org/fdroid/ui/apps/MyAppsPresenter.kt     | 34 +++++++--------
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |  2 +-
 .../org/fdroid/ui/details/AppDetails.kt       | 42 +++++++++++++++----
 next/src/main/res/values/strings-next.xml     |  1 +
 8 files changed, 115 insertions(+), 34 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index f19c14bd1..376438a82 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -162,7 +162,14 @@ class AppInstallManager @Inject constructor(
         )
         // continue depending on result, abort early if no approval was given
         return when (preApprovalResult) {
-            is PreApprovalResult.Error -> InstallState.Error(preApprovalResult.errorMsg)
+            is PreApprovalResult.Error -> InstallState.Error(
+                msg = preApprovalResult.errorMsg,
+                name = appMetadata.name.getBestLocale(LocaleListCompat.getDefault()) ?: "Unknown",
+                versionName = version.versionName,
+                currentVersionName = currentVersionName,
+                lastUpdated = version.added,
+                iconDownloadRequest = iconDownloadRequest,
+            )
             is PreApprovalResult.UserAborted -> InstallState.UserAborted
             is PreApprovalResult.Success, PreApprovalResult.NotSupported -> {
                 apps.checkAndUpdateApp(appMetadata.packageName) {
@@ -205,7 +212,15 @@ class AppInstallManager @Inject constructor(
                     if (e is CancellationException) throw e
                     log.error(e) { "Error downloading ${version.file}" }
                     val msg = "Download failed: ${e::class.java.simpleName} ${e.message}"
-                    return InstallState.Error(msg)
+                    return InstallState.Error(
+                        msg = msg,
+                        name = appMetadata.name.getBestLocale(LocaleListCompat.getDefault())
+                            ?: "Unknown",
+                        versionName = version.versionName,
+                        currentVersionName = currentVersionName,
+                        lastUpdated = version.added,
+                        iconDownloadRequest = iconDownloadRequest,
+                    )
                 }
                 coroutineContext.ensureActive()
                 val newState = apps.checkAndUpdateApp(appMetadata.packageName) {
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallState.kt b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
index 09790b905..da5470794 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
@@ -79,7 +79,24 @@ sealed class InstallState(val showProgress: Boolean) {
     ) : InstallStateWithInfo(false)
 
     data object UserAborted : InstallState(false)
-    data class Error(val msg: String?) : InstallState(false)
+
+    data class Error(
+        val msg: String?,
+        override val name: String,
+        override val versionName: String,
+        override val currentVersionName: String?,
+        override val lastUpdated: Long,
+        override val iconDownloadRequest: DownloadRequest?,
+    ) : InstallStateWithInfo(false) {
+        constructor(msg: String?, s: InstallStateWithInfo) : this(
+            msg = msg,
+            name = s.name,
+            versionName = s.versionName,
+            currentVersionName = s.currentVersionName,
+            lastUpdated = s.lastUpdated,
+            iconDownloadRequest = s.iconDownloadRequest,
+        )
+    }
 
     data object Uninstalled : InstallState(false)
 }
diff --git a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
index a8d346755..2e1332971 100644
--- a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
@@ -195,7 +195,8 @@ class SessionInstallManager @Inject constructor(
             }
         } catch (e: Exception) {
             log.error(e) { "Error when creating session: " }
-            cont.resume(InstallState.Error("${e::class.java.simpleName} ${e.message}"))
+            val s = InstallState.Error("${e::class.java.simpleName} ${e.message}", state)
+            cont.resume(s)
             return@suspendCancellableCoroutine
         }
         // set-up receiver for install result
@@ -248,7 +249,7 @@ class SessionInstallManager @Inject constructor(
                         )
                         cont.resume(newState)
                     } else {
-                        cont.resume(InstallState.Error(msg))
+                        cont.resume(InstallState.Error(msg, state))
                     }
                 }
             }
@@ -284,7 +285,7 @@ class SessionInstallManager @Inject constructor(
             }
         } catch (e: Exception) {
             log.error(e) { "Error during install session: " }
-            cont.resume(InstallState.Error("${e::class.java.simpleName} ${e.message}"))
+            cont.resume(InstallState.Error("${e::class.java.simpleName} ${e.message}", state))
         }
     }
 
@@ -311,7 +312,7 @@ class SessionInstallManager @Inject constructor(
                     if (status == PackageInstaller.STATUS_FAILURE_ABORTED) {
                         cont.resume(InstallState.UserAborted)
                     } else {
-                        cont.resume(InstallState.Error(msg))
+                        cont.resume(InstallState.Error(msg, installState))
                     }
                 }
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
index 305dc5ad2..7324beb7b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
@@ -1,9 +1,11 @@
 package org.fdroid.ui.apps
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.ErrorOutline
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
@@ -56,6 +58,15 @@ fun InstallingAppRow(
                         imageVector = Icons.Default.CheckCircle,
                         contentDescription = stringResource(R.string.app_installed),
                         tint = MaterialTheme.colorScheme.secondary,
+                        modifier = Modifier.padding(8.dp)
+                    )
+                } else if (app.installState is InstallState.Error) {
+                    val desc = stringResource(R.string.notification_title_summary_install_error)
+                    Icon(
+                        imageVector = Icons.Default.ErrorOutline,
+                        contentDescription = desc,
+                        tint = MaterialTheme.colorScheme.error,
+                        modifier = Modifier.padding(8.dp)
                     )
                 } else {
                     if (app.installState is InstallState.Downloading) {
@@ -103,10 +114,22 @@ private fun Preview() {
             iconDownloadRequest = null,
         )
     )
+    val installingApp3 = InstallingAppItem(
+        packageName = "A3",
+        installState = InstallState.Error(
+            msg = "error msg",
+            name = "Installing App 2",
+            versionName = "0.0.4",
+            currentVersionName = null,
+            lastUpdated = 13,
+            iconDownloadRequest = null,
+        )
+    )
     FDroidContent {
         Column {
             InstallingAppRow(installingApp1, false)
             InstallingAppRow(installingApp2, true)
+            InstallingAppRow(installingApp3, false)
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index 38d6ba881..368d3f633 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -14,41 +14,39 @@ import java.util.Locale
 
 @Composable
 fun MyAppsPresenter(
-    appInstallStatesFlow: StateFlow<Map<String, InstallState>>,
     appUpdatesFlow: StateFlow<List<AppUpdateItem>?>,
+    appInstallStatesFlow: StateFlow<Map<String, InstallState>>,
     installedAppsFlow: StateFlow<List<InstalledAppItem>?>,
     searchQueryFlow: StateFlow<String>,
     sortOrderFlow: StateFlow<AppListSortOrder>,
 ): MyAppsModel {
-    val appInstallStates = appInstallStatesFlow.collectAsState().value
     val appUpdates = appUpdatesFlow.collectAsState().value
+    val appInstallStates = appInstallStatesFlow.collectAsState().value
     val installedApps = installedAppsFlow.collectAsState().value
     val searchQuery = searchQueryFlow.collectAsState().value.normalize()
     val sortOrder = sortOrderFlow.collectAsState().value
     val processedPackageNames = mutableSetOf<String>()
 
-    // TODO process updates first
+    val updates = appUpdates?.filter {
+        val keep = searchQuery.isBlank() ||
+            it.name.normalize().contains(searchQuery, ignoreCase = true)
+        if (keep) processedPackageNames.add(it.packageName)
+        keep
+    }
     val installingApps = appInstallStates.mapNotNull { (packageName, state) ->
         if (state is InstallStateWithInfo) {
+            val keep = if (searchQuery.isBlank()) {
+                packageName !in processedPackageNames
+            } else {
+                packageName !in processedPackageNames &&
+                    state.name.normalize().contains(searchQuery, ignoreCase = true)
+            }
             processedPackageNames.add(packageName)
-            InstallingAppItem(packageName, state)
+            if (keep) InstallingAppItem(packageName, state) else null
         } else {
             null
         }
     }
-    val installing = if (searchQuery.isBlank()) installingApps else installingApps.filter {
-        it.name.normalize().contains(searchQuery, ignoreCase = true)
-    }
-    val updates = appUpdates?.filter {
-        val keep = if (searchQuery.isBlank()) {
-            it.packageName !in processedPackageNames
-        } else {
-            it.packageName !in processedPackageNames &&
-                it.name.normalize().contains(searchQuery, ignoreCase = true)
-        }
-        processedPackageNames.add(it.packageName)
-        keep
-    }
     val installed = installedApps?.filter {
         if (searchQuery.isBlank()) {
             it.packageName !in processedPackageNames
@@ -58,7 +56,7 @@ fun MyAppsPresenter(
         }
     }
     return MyAppsModel(
-        installingApps = installing.sort(sortOrder),
+        installingApps = installingApps.sort(sortOrder),
         appUpdates = updates?.sort(sortOrder),
         installedApps = installed?.sort(sortOrder),
         sortOrder = sortOrder,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index fe3febac7..9b2a774b5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -68,8 +68,8 @@ class MyAppsViewModel @Inject constructor(
     private val sortOrder = savedStateHandle.getMutableStateFlow("sort", AppListSortOrder.NAME)
     val myAppsModel: StateFlow<MyAppsModel> = moleculeScope.launchMolecule(mode = ContextClock) {
         MyAppsPresenter(
-            appInstallStatesFlow = appInstallManager.appInstallStates,
             appUpdatesFlow = updates,
+            appInstallStatesFlow = appInstallManager.appInstallStates,
             installedAppsFlow = installedApps,
             searchQueryFlow = searchQuery,
             sortOrderFlow = sortOrder,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index f4dd75735..bf4cf3fbb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -22,6 +22,7 @@ import androidx.compose.material.icons.filled.Mail
 import androidx.compose.material.icons.filled.OndemandVideo
 import androidx.compose.material.icons.filled.Person
 import androidx.compose.material.icons.filled.Translate
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ElevatedCard
@@ -29,8 +30,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
@@ -45,11 +44,11 @@ import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.fromHtml
 import androidx.compose.ui.text.style.TextAlign.Companion.Center
 import androidx.compose.ui.text.style.TextOverflow
@@ -79,9 +78,8 @@ fun AppDetails(
     onBackNav: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
-    val res = LocalResources.current
     val topAppBarState = rememberTopAppBarState()
-    val snackbarHostState = remember { SnackbarHostState() }
+    var showInstallError by remember { mutableStateOf(false) }
     val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(topAppBarState)
     if (item == null) BigLoadingIndicator()
     else Scaffold(
@@ -89,7 +87,6 @@ fun AppDetails(
         topBar = {
             AppDetailsTopAppBar(item, topAppBarState, scrollBehavior, onBackNav)
         },
-        snackbarHost = { SnackbarHost(snackbarHostState) },
     ) { innerPadding ->
         // react to install state changes
         LaunchedEffect(item.installState) {
@@ -98,8 +95,7 @@ fun AppDetails(
                 Log.i("AppDetails", "Requesting user confirmation... $state")
                 item.actions.requestUserConfirmation(item.app.packageName, state)
             } else if (state is InstallState.Error) {
-                val msg = res.getString(R.string.install_error_notify_title, state.msg ?: "")
-                snackbarHostState.showSnackbar(msg)
+                showInstallError = true
             }
         }
         val scrollState = rememberScrollState()
@@ -376,6 +372,36 @@ fun AppDetails(
             }
         }
     }
+    if (showInstallError && item != null && item.installState is InstallState.Error) AlertDialog(
+        onDismissRequest = { showInstallError = false },
+        containerColor = MaterialTheme.colorScheme.errorContainer,
+        title = {
+            Text(stringResource(R.string.install_error_notify_title, item.name))
+        },
+        text = {
+            if (item.installState.msg == null) {
+                Text(stringResource(R.string.app_details_install_error_text))
+            } else {
+                ExpandableSection(
+                    icon = null,
+                    title = stringResource(R.string.app_details_install_error_text)
+                ) {
+                    SelectionContainer {
+                        Text(
+                            text = item.installState.msg,
+                            fontFamily = FontFamily.Monospace,
+                            modifier = Modifier.padding(top = 8.dp),
+                        )
+                    }
+                }
+            }
+        },
+        confirmButton = {
+            TextButton(onClick = { showInstallError = false }) {
+                Text(stringResource(R.string.ok))
+            }
+        },
+    )
 }
 
 @Preview
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 5e98f9d6a..f227e4508 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -65,6 +65,7 @@
     <string name="architectures_colon">Architectures: %1$s</string>
     <string name="app_details_incompatible_version">Incompatible • Installation likely to fail</string>
     <string name="app_details_incompatible_signer">Signature mismatch, can\'t install</string>
+    <string name="app_details_install_error_text">Sorry! There was an unexpected error installing this app.</string>
 
     <string name="notification_title">Notifications</string>
     <string name="notification_summary">Opens system notification settings</string>

From f20781f41b2a3e6d53436f2106209860afe2e9f0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 3 Nov 2025 11:17:38 -0300
Subject: [PATCH 101/180] Don't forget scroll position in app lists

When tapping an app, viewing the app details page and then going back, then scroll position would get lost without this change.
---
 next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index f970d2598..e10e542ab 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
@@ -155,6 +156,9 @@ fun AppList(
         },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
+        val listState = rememberSaveable(saver = LazyListState.Saver) {
+            LazyListState()
+        }
         Column(
             modifier = Modifier
                 .padding(paddingValues)
@@ -171,6 +175,7 @@ fun AppList(
                         .padding(16.dp),
                 )
             } else LazyColumn(
+                state = listState,
                 contentPadding = PaddingValues(vertical = 8.dp),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
                 modifier = Modifier.then(

From ba465d147e2985be847054919fd79421aa4f2b0f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 3 Nov 2025 17:03:00 -0300
Subject: [PATCH 102/180] Fix install related bugs

Most prominently, pre-approval was broken when updating many apps at once, because the system doesn't stack the approval dialogs, so they get lost and installs stuck.
---
 .../org/fdroid/install/AppInstallManager.kt   | 249 ++++++++++++------
 .../install/InstallBroadcastReceiver.kt       |   2 +-
 .../install/InstallNotificationState.kt       |   3 +
 .../kotlin/org/fdroid/install/InstallState.kt |  27 +-
 .../org/fdroid/install/PreApprovalResult.kt   |   7 +
 .../fdroid/install/SessionInstallManager.kt   |  57 ++--
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   4 +-
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |  15 +-
 .../kotlin/org/fdroid/ui/apps/MyAppsInfo.kt   |   4 +-
 .../org/fdroid/ui/apps/MyAppsPresenter.kt     |  33 ++-
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |  12 +-
 .../fdroid/ui/details/AppDetailsViewModel.kt  |   1 +
 .../org/fdroid/ui/utils/PreviewUtils.kt       |   7 +-
 .../org/fdroid/updates/UpdatesManager.kt      |   9 +-
 14 files changed, 290 insertions(+), 140 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index 376438a82..230ec3691 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -17,6 +17,7 @@ import coil3.toBitmap
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.currentCoroutineContext
@@ -62,7 +63,7 @@ class AppInstallManager @Inject constructor(
             var numBytesDownloaded = 0L
             var numTotalBytes = 0L
             // go throw all apps that have active state
-            apps.value.toMap().forEach { packageName, state ->
+            apps.value.toMap().forEach { (packageName, state) ->
                 // assign a category to each in progress state
                 val appStateCategory = when (state) {
                     is InstallState.Installing, is InstallState.PreApproved,
@@ -101,6 +102,16 @@ class AppInstallManager @Inject constructor(
         return apps.map { it[packageName] ?: InstallState.Unknown }
     }
 
+    /**
+     * Installs the given [version].
+     *
+     * @param canAskPreApprovalNow true if there will be only one approval dialog
+     * and the app is currently in the foreground.
+     * Reasoning:
+     * The system will swallow the second or third dialog we pop up
+     * before the user could respond to the first.
+     * Also we are not allowed anymore to start other activities while in the background.
+     */
     @UiThread
     suspend fun install(
         appMetadata: AppMetadata,
@@ -108,14 +119,31 @@ class AppInstallManager @Inject constructor(
         currentVersionName: String?,
         repo: Repository,
         iconModel: Any?,
+        canAskPreApprovalNow: Boolean,
     ): InstallState {
         val packageName = appMetadata.packageName
+        val currentState = apps.value[packageName]
+        if (currentState?.showProgress == true) {
+            log.warn { "Attempted to install $packageName with install in progress: $currentState" }
+            return currentState
+        }
         val iconDownloadRequest = iconModel as? DownloadRequest
         val job = scope.async {
-            installInt(appMetadata, version, currentVersionName, repo, iconDownloadRequest)
+            startInstall(
+                appMetadata = appMetadata,
+                version = version,
+                currentVersionName = currentVersionName,
+                repo = repo,
+                iconDownloadRequest = iconDownloadRequest,
+                canAskPreApprovalNow = canAskPreApprovalNow,
+            )
         }
         // keep track of this job, in case we want to cancel it
-        jobs.put(packageName, job)
+        return trackJob(packageName, job)
+    }
+
+    private suspend fun trackJob(packageName: String, job: Deferred<InstallState>): InstallState {
+        jobs[packageName] = job
         // wait for job to return
         val result = try {
             job.await()
@@ -131,22 +159,23 @@ class AppInstallManager @Inject constructor(
     }
 
     @WorkerThread
-    private suspend fun installInt(
+    private suspend fun startInstall(
         appMetadata: AppMetadata,
         version: AppVersion,
         currentVersionName: String?,
         repo: Repository,
         iconDownloadRequest: DownloadRequest?,
+        canAskPreApprovalNow: Boolean,
     ): InstallState {
-        apps.updateApp(appMetadata.packageName) {
-            InstallState.Starting(
-                name = appMetadata.name.getBestLocale(LocaleListCompat.getDefault()) ?: "Unknown",
-                versionName = version.versionName,
-                currentVersionName = currentVersionName,
-                lastUpdated = version.added,
-                iconDownloadRequest = iconDownloadRequest,
-            )
-        }
+        val startingState = InstallState.Starting(
+            name = appMetadata.name.getBestLocale(LocaleListCompat.getDefault()) ?: "Unknown",
+            versionName = version.versionName,
+            currentVersionName = currentVersionName,
+            lastUpdated = version.added,
+            iconDownloadRequest = iconDownloadRequest,
+        )
+        apps.updateApp(appMetadata.packageName) { startingState }
+        log.info { "Started install of ${appMetadata.packageName}" }
         onStatesUpdated()
         val coroutineContext = currentCoroutineContext()
         // get the icon for pre-approval (usually in memory cache, so should be quick)
@@ -159,20 +188,14 @@ class AppInstallManager @Inject constructor(
             icon = icon,
             isUpdate = currentVersionName != null,
             version = version,
+            canRequestUserConfirmationNow = canAskPreApprovalNow,
         )
+        log.info { "Got pre-approval result $preApprovalResult for ${appMetadata.packageName}" }
         // continue depending on result, abort early if no approval was given
         return when (preApprovalResult) {
-            is PreApprovalResult.Error -> InstallState.Error(
-                msg = preApprovalResult.errorMsg,
-                name = appMetadata.name.getBestLocale(LocaleListCompat.getDefault()) ?: "Unknown",
-                versionName = version.versionName,
-                currentVersionName = currentVersionName,
-                lastUpdated = version.added,
-                iconDownloadRequest = iconDownloadRequest,
-            )
             is PreApprovalResult.UserAborted -> InstallState.UserAborted
             is PreApprovalResult.Success, PreApprovalResult.NotSupported -> {
-                apps.checkAndUpdateApp(appMetadata.packageName) {
+                val newState = apps.checkAndUpdateApp(appMetadata.packageName) {
                     InstallState.PreApproved(
                         name = it.name,
                         versionName = it.versionName,
@@ -181,69 +204,127 @@ class AppInstallManager @Inject constructor(
                         iconDownloadRequest = it.iconDownloadRequest,
                         result = preApprovalResult,
                     )
-                }
-                val sessionId = (preApprovalResult as? PreApprovalResult.Success)?.sessionId
-                coroutineContext.ensureActive()
-                // download file
-                val file = File(context.cacheDir, version.file.sha256)
-                val uri = getUri(repo.address, version.file)
-                val downloader = downloaderFactory.create(repo, uri, version.file, file)
-                val now = System.currentTimeMillis()
-                downloader.setListener { bytesRead, totalBytes ->
-                    coroutineContext.ensureActive()
-                    apps.checkAndUpdateApp(appMetadata.packageName) {
-                        InstallState.Downloading(
-                            name = it.name,
-                            versionName = it.versionName,
-                            currentVersionName = it.currentVersionName,
-                            lastUpdated = it.lastUpdated,
-                            iconDownloadRequest = it.iconDownloadRequest,
-                            downloadedBytes = bytesRead,
-                            totalBytes = totalBytes,
-                            startMillis = now,
-                        )
-                    }
-                    onStatesUpdated()
-                }
-                try {
-                    downloader.download()
-                    log.debug { "Download completed" }
-                } catch (e: Exception) {
-                    if (e is CancellationException) throw e
-                    log.error(e) { "Error downloading ${version.file}" }
-                    val msg = "Download failed: ${e::class.java.simpleName} ${e.message}"
-                    return InstallState.Error(
-                        msg = msg,
-                        name = appMetadata.name.getBestLocale(LocaleListCompat.getDefault())
-                            ?: "Unknown",
-                        versionName = version.versionName,
-                        currentVersionName = currentVersionName,
-                        lastUpdated = version.added,
-                        iconDownloadRequest = iconDownloadRequest,
-                    )
-                }
-                coroutineContext.ensureActive()
-                val newState = apps.checkAndUpdateApp(appMetadata.packageName) {
-                    InstallState.Installing(
-                        name = it.name,
-                        versionName = it.versionName,
-                        currentVersionName = it.currentVersionName,
-                        lastUpdated = it.lastUpdated,
-                        iconDownloadRequest = it.iconDownloadRequest,
-                    )
-                }
-                val result =
-                    sessionInstallManager.install(sessionId, version.packageName, newState, file)
-                if (result is InstallState.PreApproved &&
-                    result.result is PreApprovalResult.Error
-                ) {
-                    // if pre-approval failed (e.g. due to app label mismatch),
-                    // then try to install again, this time not using the pre-approved session
-                    sessionInstallManager.install(null, version.packageName, newState, file)
-                } else {
-                    result
-                }
+                } as InstallState.PreApproved
+                downloadAndInstall(newState, version, currentVersionName, repo, iconDownloadRequest)
             }
+            is PreApprovalResult.UserConfirmationRequired -> {
+                InstallState.PreApprovalConfirmationNeeded(
+                    state = startingState,
+                    version = version,
+                    repo = repo,
+                    sessionId = preApprovalResult.sessionId,
+                    intent = preApprovalResult.intent,
+                )
+            }
+            is PreApprovalResult.Error -> InstallState.Error(
+                msg = preApprovalResult.errorMsg,
+                s = startingState,
+            )
+        }
+    }
+
+    /**
+     * Request user confirmation for pre-approval and suspend until we get a result.
+     */
+    @UiThread
+    suspend fun requestPreApprovalConfirmation(
+        packageName: String,
+        installState: InstallState.PreApprovalConfirmationNeeded,
+    ): InstallState? {
+        val state = apps.value[packageName] ?: error("No state for $packageName $installState")
+        if (state !is InstallState.PreApprovalConfirmationNeeded) {
+            log.error { "Unexpected state: $state" }
+            return null
+        }
+        log.info { "Requesting pre-approval confirmation for $packageName" }
+        val result = sessionInstallManager.requestUserConfirmation(installState)
+        log.info { "Pre-approval confirmation for $packageName $result" }
+        apps.updateApp(packageName) { result }
+        onStatesUpdated()
+        return if (result is InstallState.PreApproved) {
+            // move us off the UiThread, so we can download/install this app now
+            val job = scope.async {
+                downloadAndInstall(
+                    state = result,
+                    version = installState.version,
+                    currentVersionName = installState.currentVersionName,
+                    repo = installState.repo,
+                    iconDownloadRequest = installState.iconDownloadRequest,
+                )
+            }
+            // suspend/wait for this job and track it in case we want to cancel it
+            return trackJob(packageName, job)
+        } else result
+    }
+
+    @WorkerThread
+    private suspend fun downloadAndInstall(
+        state: InstallState.PreApproved,
+        version: AppVersion,
+        currentVersionName: String?,
+        repo: Repository,
+        iconDownloadRequest: DownloadRequest?,
+    ): InstallState {
+        val sessionId = (state.result as? PreApprovalResult.Success)?.sessionId
+        val coroutineContext = currentCoroutineContext()
+        coroutineContext.ensureActive()
+        // download file
+        val file = File(context.cacheDir, version.file.sha256)
+        val uri = getUri(repo.address, version.file)
+        val downloader = downloaderFactory.create(repo, uri, version.file, file)
+        val now = System.currentTimeMillis()
+        downloader.setListener { bytesRead, totalBytes ->
+            coroutineContext.ensureActive()
+            apps.checkAndUpdateApp(version.packageName) {
+                InstallState.Downloading(
+                    name = it.name,
+                    versionName = it.versionName,
+                    currentVersionName = it.currentVersionName,
+                    lastUpdated = it.lastUpdated,
+                    iconDownloadRequest = it.iconDownloadRequest,
+                    downloadedBytes = bytesRead,
+                    totalBytes = totalBytes,
+                    startMillis = now,
+                )
+            }
+            onStatesUpdated()
+        }
+        try {
+            downloader.download()
+            log.debug { "Download completed" }
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+            log.error(e) { "Error downloading ${version.file}" }
+            val msg = "Download failed: ${e::class.java.simpleName} ${e.message}"
+            return InstallState.Error(
+                msg = msg,
+                name = state.name,
+                versionName = version.versionName,
+                currentVersionName = currentVersionName,
+                lastUpdated = version.added,
+                iconDownloadRequest = iconDownloadRequest,
+            )
+        }
+        currentCoroutineContext().ensureActive()
+        val newState = apps.checkAndUpdateApp(version.packageName) {
+            InstallState.Installing(
+                name = it.name,
+                versionName = it.versionName,
+                currentVersionName = it.currentVersionName,
+                lastUpdated = it.lastUpdated,
+                iconDownloadRequest = it.iconDownloadRequest,
+            )
+        }
+        val result =
+            sessionInstallManager.install(sessionId, version.packageName, newState, file)
+        return if (result is InstallState.PreApproved &&
+            result.result is PreApprovalResult.Error
+        ) {
+            // if pre-approval failed (e.g. due to app label mismatch),
+            // then try to install again, this time not using the pre-approved session
+            sessionInstallManager.install(null, version.packageName, newState, file)
+        } else {
+            result
         }
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt b/next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
index 6878d05cc..e8d16bb86 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
@@ -32,7 +32,7 @@ class InstallBroadcastReceiver(
         }
         val confirmIntent = getParcelableExtra(intent, EXTRA_INTENT, Intent::class.java)
         val packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME)
-        val status = intent.getIntExtra(EXTRA_STATUS, Int.Companion.MIN_VALUE)
+        val status = intent.getIntExtra(EXTRA_STATUS, Int.MIN_VALUE)
         val msg = intent.getStringExtra(EXTRA_STATUS_MESSAGE)
         val warnings = intent.getStringArrayListExtra("android.content.pm.extra.WARNINGS")
         log.info {
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
index e2387f3f4..4a1d8cd61 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
@@ -40,6 +40,9 @@ data class InstallNotificationState(
     val numInstalled: Int get() = apps.count { it.category == AppStateCategory.INSTALLED }
 
     fun getTitle(context: Context): String {
+        // can briefly show as foreground service notification, before we update real state
+        if (apps.isEmpty()) return context.getString(R.string.installing)
+
         val titleRes = if (isUpdatingApps) {
             R.plurals.notification_updating_title
         } else {
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallState.kt b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
index da5470794..1fd743dda 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstallState.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstallState.kt
@@ -1,6 +1,8 @@
 package org.fdroid.install
 
 import android.app.PendingIntent
+import org.fdroid.database.AppVersion
+import org.fdroid.database.Repository
 import org.fdroid.download.DownloadRequest
 
 sealed class InstallState(val showProgress: Boolean) {
@@ -13,6 +15,20 @@ sealed class InstallState(val showProgress: Boolean) {
         override val iconDownloadRequest: DownloadRequest? = null,
     ) : InstallStateWithInfo(true)
 
+    data class PreApprovalConfirmationNeeded(
+        private val state: InstallStateWithInfo,
+        val version: AppVersion,
+        val repo: Repository,
+        override val sessionId: Int,
+        override val intent: PendingIntent,
+    ) : InstallConfirmationState() {
+        override val name: String = state.name
+        override val versionName: String = state.versionName
+        override val currentVersionName: String? = state.currentVersionName
+        override val lastUpdated: Long = state.lastUpdated
+        override val iconDownloadRequest: DownloadRequest? = state.iconDownloadRequest
+    }
+
     data class PreApproved(
         override val name: String,
         override val versionName: String,
@@ -49,10 +65,10 @@ sealed class InstallState(val showProgress: Boolean) {
         override val currentVersionName: String?,
         override val lastUpdated: Long,
         override val iconDownloadRequest: DownloadRequest?,
-        val sessionId: Int,
-        val intent: PendingIntent,
+        override val sessionId: Int,
+        override val intent: PendingIntent,
         val progress: Float,
-    ) : InstallStateWithInfo(true) {
+    ) : InstallConfirmationState() {
         constructor(
             state: InstallStateWithInfo,
             sessionId: Int,
@@ -108,3 +124,8 @@ sealed class InstallStateWithInfo(showProgress: Boolean) : InstallState(showProg
     abstract val lastUpdated: Long
     abstract val iconDownloadRequest: DownloadRequest?
 }
+
+sealed class InstallConfirmationState() : InstallStateWithInfo(true) {
+    abstract val sessionId: Int
+    abstract val intent: PendingIntent
+}
diff --git a/next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt b/next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
index ab0013ce2..3195c0a8b 100644
--- a/next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
+++ b/next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
@@ -1,8 +1,15 @@
 package org.fdroid.install
 
+import android.app.PendingIntent
+
 sealed interface PreApprovalResult {
     data object NotSupported : PreApprovalResult
     data object UserAborted : PreApprovalResult
+    data class UserConfirmationRequired(
+        val sessionId: Int,
+        val intent: PendingIntent,
+    ) : PreApprovalResult
+
     data class Success(val sessionId: Int) : PreApprovalResult
     data class Error(val errorMsg: String?) : PreApprovalResult
 }
diff --git a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
index 2e1332971..6b9518c9c 100644
--- a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
@@ -93,21 +93,22 @@ class SessionInstallManager @Inject constructor(
         app: AppMetadata,
         icon: Bitmap?,
         isUpdate: Boolean,
-        version: AppVersion
+        version: AppVersion,
+        canRequestUserConfirmationNow: Boolean,
     ): PreApprovalResult {
         return if (!context.isAppInForeground()) {
-            log.info { "App not in foreground, pre-approval not supported." }
+            log.info { "App not in foreground, pre-approval for ${app.packageName} not supported." }
             PreApprovalResult.NotSupported
         } else if (isUpdate && canDoAutoUpdate(version)) {
             // should not be needed, so we say not supported
-            log.info { "Can do auto-update pre-approval not needed." }
+            log.info { "Can do auto-update pre-approval for ${app.packageName} not needed." }
             PreApprovalResult.NotSupported
         } else if (SDK_INT >= 34) {
-            log.info { "Requesting pre-approval..." }
+            log.info { "Requesting pre-approval for ${app.packageName}..." }
             try {
-                preapproval(app, icon)
+                preapproval(app, icon, canRequestUserConfirmationNow)
             } catch (e: Exception) {
-                log.error(e) { "Error requesting pre-approval: " }
+                log.error(e) { "Error requesting pre-approval for ${app.packageName}: " }
                 PreApprovalResult.Error("${e::class.java.simpleName} ${e.message}")
             }
         } else {
@@ -119,10 +120,11 @@ class SessionInstallManager @Inject constructor(
     private suspend fun preapproval(
         app: AppMetadata,
         icon: Bitmap?,
+        canRequestUserConfirmationNow: Boolean,
     ): PreApprovalResult = suspendCancellableCoroutine { cont ->
         val params = getSessionParams(app.packageName)
         val sessionId = installer.createSession(params)
-        log.info { "Opened session $sessionId" }
+        log.info { "Opened session $sessionId for ${app.packageName}" }
         val name = app.name.getBestLocale(LocaleListCompat.getDefault()) ?: ""
 
         val receiver = InstallBroadcastReceiver(sessionId) { status, intent, msg ->
@@ -138,7 +140,15 @@ class SessionInstallManager @Inject constructor(
                     // There should be no bugs on Android versions where this is supported
                     // and we should be in the foreground right now,
                     // so fire up intent here and now.
-                    pendingIntent.send()
+                    if (canRequestUserConfirmationNow) {
+                        log.info { "Sending pre-approval intent for ${app.packageName}: $intent" }
+                        pendingIntent.send()
+                    } else {
+                        log.info { "Can not ask pre-approval for ${app.packageName}: $intent" }
+                        val s = PreApprovalResult.UserConfirmationRequired(sessionId, pendingIntent)
+                        cont.resume(s)
+                        context.unregisterReceiver(this)
+                    }
                 }
                 else -> { // some error, can't help it now, continue
                     if (status == PackageInstaller.STATUS_FAILURE_ABORTED) {
@@ -157,7 +167,7 @@ class SessionInstallManager @Inject constructor(
             RECEIVER_NOT_EXPORTED
         )
         cont.invokeOnCancellation {
-            log.info { "Pre-approval cancelled." }
+            log.info { "Pre-approval for ${app.packageName} cancelled." }
             context.unregisterReceiver(receiver)
         }
 
@@ -172,7 +182,6 @@ class SessionInstallManager @Inject constructor(
             val sender = getInstallIntentSender(sessionId, app.packageName)
             session.requestUserPreapproval(details, sender)
         }
-        sessionId
     }
 
     @WorkerThread
@@ -290,18 +299,26 @@ class SessionInstallManager @Inject constructor(
     }
 
     suspend fun requestUserConfirmation(
-        installState: InstallState.UserConfirmationNeeded,
+        state: InstallConfirmationState,
     ): InstallState = suspendCancellableCoroutine { cont ->
-        val receiver = InstallBroadcastReceiver(installState.sessionId) { status, intent, msg ->
+        val isPreApproval = state is InstallState.PreApprovalConfirmationNeeded
+        val receiver = InstallBroadcastReceiver(state.sessionId) { status, _, msg ->
             context.unregisterReceiver(this)
             when (status) {
                 PackageInstaller.STATUS_SUCCESS -> {
-                    val newState = InstallState.Installed(
-                        name = installState.name,
-                        versionName = installState.versionName,
-                        currentVersionName = installState.currentVersionName,
-                        lastUpdated = installState.lastUpdated,
-                        iconDownloadRequest = installState.iconDownloadRequest,
+                    val newState = if (isPreApproval) InstallState.PreApproved(
+                        name = state.name,
+                        versionName = state.versionName,
+                        currentVersionName = state.currentVersionName,
+                        lastUpdated = state.lastUpdated,
+                        iconDownloadRequest = state.iconDownloadRequest,
+                        result = PreApprovalResult.Success(state.sessionId),
+                    ) else InstallState.Installed(
+                        name = state.name,
+                        versionName = state.versionName,
+                        currentVersionName = state.currentVersionName,
+                        lastUpdated = state.lastUpdated,
+                        iconDownloadRequest = state.iconDownloadRequest,
                     )
                     cont.resume(newState)
                 }
@@ -312,7 +329,7 @@ class SessionInstallManager @Inject constructor(
                     if (status == PackageInstaller.STATUS_FAILURE_ABORTED) {
                         cont.resume(InstallState.UserAborted)
                     } else {
-                        cont.resume(InstallState.Error(msg, installState))
+                        cont.resume(InstallState.Error(msg, state))
                     }
                 }
             }
@@ -326,7 +343,7 @@ class SessionInstallManager @Inject constructor(
         cont.invokeOnCancellation {
             context.unregisterReceiver(receiver)
         }
-        installState.intent.send()
+        state.intent.send()
     }
 
     private fun getSessionParams(packageName: String, size: Long? = null): SessionParams {
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index b30aec20f..9b7b7afc4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -29,7 +29,7 @@ import com.viktormykhailiv.compose.hints.HintHost
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import org.fdroid.install.InstallState
+import org.fdroid.install.InstallConfirmationState
 import org.fdroid.ui.apps.MyApps
 import org.fdroid.ui.apps.MyAppsInfo
 import org.fdroid.ui.apps.MyAppsViewModel
@@ -119,7 +119,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 override fun search(query: String) = myAppsViewModel.search(query)
                 override fun confirmAppInstall(
                     packageName: String,
-                    state: InstallState.UserConfirmationNeeded,
+                    state: InstallConfirmationState,
                 ) = myAppsViewModel.confirmAppInstall(packageName, state)
             }
             MyApps(
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 25f3ce1d2..e1b766abc 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -54,6 +54,7 @@ import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppListSortOrder.LAST_UPDATED
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.install.InstallConfirmationState
 import org.fdroid.install.InstallState
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.NavigationKey
@@ -78,7 +79,7 @@ fun MyApps(
     val appToConfirm by remember(myAppsInfo.model.installingApps) {
         derivedStateOf {
             myAppsInfo.model.installingApps.find { app ->
-                app.installState is InstallState.UserConfirmationNeeded
+                app.installState is InstallConfirmationState
             }
         }
     }
@@ -92,7 +93,7 @@ fun MyApps(
     LaunchedEffect(appToConfirm) {
         val app = appToConfirm
         if (app != null && lifecycleOwner.lifecycle.currentState.isAtLeast(STARTED)) {
-            val state = app.installState as InstallState.UserConfirmationNeeded
+            val state = app.installState as InstallConfirmationState
             myAppsInfo.confirmAppInstall(app.packageName, state)
         }
     }
@@ -194,6 +195,9 @@ fun MyApps(
                     .padding(16.dp),
             )
         } else {
+            var showUpdateAllButton by remember(updatableApps) {
+                mutableStateOf(true)
+            }
             LazyColumn(
                 state = lazyListState,
                 modifier = modifier
@@ -214,8 +218,11 @@ fun MyApps(
                                     .padding(16.dp)
                                     .weight(1f),
                             )
-                            Button(
-                                onClick = myAppsInfo::updateAll,
+                            if (showUpdateAllButton) Button(
+                                onClick = {
+                                    myAppsInfo.updateAll()
+                                    showUpdateAllButton = false
+                                },
                                 modifier = Modifier.padding(end = 16.dp),
                             ) {
                                 Text(stringResource(R.string.update_all))
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
index 0feca5b7e..df28d9957 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
@@ -1,7 +1,7 @@
 package org.fdroid.ui.apps
 
 import org.fdroid.database.AppListSortOrder
-import org.fdroid.install.InstallState
+import org.fdroid.install.InstallConfirmationState
 
 interface MyAppsInfo {
     val model: MyAppsModel
@@ -9,7 +9,7 @@ interface MyAppsInfo {
     fun updateAll()
     fun changeSortOrder(sort: AppListSortOrder)
     fun search(query: String)
-    fun confirmAppInstall(packageName: String, state: InstallState.UserConfirmationNeeded)
+    fun confirmAppInstall(packageName: String, state: InstallConfirmationState)
 }
 
 data class MyAppsModel(
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index 368d3f633..ad5b83fce 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -12,6 +12,7 @@ import org.fdroid.ui.utils.normalize
 import java.text.Collator
 import java.util.Locale
 
+// TODO add tests for this, similar to DetailsPresenter
 @Composable
 fun MyAppsPresenter(
     appUpdatesFlow: StateFlow<List<AppUpdateItem>?>,
@@ -27,26 +28,30 @@ fun MyAppsPresenter(
     val sortOrder = sortOrderFlow.collectAsState().value
     val processedPackageNames = mutableSetOf<String>()
 
-    val updates = appUpdates?.filter {
-        val keep = searchQuery.isBlank() ||
-            it.name.normalize().contains(searchQuery, ignoreCase = true)
-        if (keep) processedPackageNames.add(it.packageName)
-        keep
-    }
+    // we want to show apps currently installing/updating even if they have updates available,
+    // so we need to handle those first
     val installingApps = appInstallStates.mapNotNull { (packageName, state) ->
         if (state is InstallStateWithInfo) {
-            val keep = if (searchQuery.isBlank()) {
-                packageName !in processedPackageNames
-            } else {
-                packageName !in processedPackageNames &&
-                    state.name.normalize().contains(searchQuery, ignoreCase = true)
-            }
-            processedPackageNames.add(packageName)
-            if (keep) InstallingAppItem(packageName, state) else null
+            val keep = searchQuery.isBlank() ||
+                state.name.normalize().contains(searchQuery, ignoreCase = true)
+            if (keep) {
+                processedPackageNames.add(packageName)
+                InstallingAppItem(packageName, state)
+            } else null
         } else {
             null
         }
     }
+    val updates = appUpdates?.filter {
+        val keep = if (searchQuery.isBlank()) {
+            it.packageName !in processedPackageNames
+        } else {
+            it.packageName !in processedPackageNames &&
+                it.name.normalize().contains(searchQuery, ignoreCase = true)
+        }
+        if (keep) processedPackageNames.add(it.packageName)
+        keep
+    }
     val installed = installedApps?.filter {
         if (searchQuery.isBlank()) {
             it.packageName !in processedPackageNames
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index 9b2a774b5..46b1b3636 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -23,6 +23,7 @@ import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
+import org.fdroid.install.InstallConfirmationState
 import org.fdroid.install.InstallState
 import org.fdroid.settings.SettingsManager
 import org.fdroid.updates.UpdatesManager
@@ -109,10 +110,17 @@ class MyAppsViewModel @Inject constructor(
             }
     }
 
-    fun confirmAppInstall(packageName: String, state: InstallState.UserConfirmationNeeded) {
+    fun confirmAppInstall(packageName: String, state: InstallConfirmationState) {
         log.info { "Asking user to confirm install of $packageName..." }
         scope.launch(Dispatchers.Main) {
-            appInstallManager.requestUserConfirmation(packageName, state)
+            when (state) {
+                is InstallState.PreApprovalConfirmationNeeded -> {
+                    appInstallManager.requestPreApprovalConfirmation(packageName, state)
+                }
+                is InstallState.UserConfirmationNeeded -> {
+                    appInstallManager.requestUserConfirmation(packageName, state)
+                }
+            }
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 2dc9540fb..2dd069ca1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -102,6 +102,7 @@ class AppDetailsViewModel @Inject constructor(
                 currentVersionName = packageInfoFlow.value?.packageInfo?.versionName,
                 repo = repoManager.getRepository(version.repoId) ?: return@launch, // TODO
                 iconModel = iconModel,
+                canAskPreApprovalNow = true,
             )
             if (result is InstallState.Installed) {
                 // to reload packageInfoFlow with fresh packageInfo
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 1b7d79615..9c226ea51 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -11,6 +11,7 @@ import org.fdroid.index.IndexFormatVersion
 import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
+import org.fdroid.install.InstallConfirmationState
 import org.fdroid.install.InstallState
 import org.fdroid.ui.apps.MyAppsInfo
 import org.fdroid.ui.apps.MyAppsModel
@@ -260,11 +261,7 @@ fun getMyAppsInfo(model: MyAppsModel): MyAppsInfo = object : MyAppsInfo {
     override fun updateAll() {}
     override fun changeSortOrder(sort: AppListSortOrder) {}
     override fun search(query: String) {}
-    override fun confirmAppInstall(
-        packageName: String,
-        state: InstallState.UserConfirmationNeeded,
-    ) {
-    }
+    override fun confirmAppInstall(packageName: String, state: InstallConfirmationState) {}
 }
 
 fun getRepositoriesInfo(
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 10111dce4..3851d7c5e 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -105,6 +105,8 @@ class UpdatesManager @Inject constructor(
 
     suspend fun updateAll(): List<Job> {
         val appsToUpdate = updates.value ?: updates.first() ?: return emptyList()
+        // we could do more in-depth checks regarding pre-approval, but this also works
+        val canAskPreApprovalNow = appsToUpdate.size == 1
         val concurrencyLimit = min(Runtime.getRuntime().availableProcessors(), 8)
         val semaphore = Semaphore(concurrencyLimit)
         return appsToUpdate.map { update ->
@@ -112,13 +114,13 @@ class UpdatesManager @Inject constructor(
             coroutineScope.launch {
                 // suspend here until we get a permit from the semaphore (there's free workers)
                 semaphore.withPermit {
-                    updateApp(update)
+                    updateApp(update, canAskPreApprovalNow)
                 }
             }
         }
     }
 
-    private suspend fun updateApp(update: AppUpdateItem) {
+    private suspend fun updateApp(update: AppUpdateItem, canAskPreApprovalNow: Boolean) {
         val app = db.getAppDao().getApp(update.repoId, update.packageName) ?: return
         appInstallManager.install(
             appMetadata = app.metadata,
@@ -126,7 +128,8 @@ class UpdatesManager @Inject constructor(
             version = update.update as AppVersion,
             currentVersionName = update.installedVersionName,
             repo = repoManager.getRepository(update.repoId) ?: return,
-            iconModel = update.iconModel
+            iconModel = update.iconModel,
+            canAskPreApprovalNow = canAskPreApprovalNow,
         )
     }
 }

From a4c6febfbce1102d4b8e3d856fb428f4168acfe1 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 7 Nov 2025 16:42:33 -0300
Subject: [PATCH 103/180] Improve screenreader support

---
 next/src/main/kotlin/org/fdroid/ui/About.kt   |  3 ++
 .../kotlin/org/fdroid/ui/MainOverflowMenu.kt  |  9 +++-
 .../org/fdroid/ui/apps/InstalledAppRow.kt     |  6 ++-
 .../org/fdroid/ui/apps/UpdatableAppRow.kt     | 27 +++++++-----
 .../org/fdroid/ui/categories/CategoryChip.kt  |  3 ++
 .../org/fdroid/ui/crash/CrashContent.kt       |  3 ++
 .../org/fdroid/ui/details/AppDetails.kt       |  9 +++-
 .../kotlin/org/fdroid/ui/details/Versions.kt  | 22 +++++-----
 .../org/fdroid/ui/discover/AppCarousel.kt     |  6 ++-
 .../org/fdroid/ui/discover/AppsSearch.kt      |  8 +++-
 .../kotlin/org/fdroid/ui/discover/Discover.kt | 13 ++++--
 .../kotlin/org/fdroid/ui/lists/AppList.kt     |  4 +-
 .../kotlin/org/fdroid/ui/lists/AppListRow.kt  |  6 ++-
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  |  7 +++-
 .../ui/repositories/add/AddRepoErrorScreen.kt |  2 +-
 .../ui/repositories/add/AddRepoIntro.kt       | 28 +++++++------
 .../ui/repositories/details/BasicAuth.kt      | 10 ++++-
 .../ui/repositories/details/RepoDetails.kt    | 16 ++++++--
 .../org/fdroid/ui/settings/PreferenceProxy.kt |  3 ++
 .../kotlin/org/fdroid/ui/settings/Settings.kt |  8 ++++
 .../kotlin/org/fdroid/ui/utils/ExpandIcon.kt  | 41 +++++++++++++++++++
 .../org/fdroid/ui/utils/ExpandableSection.kt  | 22 +++++-----
 next/src/main/res/values/strings-next.xml     |  1 +
 23 files changed, 192 insertions(+), 65 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
index 52cb4b767..82ee49c79 100644
--- a/next/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -29,6 +29,8 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -109,6 +111,7 @@ fun AboutHeader(modifier: Modifier = Modifier) {
     ) {
         Image(
             painter = painterResource(id = R.drawable.ic_launcher),
+            modifier = Modifier.semantics { hideFromAccessibility() },
             contentDescription = null, // decorative element
         )
         SelectionContainer {
diff --git a/next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt b/next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt
index 5d561ce6a..71cda2d27 100644
--- a/next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt
@@ -5,7 +5,10 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 
 @Composable
 fun MainOverFlowMenu(
@@ -22,7 +25,11 @@ fun MainOverFlowMenu(
                 text = { Text(stringResource(dest.label)) },
                 onClick = { onItemClicked(dest) },
                 leadingIcon = {
-                    Icon(dest.icon, contentDescription = null)
+                    Icon(
+                        imageVector = dest.icon,
+                        contentDescription = null,
+                        modifier = Modifier.semantics { hideFromAccessibility() },
+                    )
                 }
             )
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
index 29bc27041..d0676bab7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
@@ -10,6 +10,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
@@ -32,7 +34,9 @@ fun InstalledAppRow(
                     model = PackageName(app.packageName, app.iconModel as? DownloadRequest),
                     error = painterResource(R.drawable.ic_repo_app_default),
                     contentDescription = null,
-                    modifier = Modifier.size(48.dp),
+                    modifier = Modifier
+                        .size(48.dp)
+                        .semantics { hideFromAccessibility() },
                 )
             },
             headlineContent = {
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index e4302fdbb..fed0f7735 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowDropDown
-import androidx.compose.material.icons.filled.ArrowDropUp
 import androidx.compose.material.icons.filled.NewReleases
 import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.Card
@@ -27,6 +25,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
@@ -34,6 +36,7 @@ import org.fdroid.download.DownloadRequest
 import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.ExpandIconArrow
 import org.fdroid.ui.utils.getPreviewVersion
 
 @Composable
@@ -50,7 +53,9 @@ fun UpdatableAppRow(
                     Icon(
                         imageVector = Icons.Filled.NewReleases,
                         tint = MaterialTheme.colorScheme.error,
-                        contentDescription = null, modifier = Modifier.size(24.dp),
+                        contentDescription =
+                        stringResource(R.string.notification_title_single_update_available),
+                        modifier = Modifier.size(24.dp),
                     )
                 }) {
                     AsyncShimmerImage(
@@ -72,11 +77,7 @@ fun UpdatableAppRow(
             },
             trailingContent = {
                 if (app.whatsNew != null) IconButton(onClick = { isExpanded = !isExpanded }) {
-                    if (isExpanded) {
-                        Icon(Icons.Default.ArrowDropUp, "TODO")
-                    } else {
-                        Icon(Icons.Default.ArrowDropDown, "TODO")
-                    }
+                    ExpandIconArrow(isExpanded)
                 }
             },
             colors = ListItemDefaults.colors(
@@ -88,12 +89,18 @@ fun UpdatableAppRow(
             ),
             modifier = modifier,
         )
-        AnimatedVisibility(visible = isExpanded, modifier = Modifier.padding(8.dp)) {
+        AnimatedVisibility(
+            visible = isExpanded,
+            modifier = Modifier
+                .padding(8.dp)
+                .semantics { liveRegion = LiveRegionMode.Polite }
+        ) {
             Card(modifier = Modifier.fillMaxWidth()) {
                 Text(
                     text = app.whatsNew ?: "",
                     style = MaterialTheme.typography.bodyMedium,
-                    modifier = Modifier.padding(8.dp)
+                    modifier = Modifier
+                        .padding(8.dp)
                 )
             }
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
index 24a20eb19..4e116db38 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
@@ -11,6 +11,8 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -34,6 +36,7 @@ fun CategoryChip(
                 imageVector = categoryItem.imageVector,
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.primary,
+                modifier = Modifier.semantics { hideFromAccessibility() },
             )
         },
         label = {
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt b/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
index 79c3bdecf..6dc52d809 100644
--- a/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
@@ -24,6 +24,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
@@ -54,6 +56,7 @@ fun CrashContent(
                 .fillMaxWidth(0.5f)
                 .aspectRatio(1f)
                 .padding(vertical = 16.dp)
+                .semantics { hideFromAccessibility() },
         )
         Column(verticalArrangement = spacedBy(16.dp)) {
             Text(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index bf4cf3fbb..e8d3f87f1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -45,6 +45,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.buildAnnotatedString
@@ -146,7 +149,11 @@ fun AppDetails(
             var descriptionExpanded by remember { mutableStateOf(false) }
             item.description?.let { description ->
                 val htmlDescription = AnnotatedString.fromHtml(description)
-                AnimatedVisibility(descriptionExpanded) {
+                AnimatedVisibility(
+                    visible = descriptionExpanded,
+                    modifier = Modifier
+                        .semantics { liveRegion = LiveRegionMode.Polite },
+                ) {
                     SelectionContainer {
                         Text(
                             text = htmlDescription,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index 5f1a786e3..d0221be7b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -9,11 +9,8 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccessTime
-import androidx.compose.material.icons.filled.ExpandLess
-import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.material3.Badge
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -28,6 +25,9 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -35,6 +35,7 @@ import kotlinx.coroutines.launch
 import org.fdroid.R
 import org.fdroid.database.AppVersion
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.ExpandIconChevron
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.FDroidOutlineButton
 import org.fdroid.ui.utils.asRelativeTimeString
@@ -83,14 +84,7 @@ fun Version(
                     expanded = !expanded
                 }
         ) {
-            Icon(
-                imageVector = if (expanded) {
-                    Icons.Default.ExpandLess
-                } else {
-                    Icons.Default.ExpandMore
-                },
-                contentDescription = null,
-            )
+            ExpandIconChevron(expanded)
             Row {
                 Column(modifier = Modifier.weight(1f)) {
                     Text(
@@ -129,7 +123,11 @@ fun Version(
                 }
             }
         }
-        AnimatedVisibility(expanded) {
+        AnimatedVisibility(
+            visible = expanded,
+            modifier = Modifier
+                .semantics { liveRegion = LiveRegionMode.Polite }
+        ) {
             Row(
                 horizontalArrangement = spacedBy(16.dp),
                 verticalAlignment = Alignment.CenterVertically,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
index 8086f1a0e..f12f41d4c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
@@ -21,6 +21,8 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
@@ -51,6 +53,7 @@ fun AppCarousel(
             )
             Icon(
                 imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
+                modifier = Modifier.semantics { hideFromAccessibility() },
                 contentDescription = null,
             )
         }
@@ -79,7 +82,8 @@ fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
             contentScale = ContentScale.Fit,
             modifier = Modifier
                 .requiredSize(76.dp)
-                .clip(MaterialTheme.shapes.medium),
+                .clip(MaterialTheme.shapes.medium)
+                .semantics { hideFromAccessibility() },
         )
         Text(
             text = app.name,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 81927dad0..e04ef2b20 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -27,6 +27,8 @@ import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -65,7 +67,11 @@ fun AppsSearch(
                 textFieldState = textFieldState,
                 placeholder = { Text(stringResource(R.string.search_placeholder)) },
                 leadingIcon = {
-                    Icon(imageVector = Icons.Default.Search, contentDescription = null)
+                    Icon(
+                        imageVector = Icons.Default.Search,
+                        contentDescription = null,
+                        modifier = Modifier.semantics { hideFromAccessibility() },
+                    )
                 },
                 onSearch = { },
             )
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 f071cb5fd..b16493b54 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -31,6 +31,9 @@ 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
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -79,8 +82,8 @@ fun Discover(
                     var menuExpanded by remember { mutableStateOf(false) }
                     IconButton(onClick = { menuExpanded = !menuExpanded }) {
                         Icon(
-                            Icons.Default.MoreVert,
-                            contentDescription = null,
+                            imageVector = Icons.Default.MoreVert,
+                            contentDescription = stringResource(R.string.more),
                         )
                     }
                     MainOverFlowMenu(menuExpanded, {
@@ -107,7 +110,11 @@ fun Discover(
         ) {
             when (discoverModel) {
                 is LoadingDiscoverModel -> {
-                    AnimatedVisibility(discoverModel.isFirstStart) {
+                    AnimatedVisibility(
+                        visible = discoverModel.isFirstStart,
+                        modifier = Modifier
+                            .semantics { liveRegion = LiveRegionMode.Polite },
+                    ) {
                         Text(
                             stringResource(R.string.first_start_loading),
                             textAlign = TextAlign.Center,
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index e10e542ab..91d7ddcbf 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -144,9 +144,7 @@ fun AppList(
                         }) {
                             Icon(
                                 imageVector = Icons.Filled.FilterList,
-                                contentDescription = stringResource(
-                                    R.string.search_filter_no_results
-                                ),
+                                contentDescription = stringResource(R.string.filter),
                             )
                         }
                     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
index 092b3849d..5d74acc24 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
@@ -11,6 +11,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
@@ -31,7 +33,9 @@ fun AppListRow(
                 model = item.iconModel,
                 error = painterResource(R.drawable.ic_repo_app_default),
                 contentDescription = null,
-                modifier = Modifier.size(48.dp),
+                modifier = Modifier
+                    .size(48.dp)
+                    .semantics { hideFromAccessibility() },
             )
         },
         colors = ListItemDefaults.colors(
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index 19a402f1e..cdfecff49 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -32,6 +32,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
@@ -181,7 +183,9 @@ fun AppsFilter(
                             } else AsyncShimmerImage(
                                 model = repo.icon,
                                 contentDescription = null,
-                                modifier = Modifier.size(24.dp)
+                                modifier = Modifier
+                                    .size(24.dp)
+                                    .semantics { hideFromAccessibility() },
                             )
                         },
                         label = {
@@ -223,6 +227,7 @@ private fun FilterHeader(icon: ImageVector, text: String) {
             imageVector = icon,
             contentDescription = null,
             tint = MaterialTheme.colorScheme.primary,
+            modifier = Modifier.semantics { hideFromAccessibility() },
         )
         Text(text = text, style = MaterialTheme.typography.titleMedium)
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
index 562eb5d6e..679b6c1d9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
@@ -46,7 +46,7 @@ fun AddRepoErrorScreen(state: AddRepoError, modifier: Modifier = Modifier) {
     ) {
         Image(
             imageVector = Icons.Default.Error,
-            contentDescription = null,
+            contentDescription = stringResource(R.string.error),
             colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.error),
             modifier = Modifier.size(48.dp),
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
index de22b8408..14e3d2277 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
@@ -25,14 +25,11 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowDropDown
-import androidx.compose.material.icons.filled.ArrowDropUp
 import androidx.compose.material.icons.filled.ContentPaste
 import androidx.compose.material.icons.filled.QrCode
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
@@ -54,6 +51,9 @@ import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
@@ -69,6 +69,7 @@ import kotlinx.coroutines.launch
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.repo.None
+import org.fdroid.ui.utils.ExpandIconArrow
 import org.fdroid.ui.utils.FDroidButton
 import org.fdroid.ui.utils.FDroidOutlineButton
 
@@ -124,7 +125,11 @@ fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modi
                 }
             },
         )
-        AnimatedVisibility(showPermissionWarning) {
+        AnimatedVisibility(
+            visible = showPermissionWarning,
+            modifier = Modifier
+                .semantics { liveRegion = LiveRegionMode.Polite },
+        ) {
             Card(
                 colors = CardDefaults.cardColors(
                     containerColor = MaterialTheme.colorScheme.inverseSurface,
@@ -161,19 +166,16 @@ fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modi
                 // avoid occupying the whole row
                 modifier = Modifier.weight(1f),
             )
-            Icon(
-                imageVector = if (manualExpanded) {
-                    Icons.Default.ArrowDropUp
-                } else {
-                    Icons.Default.ArrowDropDown
-                },
-                contentDescription = null,
-            )
+            ExpandIconArrow(manualExpanded)
         }
         val textState = remember { mutableStateOf(TextFieldValue()) }
         val focusRequester = remember { FocusRequester() }
         val coroutineScope = rememberCoroutineScope()
-        AnimatedVisibility(visible = manualExpanded) {
+        AnimatedVisibility(
+            visible = manualExpanded,
+            modifier = Modifier
+                .semantics { liveRegion = LiveRegionMode.Polite },
+        ) {
             Column(
                 horizontalAlignment = Alignment.End,
                 verticalArrangement = spacedBy(16.dp),
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
index 5405dc15f..79e25569b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
@@ -20,6 +20,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
@@ -53,7 +56,12 @@ fun BasicAuth(
             state = passwordState,
             label = { Text(stringResource(R.string.repo_basicauth_password)) }
         )
-        AnimatedVisibility(showSaveButton, Modifier.align(Alignment.End)) {
+        AnimatedVisibility(
+            visible = showSaveButton,
+            modifier = Modifier
+                .align(Alignment.End)
+                .semantics { liveRegion = LiveRegionMode.Polite },
+        ) {
             FDroidOutlineButton(
                 text = stringResource(R.string.repo_basicauth_edit),
                 onClick = {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index 7c3770e41..2c5aa3f2a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -29,6 +29,8 @@ import androidx.compose.ui.Alignment
 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 androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.viktormykhailiv.compose.hints.rememberHint
@@ -115,7 +117,7 @@ fun RepoDetails(
                 IconButton(onClick = { menuExpanded = !menuExpanded }) {
                     Icon(
                         Icons.Default.MoreVert,
-                        contentDescription = null,
+                        contentDescription = stringResource(R.string.more),
                     )
                 }
                 DropdownMenu(
@@ -129,7 +131,11 @@ fun RepoDetails(
                             RepoUpdateWorker.updateNow(context, repo.repoId)
                         },
                         leadingIcon = {
-                            Icon(Icons.Default.Update, contentDescription = null)
+                            Icon(
+                                imageVector = Icons.Default.Update,
+                                contentDescription = null,
+                                modifier = Modifier.semantics { hideFromAccessibility() },
+                            )
                         }
                     )
                     DropdownMenuItem(
@@ -139,7 +145,11 @@ fun RepoDetails(
                             deleteDialog = true
                         },
                         leadingIcon = {
-                            Icon(Icons.Default.Delete, contentDescription = null)
+                            Icon(
+                                imageVector = Icons.Default.Delete,
+                                contentDescription = null,
+                                modifier = Modifier.semantics { hideFromAccessibility() },
+                            )
                         }
                     )
                 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt b/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
index 478294700..98cd7b57d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
@@ -17,6 +17,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import me.zhanghai.compose.preference.ProvidePreferenceLocals
@@ -39,6 +41,7 @@ fun LazyListScope.preferenceProxy(
             Icon(
                 imageVector = Icons.Default.VpnLock,
                 contentDescription = null,
+                modifier = Modifier.semantics { hideFromAccessibility() },
             )
         },
         title = {
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index 239d67305..fde06cc89 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -40,6 +40,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -131,6 +133,7 @@ fun Settings(
                         Icon(
                             imageVector = Icons.Default.BrightnessMedium,
                             contentDescription = null,
+                            modifier = Modifier.semantics { hideFromAccessibility() },
                         )
                     },
                     summary = { Text(text = "${themeToString(it)}") },
@@ -141,6 +144,7 @@ fun Settings(
                         Icon(
                             imageVector = Icons.Default.Translate,
                             contentDescription = null,
+                            modifier = Modifier.semantics { hideFromAccessibility() },
                         )
                     },
                     title = { Text(stringResource(R.string.pref_language)) },
@@ -158,6 +162,7 @@ fun Settings(
                         Icon(
                             imageVector = Icons.Default.Notifications,
                             contentDescription = null,
+                            modifier = Modifier.semantics { hideFromAccessibility() },
                         )
                     },
                     title = { Text(stringResource(R.string.notification_title)) },
@@ -183,10 +188,12 @@ fun Settings(
                         if (repoUpdatesEnabled) Icon(
                             imageVector = Icons.Default.SystemSecurityUpdate,
                             contentDescription = null,
+                            modifier = Modifier.semantics { hideFromAccessibility() },
                         ) else Icon(
                             imageVector = Icons.Default.SystemSecurityUpdateWarning,
                             contentDescription = null,
                             tint = MaterialTheme.colorScheme.error,
+                            modifier = Modifier.semantics { hideFromAccessibility() },
                         )
                     },
                     summary = { repoUpdatesEnabled ->
@@ -231,6 +238,7 @@ fun Settings(
                                 Icons.Default.UpdateDisabled
                             },
                             contentDescription = null,
+                            modifier = Modifier.semantics { hideFromAccessibility() },
                         )
                     },
                     summary = { autoUpdatesEnabled ->
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt b/next/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt
new file mode 100644
index 000000000..e4f77f372
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt
@@ -0,0 +1,41 @@
+package org.fdroid.ui.utils
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import org.fdroid.R
+
+@Composable
+fun ExpandIconChevron(isExpanded: Boolean) {
+    Icon(
+        imageVector = if (isExpanded) {
+            Icons.Default.ExpandLess
+        } else {
+            Icons.Default.ExpandMore
+        },
+        contentDescription = if (isExpanded) {
+            stringResource(R.string.collapse)
+        } else {
+            stringResource(R.string.expand)
+        },
+    )
+}
+
+@Composable
+fun ExpandIconArrow(isExpanded: Boolean) {
+    Icon(
+        imageVector = if (isExpanded) {
+            Icons.Default.ExpandLess
+        } else {
+            Icons.Default.ExpandMore
+        },
+        contentDescription = if (isExpanded) {
+            stringResource(R.string.collapse)
+        } else {
+            stringResource(R.string.expand)
+        },
+    )
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt b/next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
index cfebae557..bb2576b29 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
@@ -7,9 +7,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.KeyboardArrowDown
-import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -23,6 +20,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 
 @Composable
@@ -45,6 +46,7 @@ fun ExpandableSection(
             if (icon != null) Icon(
                 painter = icon,
                 contentDescription = null,
+                modifier = Modifier.semantics { hideFromAccessibility() },
             )
             Text(
                 text = title,
@@ -52,17 +54,13 @@ fun ExpandableSection(
                 modifier = Modifier.weight(1f),
             )
             IconButton(onClick = { sectionExpanded = !sectionExpanded }) {
-                Icon(
-                    imageVector = if (sectionExpanded) {
-                        Icons.Default.KeyboardArrowUp
-                    } else {
-                        Icons.Default.KeyboardArrowDown
-                    },
-                    contentDescription = null,
-                )
+                ExpandIconArrow(sectionExpanded)
             }
         }
-        AnimatedVisibility(sectionExpanded) {
+        AnimatedVisibility(
+            visible = sectionExpanded,
+            modifier = Modifier.semantics { liveRegion = LiveRegionMode.Polite },
+        ) {
             content()
         }
     }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index f227e4508..78a7568fc 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -94,6 +94,7 @@
     <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
     <string name="got_it">Got it</string>
     <string name="clear">Clear</string>
+    <string name="error">Error</string>
     <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
     <string name="repo_last_update_upstream">Last update: %s</string>
     <string name="repo_basicauth_username">Username</string>

From 99e14793df1436e6e839f5cc8ad80586cbbd0abf Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 7 Nov 2025 16:50:20 -0300
Subject: [PATCH 104/180] Align cancel button on app details page with progress
 bar

---
 .../org/fdroid/ui/details/AppDetailsHeader.kt | 61 +++++++++----------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 3cac3bc80..961b1c878 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -191,10 +191,7 @@ fun AppDetailsHeader(
             modifier = buttonLineModifier,
             verticalAlignment = CenterVertically,
         ) {
-            Column(
-                verticalArrangement = spacedBy(8.dp, CenterVertically),
-                modifier = Modifier.weight(1f)
-            ) {
+            Column {
                 val strRes = when (item.installState) {
                     is InstallState.Starting -> R.string.status_install_preparing
                     is InstallState.PreApproved -> R.string.status_install_preparing
@@ -207,33 +204,35 @@ fun AppDetailsHeader(
                     text = stringResource(strRes),
                     style = MaterialTheme.typography.bodyMedium,
                 )
-                if (item.installState is InstallState.Downloading) {
-                    val animatedProgress by animateFloatAsState(
-                        targetValue = item.installState.progress,
-                        animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
-                    )
-                    LinearWavyProgressIndicator(
-                        stopSize = 0.dp,
-                        progress = { animatedProgress },
-                        modifier = Modifier.fillMaxWidth(),
-                    )
-                } else {
-                    LinearWavyProgressIndicator(modifier = Modifier.fillMaxWidth())
-                }
-            }
-            var cancelled by remember { mutableStateOf(false) }
-            IconButton(onClick = {
-                if (!cancelled) item.actions.cancelInstall(item.app.packageName)
-                cancelled = true
-            }) {
-                AnimatedVisibility(cancelled) {
-                    CircularProgressIndicator(modifier = Modifier.size(24.dp))
-                }
-                AnimatedVisibility(!cancelled) {
-                    Icon(
-                        imageVector = Icons.Default.Cancel,
-                        contentDescription = stringResource(R.string.cancel),
-                    )
+                Row(verticalAlignment = CenterVertically) {
+                    if (item.installState is InstallState.Downloading) {
+                        val animatedProgress by animateFloatAsState(
+                            targetValue = item.installState.progress,
+                            animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
+                        )
+                        LinearWavyProgressIndicator(
+                            stopSize = 0.dp,
+                            progress = { animatedProgress },
+                            modifier = Modifier.weight(1f),
+                        )
+                    } else {
+                        LinearWavyProgressIndicator(modifier = Modifier.weight(1f))
+                    }
+                    var cancelled by remember { mutableStateOf(false) }
+                    IconButton(onClick = {
+                        if (!cancelled) item.actions.cancelInstall(item.app.packageName)
+                        cancelled = true
+                    }) {
+                        AnimatedVisibility(cancelled) {
+                            CircularProgressIndicator(modifier = Modifier.size(24.dp))
+                        }
+                        AnimatedVisibility(!cancelled) {
+                            Icon(
+                                imageVector = Icons.Default.Cancel,
+                                contentDescription = stringResource(R.string.cancel),
+                            )
+                        }
+                    }
                 }
             }
         }

From bfa775bf9877e26fbcd5e478778f600457f37ec9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 7 Nov 2025 16:55:21 -0300
Subject: [PATCH 105/180] Search filter app lists by package name as well

previously we only filtered by name and summary
---
 next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
index 85a079c85..20eafc36b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
@@ -56,7 +56,8 @@ fun AppListPresenter(
         val matchesRepos = filteredRepositoryIds.isEmpty() || it.repoId in filteredRepositoryIds
         val matchesQuery = searchQuery.isEmpty() ||
             it.name.normalize().contains(searchQuery, ignoreCase = true) ||
-            it.summary.normalize().contains(searchQuery, ignoreCase = true)
+            it.summary.normalize().contains(searchQuery, ignoreCase = true) ||
+            it.packageName.contains(searchQuery, ignoreCase = true)
         val matchesCompatibility = !filterIncompatible || it.isCompatible
         matchesCategories && matchesRepos && matchesQuery && matchesCompatibility
     }

From 30bf805a0db689797163325f6a5c274fdf050b1e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 7 Nov 2025 17:31:13 -0300
Subject: [PATCH 106/180] Update/cancel notification for available updates

if an app gets updated manually
---
 next/src/main/kotlin/org/fdroid/NotificationManager.kt   | 5 +++++
 .../kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt  | 2 ++
 .../src/main/kotlin/org/fdroid/updates/UpdatesManager.kt | 9 ++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
index de31369a1..d36111cc2 100644
--- a/next/src/main/kotlin/org/fdroid/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -115,6 +115,11 @@ class NotificationManager @Inject constructor(
             .setAutoCancel(true)
     }
 
+    val isAppUpdatesAvailableNotificationShowing: Boolean
+        get() = nm.activeNotifications.any { notification ->
+            notification.id == NOTIFICATION_ID_APP_UPDATES_AVAILABLE
+        }
+
     fun cancelAppUpdatesAvailableNotification() {
         log.info { "cancel app updates available notification" }
         nm.cancel(NOTIFICATION_ID_APP_UPDATES_AVAILABLE)
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 2dd069ca1..3b20736c3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -107,6 +107,8 @@ class AppDetailsViewModel @Inject constructor(
             if (result is InstallState.Installed) {
                 // to reload packageInfoFlow with fresh packageInfo
                 loadPackageInfoFlow(appMetadata.packageName)
+                // load updates as there may be less now (removes/updates notification)
+                updatesManager.loadUpdates()
             }
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 3851d7c5e..d4c0e2760 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import mu.KotlinLogging
+import org.fdroid.NotificationManager
 import org.fdroid.database.AppVersion
 import org.fdroid.database.DbUpdateChecker
 import org.fdroid.database.FDroidDatabase
@@ -29,12 +30,13 @@ import kotlin.math.min
 
 @Singleton
 class UpdatesManager @Inject constructor(
-    @ApplicationContext context: Context,
+    @param:ApplicationContext private val context: Context,
     private val db: FDroidDatabase,
     private val dbUpdateChecker: DbUpdateChecker,
     private val settingsManager: SettingsManager,
     private val repoManager: RepoManager,
     private val appInstallManager: AppInstallManager,
+    private val notificationManager: NotificationManager,
     @param:IoDispatcher private val coroutineScope: CoroutineScope,
 ) {
     private val log = KotlinLogging.logger { }
@@ -101,6 +103,11 @@ class UpdatesManager @Inject constructor(
         }
         _updates.value = updates
         _numUpdates.value = updates.size
+        // update 'update available' notification, if it is currently showing
+        if (notificationManager.isAppUpdatesAvailableNotificationShowing) {
+            if (updates.isEmpty()) notificationManager.cancelAppUpdatesAvailableNotification()
+            else notificationManager.showAppUpdatesAvailableNotification(notificationStates)
+        }
     }
 
     suspend fun updateAll(): List<Job> {

From 42b5b31e0d7ac77b97b16d9fc8046de0ea40f518 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 25 Nov 2025 15:46:25 -0300
Subject: [PATCH 107/180] Save list position in search results

This removes a crash, so another workaround could be removed.

Only remaining issue: predictive back animation cancels back navigation. If I go back quickly without leaving time for the animation, navigating back works.
---
 .../kotlin/org/fdroid/ui/discover/AppsSearch.kt    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index e04ef2b20..c047480f1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
@@ -25,6 +26,7 @@ import androidx.compose.material3.SearchBarValue
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
@@ -78,6 +80,10 @@ fun AppsSearch(
         },
         modifier = modifier,
     )
+    // rememberLazyListState done differently, so it refreshes for different searchResults
+    val listState = rememberSaveable(searchResults, saver = LazyListState.Saver) {
+        LazyListState(0, 0)
+    }
     ExpandedFullScreenSearchBar(
         state = searchBarState,
         inputField = {
@@ -106,7 +112,10 @@ fun AppsSearch(
                     .fillMaxWidth()
             )
         } else {
-            LazyColumn(modifier = Modifier.fillMaxSize()) {
+            LazyColumn(
+                state = listState,
+                modifier = Modifier.fillMaxSize()
+            ) {
                 if (searchResults.categories.isNotEmpty()) {
                     item(
                         key = "categories",
@@ -140,7 +149,8 @@ fun AppsSearch(
                     contentType = { "app" },
                 ) { item ->
                     AppListRow(
-                        item = item, isSelected = false,
+                        item = item,
+                        isSelected = false,
                         modifier = Modifier
                             .fillMaxWidth()
                             .animateItem()

From 0df5dc94a7bd6cb489cc3dd404007f4e64c2bfc2 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 25 Nov 2025 15:51:54 -0300
Subject: [PATCH 108/180] Open app when tapping repo update notification

---
 next/src/main/kotlin/org/fdroid/NotificationManager.kt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
index d36111cc2..cbfce6aef 100644
--- a/next/src/main/kotlin/org/fdroid/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -6,6 +6,7 @@ import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
 import android.content.Intent
+import android.content.Intent.ACTION_MAIN
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import androidx.annotation.StringRes
 import androidx.core.app.NotificationChannelCompat
@@ -91,6 +92,7 @@ class NotificationManager @Inject constructor(
         .setCategory(CATEGORY_SERVICE)
         .setContentTitle(context.getString(R.string.banner_updating_repositories))
         .setContentText(msg)
+        .setContentIntent(getMainActivityPendingIntent(context))
         .setOngoing(true)
         .setProgress(100, progress ?: 0, progress == null)
 
@@ -173,6 +175,14 @@ class NotificationManager @Inject constructor(
         return builder
     }
 
+    private fun getMainActivityPendingIntent(context: Context): PendingIntent {
+        val i = Intent(ACTION_MAIN).apply {
+            setClass(context, MainActivity::class.java)
+        }
+        val flags = FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
+        return PendingIntent.getActivity(context, 0, i, flags)
+    }
+
     private fun getMyAppsPendingIntent(context: Context): PendingIntent {
         val i = Intent(ACTION_MY_APPS).apply {
             setClass(context, MainActivity::class.java)

From aee414cacb026f75d4182deb17ac6bf4e5313185 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 25 Nov 2025 16:19:45 -0300
Subject: [PATCH 109/180] Don't update repos concurrently

Sometimes WorkManager goes through scheduling/cancellation loops and then ends up running the same worker more than once.
---
 .../main/kotlin/org/fdroid/repo/RepoUpdateManager.kt   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index 3384014af..4ab01f18e 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -142,9 +142,17 @@ class RepoUpdateManager(
 
     @WorkerThread
     suspend fun updateRepos() {
-        if (isUpdating.value) log.warn { "Already updating repositories: updateRepos()" }
+        if (isUpdating.value) {
+            // This is a workaround for what looks like a WorkManager bug.
+            // Sometimes it goes through scheduling/cancellation loops
+            // and then ends up running the same worker more than once.
+            log.warn { "Already updating repositories in updateRepos() not doing it again." }
+            return
+        }
         val timeSinceLastCheck = System.currentTimeMillis() - settingsManager.lastRepoUpdate
         if (timeSinceLastCheck < MIN_UPDATE_INTERVAL_MILLIS) {
+            // This is a workaround for a similar issue as above.
+            // We've seen WorkManager tell our worker to run in what looks like an endless loop.
             log.info { "Not updating, only $timeSinceLastCheck ms since last check." }
             return
         }

From 14f0d70d2cd9c98a95f6d4bf85e216efa51ac1d7 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 25 Nov 2025 17:21:53 -0300
Subject: [PATCH 110/180] Show SDK versions in app details

When expanding a version, it will show min, target and max SDK, if available.
---
 .../kotlin/org/fdroid/ui/details/Versions.kt  | 19 +++++++++++++++++++
 .../org/fdroid/ui/utils/PreviewUtils.kt       | 14 +++++++-------
 next/src/main/res/values/strings-next.xml     |  7 +++++++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index d0221be7b..aad72b2a9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -155,6 +155,25 @@ fun Version(
                             overflow = TextOverflow.Ellipsis,
                         )
                     }
+                    val sdkString = buildString {
+                        item.version.packageManifest.minSdkVersion?.let { sdk ->
+                            append(stringResource(R.string.sdk_min_version, sdk))
+                        }
+                        item.version.packageManifest.targetSdkVersion?.let { sdk ->
+                            if (isNotEmpty()) append(" ")
+                            append(stringResource(R.string.sdk_target_version, sdk))
+                        }
+                        item.version.packageManifest.maxSdkVersion?.let { sdk ->
+                            if (isNotEmpty()) append(" ")
+                            append(stringResource(R.string.sdk_max_version, sdk))
+                        }
+                    }
+                    if (sdkString.isNotEmpty()) Text(
+                        text = stringResource(R.string.sdk_versions_colon, sdkString),
+                        style = MaterialTheme.typography.bodySmall,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
                     item.version.packageManifest.nativecode?.let { nativeCode ->
                         if (nativeCode.isNotEmpty()) {
                             Text(
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 9c226ea51..6f3319071 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -68,17 +68,17 @@ val testVersion1 = object : PackageVersion {
     override val versionCode: Long = 42
     override val versionName: String = "42.23.0-alpha1337-33d2252b90"
     override val added: Long = System.currentTimeMillis() - DAYS.toMillis(4)
-    override val size: Long? = 1024 * 1024 * 42
-    override val signer: SignerV2? = SignerV2(
+    override val size: Long = 1024 * 1024 * 42
+    override val signer: SignerV2 = SignerV2(
         listOf("271721a9cddc96660336c19a39ae3cca4375072c80d3c8170860c333d2252b90")
     )
     override val releaseChannels: List<String>? = null
     override val packageManifest: PackageManifest = object : PackageManifest {
-        override val minSdkVersion: Int? = null
+        override val minSdkVersion: Int = 2
+        override val targetSdkVersion: Int = 13
         override val maxSdkVersion: Int? = null
         override val featureNames: List<String>? = null
-        override val nativecode: List<String>? = listOf("amd64", "x86")
-        override val targetSdkVersion: Int? = 13
+        override val nativecode: List<String> = listOf("amd64", "x86")
     }
     override val hasKnownVulnerability: Boolean = false
 }
@@ -93,10 +93,10 @@ val testVersion2 = object : PackageVersion {
     override val releaseChannels: List<String>? = null
     override val packageManifest: PackageManifest = object : PackageManifest {
         override val minSdkVersion: Int? = null
-        override val maxSdkVersion: Int? = null
+        override val targetSdkVersion: Int = 13
+        override val maxSdkVersion: Int = 99
         override val featureNames: List<String>? = null
         override val nativecode: List<String>? = null
-        override val targetSdkVersion: Int? = 13
     }
     override val hasKnownVulnerability: Boolean = false
 }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 78a7568fc..112b4f57a 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -61,6 +61,13 @@
     <string name="app_no_auto_update">Auto-update not available, because app targets old version of Android.</string>
     <string name="added_x_ago">Added %1$s</string>
     <string name="size_colon">Size: %1$s</string>
+    <string name="sdk_versions_colon">SDK versions: %1$s</string>
+    <!-- The minimum SDK version the app can be installed on, e.g. only Android 10 or higher -->
+    <string name="sdk_min_version">%1$s (Min)</string>
+    <!-- The target SDK version of the app -->
+    <string name="sdk_target_version">%1$s (Target)</string>
+    <!-- The maximum SDK version the app can be installed on, e.g. only Android 10 or lower -->
+    <string name="sdk_max_version">%1$s (Max)</string>
     <string name="signer_colon">Signer: %1$s</string>
     <string name="architectures_colon">Architectures: %1$s</string>
     <string name="app_details_incompatible_version">Incompatible • Installation likely to fail</string>

From 2a6736096c8f0b3bec0abb22ab81f430d1f1c2ca Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 1 Dec 2025 13:49:51 -0300
Subject: [PATCH 111/180] Improve handling of worker cancellation

If we keep running our code, but the worker gets cancelled, the system may freeze our code execution making notifications hang.

Also, it may cause the code to run more than once at roughly the same time, because the system reschedules our worker.
---
 .../main/kotlin/org/fdroid/install/AppInstallManager.kt   | 1 +
 next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt | 5 +++++
 next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt  | 3 +++
 .../src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt | 8 +++++---
 next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt | 4 ++++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index 230ec3691..b72932520 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -128,6 +128,7 @@ class AppInstallManager @Inject constructor(
             return currentState
         }
         val iconDownloadRequest = iconModel as? DownloadRequest
+        currentCoroutineContext().ensureActive()
         val job = scope.async {
             startInstall(
                 appMetadata = appMetadata,
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index 4ab01f18e..de8b5c154 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -5,6 +5,8 @@ import android.text.format.Formatter
 import android.util.Log
 import androidx.annotation.WorkerThread
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
@@ -142,6 +144,7 @@ class RepoUpdateManager(
 
     @WorkerThread
     suspend fun updateRepos() {
+        currentCoroutineContext().ensureActive()
         if (isUpdating.value) {
             // This is a workaround for what looks like a WorkManager bug.
             // Sometimes it goes through scheduling/cancellation loops
@@ -158,6 +161,7 @@ class RepoUpdateManager(
         }
         _isUpdating.value = true
         try {
+            currentCoroutineContext().ensureActive()
             var reposUpdated = false
             val repoErrors = mutableListOf<Pair<Repository, Exception>>()
             // always get repos fresh from DB, because
@@ -167,6 +171,7 @@ class RepoUpdateManager(
             //   it might not be in the FDroidApp list, yet
             db.getRepositoryDao().getRepositories().forEach { repo ->
                 if (!repo.enabled) return@forEach
+                currentCoroutineContext().ensureActive()
 
                 // show notification
                 if (isUpdateNotificationEnabled) {
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
index e18465dbe..7ee9165be 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
@@ -20,6 +20,8 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import mu.KotlinLogging
@@ -116,6 +118,7 @@ class RepoUpdateWorker @AssistedInject constructor(
         }
         val repoId = inputData.getLong("repoId", -1)
         return try {
+            currentCoroutineContext().ensureActive()
             if (repoId >= 0) repoUpdateManager.updateRepo(repoId)
             else repoUpdateManager.updateRepos()
             Result.success()
diff --git a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
index dbb371379..dd10d987b 100644
--- a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
@@ -17,8 +17,11 @@ import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.joinAll
 import mu.KotlinLogging
 import org.fdroid.NotificationManager
 import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_APP_INSTALLS
@@ -96,14 +99,13 @@ class AppUpdateWorker @AssistedInject constructor(
             log.error(e) { "Error while running setForeground: " }
         }
         return try {
+            currentCoroutineContext().ensureActive()
             nm.cancelAppUpdatesAvailableNotification()
             // Updating apps will try start a foreground service
             // and it will "share" the same notification.
             // This is easier than trying to tell the [AppInstallManager]
             // not to start a foreground service in this specific case.
-            updatesManager.updateAll().forEach { job ->
-                job.join()
-            }
+            updatesManager.updateAll().joinAll()
             // show success notification, if at least one app got installed
             val notificationState = appInstallManager.installNotificationState
             if (notificationState.numInstalled > 0) {
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index d4c0e2760..5a65cd5a4 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -5,6 +5,8 @@ import androidx.core.os.LocaleListCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
@@ -117,10 +119,12 @@ class UpdatesManager @Inject constructor(
         val concurrencyLimit = min(Runtime.getRuntime().availableProcessors(), 8)
         val semaphore = Semaphore(concurrencyLimit)
         return appsToUpdate.map { update ->
+            currentCoroutineContext().ensureActive()
             // launch a new co-routine for each app to update
             coroutineScope.launch {
                 // suspend here until we get a permit from the semaphore (there's free workers)
                 semaphore.withPermit {
+                    currentCoroutineContext().ensureActive()
                     updateApp(update, canAskPreApprovalNow)
                 }
             }

From de2f3f0ec6bbb02e9775f466fcbdf28fa19a470e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 28 Nov 2025 16:54:04 -0300
Subject: [PATCH 112/180] Add InstalledAppsCache and show apps with issues

in the My Apps list, we are now showing apps with issues such as incompatible signer. The install cache can be used to indicate that apps are installed.
---
 .../org/fdroid/install/InstalledAppsCache.kt  | 108 ++++++++
 .../main/kotlin/org/fdroid/ui/BottomBar.kt    |  39 ++-
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   3 +
 .../org/fdroid/ui/apps/InstalledAppRow.kt     |  35 ++-
 .../kotlin/org/fdroid/ui/apps/MyAppItem.kt    |  18 +-
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  | 208 ++-------------
 .../kotlin/org/fdroid/ui/apps/MyAppsInfo.kt   |   1 +
 .../kotlin/org/fdroid/ui/apps/MyAppsList.kt   | 237 ++++++++++++++++++
 .../org/fdroid/ui/apps/MyAppsPresenter.kt     |  18 +-
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |  67 +++--
 .../org/fdroid/ui/apps/UpdatableAppRow.kt     |   7 +-
 .../org/fdroid/ui/details/AppDetails.kt       |   4 +-
 .../org/fdroid/ui/details/AppDetailsItem.kt   |  14 +-
 .../fdroid/ui/details/AppDetailsViewModel.kt  |  12 +-
 .../fdroid/ui/details/AppDetailsWarnings.kt   |  74 +++++-
 .../org/fdroid/ui/details/DetailsPresenter.kt |  16 +-
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  13 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |   1 +
 .../ui/repositories/RepositoriesViewModel.kt  |   3 +
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  82 +++++-
 .../org/fdroid/updates/UpdatesManager.kt      |  72 ++++--
 .../org/fdroid/updates/UpdatesModule.kt       |   8 +-
 next/src/main/res/values/strings-next.xml     |   7 +-
 23 files changed, 734 insertions(+), 313 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt

diff --git a/next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt b/next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
new file mode 100644
index 000000000..9ab988fd5
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
@@ -0,0 +1,108 @@
+package org.fdroid.install
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.Intent.EXTRA_REPLACING
+import android.content.IntentFilter
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.GET_SIGNATURES
+import androidx.annotation.UiThread
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import mu.KotlinLogging
+import org.fdroid.utils.IoDispatcher
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class InstalledAppsCache @Inject constructor(
+    @param:ApplicationContext private val context: Context,
+    @param:IoDispatcher private val ioScope: CoroutineScope,
+) : BroadcastReceiver() {
+
+    private val log = KotlinLogging.logger { }
+    private val packageManager = context.packageManager
+    private val _installedApps = MutableStateFlow<Map<String, PackageInfo>>(emptyMap())
+    val installedApps = _installedApps.asStateFlow()
+    private var loadJob: Job? = null
+
+    init {
+        val intentFilter = IntentFilter().apply {
+            addAction(Intent.ACTION_PACKAGE_ADDED)
+            addAction(Intent.ACTION_PACKAGE_REMOVED)
+            addDataScheme("package")
+        }
+        context.registerReceiver(this, intentFilter)
+        loadInstalledApps()
+    }
+
+    @UiThread
+    private fun loadInstalledApps() {
+        if (loadJob?.isActive == true) {
+            // TODO this may give us a stale cache if an app was changed
+            //  while the system had already assembled the data, but we didn't return yet
+            log.warn { "Already loading apps, not loading again." }
+            return
+        }
+        loadJob = ioScope.launch {
+            log.info { "Loading installed apps..." }
+            @Suppress("DEPRECATION") // we'll use this as long as it works, new one was broken
+            val installedPackages = packageManager.getInstalledPackages(GET_SIGNATURES)
+            _installedApps.update { installedPackages.associateBy { it.packageName } }
+        }
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.`package` != null) {
+            // we have seen duplicate intents on Android 15, need to check other versions
+            log.warn { "Ignoring intent with package: $intent" }
+            return
+        }
+        when (intent.action) {
+            Intent.ACTION_PACKAGE_ADDED -> onPackageAdded(intent)
+            Intent.ACTION_PACKAGE_REMOVED -> onPackageRemoved(intent)
+            else -> log.error { "Unknown broadcast received: $intent" }
+        }
+    }
+
+    private fun onPackageAdded(intent: Intent) {
+        val replacing = intent.getBooleanExtra(EXTRA_REPLACING, false)
+        log.info { "onPackageAdded($intent) ${intent.data} replacing: $replacing" }
+        val packageName = intent.data?.schemeSpecificPart
+            ?: error("No package name in ACTION_PACKAGE_ADDED")
+
+        try {
+            @Suppress("DEPRECATION") // we'll use this as long as it works, new one was broken
+            val packageInfo = packageManager.getPackageInfo(packageName, GET_SIGNATURES)
+            // even if the app got replaced, we need to update packageInfo for new version code
+            _installedApps.update {
+                it.toMutableMap().apply {
+                    put(packageName, packageInfo)
+                }
+            }
+        } catch (e: PackageManager.NameNotFoundException) {
+            // Broadcasts don't always get delivered on time. So when this broadcast arrives,
+            // the user may already have uninstalled the app.
+            log.warn(e) { "Maybe broadcast was late? App not installed anymore: " }
+        }
+    }
+
+    private fun onPackageRemoved(intent: Intent) {
+        val replacing = intent.getBooleanExtra(EXTRA_REPLACING, false)
+        log.info { "onPackageRemoved($intent) ${intent.data} replacing: $replacing" }
+        val packageName = intent.data?.schemeSpecificPart
+            ?: error("No package name in ACTION_PACKAGE_REMOVED")
+        if (!replacing) _installedApps.update { apps ->
+            apps.toMutableMap().apply {
+                remove(packageName)
+            }
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt b/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
index 5a501a0bf..93772c358 100644
--- a/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
@@ -1,26 +1,43 @@
 package org.fdroid.ui
 
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Error
 import androidx.compose.material3.Badge
 import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.NavigationBarItemDefaults
 import androidx.compose.material3.NavigationRail
 import androidx.compose.material3.NavigationRailItem
+import androidx.compose.material3.NavigationRailItemDefaults
 import androidx.compose.material3.Text
+import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.navigation3.runtime.NavKey
+import org.fdroid.R
 
 @Composable
-fun BottomBar(numUpdates: Int, currentNavKey: NavKey, onNav: (NavigationKey) -> Unit) {
+fun BottomBar(
+    numUpdates: Int,
+    hasIssues: Boolean,
+    currentNavKey: NavKey,
+    onNav: (NavigationKey) -> Unit,
+) {
     NavigationBar {
         BottomNavDestinations.entries.forEach { dest ->
             NavigationBarItem(
-                icon = { NavIcon(dest, numUpdates) },
+                icon = { NavIcon(dest, numUpdates, hasIssues) },
                 label = { Text(stringResource(dest.label)) },
                 selected = dest.key == currentNavKey,
+                colors = NavigationBarItemDefaults.colors(
+                    indicatorColor = MaterialTheme.colorScheme.primary,
+                    selectedTextColor = MaterialTheme.colorScheme.primary,
+                    selectedIconColor = contentColorFor(MaterialTheme.colorScheme.primary),
+                ),
                 onClick = {
                     if (dest.key != currentNavKey) onNav(dest.key)
                 },
@@ -32,6 +49,7 @@ fun BottomBar(numUpdates: Int, currentNavKey: NavKey, onNav: (NavigationKey) ->
 @Composable
 fun NavigationRail(
     numUpdates: Int,
+    hasIssues: Boolean,
     currentNavKey: NavKey,
     onNav: (NavigationKey) -> Unit,
     modifier: Modifier,
@@ -39,9 +57,14 @@ fun NavigationRail(
     NavigationRail(modifier) {
         BottomNavDestinations.entries.forEach { dest ->
             NavigationRailItem(
-                icon = { NavIcon(dest, numUpdates) },
+                icon = { NavIcon(dest, numUpdates, hasIssues) },
                 label = { Text(stringResource(dest.label)) },
                 selected = dest.key == currentNavKey,
+                colors = NavigationRailItemDefaults.colors(
+                    indicatorColor = MaterialTheme.colorScheme.primary,
+                    selectedTextColor = MaterialTheme.colorScheme.primary,
+                    selectedIconColor = contentColorFor(MaterialTheme.colorScheme.primary),
+                ),
                 onClick = {
                     if (dest.key != currentNavKey) onNav(dest.key)
                 },
@@ -51,13 +74,19 @@ fun NavigationRail(
 }
 
 @Composable
-private fun NavIcon(dest: BottomNavDestinations, numUpdates: Int) {
+private fun NavIcon(dest: BottomNavDestinations, numUpdates: Int, hasIssues: Boolean) {
     BadgedBox(
         badge = {
             if (dest == BottomNavDestinations.MY_APPS && numUpdates > 0) {
-                Badge {
+                Badge(containerColor = MaterialTheme.colorScheme.secondary) {
                     Text(text = numUpdates.toString())
                 }
+            } else if (dest == BottomNavDestinations.MY_APPS && hasIssues) {
+                Icon(
+                    imageVector = Icons.Default.Error,
+                    tint = MaterialTheme.colorScheme.error,
+                    contentDescription = stringResource(R.string.my_apps_header_apps_with_issue)
+                )
             }
         }
     ) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 9b7b7afc4..1721509f6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -11,6 +11,7 @@ import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneSt
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -86,6 +87,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
         ) {
             val viewModel = hiltViewModel<DiscoverViewModel>()
             val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
+            val hasIssues = viewModel.hasIssues.collectAsState(false).value
             Discover(
                 discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
                 onListTap = {
@@ -96,6 +98,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 },
                 onNav = { backStack.add(it) },
                 numUpdates = numUpdates,
+                hasIssues = hasIssues,
                 isBigScreen = isBigScreen,
                 onSearch = viewModel::search,
                 onSearchCleared = viewModel::onSearchCleared,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
index d0676bab7..2f93a2ee0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
@@ -2,6 +2,10 @@ package org.fdroid.ui.apps
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
@@ -10,6 +14,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
@@ -23,21 +28,32 @@ import org.fdroid.ui.utils.Names
 
 @Composable
 fun InstalledAppRow(
-    app: InstalledAppItem,
+    app: MyInstalledAppItem,
     isSelected: Boolean,
     modifier: Modifier = Modifier,
+    hasIssue: Boolean = false,
 ) {
     Column(modifier = modifier) {
         ListItem(
             leadingContent = {
-                AsyncShimmerImage(
-                    model = PackageName(app.packageName, app.iconModel as? DownloadRequest),
-                    error = painterResource(R.drawable.ic_repo_app_default),
-                    contentDescription = null,
-                    modifier = Modifier
-                        .size(48.dp)
-                        .semantics { hideFromAccessibility() },
-                )
+                BadgedBox(badge = {
+                    if (hasIssue) Icon(
+                        imageVector = Icons.Filled.Error,
+                        tint = MaterialTheme.colorScheme.error,
+                        contentDescription =
+                        stringResource(R.string.notification_title_single_update_available),
+                        modifier = Modifier.size(24.dp),
+                    )
+                }) {
+                    AsyncShimmerImage(
+                        model = PackageName(app.packageName, app.iconModel as? DownloadRequest),
+                        error = painterResource(R.drawable.ic_repo_app_default),
+                        contentDescription = null,
+                        modifier = Modifier
+                            .size(48.dp)
+                            .semantics { hideFromAccessibility() },
+                    )
+                }
             },
             headlineContent = {
                 Text(app.name)
@@ -70,6 +86,7 @@ fun InstalledAppRowPreview() {
         Column {
             InstalledAppRow(app, false)
             InstalledAppRow(app, true)
+            InstalledAppRow(app, false, hasIssue = true)
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
index af1176d3f..4be3cb271 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
@@ -1,5 +1,6 @@
 package org.fdroid.ui.apps
 
+import org.fdroid.database.AppIssue
 import org.fdroid.download.DownloadRequest
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.install.InstallStateWithInfo
@@ -32,10 +33,23 @@ data class AppUpdateItem(
     override val lastUpdated: Long = update.added
 }
 
+data class AppWithIssueItem(
+    override val packageName: String,
+    override val name: String,
+    override val installedVersionName: String,
+    val issue: AppIssue,
+    override val lastUpdated: Long,
+    override val iconModel: Any? = null,
+) : MyInstalledAppItem()
+
 data class InstalledAppItem(
     override val packageName: String,
     override val name: String,
-    val installedVersionName: String,
+    override val installedVersionName: String,
     override val lastUpdated: Long,
     override val iconModel: Any? = null,
-) : MyAppItem()
+) : MyInstalledAppItem()
+
+abstract class MyInstalledAppItem : MyAppItem() {
+    abstract val installedVersionName: String
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index e1b766abc..3ab7378ac 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -3,28 +3,20 @@ package org.fdroid.ui.apps
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.annotation.RestrictTo
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.selection.selectable
-import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccessTime
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.SortByAlpha
-import androidx.compose.material3.Button
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -39,7 +31,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
@@ -55,15 +46,12 @@ import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppListSortOrder.LAST_UPDATED
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallConfirmationState
-import org.fdroid.install.InstallState
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.lists.TopSearchBar
 import org.fdroid.ui.utils.BigLoadingIndicator
-import org.fdroid.ui.utils.Names
 import org.fdroid.ui.utils.getMyAppsInfo
-import org.fdroid.ui.utils.getPreviewVersion
-import java.util.concurrent.TimeUnit.DAYS
+import org.fdroid.ui.utils.myAppsModel
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@@ -172,7 +160,12 @@ fun MyApps(
             )
         },
         bottomBar = {
-            if (!isBigScreen) BottomBar(updatableApps?.size ?: 0, NavigationKey.MyApps, onNav)
+            if (!isBigScreen) BottomBar(
+                numUpdates = updatableApps?.size ?: 0,
+                hasIssues = !myAppsModel.appsWithIssue.isNullOrEmpty(),
+                currentNavKey = NavigationKey.MyApps,
+                onNav = onNav,
+            )
         },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
@@ -195,131 +188,13 @@ fun MyApps(
                     .padding(16.dp),
             )
         } else {
-            var showUpdateAllButton by remember(updatableApps) {
-                mutableStateOf(true)
-            }
-            LazyColumn(
-                state = lazyListState,
-                modifier = modifier
-                    .padding(paddingValues)
-                    .then(
-                        if (currentPackageName == null) Modifier
-                        else Modifier.selectableGroup()
-                    ),
-            ) {
-                // Updates header with Update all button (only show when there's a list below)
-                if (!updatableApps.isNullOrEmpty()) {
-                    item(key = "A", contentType = "header") {
-                        Row(verticalAlignment = Alignment.CenterVertically) {
-                            Text(
-                                text = stringResource(R.string.updates),
-                                style = MaterialTheme.typography.titleMedium,
-                                modifier = Modifier
-                                    .padding(16.dp)
-                                    .weight(1f),
-                            )
-                            if (showUpdateAllButton) Button(
-                                onClick = {
-                                    myAppsInfo.updateAll()
-                                    showUpdateAllButton = false
-                                },
-                                modifier = Modifier.padding(end = 16.dp),
-                            ) {
-                                Text(stringResource(R.string.update_all))
-                            }
-                        }
-                    }
-                    // List of updatable apps
-                    items(
-                        items = updatableApps,
-                        key = { it.packageName },
-                        contentType = { "A" },
-                    ) { app ->
-                        val isSelected = app.packageName == currentPackageName
-                        val interactionModifier = if (currentPackageName == null) {
-                            Modifier.clickable(
-                                onClick = { onAppItemClick(app.packageName) }
-                            )
-                        } else {
-                            Modifier.selectable(
-                                selected = isSelected,
-                                onClick = { onAppItemClick(app.packageName) }
-                            )
-                        }
-                        val modifier = Modifier.Companion
-                            .animateItem()
-                            .then(interactionModifier)
-                        UpdatableAppRow(app, isSelected, modifier)
-                    }
-                }
-                // Apps currently installing header
-                if (installingApps.isNotEmpty()) {
-                    item(key = "B", contentType = "header") {
-                        Text(
-                            text = stringResource(R.string.notification_title_summary_installing),
-                            style = MaterialTheme.typography.titleMedium,
-                            modifier = Modifier
-                                .padding(16.dp)
-                        )
-                    }
-                    // List of currently installing apps
-                    items(
-                        items = installingApps,
-                        key = { it.packageName },
-                        contentType = { "B" },
-                    ) { app ->
-                        val isSelected = app.packageName == currentPackageName
-                        val interactionModifier = if (currentPackageName == null) {
-                            Modifier.clickable(
-                                onClick = { onAppItemClick(app.packageName) }
-                            )
-                        } else {
-                            Modifier.selectable(
-                                selected = isSelected,
-                                onClick = { onAppItemClick(app.packageName) }
-                            )
-                        }
-                        val modifier = Modifier.Companion
-                            .animateItem()
-                            .then(interactionModifier)
-                        InstallingAppRow(app, isSelected, modifier)
-                    }
-                }
-                // Installed apps header (only show when we have non-empty lists above)
-                if ((installingApps.isNotEmpty() || !updatableApps.isNullOrEmpty()) &&
-                    !installedApps.isNullOrEmpty()
-                ) {
-                    item(key = "C", contentType = "header") {
-                        Text(
-                            text = stringResource(R.string.installed_apps__activity_title),
-                            style = MaterialTheme.typography.titleMedium,
-                            modifier = Modifier.padding(16.dp),
-                        )
-                    }
-                }
-                // List of installed apps
-                if (installedApps != null) items(
-                    items = installedApps,
-                    key = { it.packageName },
-                    contentType = { "C" },
-                ) { app ->
-                    val isSelected = app.packageName == currentPackageName
-                    val interactionModifier = if (currentPackageName == null) {
-                        Modifier.clickable(
-                            onClick = { onAppItemClick(app.packageName) }
-                        )
-                    } else {
-                        Modifier.selectable(
-                            selected = isSelected,
-                            onClick = { onAppItemClick(app.packageName) }
-                        )
-                    }
-                    val modifier = Modifier
-                        .animateItem()
-                        .then(interactionModifier)
-                    InstalledAppRow(app, isSelected, modifier)
-                }
-            }
+            MyAppsList(
+                myAppsInfo = myAppsInfo,
+                currentPackageName = currentPackageName,
+                lazyListState = lazyListState,
+                onAppItemClick = onAppItemClick,
+                modifier = modifier.padding(paddingValues),
+            )
         }
     }
 }
@@ -349,61 +224,8 @@ fun MyAppsLoadingPreview() {
 @RestrictTo(RestrictTo.Scope.TESTS)
 fun MyAppsPreview() {
     FDroidContent {
-        val installingApp1 = InstallingAppItem(
-            packageName = "A1",
-            installState = InstallState.Downloading(
-                name = "Installing App 1",
-                versionName = "1.0.4",
-                currentVersionName = null,
-                lastUpdated = 23,
-                iconDownloadRequest = null,
-                downloadedBytes = 25,
-                totalBytes = 100,
-                startMillis = System.currentTimeMillis(),
-            )
-        )
-        val app1 = AppUpdateItem(
-            repoId = 1,
-            packageName = "B1",
-            name = "App Update 123",
-            installedVersionName = "1.0.1",
-            update = getPreviewVersion("1.1.0", 123456789),
-            whatsNew = "This is new, all is new, nothing old.",
-        )
-        val app2 = AppUpdateItem(
-            repoId = 2,
-            packageName = "B2",
-            name = Names.randomName,
-            installedVersionName = "3.0.1",
-            update = getPreviewVersion("3.1.0", 9876543),
-            whatsNew = null,
-        )
-        val installedApp1 = InstalledAppItem(
-            packageName = "C1",
-            name = Names.randomName,
-            installedVersionName = "1",
-            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(1)
-        )
-        val installedApp2 = InstalledAppItem(
-            packageName = "C2",
-            name = Names.randomName,
-            installedVersionName = "2",
-            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(2)
-        )
-        val installedApp3 = InstalledAppItem(
-            packageName = "C3",
-            name = Names.randomName,
-            installedVersionName = "3",
-            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(3)
-        )
-        val model = MyAppsModel(
-            installingApps = listOf(installingApp1),
-            appUpdates = listOf(app1, app2),
-            installedApps = listOf(installedApp1, installedApp2, installedApp3),
-            sortOrder = AppListSortOrder.NAME,
-        )
         MyApps(
-            myAppsInfo = getMyAppsInfo(model),
+            myAppsInfo = getMyAppsInfo(myAppsModel),
             currentPackageName = null,
             onAppItemClick = {},
             onNav = {},
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
index df28d9957..fc8e531a2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
@@ -15,6 +15,7 @@ interface MyAppsInfo {
 data class MyAppsModel(
     val installingApps: List<InstallingAppItem>,
     val appUpdates: List<AppUpdateItem>? = null,
+    val appsWithIssue: List<AppWithIssueItem>? = null,
     val installedApps: List<InstalledAppItem>? = null,
     val sortOrder: AppListSortOrder = AppListSortOrder.NAME,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
new file mode 100644
index 000000000..4f2f08425
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
@@ -0,0 +1,237 @@
+package org.fdroid.ui.apps
+
+import androidx.annotation.RestrictTo
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.database.NotAvailable
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.getMyAppsInfo
+import org.fdroid.ui.utils.myAppsModel
+
+@Composable
+fun MyAppsList(
+    myAppsInfo: MyAppsInfo,
+    currentPackageName: String?,
+    lazyListState: LazyListState,
+    onAppItemClick: (String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val updatableApps = myAppsInfo.model.appUpdates
+    val installingApps = myAppsInfo.model.installingApps
+    val appsWithIssue = myAppsInfo.model.appsWithIssue
+    val installedApps = myAppsInfo.model.installedApps
+    // allow us to hide "update all" button to avoid user pressing it twice
+    var showUpdateAllButton by remember(updatableApps) {
+        mutableStateOf(true)
+    }
+    LazyColumn(
+        state = lazyListState,
+        modifier = modifier
+            .then(
+                if (currentPackageName == null) Modifier
+                else Modifier.selectableGroup()
+            ),
+    ) {
+        // Updates header with Update all button (only show when there's a list below)
+        if (!updatableApps.isNullOrEmpty()) {
+            item(key = "A", contentType = "header") {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Text(
+                        text = stringResource(R.string.updates),
+                        style = MaterialTheme.typography.titleMedium,
+                        modifier = Modifier
+                            .padding(16.dp)
+                            .weight(1f),
+                    )
+                    if (showUpdateAllButton) Button(
+                        onClick = {
+                            myAppsInfo.updateAll()
+                            showUpdateAllButton = false
+                        },
+                        modifier = Modifier.padding(end = 16.dp),
+                    ) {
+                        Text(stringResource(R.string.update_all))
+                    }
+                }
+            }
+            // List of updatable apps
+            items(
+                items = updatableApps,
+                key = { it.packageName },
+                contentType = { "A" },
+            ) { app ->
+                val isSelected = app.packageName == currentPackageName
+                val interactionModifier = if (currentPackageName == null) {
+                    Modifier.clickable(
+                        onClick = { onAppItemClick(app.packageName) }
+                    )
+                } else {
+                    Modifier.selectable(
+                        selected = isSelected,
+                        onClick = { onAppItemClick(app.packageName) }
+                    )
+                }
+                val modifier = Modifier.Companion
+                    .animateItem()
+                    .then(interactionModifier)
+                UpdatableAppRow(app, isSelected, modifier)
+            }
+        }
+        // Apps currently installing header
+        if (installingApps.isNotEmpty()) {
+            item(key = "B", contentType = "header") {
+                Text(
+                    text = stringResource(R.string.notification_title_summary_installing),
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier
+                        .padding(16.dp)
+                )
+            }
+            // List of currently installing apps
+            items(
+                items = installingApps,
+                key = { it.packageName },
+                contentType = { "B" },
+            ) { app ->
+                val isSelected = app.packageName == currentPackageName
+                val interactionModifier = if (currentPackageName == null) {
+                    Modifier.clickable(
+                        onClick = { onAppItemClick(app.packageName) }
+                    )
+                } else {
+                    Modifier.selectable(
+                        selected = isSelected,
+                        onClick = { onAppItemClick(app.packageName) }
+                    )
+                }
+                val modifier = Modifier.Companion
+                    .animateItem()
+                    .then(interactionModifier)
+                InstallingAppRow(app, isSelected, modifier)
+            }
+        }
+        // Apps with issues
+        if (!appsWithIssue.isNullOrEmpty()) {
+            // header
+            item(key = "C", contentType = "header") {
+                Text(
+                    text = stringResource(R.string.my_apps_header_apps_with_issue),
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier.padding(16.dp),
+                )
+            }
+            // list of apps with issues
+            items(
+                items = appsWithIssue,
+                key = { it.packageName },
+                contentType = { "C" },
+            ) { app ->
+                val isSelected = app.packageName == currentPackageName
+                var showNotAvailableDialog by remember { mutableStateOf(false) }
+                val onClick = {
+                    if (app.issue is NotAvailable) {
+                        showNotAvailableDialog = true
+                    } else {
+                        onAppItemClick(app.packageName)
+                    }
+                }
+                val interactionModifier = if (currentPackageName == null) {
+                    Modifier.clickable(
+                        onClick = onClick,
+                    )
+                } else {
+                    Modifier.selectable(
+                        selected = isSelected,
+                        onClick = onClick,
+                    )
+                }
+                val modifier = Modifier
+                    .animateItem()
+                    .then(interactionModifier)
+                InstalledAppRow(app, isSelected, modifier, hasIssue = true)
+                if (showNotAvailableDialog) AlertDialog(
+                    onDismissRequest = { showNotAvailableDialog = false },
+                    title = { Text(text = stringResource(R.string.app_issue_not_available_title)) },
+                    text = { Text(text = stringResource(R.string.app_issue_not_available_text)) },
+                    confirmButton = {
+                        TextButton(
+                            onClick = { showNotAvailableDialog = false }
+                        ) { Text(stringResource(R.string.ok)) }
+                    },
+                )
+            }
+        }
+        // Installed apps header (only show when we have non-empty lists above)
+        val aboveNonEmpty = installingApps.isNotEmpty() ||
+            !updatableApps.isNullOrEmpty() ||
+            !appsWithIssue.isNullOrEmpty()
+        if (aboveNonEmpty && !installedApps.isNullOrEmpty()) {
+            item(key = "D", contentType = "header") {
+                Text(
+                    text = stringResource(R.string.installed_apps__activity_title),
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier.padding(16.dp),
+                )
+            }
+        }
+        // List of installed apps
+        if (installedApps != null) items(
+            items = installedApps,
+            key = { it.packageName },
+            contentType = { "D" },
+        ) { app ->
+            val isSelected = app.packageName == currentPackageName
+            val interactionModifier = if (currentPackageName == null) {
+                Modifier.clickable(
+                    onClick = { onAppItemClick(app.packageName) }
+                )
+            } else {
+                Modifier.selectable(
+                    selected = isSelected,
+                    onClick = { onAppItemClick(app.packageName) }
+                )
+            }
+            val modifier = Modifier
+                .animateItem()
+                .then(interactionModifier)
+            InstalledAppRow(app, isSelected, modifier)
+        }
+    }
+}
+
+@Preview
+@Composable
+@RestrictTo(RestrictTo.Scope.TESTS)
+private fun MyAppsListPreview() {
+    FDroidContent {
+        MyApps(
+            myAppsInfo = getMyAppsInfo(myAppsModel),
+            currentPackageName = null,
+            onAppItemClick = {},
+            onNav = {},
+            isBigScreen = false,
+        )
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index ad5b83fce..b751a4f22 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -4,6 +4,7 @@ package org.fdroid.ui.apps
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.install.InstallState
@@ -17,13 +18,15 @@ import java.util.Locale
 fun MyAppsPresenter(
     appUpdatesFlow: StateFlow<List<AppUpdateItem>?>,
     appInstallStatesFlow: StateFlow<Map<String, InstallState>>,
-    installedAppsFlow: StateFlow<List<InstalledAppItem>?>,
+    appsWithIssuesFlow: StateFlow<List<AppWithIssueItem>?>,
+    installedAppsFlow: Flow<List<InstalledAppItem>>,
     searchQueryFlow: StateFlow<String>,
     sortOrderFlow: StateFlow<AppListSortOrder>,
 ): MyAppsModel {
     val appUpdates = appUpdatesFlow.collectAsState().value
     val appInstallStates = appInstallStatesFlow.collectAsState().value
-    val installedApps = installedAppsFlow.collectAsState().value
+    val appsWithIssues = appsWithIssuesFlow.collectAsState().value
+    val installedApps = installedAppsFlow.collectAsState(null).value
     val searchQuery = searchQueryFlow.collectAsState().value.normalize()
     val sortOrder = sortOrderFlow.collectAsState().value
     val processedPackageNames = mutableSetOf<String>()
@@ -52,6 +55,16 @@ fun MyAppsPresenter(
         if (keep) processedPackageNames.add(it.packageName)
         keep
     }
+    val withIssues = appsWithIssues?.filter {
+        val keep = if (searchQuery.isBlank()) {
+            it.packageName !in processedPackageNames
+        } else {
+            it.packageName !in processedPackageNames &&
+                it.name.normalize().contains(searchQuery, ignoreCase = true)
+        }
+        if (keep) processedPackageNames.add(it.packageName)
+        keep
+    }
     val installed = installedApps?.filter {
         if (searchQuery.isBlank()) {
             it.packageName !in processedPackageNames
@@ -63,6 +76,7 @@ fun MyAppsPresenter(
     return MyAppsModel(
         installingApps = installingApps.sort(sortOrder),
         appUpdates = updates?.sort(sortOrder),
+        appsWithIssue = withIssues?.sort(sortOrder),
         installedApps = installed?.sort(sortOrder),
         sortOrder = sortOrder,
     )
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index 46b1b3636..a9e8c32ec 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -3,9 +3,7 @@ package org.fdroid.ui.apps
 import android.app.Application
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.Observer
 import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.application
 import androidx.lifecycle.viewModelScope
 import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
@@ -13,11 +11,12 @@ import app.cash.molecule.launchMolecule
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import mu.KotlinLogging
-import org.fdroid.database.AppListItem
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.getImageModel
@@ -25,6 +24,7 @@ import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallConfirmationState
 import org.fdroid.install.InstallState
+import org.fdroid.install.InstalledAppsCache
 import org.fdroid.settings.SettingsManager
 import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
@@ -37,6 +37,7 @@ class MyAppsViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
     private val settingsManager: SettingsManager,
+    private val installedAppsCache: InstalledAppsCache,
     private val appInstallManager: AppInstallManager,
     private val updatesManager: UpdatesManager,
     private val repoManager: RepoManager,
@@ -48,43 +49,39 @@ class MyAppsViewModel @Inject constructor(
         CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
     private val updates = updatesManager.updates
-    private val installedApps = MutableStateFlow<List<InstalledAppItem>?>(null)
-    private var installedAppsLiveData =
-        db.getAppDao().getInstalledAppListItems(application.packageManager)
-    private val installedAppsObserver = Observer<List<AppListItem>> { list ->
-        val proxyConfig = settingsManager.proxyConfig
-        installedApps.value = list.map { app ->
-            InstalledAppItem(
-                packageName = app.packageName,
-                name = app.name ?: "Unknown app",
-                installedVersionName = app.installedVersionName ?: "???",
-                lastUpdated = app.lastUpdated,
-                iconModel = repoManager.getRepository(app.repoId)?.let { repo ->
-                    app.getIcon(localeList)?.getImageModel(repo, proxyConfig)
-                },
-            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val installedAppItems =
+        installedAppsCache.installedApps.flatMapLatest { installedApps ->
+            val proxyConfig = settingsManager.proxyConfig
+            db.getAppDao().getInstalledAppListItems(installedApps).map { list ->
+                list.map { app ->
+                    InstalledAppItem(
+                        packageName = app.packageName,
+                        name = app.name ?: "Unknown app",
+                        installedVersionName = app.installedVersionName ?: "???",
+                        lastUpdated = app.lastUpdated,
+                        iconModel = repoManager.getRepository(app.repoId)?.let { repo ->
+                            app.getIcon(localeList)?.getImageModel(repo, proxyConfig)
+                        },
+                    )
+                }
+            }
         }
-    }
-    private val searchQuery = savedStateHandle.getMutableStateFlow<String>("query", "")
+
+    private val searchQuery = savedStateHandle.getMutableStateFlow("query", "")
     private val sortOrder = savedStateHandle.getMutableStateFlow("sort", AppListSortOrder.NAME)
     val myAppsModel: StateFlow<MyAppsModel> = moleculeScope.launchMolecule(mode = ContextClock) {
         MyAppsPresenter(
             appUpdatesFlow = updates,
             appInstallStatesFlow = appInstallManager.appInstallStates,
-            installedAppsFlow = installedApps,
+            appsWithIssuesFlow = updatesManager.appsWithIssues,
+            installedAppsFlow = installedAppItems,
             searchQueryFlow = searchQuery,
             sortOrderFlow = sortOrder,
         )
     }
 
-    init {
-        installedAppsLiveData.observeForever(installedAppsObserver)
-    }
-
-    override fun onCleared() {
-        installedAppsLiveData.removeObserver(installedAppsObserver)
-    }
-
     fun updateAll() {
         scope.launch {
             updatesManager.updateAll()
@@ -100,14 +97,8 @@ class MyAppsViewModel @Inject constructor(
     }
 
     fun refresh() {
-        updatesManager.loadUpdates()
-
-        // need to get new liveData from the DB, so it re-queries installed packages
-        installedAppsLiveData.removeObserver(installedAppsObserver)
-        installedAppsLiveData =
-            db.getAppDao().getInstalledAppListItems(application.packageManager).apply {
-                observeForever(installedAppsObserver)
-            }
+        // TODO check if really not needed anymore and if so remove
+        // updatesManager.loadUpdates()
     }
 
     fun confirmAppInstall(packageName: String, state: InstallConfirmationState) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index fed0f7735..6c7a0c9dd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.liveRegion
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
@@ -52,7 +53,7 @@ fun UpdatableAppRow(
                 BadgedBox(badge = {
                     Icon(
                         imageVector = Icons.Filled.NewReleases,
-                        tint = MaterialTheme.colorScheme.error,
+                        tint = MaterialTheme.colorScheme.secondary,
                         contentDescription =
                         stringResource(R.string.notification_title_single_update_available),
                         modifier = Modifier.size(24.dp),
@@ -62,7 +63,9 @@ fun UpdatableAppRow(
                         model = PackageName(app.packageName, app.iconModel as? DownloadRequest),
                         error = painterResource(R.drawable.ic_repo_app_default),
                         contentDescription = null,
-                        modifier = Modifier.size(48.dp),
+                        modifier = Modifier
+                            .size(48.dp)
+                            .semantics { hideFromAccessibility() },
                     )
                 }
             },
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index e8d3f87f1..d4f25b741 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -110,7 +110,9 @@ fun AppDetails(
         ) {
             // Header is taking care of top innerPadding
             AppDetailsHeader(item, innerPadding)
-            AnimatedVisibility(item.showWarnings) { AppDetailsWarnings(item) }
+            AnimatedVisibility(item.showWarnings) {
+                AppDetailsWarnings(item, Modifier.padding(horizontal = 16.dp))
+            }
             // What's New
             if (item.installedVersion != null &&
                 (item.whatsNew != null || item.app.changelog != null)
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index aebd5cc35..d580fd027 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -7,6 +7,7 @@ import androidx.annotation.VisibleForTesting
 import androidx.core.os.LocaleListCompat
 import io.ktor.client.engine.ProxyConfig
 import org.fdroid.database.App
+import org.fdroid.database.AppIssue
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppPrefs
 import org.fdroid.database.AppVersion
@@ -56,12 +57,7 @@ data class AppDetailsItem(
     val appPrefs: AppPrefs? = null,
     val whatsNew: String? = null,
     val antiFeatures: List<AntiFeature>? = null,
-    /**
-     * true if this app from this repository has no versions with a
-     * compatible signer. This means that the app is installed, but does not receive updates either
-     * because the signer in the repo has changed or a wrong repo is set as preferred.
-     */
-    val noUpdatesBecauseDifferentSigner: Boolean = false,
+    val issue: AppIssue? = null,
     val authorHasMoreThanOneApp: Boolean = false,
     val proxy: ProxyConfig?,
 ) {
@@ -78,7 +74,7 @@ data class AppDetailsItem(
         suggestedVersion: AppVersion?,
         possibleUpdate: AppVersion?,
         appPrefs: AppPrefs?,
-        noUpdatesBecauseDifferentSigner: Boolean,
+        issue: AppIssue?,
         authorHasMoreThanOneApp: Boolean,
         localeList: LocaleListCompat,
         proxy: ProxyConfig?,
@@ -117,7 +113,7 @@ data class AppDetailsItem(
                 localeList = localeList,
                 proxy = proxy,
             ),
-        noUpdatesBecauseDifferentSigner = noUpdatesBecauseDifferentSigner,
+        issue = issue,
         authorHasMoreThanOneApp = authorHasMoreThanOneApp,
         proxy = proxy,
     )
@@ -171,7 +167,7 @@ data class AppDetailsItem(
      * True if this app has warnings, we need to show to the user.
      */
     val showWarnings: Boolean
-        get() = isIncompatible || oldTargetSdk || noUpdatesBecauseDifferentSigner
+        get() = isIncompatible || oldTargetSdk || issue != null
 
     /**
      * True if the targetSdk of the suggested version is so old
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 3b20736c3..079a38c1b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -56,18 +56,19 @@ class AppDetailsViewModel @Inject constructor(
     private val currentRepoIdFlow = MutableStateFlow<Long?>(null)
 
     val appDetails: StateFlow<AppDetailsItem?> = viewModelScope.launchMolecule(
-        context = Dispatchers.IO, mode = Immediate,
+        context = scope.coroutineContext, mode = Immediate,
     ) {
         DetailsPresenter(
             db = db,
             repoManager = repoManager,
             repoPreLoader = repoPreLoader,
             updateChecker = updateChecker,
+            settingsManager = settingsManager,
             appInstallManager = appInstallManager,
             viewModel = this,
             packageInfoFlow = packageInfoFlow,
             currentRepoIdFlow = currentRepoIdFlow,
-            settingsManager = settingsManager,
+            appsWithIssuesFlow = updatesManager.appsWithIssues,
         )
     }
 
@@ -107,8 +108,6 @@ class AppDetailsViewModel @Inject constructor(
             if (result is InstallState.Installed) {
                 // to reload packageInfoFlow with fresh packageInfo
                 loadPackageInfoFlow(appMetadata.packageName)
-                // load updates as there may be less now (removes/updates notification)
-                updatesManager.loadUpdates()
             }
         }
     }
@@ -160,7 +159,10 @@ class AppDetailsViewModel @Inject constructor(
     @UiThread
     fun onPreferredRepoChanged(repoId: Long) {
         val packageName = packageInfoFlow.value?.packageName ?: error("Had not package name")
-        repoManager.setPreferredRepoId(packageName, repoId)
+        scope.launch {
+            repoManager.setPreferredRepoId(packageName, repoId).join()
+            updatesManager.loadUpdates()
+        }
     }
 
     override fun onCleared() {
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
index 593e8af3c..e87c4adf6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
@@ -18,40 +18,79 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
 import org.fdroid.R
+import org.fdroid.database.AppVersion
+import org.fdroid.database.KnownVulnerability
+import org.fdroid.database.NoCompatibleSigner
+import org.fdroid.database.NotAvailable
+import org.fdroid.database.UpdateInOtherRepo
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.index.v2.ANTI_FEATURE_KNOWN_VULNERABILITY
 import org.fdroid.ui.utils.testApp
 
 @Composable
 fun AppDetailsWarnings(
     item: AppDetailsItem,
+    modifier: Modifier = Modifier,
 ) {
-    val (color, stringRes) = when {
+    val (color, string) = when {
+        // app issues take priority
+        item.issue != null -> when (item.issue) {
+            // apps has a known security vulnerability
+            is KnownVulnerability -> {
+                val details = item.versions?.firstNotNullOfOrNull { versionItem ->
+                    (versionItem.version as? AppVersion)?.getAntiFeatureReason(
+                        antiFeatureKey = ANTI_FEATURE_KNOWN_VULNERABILITY,
+                        localeList = LocaleListCompat.getDefault(),
+                    )
+                }
+                Pair(
+                    MaterialTheme.colorScheme.errorContainer,
+                    if (details.isNullOrBlank()) {
+                        stringResource(R.string.antiknownvulnlist)
+                    } else {
+                        stringResource(R.string.antiknownvulnlist) + ":\n\n" + details
+                    },
+                )
+            }
+            is NoCompatibleSigner -> Pair(
+                MaterialTheme.colorScheme.errorContainer,
+                if (item.issue.repoIdWithCompatibleSigner == null) {
+                    stringResource(R.string.app_no_compatible_signer)
+                } else {
+                    stringResource(R.string.app_no_compatible_signer_in_this_repo)
+                },
+            )
+            is UpdateInOtherRepo -> Pair(
+                MaterialTheme.colorScheme.inverseSurface,
+                stringResource(R.string.app_issue_update_other_repo),
+            )
+            NotAvailable -> Pair(
+                MaterialTheme.colorScheme.errorContainer,
+                stringResource(R.string.error),
+            )
+        }
         // app is outright incompatible
         item.isIncompatible -> Pair(
             MaterialTheme.colorScheme.errorContainer,
-            R.string.app_no_compatible_versions,
-        )
-        // app is installed, but can't receive updates, because current repo has different signer
-        item.noUpdatesBecauseDifferentSigner -> Pair(
-            MaterialTheme.colorScheme.errorContainer,
-            R.string.app_no_compatible_signer,
+            stringResource(R.string.app_no_compatible_versions),
         )
         // app targets old targetSdk, not a deal breaker, but worth flagging, no auto-update
         item.oldTargetSdk -> Pair(
             MaterialTheme.colorScheme.inverseSurface,
-            R.string.app_no_auto_update,
+            stringResource(R.string.app_no_auto_update),
         )
         else -> return
     }
     ElevatedCard(
         colors = CardDefaults.elevatedCardColors(containerColor = color),
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
-            .padding(8.dp),
+            .padding(vertical = 8.dp),
     ) {
         WarningRow(
-            text = stringResource(stringRes),
+            text = string,
         )
     }
 }
@@ -59,7 +98,7 @@ fun AppDetailsWarnings(
 @Composable
 private fun WarningRow(text: String) {
     Row(
-        horizontalArrangement = spacedBy(8.dp),
+        horizontalArrangement = spacedBy(16.dp),
         verticalAlignment = CenterVertically,
         modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
     ) {
@@ -78,6 +117,17 @@ fun AppDetailsWarningsPreview() {
     }
 }
 
+@Preview
+@Composable
+private fun KnownVulnPreview() {
+    FDroidContent {
+        Column {
+            AppDetailsWarnings(testApp.copy(issue = KnownVulnerability(true)))
+            AppDetailsWarnings(testApp.copy(issue = KnownVulnerability(false)))
+        }
+    }
+}
+
 @Preview
 @Composable
 private fun IncompatiblePreview() {
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 590aa817a..95341045d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -20,6 +20,7 @@ import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallState
 import org.fdroid.repo.RepoPreLoader
 import org.fdroid.settings.SettingsManager
+import org.fdroid.ui.apps.AppWithIssueItem
 import org.fdroid.utils.sha256
 
 private const val TAG = "DetailsPresenter"
@@ -37,11 +38,13 @@ fun DetailsPresenter(
     viewModel: AppDetailsViewModel,
     packageInfoFlow: StateFlow<AppInfo?>,
     currentRepoIdFlow: StateFlow<Long?>,
+    appsWithIssuesFlow: StateFlow<List<AppWithIssueItem>?>,
 ): AppDetailsItem? {
     val packagePair = packageInfoFlow.collectAsState().value ?: return null
     val packageName = packagePair.packageName
     val packageInfo = packagePair.packageInfo
     val currentRepoId = currentRepoIdFlow.collectAsState().value
+    val appsWithIssues = appsWithIssuesFlow.collectAsState().value
     val app = if (currentRepoId == null) {
         val flow = remember {
             db.getAppDao().getApp(packageName).asFlow()
@@ -118,14 +121,6 @@ fun DetailsPresenter(
     val installedVersion = packageInfo?.let {
         versions?.find { it.versionCode == installedVersionCode }
     }
-    val noUpdatesBecauseDifferentSigner = if (packageInfo != null && versions != null) {
-        // return true of no version has same signer
-        versions.none { version ->
-            version.manifest.signer?.sha256?.get(0) == installedSigner
-        }
-    } else {
-        false
-    }
     val authorName = app.authorName
     val authorHasMoreThanOneApp = if (authorName == null) false else {
         val flow = remember(authorName) {
@@ -133,6 +128,9 @@ fun DetailsPresenter(
         }
         flow.collectAsState(false).value
     }
+    val issue = remember(appsWithIssues) {
+        appsWithIssues?.find { it.packageName == packageName }?.issue
+    }
     val locales = LocaleListCompat.getDefault()
     Log.d(TAG, "Presenting app details:")
     Log.d(TAG, "   app '${app.name}' ($packageName) in ${repo.address}")
@@ -202,7 +200,7 @@ fun DetailsPresenter(
         suggestedVersion = suggestedVersion,
         possibleUpdate = possibleUpdate,
         appPrefs = appPrefs,
-        noUpdatesBecauseDifferentSigner = noUpdatesBecauseDifferentSigner,
+        issue = issue,
         authorHasMoreThanOneApp = authorHasMoreThanOneApp,
         localeList = locales,
         proxy = settingsManager.proxyConfig,
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 b16493b54..6084c48c3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -54,6 +54,7 @@ import org.fdroid.ui.utils.BigLoadingIndicator
 fun Discover(
     discoverModel: DiscoverModel,
     numUpdates: Int,
+    hasIssues: Boolean,
     isBigScreen: Boolean,
     onSearch: suspend (String) -> Unit,
     onSearchCleared: () -> Unit,
@@ -97,7 +98,7 @@ fun Discover(
             )
         },
         bottomBar = {
-            if (!isBigScreen) BottomBar(numUpdates, NavigationKey.Discover, onNav)
+            if (!isBigScreen) BottomBar(numUpdates, hasIssues, NavigationKey.Discover, onNav)
         },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
@@ -205,12 +206,13 @@ fun LoadingDiscoverPreview() {
         Discover(
             discoverModel = LoadingDiscoverModel(true),
             numUpdates = 23,
+            hasIssues = true,
             isBigScreen = false,
+            onSearch = {},
+            onSearchCleared = {},
             onListTap = {},
             onAppTap = {},
             onNav = {},
-            onSearch = {},
-            onSearchCleared = {},
         )
     }
 }
@@ -222,12 +224,13 @@ private fun NoEnabledReposPreview() {
         Discover(
             discoverModel = NoEnabledReposDiscoverModel,
             numUpdates = 0,
+            hasIssues = true,
             isBigScreen = false,
+            onSearch = {},
+            onSearchCleared = {},
             onListTap = {},
             onAppTap = {},
             onNav = {},
-            onSearch = {},
-            onSearchCleared = {},
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 3d239a051..77d1552c0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -52,6 +52,7 @@ class DiscoverViewModel @Inject constructor(
     private val collator = Collator.getInstance(Locale.getDefault())
 
     val numUpdates = updatesManager.numUpdates
+    val hasIssues = updatesManager.appsWithIssues.map { !it.isNullOrEmpty() }
     val newApps = db.getAppDao().getNewAppsFlow().map { list ->
         val proxyConfig = settingsManager.proxyConfig
         list.mapNotNull {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index fe64391ae..4eddeb9e7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -22,6 +22,7 @@ import org.fdroid.index.RepoManager
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.OnboardingManager
 import org.fdroid.settings.SettingsManager
+import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 
@@ -29,6 +30,7 @@ import javax.inject.Inject
 class RepositoriesViewModel @Inject constructor(
     app: Application,
     private val repoManager: RepoManager,
+    private val updateManager: UpdatesManager,
     private val settingsManager: SettingsManager,
     private val onboardingManager: OnboardingManager,
     @param:IoDispatcher private val ioScope: CoroutineScope,
@@ -82,6 +84,7 @@ class RepositoriesViewModel @Inject constructor(
     fun onRepositoryEnabled(repoId: Long, enabled: Boolean) {
         ioScope.launch {
             repoManager.setRepositoryEnabled(repoId, enabled)
+            updateManager.loadUpdates()
             if (enabled) withContext(Dispatchers.Main) {
                 RepoUpdateWorker.updateNow(application, repoId)
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 6f3319071..210495df8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -1,10 +1,13 @@
 package org.fdroid.ui.utils
 
 import android.content.Intent
+import androidx.annotation.RestrictTo
 import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppPrefs
+import org.fdroid.database.KnownVulnerability
+import org.fdroid.database.NotAvailable
 import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
 import org.fdroid.index.IndexFormatVersion
@@ -13,6 +16,10 @@ import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
 import org.fdroid.install.InstallConfirmationState
 import org.fdroid.install.InstallState
+import org.fdroid.ui.apps.AppUpdateItem
+import org.fdroid.ui.apps.AppWithIssueItem
+import org.fdroid.ui.apps.InstalledAppItem
+import org.fdroid.ui.apps.InstallingAppItem
 import org.fdroid.ui.apps.MyAppsInfo
 import org.fdroid.ui.apps.MyAppsModel
 import org.fdroid.ui.categories.CategoryItem
@@ -176,7 +183,6 @@ val testApp = AppDetailsItem(
         "and in the long run the SABR video protocol needs to be implemented, " +
         "but TeamNewPipe members are currently busy so any help would be greatly appreciated! " +
         "https://github.com/TeamNewPipe/NewPipe/issues/12248",
-    noUpdatesBecauseDifferentSigner = true,
     authorHasMoreThanOneApp = true,
     versions = listOf(
         VersionItem(
@@ -264,6 +270,80 @@ fun getMyAppsInfo(model: MyAppsModel): MyAppsInfo = object : MyAppsInfo {
     override fun confirmAppInstall(packageName: String, state: InstallConfirmationState) {}
 }
 
+@RestrictTo(RestrictTo.Scope.TESTS)
+internal val myAppsModel = MyAppsModel(
+    appUpdates = listOf(
+        AppUpdateItem(
+            repoId = 1,
+            packageName = "B1",
+            name = "App Update 123",
+            installedVersionName = "1.0.1",
+            update = getPreviewVersion("1.1.0", 123456789),
+            whatsNew = "This is new, all is new, nothing old.",
+        ),
+        AppUpdateItem(
+            repoId = 2,
+            packageName = "B2",
+            name = Names.randomName,
+            installedVersionName = "3.0.1",
+            update = getPreviewVersion("3.1.0", 9876543),
+            whatsNew = null,
+        )
+    ),
+    installingApps = listOf(
+        InstallingAppItem(
+            packageName = "A1",
+            installState = InstallState.Downloading(
+                name = "Installing App 1",
+                versionName = "1.0.4",
+                currentVersionName = null,
+                lastUpdated = 23,
+                iconDownloadRequest = null,
+                downloadedBytes = 25,
+                totalBytes = 100,
+                startMillis = System.currentTimeMillis(),
+            )
+        )
+    ),
+    appsWithIssue = listOf(
+        AppWithIssueItem(
+            packageName = "C1",
+            name = Names.randomName,
+            installedVersionName = "1",
+            issue = KnownVulnerability(true),
+            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(5)
+        ),
+        AppWithIssueItem(
+            packageName = "C2",
+            name = Names.randomName,
+            installedVersionName = "2",
+            issue = NotAvailable,
+            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(7)
+        ),
+    ),
+    installedApps = listOf(
+        InstalledAppItem(
+            packageName = "D1",
+            name = Names.randomName,
+            installedVersionName = "1",
+            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(1)
+        ),
+        InstalledAppItem(
+            packageName = "D2",
+            name = Names.randomName,
+            installedVersionName = "2",
+            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(2)
+        ),
+        InstalledAppItem(
+            packageName = "D3",
+            name = Names.randomName,
+            installedVersionName = "3",
+            lastUpdated = System.currentTimeMillis() - DAYS.toMillis(3)
+        )
+    ),
+    sortOrder = AppListSortOrder.NAME,
+)
+
 fun getRepositoriesInfo(
     model: RepositoryModel,
     currentRepositoryId: Long? = null,
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 5a65cd5a4..6e0937b11 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -1,6 +1,7 @@
 package org.fdroid.updates
 
 import android.content.Context
+import android.content.pm.PackageInfo
 import androidx.core.os.LocaleListCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
@@ -17,14 +18,18 @@ import kotlinx.coroutines.sync.withPermit
 import mu.KotlinLogging
 import org.fdroid.NotificationManager
 import org.fdroid.database.AppVersion
-import org.fdroid.database.DbUpdateChecker
+import org.fdroid.database.AvailableAppWithIssue
+import org.fdroid.database.DbAppChecker
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.database.UnavailableAppWithIssue
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
+import org.fdroid.install.InstalledAppsCache
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.apps.AppUpdateItem
+import org.fdroid.ui.apps.AppWithIssueItem
 import org.fdroid.utils.IoDispatcher
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -34,10 +39,11 @@ import kotlin.math.min
 class UpdatesManager @Inject constructor(
     @param:ApplicationContext private val context: Context,
     private val db: FDroidDatabase,
-    private val dbUpdateChecker: DbUpdateChecker,
+    private val dbAppChecker: DbAppChecker,
     private val settingsManager: SettingsManager,
     private val repoManager: RepoManager,
     private val appInstallManager: AppInstallManager,
+    private val installedAppsCache: InstalledAppsCache,
     private val notificationManager: NotificationManager,
     @param:IoDispatcher private val coroutineScope: CoroutineScope,
 ) {
@@ -45,6 +51,8 @@ class UpdatesManager @Inject constructor(
 
     private val _updates = MutableStateFlow<List<AppUpdateItem>?>(null)
     val updates = _updates.asStateFlow()
+    private val _appsWithIssues = MutableStateFlow<List<AppWithIssueItem>?>(null)
+    val appsWithIssues = _appsWithIssues.asStateFlow()
     private val _numUpdates = MutableStateFlow(0)
     val numUpdates = _numUpdates.asStateFlow()
 
@@ -77,16 +85,24 @@ class UpdatesManager @Inject constructor(
         )
 
     init {
-        loadUpdates()
+        coroutineScope.launch {
+            // refresh updates whenever installed apps change
+            installedAppsCache.installedApps.collect {
+                loadUpdates(it)
+            }
+        }
     }
 
-    fun loadUpdates() = coroutineScope.launch {
-        // TODO (includeKnownVulnerabilities = true) and show in AppDetails
+    fun loadUpdates(
+        packageInfoMap: Map<String, PackageInfo> = installedAppsCache.installedApps.value,
+    ) = coroutineScope.launch {
+        if (packageInfoMap.isEmpty()) return@launch
         val localeList = LocaleListCompat.getDefault()
-        val updates = try {
-            log.info { "Checking for updates..." }
+        try {
+            log.info { "Checking for updates (${packageInfoMap.size} apps)..." }
             val proxyConfig = settingsManager.proxyConfig
-            dbUpdateChecker.getUpdatableApps(onlyFromPreferredRepo = true).map { update ->
+            val apps = dbAppChecker.getApps(packageInfoMap = packageInfoMap)
+            val updates = apps.updates.map { update ->
                 AppUpdateItem(
                     repoId = update.repoId,
                     packageName = update.packageName,
@@ -99,17 +115,43 @@ class UpdatesManager @Inject constructor(
                     },
                 )
             }
+            _updates.value = updates
+            _numUpdates.value = updates.size
+            // update 'update available' notification, if it is currently showing
+            if (notificationManager.isAppUpdatesAvailableNotificationShowing) {
+                if (updates.isEmpty()) notificationManager.cancelAppUpdatesAvailableNotification()
+                else notificationManager.showAppUpdatesAvailableNotification(notificationStates)
+            }
+
+            val issueItems = apps.issues.map { app ->
+                when (app) {
+                    is AvailableAppWithIssue -> AppWithIssueItem(
+                        packageName = app.app.packageName,
+                        name = app.app.getName(localeList) ?: "Unknown app",
+                        installedVersionName = app.installVersionName,
+                        issue = app.issue,
+                        lastUpdated = app.app.lastUpdated,
+                        iconModel = PackageName(
+                            packageName = app.app.packageName,
+                            iconDownloadRequest = repoManager.getRepository(app.app.repoId)?.let {
+                                app.app.getIcon(localeList)?.getImageModel(it, proxyConfig)
+                            } as? DownloadRequest),
+                    )
+                    is UnavailableAppWithIssue -> AppWithIssueItem(
+                        packageName = app.packageName,
+                        name = app.name.toString(),
+                        installedVersionName = app.installVersionName,
+                        issue = app.issue,
+                        lastUpdated = -1,
+                        iconModel = PackageName(app.packageName, null),
+                    )
+                }
+            }
+            _appsWithIssues.value = issueItems
         } catch (e: Exception) {
             log.error(e) { "Error loading updates: " }
             return@launch
         }
-        _updates.value = updates
-        _numUpdates.value = updates.size
-        // update 'update available' notification, if it is currently showing
-        if (notificationManager.isAppUpdatesAvailableNotificationShowing) {
-            if (updates.isEmpty()) notificationManager.cancelAppUpdatesAvailableNotification()
-            else notificationManager.showAppUpdatesAvailableNotification(notificationStates)
-        }
     }
 
     suspend fun updateAll(): List<Job> {
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
index e95adbaf9..0d404f95e 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
@@ -9,7 +9,7 @@ import dagger.hilt.components.SingletonComponent
 import org.fdroid.CompatibilityChecker
 import org.fdroid.CompatibilityCheckerImpl
 import org.fdroid.UpdateChecker
-import org.fdroid.database.DbUpdateChecker
+import org.fdroid.database.DbAppChecker
 import org.fdroid.database.FDroidDatabase
 import javax.inject.Singleton
 
@@ -30,12 +30,12 @@ object UpdatesModule {
 
     @Provides
     @Singleton
-    fun provideDbUpdateChecker(
+    fun provideDbAppChecker(
         @ApplicationContext context: Context,
         db: FDroidDatabase,
         updateChecker: UpdateChecker,
         compatibilityChecker: CompatibilityChecker,
-    ): DbUpdateChecker {
-        return DbUpdateChecker(db, context.packageManager, compatibilityChecker, updateChecker)
+    ): DbAppChecker {
+        return DbAppChecker(db, context, compatibilityChecker, updateChecker)
     }
 }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 112b4f57a..b4c530abe 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -14,6 +14,7 @@
     <string name="no_repository_selected">No repository selected</string>
 
     <string name="my_apps_empty">No apps installed.\n\nInstall apps and they will appear here.</string>
+    <string name="my_apps_header_apps_with_issue">Apps with issues</string>
 
     <string name="app_list_new">New apps</string>
     <string name="app_list_recently_updated">Recently updated</string>
@@ -57,8 +58,12 @@
     <string name="developer_contact">Developer contact</string>
     <string name="copy_link">Copy link</string>
     <string name="app_no_compatible_versions">This app is not compatible with your device.</string>
-    <string name="app_no_compatible_signer">Can not update this app, because no compatible versions available in repository.</string>
+    <string name="app_no_compatible_signer">Can not update this app, because all versions have an incompatible signature.\n\nIf you don\'t receive updates through other means, you may need to uninstall and then reinstall this app. The app\'s data will be lost.</string>
+    <string name="app_no_compatible_signer_in_this_repo">Can not update this app, because there are no compatible versions in the preferred repository.\n\nTry changing the preferred repository.</string>
     <string name="app_no_auto_update">Auto-update not available, because app targets old version of Android.</string>
+    <string name="app_issue_update_other_repo">An update is available in another repository, but will not get installed, because that repository is not preferred.</string>
+    <string name="app_issue_not_available_title">No longer available</string>
+    <string name="app_issue_not_available_text">This app is not receiving updates, because it is no longer in any enabled repository.\n\nIt may have been in a repository you removed or disabled. Or it was simply removed.</string>
     <string name="added_x_ago">Added %1$s</string>
     <string name="size_colon">Size: %1$s</string>
     <string name="sdk_versions_colon">SDK versions: %1$s</string>

From 3459307e11106a5a7823c9fd894395fd29ab32e5 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 2 Dec 2025 15:26:48 -0300
Subject: [PATCH 113/180] Fix more accessibility issues with screen readers

---
 .../main/kotlin/org/fdroid/ui/BottomBar.kt    | 27 ++++++++++++++++
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |  5 ++-
 .../org/fdroid/ui/categories/CategoryChip.kt  | 32 +++++++++++++++++++
 .../org/fdroid/ui/categories/CategoryList.kt  | 13 +++++---
 .../org/fdroid/ui/details/AppDetails.kt       |  2 +-
 .../org/fdroid/ui/details/AppDetailsHeader.kt |  9 ++++--
 .../org/fdroid/ui/discover/AppsSearch.kt      | 10 ++++--
 7 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt b/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
index 93772c358..e2c25d3b1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
@@ -16,7 +16,10 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.stateDescription
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
 
@@ -27,6 +30,7 @@ fun BottomBar(
     currentNavKey: NavKey,
     onNav: (NavigationKey) -> Unit,
 ) {
+    val res = LocalResources.current
     NavigationBar {
         BottomNavDestinations.entries.forEach { dest ->
             NavigationBarItem(
@@ -41,6 +45,17 @@ fun BottomBar(
                 onClick = {
                     if (dest.key != currentNavKey) onNav(dest.key)
                 },
+                modifier = Modifier.semantics {
+                    if (dest == BottomNavDestinations.MY_APPS) {
+                        if (numUpdates > 0) {
+                            stateDescription =
+                                res.getString(R.string.notification_channel_updates_available_title)
+                        } else if (hasIssues) {
+                            stateDescription =
+                                res.getString(R.string.my_apps_header_apps_with_issue)
+                        }
+                    }
+                }
             )
         }
     }
@@ -54,6 +69,7 @@ fun NavigationRail(
     onNav: (NavigationKey) -> Unit,
     modifier: Modifier,
 ) {
+    val res = LocalResources.current
     NavigationRail(modifier) {
         BottomNavDestinations.entries.forEach { dest ->
             NavigationRailItem(
@@ -68,6 +84,17 @@ fun NavigationRail(
                 onClick = {
                     if (dest.key != currentNavKey) onNav(dest.key)
                 },
+                modifier = Modifier.semantics {
+                    if (dest == BottomNavDestinations.MY_APPS) {
+                        if (numUpdates > 0) {
+                            stateDescription =
+                                res.getString(R.string.notification_channel_updates_available_title)
+                        } else if (hasIssues) {
+                            stateDescription =
+                                res.getString(R.string.my_apps_header_apps_with_issue)
+                        }
+                    }
+                }
             )
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 3ab7378ac..c0bcb48c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -116,7 +116,10 @@ fun MyApps(
                     }
                     var sortByMenuExpanded by remember { mutableStateOf(false) }
                     IconButton(onClick = { sortByMenuExpanded = !sortByMenuExpanded }) {
-                        Icon(Icons.Filled.MoreVert, null)
+                        Icon(
+                            imageVector = Icons.Default.MoreVert,
+                            contentDescription = stringResource(R.string.more),
+                        )
                     }
                     DropdownMenu(
                         expanded = sortByMenuExpanded,
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
index 4e116db38..acd3fe678 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.AssistChip
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -51,6 +52,33 @@ fun CategoryChip(
     )
 }
 
+@Composable
+fun CategoryChip(
+    categoryItem: CategoryItem,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    AssistChip(
+        onClick = onClick,
+        leadingIcon = {
+            Icon(
+                imageVector = categoryItem.imageVector,
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.primary,
+                modifier = Modifier.semantics { hideFromAccessibility() },
+            )
+        },
+        label = {
+            Text(
+                text = categoryItem.name,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+        },
+        modifier = modifier.padding(horizontal = 4.dp)
+    )
+}
+
 @Preview
 @Composable
 fun CategoryCardPreview() {
@@ -66,6 +94,10 @@ fun CategoryCardPreview() {
                 selected = false,
                 onSelected = {},
             )
+            CategoryChip(
+                CategoryItem("VPN & Proxy", "VPN & Proxy"),
+                onClick = {},
+            )
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index 599591990..678f6fe2e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -49,11 +49,14 @@ fun CategoryList(
                 horizontalArrangement = Arrangement.Start,
             ) {
                 categories.forEach { category ->
-                    CategoryChip(category, {
-                        val type = AppListType.Category(category.name, category.id)
-                        val navKey = NavigationKey.AppList(type)
-                        onNav(navKey)
-                    })
+                    CategoryChip(
+                        categoryItem = category,
+                        onClick = {
+                            val type = AppListType.Category(category.name, category.id)
+                            val navKey = NavigationKey.AppList(type)
+                            onNav(navKey)
+                        },
+                    )
                 }
             }
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index d4f25b741..1569a3b8c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -356,7 +356,7 @@ fun AppDetails(
             ) {
                 FlowRow(modifier = Modifier.padding(start = 16.dp)) {
                     item.categories.forEach { item ->
-                        CategoryChip(item, onSelected = {
+                        CategoryChip(item, onClick = {
                             val categoryNav = AppListType.Category(item.name, item.id)
                             onNav(NavigationKey.AppList(categoryNav))
                         })
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 961b1c878..273b3ba96 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -46,6 +46,8 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
@@ -96,7 +98,8 @@ fun AppDetailsHeader(
                         blendMode = BlendMode.DstIn
                     )
                 }
-                .padding(bottom = 8.dp),
+                .padding(bottom = 8.dp)
+                .semantics { hideFromAccessibility() },
         )
     }
     // Header
@@ -110,7 +113,9 @@ fun AppDetailsHeader(
             model = item.icon,
             contentDescription = "",
             error = painterResource(R.drawable.ic_repo_app_default),
-            modifier = Modifier.size(64.dp),
+            modifier = Modifier
+                .size(64.dp)
+                .semantics { hideFromAccessibility() },
         )
         Column {
             SelectionContainer {
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index c047480f1..d223ffaf7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -67,7 +67,13 @@ fun AppsSearch(
             SearchBarDefaults.InputField(
                 searchBarState = searchBarState,
                 textFieldState = textFieldState,
-                placeholder = { Text(stringResource(R.string.search_placeholder)) },
+                placeholder = {
+                    Text(
+                        text = stringResource(R.string.search_placeholder),
+                        // we hide the placeholder, because TalkBack is already saying "Search"
+                        modifier = Modifier.semantics { hideFromAccessibility() },
+                    )
+                },
                 leadingIcon = {
                     Icon(
                         imageVector = Icons.Default.Search,
@@ -174,7 +180,7 @@ private fun CategoriesFlowRow(categories: List<CategoryItem>, onNav: (Navigation
         )
         FlowRow {
             categories.forEach { item ->
-                CategoryChip(categoryItem = item, onSelected = {
+                CategoryChip(categoryItem = item, onClick = {
                     val type = AppListType.Category(item.name, item.id)
                     val navKey = NavigationKey.AppList(type)
                     onNav(navKey)

From 6c3caa5e6bd9ba7334b667d8e9a1c5a4fb469f1c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 2 Dec 2025 16:05:46 -0300
Subject: [PATCH 114/180] Fix back navigation for main bottom nav bar
 destinations

---
 .../main/kotlin/org/fdroid/ui/IntentRouter.kt    |  7 ++++++-
 next/src/main/kotlin/org/fdroid/ui/Main.kt       | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
index c3cd7ecc6..3c2640415 100644
--- a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
@@ -50,7 +50,12 @@ class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Inten
                 backStack.add(NavigationKey.AddRepo(uri.toString()))
             }
         } else if (ACTION_MY_APPS == intent.action) {
-            if (backStack.lastOrNull() !is NavigationKey.MyApps) {
+            val lastOnBackStack = backStack.lastOrNull()
+            if (lastOnBackStack !is NavigationKey.MyApps) {
+                if (lastOnBackStack is NavigationKey.Discover) {
+                    // reset back stack when going to My Apps from Discover
+                    while (backStack.isNotEmpty()) backStack.removeLastOrNull()
+                }
                 backStack.add(NavigationKey.MyApps)
             }
         } else {
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 1721509f6..dfb1bab79 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -96,7 +96,13 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 onAppTap = {
                     backStack.add(NavigationKey.AppDetails(it.packageName))
                 },
-                onNav = { backStack.add(it) },
+                onNav = { navKey ->
+                    if (navKey == NavigationKey.MyApps) {
+                        // reset back stack when going to My Apps
+                        while (backStack.isNotEmpty()) backStack.removeLastOrNull()
+                    }
+                    backStack.add(navKey)
+                },
                 numUpdates = numUpdates,
                 hasIssues = hasIssues,
                 isBigScreen = isBigScreen,
@@ -133,7 +139,13 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 onAppItemClick = {
                     backStack.add(NavigationKey.AppDetails(it))
                 },
-                onNav = { backStack.add(it) },
+                onNav = { navKey ->
+                    if (navKey == NavigationKey.Discover) {
+                        // reset back stack when going to Discover
+                        while (backStack.isNotEmpty()) backStack.removeLastOrNull()
+                    }
+                    backStack.add(navKey)
+                },
                 isBigScreen = isBigScreen,
             )
         }

From 93317c30910e0fa02734ac8a9321fd7088c8b636 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 2 Dec 2025 16:50:43 -0300
Subject: [PATCH 115/180] Fix issue where search would open all the time on its
 own

on certain older phones. Upstream issue: https://issuetracker.google.com/issues/445720462
---
 next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt | 2 ++
 1 file changed, 2 insertions(+)

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 6084c48c3..072709847 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -1,6 +1,7 @@
 package org.fdroid.ui.discover
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -105,6 +106,7 @@ fun Discover(
         val scope = rememberCoroutineScope()
         Column(
             Modifier
+                .focusable() // workaround for https://issuetracker.google.com/issues/445720462
                 .fillMaxSize()
                 .verticalScroll(rememberScrollState())
                 .padding(paddingValues)

From 469535a16d33dea13b085472f3c9a16c322cd23c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 3 Dec 2025 10:13:39 -0300
Subject: [PATCH 116/180] Workaround another installer bug

When the user tries to install an incompatible app, certain Android versions don't send us the error broadcast. So we think the user simply clicked outside the confirmation dialog and ask again, leading to a UI dialog loop. As a simple workaround we use a counter and bail out after showing the dialog three times.
---
 .../org/fdroid/install/AppInstallManager.kt      |  6 +++++-
 .../org/fdroid/install/AppInstallService.kt      |  4 ++--
 .../org/fdroid/ui/details/AppDetailsHeader.kt    | 16 ++++++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index b72932520..0f564b952 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -343,7 +343,11 @@ class AppInstallManager @Inject constructor(
             return null
         }
         log.info { "Requesting user confirmation for $packageName" }
-        val result = sessionInstallManager.requestUserConfirmation(installState)
+        val job = scope.async {
+            sessionInstallManager.requestUserConfirmation(installState)
+        }
+        // keep track of this job, in case we need to cancel it
+        val result = trackJob(packageName, job)
         log.info { "User confirmation for $packageName $result" }
         apps.updateApp(packageName) { result }
         onStatesUpdated()
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
index 790cc50d3..f9520bacf 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
@@ -31,11 +31,11 @@ class AppInstallService : Service() {
     }
 
     override fun onStartCommand(
-        intent: Intent,
+        intent: Intent?,
         flags: Int,
         startId: Int
     ): Int {
-        log.info { "onStartCommand" }
+        log.info { "onStartCommand $intent" }
         val notificationState = InstallNotificationState()
         try {
             ServiceCompat.startForeground(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 273b3ba96..c38cc1187 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -172,13 +172,25 @@ fun AppDetailsHeader(
     // check user confirmation ON_RESUME to work around Android bug
     val lifecycleOwner = LocalLifecycleOwner.current
     val currentInstallState by rememberUpdatedState(item.installState)
+    var numChecks by remember { mutableStateOf(0) }
     DisposableEffect(lifecycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 val state = currentInstallState
-                if (state is InstallState.UserConfirmationNeeded) {
-                    Log.i("AppDetailsHeader", "Resumed. Checking user confirmation... $state")
+                if (state is InstallState.UserConfirmationNeeded && numChecks < 3) {
+                    Log.i(
+                        "AppDetailsHeader",
+                        "Resumed ($numChecks). Checking user confirmation... $state"
+                    )
+                    // there's annoying installer bugs where it doesn't tell us about errors
+                    // and we would run into infinite UI loops here, so there's a counter.
+                    @Suppress("AssignedValueIsNeverRead")
+                    numChecks += 1
                     item.actions.checkUserConfirmation(item.app.packageName, state)
+                } else if (state is InstallState.UserConfirmationNeeded) {
+                    // we tried three times, so cancel install now
+                    Log.i("AppDetailsHeader", "Cancel installation")
+                    item.actions.cancelInstall(item.app.packageName)
                 }
             }
         }

From 0a12689bcb1637648d266fcc738fdaab4c5b0241 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 3 Dec 2025 10:23:52 -0300
Subject: [PATCH 117/180] Properly parse description URLs enclosed in round
 brackets

---
 .../main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt  | 2 +-
 .../org/fdroid/ui/main/details/HtmlDescriptionTest.kt    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index d580fd027..ef422eab3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -261,7 +261,7 @@ private fun AppVersion?.getAntiFeatures(
 @VisibleForTesting
 internal fun getHtmlDescription(description: String?): String? {
     return description?.replace("</?h[1-6]>".toRegex(), "")
-        ?.replace("(\\s)(https://\\S+[^\\s.])([\\s\\n.]|$)".toRegex()) {
+        ?.replace("(\\s\\(?)(https://\\S+[^\\s).])([\\s\\n).]|$)".toRegex()) {
             val prefix = it.groups[1]?.value ?: it.value
             val url = it.groups[2]?.value ?: it.value
             val suffix = it.groups[3]?.value ?: it.value
diff --git a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
index ee5889311..ce57d9a27 100644
--- a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
+++ b/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
@@ -41,6 +41,15 @@ Project page: <a href="https://github.com/lukaspieper/Gcam-Services-Provider">ht
         assertEquals(expectedDescription, getHtmlDescription(description))
     }
 
+    @Test
+    fun testLinkInRoundBrackets() {
+        val description = """our link (https://wikimediafoundation.org/)."""
+
+        @Suppress("ktlint:standard:max-line-length")
+        val expectedDescription = """our link (<a href="https://wikimediafoundation.org/">https://wikimediafoundation.org/</a>)."""
+        assertEquals(expectedDescription, getHtmlDescription(description))
+    }
+
     @Test
     fun testHeadlineRemoval() {
         val description = """<h1>SimpleX - the first messaging platform that has no user identifiers, not even random numbers!</h1>

From 42c60b374ec322c1905ed934589f1aaf618f77b6 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 3 Dec 2025 11:51:35 -0300
Subject: [PATCH 118/180] Try to fix molecule issues

We were running the presenting on the IoDispatcher and this seemed to have caused random crashes.
---
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     | 20 +++--
 .../fdroid/ui/details/AppDetailsViewModel.kt  | 36 ++++----
 .../org/fdroid/ui/details/DetailsPresenter.kt | 89 ++++++++++++-------
 .../fdroid/ui/discover/DiscoverViewModel.kt   | 23 ++---
 .../org/fdroid/ui/lists/AppListViewModel.kt   | 27 +++---
 .../ui/repositories/RepositoriesViewModel.kt  | 18 ++--
 .../details/RepoDetailsViewModel.kt           | 18 ++--
 7 files changed, 135 insertions(+), 96 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index a9e8c32ec..33f231828 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -71,15 +71,17 @@ class MyAppsViewModel @Inject constructor(
 
     private val searchQuery = savedStateHandle.getMutableStateFlow("query", "")
     private val sortOrder = savedStateHandle.getMutableStateFlow("sort", AppListSortOrder.NAME)
-    val myAppsModel: StateFlow<MyAppsModel> = moleculeScope.launchMolecule(mode = ContextClock) {
-        MyAppsPresenter(
-            appUpdatesFlow = updates,
-            appInstallStatesFlow = appInstallManager.appInstallStates,
-            appsWithIssuesFlow = updatesManager.appsWithIssues,
-            installedAppsFlow = installedAppItems,
-            searchQueryFlow = searchQuery,
-            sortOrderFlow = sortOrder,
-        )
+    val myAppsModel: StateFlow<MyAppsModel> by lazy(LazyThreadSafetyMode.NONE) {
+        moleculeScope.launchMolecule(mode = ContextClock) {
+            MyAppsPresenter(
+                appUpdatesFlow = updates,
+                appInstallStatesFlow = appInstallManager.appInstallStates,
+                appsWithIssuesFlow = updatesManager.appsWithIssues,
+                installedAppsFlow = installedAppItems,
+                searchQueryFlow = searchQuery,
+                sortOrderFlow = sortOrder,
+            )
+        }
     }
 
     fun updateAll() {
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 079a38c1b..2cf59e585 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -10,7 +10,8 @@ import androidx.annotation.UiThread
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.application
 import androidx.lifecycle.viewModelScope
-import app.cash.molecule.RecompositionMode.Immediate
+import app.cash.molecule.AndroidUiDispatcher
+import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import coil3.SingletonImageLoader
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -54,22 +55,25 @@ class AppDetailsViewModel @Inject constructor(
     private val log = KotlinLogging.logger { }
     private val packageInfoFlow = MutableStateFlow<AppInfo?>(null)
     private val currentRepoIdFlow = MutableStateFlow<Long?>(null)
+    private val moleculeScope =
+        CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
-    val appDetails: StateFlow<AppDetailsItem?> = viewModelScope.launchMolecule(
-        context = scope.coroutineContext, mode = Immediate,
-    ) {
-        DetailsPresenter(
-            db = db,
-            repoManager = repoManager,
-            repoPreLoader = repoPreLoader,
-            updateChecker = updateChecker,
-            settingsManager = settingsManager,
-            appInstallManager = appInstallManager,
-            viewModel = this,
-            packageInfoFlow = packageInfoFlow,
-            currentRepoIdFlow = currentRepoIdFlow,
-            appsWithIssuesFlow = updatesManager.appsWithIssues,
-        )
+    val appDetails: StateFlow<AppDetailsItem?> by lazy(LazyThreadSafetyMode.NONE) {
+        moleculeScope.launchMolecule(mode = ContextClock) {
+            DetailsPresenter(
+                db = db,
+                scope = scope,
+                repoManager = repoManager,
+                repoPreLoader = repoPreLoader,
+                updateChecker = updateChecker,
+                settingsManager = settingsManager,
+                appInstallManager = appInstallManager,
+                viewModel = this,
+                packageInfoFlow = packageInfoFlow,
+                currentRepoIdFlow = currentRepoIdFlow,
+                appsWithIssuesFlow = updatesManager.appsWithIssues,
+            )
+        }
     }
 
     fun setAppDetails(packageName: String) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 95341045d..6168c730a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -5,13 +5,19 @@ import android.net.Uri
 import android.util.Log
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.core.content.pm.PackageInfoCompat.getLongVersionCode
 import androidx.core.net.toUri
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.asFlow
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.withContext
 import org.fdroid.UpdateChecker
+import org.fdroid.database.App
+import org.fdroid.database.AppPrefs
+import org.fdroid.database.AppVersion
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.index.RepoManager
@@ -30,6 +36,7 @@ private const val TAG = "DetailsPresenter"
 @Composable
 fun DetailsPresenter(
     db: FDroidDatabase,
+    scope: CoroutineScope,
     repoManager: RepoManager,
     repoPreLoader: RepoPreLoader,
     updateChecker: UpdateChecker,
@@ -45,41 +52,56 @@ fun DetailsPresenter(
     val packageInfo = packagePair.packageInfo
     val currentRepoId = currentRepoIdFlow.collectAsState().value
     val appsWithIssues = appsWithIssuesFlow.collectAsState().value
-    val app = if (currentRepoId == null) {
-        val flow = remember {
-            db.getAppDao().getApp(packageName).asFlow()
+    val appDao = db.getAppDao()
+    val app = produceState<App?>(null, currentRepoId) {
+        withContext(scope.coroutineContext) {
+            if (currentRepoId == null) {
+                val flow = appDao.getApp(packageName).asFlow()
+                flow.collect { value = it }
+            } else {
+                value = appDao.getApp(currentRepoId, packageName)
+            }
         }
-        flow.collectAsState(null).value
-    } else {
-        db.getAppDao().getApp(currentRepoId, packageName)
-    } ?: return null
-    val repo = repoManager.getRepository(app.repoId) ?: return null
-    val repositories = remember(packageName) {
-        val repos = db.getAppDao().getRepositoryIdsForApp(packageName).mapNotNull { repoId ->
-            repoManager.getRepository(repoId)
+    }.value ?: return null
+    val repo = produceState<Repository?>(null) {
+        withContext(scope.coroutineContext) {
+            value = repoManager.getRepository(app.repoId)
         }
-        // show repo chooser only if
-        // * app is in more than one repo, or
-        // * app is from a non-default repo
-        if (repos.size > 1) repos
-        else if (repo.address in repoPreLoader.defaultRepoAddresses) emptyList()
-        else repos
-    }
+    }.value ?: return null
+    val repositories = produceState(emptyList(), packageName) {
+        withContext(scope.coroutineContext) {
+            val repos = appDao.getRepositoryIdsForApp(packageName).mapNotNull { repoId ->
+                repoManager.getRepository(repoId)
+            }
+            // show repo chooser only if
+            // * app is in more than one repo, or
+            // * app is from a non-default repo
+            value = if (repos.size > 1) repos
+            else if (repo.address in repoPreLoader.defaultRepoAddresses) emptyList()
+            else repos
+        }
+    }.value
     val installState =
         appInstallManager.getAppFlow(packageName).collectAsState(InstallState.Unknown).value
 
-    val versionsFlow = remember(currentRepoId) {
-        if (currentRepoId == null) {
-            db.getVersionDao().getAppVersions(app.repoId, packageName).asFlow()
-        } else {
-            db.getVersionDao().getAppVersions(currentRepoId, packageName).asFlow()
+    val versions = produceState<List<AppVersion>?>(null, currentRepoId) {
+        withContext(scope.coroutineContext) {
+            if (currentRepoId == null) {
+                db.getVersionDao().getAppVersions(app.repoId, packageName).asFlow().collect {
+                    value = it
+                }
+            } else {
+                db.getVersionDao().getAppVersions(currentRepoId, packageName).asFlow().collect {
+                    value = it
+                }
+            }
         }
-    }
-    val versions = versionsFlow.collectAsState(null).value
-    val appPrefsFlow = remember(packageName) {
-        db.getAppPrefsDao().getAppPrefs(packageName).asFlow()
-    }
-    val appPrefs = appPrefsFlow.collectAsState(null).value
+    }.value
+    val appPrefs = produceState<AppPrefs?>(null, packageName) {
+        withContext(scope.coroutineContext) {
+            db.getAppPrefsDao().getAppPrefs(packageName).asFlow().collect { value = it }
+        }
+    }.value
     val preferredRepoId = remember(packageName, appPrefs) {
         appPrefs?.preferredRepoId ?: app.repoId // DB loads preferred repo first, so we remember it
     }
@@ -123,10 +145,11 @@ fun DetailsPresenter(
     }
     val authorName = app.authorName
     val authorHasMoreThanOneApp = if (authorName == null) false else {
-        val flow = remember(authorName) {
-            db.getAppDao().hasAuthorMoreThanOneApp(authorName).asFlow()
-        }
-        flow.collectAsState(false).value
+        produceState(false) {
+            withContext(scope.coroutineContext) {
+                db.getAppDao().hasAuthorMoreThanOneApp(authorName).asFlow().collect { value = it }
+            }
+        }.value
     }
     val issue = remember(appsWithIssues) {
         appsWithIssues?.find { it.packageName == packageName }?.issue
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 77d1552c0..7ce1837f0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -48,7 +48,8 @@ class DiscoverViewModel @Inject constructor(
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger { }
-    private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+    private val moleculeScope =
+        CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
     private val collator = Collator.getInstance(Locale.getDefault())
 
     val numUpdates = updatesManager.numUpdates
@@ -78,15 +79,17 @@ class DiscoverViewModel @Inject constructor(
     private val searchResults = MutableStateFlow<SearchResults?>(null)
 
     val localeList = LocaleListCompat.getDefault()
-    val discoverModel: StateFlow<DiscoverModel> = scope.launchMolecule(mode = ContextClock) {
-        DiscoverPresenter(
-            newAppsFlow = newApps,
-            recentlyUpdatedAppsFlow = recentlyUpdatedApps,
-            categoriesFlow = categories,
-            repositoriesFlow = repoManager.repositoriesState,
-            searchResultsFlow = searchResults,
-            lastRepoUpdate = settingsManager.lastRepoUpdate,
-        )
+    val discoverModel: StateFlow<DiscoverModel> by lazy(LazyThreadSafetyMode.NONE) {
+        moleculeScope.launchMolecule(mode = ContextClock) {
+            DiscoverPresenter(
+                newAppsFlow = newApps,
+                recentlyUpdatedAppsFlow = recentlyUpdatedApps,
+                categoriesFlow = categories,
+                repositoriesFlow = repoManager.repositoriesState,
+                searchResultsFlow = searchResults,
+                lastRepoUpdate = settingsManager.lastRepoUpdate,
+            )
+        }
     }
 
     suspend fun search(term: String) = withContext(ioScope.coroutineContext) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 42f0424ea..bbf59e1dd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -43,7 +43,8 @@ class AppListViewModel @Inject constructor(
     private val onboardingManager: OnboardingManager,
 ) : AndroidViewModel(app), AppListActions {
 
-    private val scope = CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
+    private val moleculeScope =
+        CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
     private val localeList = LocaleListCompat.getDefault()
     private val apps = MutableStateFlow<List<AppListItem>?>(null)
@@ -77,17 +78,19 @@ class AppListViewModel @Inject constructor(
     private val filteredRepositoryIds = MutableStateFlow<Set<Long>>(emptySet())
     val showOnboarding = onboardingManager.showFilterOnboarding
 
-    val appListModel: StateFlow<AppListModel> = scope.launchMolecule(mode = ContextClock) {
-        AppListPresenter(
-            appsFlow = apps,
-            sortByFlow = sortBy,
-            filterIncompatibleFlow = filterIncompatible,
-            categoriesFlow = categories,
-            filteredCategoryIdsFlow = filteredCategoryIds,
-            repositoriesFlow = repositories,
-            filteredRepositoryIdsFlow = filteredRepositoryIds,
-            searchQueryFlow = query,
-        )
+    val appListModel: StateFlow<AppListModel> by lazy(LazyThreadSafetyMode.NONE) {
+        moleculeScope.launchMolecule(mode = ContextClock) {
+            AppListPresenter(
+                appsFlow = apps,
+                sortByFlow = sortBy,
+                filterIncompatibleFlow = filterIncompatible,
+                categoriesFlow = categories,
+                filteredCategoryIdsFlow = filteredCategoryIds,
+                repositoriesFlow = repositories,
+                filteredRepositoryIdsFlow = filteredRepositoryIds,
+                searchQueryFlow = query,
+            )
+        }
     }
 
     @UiThread
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index 4eddeb9e7..f6d8e6d9f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -53,14 +53,16 @@ class RepositoriesViewModel @Inject constructor(
     }
 
     // define below init, because this only defines repoSortingMap
-    val model: StateFlow<RepositoryModel> = moleculeScope.launchMolecule(mode = ContextClock) {
-        RepositoriesPresenter(
-            context = application,
-            repositoriesFlow = repos,
-            repoSortingMapFlow = repoSortingMap,
-            showOnboardingFlow = showOnboarding,
-            lastUpdateFlow = settingsManager.lastRepoUpdateFlow,
-        )
+    val model: StateFlow<RepositoryModel> by lazy(LazyThreadSafetyMode.NONE) {
+        moleculeScope.launchMolecule(mode = ContextClock) {
+            RepositoriesPresenter(
+                context = application,
+                repositoriesFlow = repos,
+                repoSortingMapFlow = repoSortingMap,
+                showOnboardingFlow = showOnboarding,
+                lastUpdateFlow = settingsManager.lastRepoUpdateFlow,
+            )
+        }
     }
 
     private fun onRepositoriesChanged(repositories: List<Repository>) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
index a79bf0593..3f8c25f86 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
@@ -56,14 +56,16 @@ class RepoDetailsViewModel @Inject constructor(
     private val archiveStateFlow = MutableStateFlow(UNKNOWN)
     private val showOnboarding = onboardingManager.showRepoDetailsOnboarding
 
-    val model: StateFlow<RepoDetailsModel> = moleculeScope.launchMolecule(mode = ContextClock) {
-        RepoDetailsPresenter(
-            repoFlow = repoFlow,
-            numAppsFlow = numAppsFlow,
-            archiveStateFlow = archiveStateFlow,
-            showOnboardingFlow = showOnboarding,
-            proxyConfig = settingsManager.proxyConfig,
-        )
+    val model: StateFlow<RepoDetailsModel> by lazy(LazyThreadSafetyMode.NONE) {
+        moleculeScope.launchMolecule(mode = ContextClock) {
+            RepoDetailsPresenter(
+                repoFlow = repoFlow,
+                numAppsFlow = numAppsFlow,
+                archiveStateFlow = archiveStateFlow,
+                showOnboardingFlow = showOnboarding,
+                proxyConfig = settingsManager.proxyConfig,
+            )
+        }
     }
 
     fun setRepoId(repoId: Long) {

From 8cf8b97765fb31a99b0bfe9c1004d5ae98c0b803 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 3 Dec 2025 17:15:25 -0300
Subject: [PATCH 119/180] Add 'show app info' action to app not available
 dialog

also start all activities safely
---
 .../kotlin/org/fdroid/ui/apps/MyAppsList.kt   | 15 +----
 .../org/fdroid/ui/apps/NotAvailableDialog.kt  | 63 +++++++++++++++++++
 .../org/fdroid/ui/details/AppDetailsMenu.kt   |  3 +-
 .../ui/repositories/add/AddRepoIntro.kt       |  3 +-
 .../repositories/details/RepoDetailsInfo.kt   |  5 +-
 .../kotlin/org/fdroid/ui/settings/Settings.kt |  5 +-
 next/src/main/res/values/strings-next.xml     |  1 +
 7 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
index 4f2f08425..0b4cfec27 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
@@ -9,11 +9,9 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -171,16 +169,9 @@ fun MyAppsList(
                     .animateItem()
                     .then(interactionModifier)
                 InstalledAppRow(app, isSelected, modifier, hasIssue = true)
-                if (showNotAvailableDialog) AlertDialog(
-                    onDismissRequest = { showNotAvailableDialog = false },
-                    title = { Text(text = stringResource(R.string.app_issue_not_available_title)) },
-                    text = { Text(text = stringResource(R.string.app_issue_not_available_text)) },
-                    confirmButton = {
-                        TextButton(
-                            onClick = { showNotAvailableDialog = false }
-                        ) { Text(stringResource(R.string.ok)) }
-                    },
-                )
+                if (showNotAvailableDialog) NotAvailableDialog(app.packageName) {
+                    showNotAvailableDialog = false
+                }
             }
         }
         // Installed apps header (only show when we have non-empty lists above)
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt b/next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
new file mode 100644
index 000000000..d7bb62c89
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
@@ -0,0 +1,63 @@
+package org.fdroid.ui.apps
+
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.startActivitySafe
+
+@Composable
+fun NotAvailableDialog(packageName: String, onDismiss: () -> Unit) {
+    val context = LocalContext.current
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        title = { Text(text = stringResource(R.string.app_issue_not_available_title)) },
+        text = {
+            Column(verticalArrangement = spacedBy(8.dp)) {
+                Text(text = stringResource(R.string.app_issue_not_available_text))
+                OutlinedButton(
+                    onClick = {
+                        val intent: Intent = Intent(ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                            setData(Uri.fromParts("package", packageName, null))
+                        }
+                        context.startActivitySafe(intent)
+                    },
+                    modifier = Modifier.align(CenterHorizontally)
+                ) {
+                    Text(stringResource(R.string.app_issue_not_available_button))
+                }
+            }
+        },
+        confirmButton = {
+            TextButton(
+                onClick = onDismiss,
+            ) { Text(stringResource(R.string.ok)) }
+        },
+    )
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        Box(modifier = Modifier.fillMaxSize()) {
+            NotAvailableDialog("foo.bar") {}
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
index d42c4f497..0d40aaa9e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
@@ -21,6 +21,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.startActivitySafe
 import org.fdroid.ui.utils.testApp
 
 @Composable
@@ -95,7 +96,7 @@ fun AppDetailsMenu(
             onClick = {
                 val s = res.getString(R.string.menu_share_apk)
                 val i = Intent.createChooser(item.actions.shareApk, s)
-                context.startActivity(i)
+                context.startActivitySafe(i)
                 onDismiss()
             },
         )
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
index 14e3d2277..606ad7191 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
@@ -72,6 +72,7 @@ import org.fdroid.repo.None
 import org.fdroid.ui.utils.ExpandIconArrow
 import org.fdroid.ui.utils.FDroidButton
 import org.fdroid.ui.utils.FDroidOutlineButton
+import org.fdroid.ui.utils.startActivitySafe
 
 @Composable
 fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modifier) {
@@ -140,7 +141,7 @@ fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modi
                         val intent = Intent(ACTION_APPLICATION_DETAILS_SETTINGS).apply {
                             data = Uri.fromParts("package", context.packageName, null)
                         }
-                        context.startActivity(intent)
+                        context.startActivitySafe(intent)
                     }
             ) {
                 Text(
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
index 2b68468d2..ad14c46e3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
@@ -11,6 +11,7 @@ import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
 import org.fdroid.ui.utils.flagEmoji
 import org.fdroid.ui.utils.generateQrBitmap
+import org.fdroid.ui.utils.startActivitySafe
 
 interface RepoDetailsInfo {
     val model: RepoDetailsModel
@@ -59,7 +60,7 @@ data class RepoDetailsModel(
             putExtra(EXTRA_TEXT, repo.shareUri)
         }
         val chooserTitle = context.getString(R.string.share_repository)
-        context.startActivity(
+        context.startActivitySafe(
             Intent.createChooser(intent, chooserTitle)
         )
     }
@@ -107,7 +108,7 @@ data class UserMirrorItem(
             type = "text/plain"
             putExtra(Intent.EXTRA_TEXT, uri)
         }
-        context.startActivity(
+        context.startActivitySafe(
             Intent.createChooser(intent, context.getString(R.string.share_mirror))
         )
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index fde06cc89..e29a477c5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -64,6 +64,7 @@ import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_KEY_REPO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
 import org.fdroid.ui.utils.asRelativeTimeString
+import org.fdroid.ui.utils.startActivitySafe
 import org.fdroid.utils.getLogName
 import java.lang.System.currentTimeMillis
 import java.util.concurrent.TimeUnit.HOURS
@@ -153,7 +154,7 @@ fun Settings(
                         val intent = Intent(ACTION_APP_LOCALE_SETTINGS).apply {
                             setData(Uri.fromParts("package", context.packageName, null))
                         }
-                        context.startActivity(intent)
+                        context.startActivitySafe(intent)
                     },
                 )
                 if (SDK_INT >= 26) preference(
@@ -171,7 +172,7 @@ fun Settings(
                         val intent = Intent(ACTION_APP_NOTIFICATION_SETTINGS).apply {
                             putExtra(EXTRA_APP_PACKAGE, context.packageName)
                         }
-                        context.startActivity(intent)
+                        context.startActivitySafe(intent)
                     },
                 )
                 preferenceCategory(
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index b4c530abe..921961404 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -64,6 +64,7 @@
     <string name="app_issue_update_other_repo">An update is available in another repository, but will not get installed, because that repository is not preferred.</string>
     <string name="app_issue_not_available_title">No longer available</string>
     <string name="app_issue_not_available_text">This app is not receiving updates, because it is no longer in any enabled repository.\n\nIt may have been in a repository you removed or disabled. Or it was simply removed.</string>
+    <string name="app_issue_not_available_button">Show app info</string>
     <string name="added_x_ago">Added %1$s</string>
     <string name="size_colon">Size: %1$s</string>
     <string name="sdk_versions_colon">SDK versions: %1$s</string>

From 37eeed3821cd83377d5edd43af0da790ca3cbde9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 8 Dec 2025 09:44:23 -0300
Subject: [PATCH 120/180] Enable D8/proguard for release builds

---
 next/build.gradle.kts   | 2 +-
 next/proguard-rules.pro | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index da44dbd42..412be0e53 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -26,7 +26,7 @@ android {
             buildConfigField("String", "ACRA_REPORT_EMAIL", "\"t+fdroidnext@grobox.de\"")
         }
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
diff --git a/next/proguard-rules.pro b/next/proguard-rules.pro
index 339e28672..58951ec3f 100644
--- a/next/proguard-rules.pro
+++ b/next/proguard-rules.pro
@@ -1,5 +1,4 @@
 -dontobfuscate
--dontoptimize
 -keepattributes SourceFile,LineNumberTable,Exceptions
 -keep class org.fdroid.fdroid.** {*;}
 

From 8527ed0b1be9f60025f30db7376e1fb1a9749dff Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 8 Dec 2025 16:23:58 -0300
Subject: [PATCH 121/180] Show technical info in app details

---
 .../org/fdroid/ui/details/AppDetails.kt       |  8 +++
 .../org/fdroid/ui/details/AppDetailsItem.kt   |  3 +
 .../org/fdroid/ui/details/DetailsPresenter.kt |  1 +
 .../org/fdroid/ui/details/TechnicalInfo.kt    | 56 +++++++++++++++++++
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  6 +-
 next/src/main/res/values/strings-next.xml     |  3 +
 6 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index 1569a3b8c..0abdada3e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AppSettingsAlt
 import androidx.compose.material.icons.filled.Category
 import androidx.compose.material.icons.filled.ChangeHistory
 import androidx.compose.material.icons.filled.Code
@@ -363,6 +364,13 @@ fun AppDetails(
                     }
                 }
             }
+            ExpandableSection(
+                icon = rememberVectorPainter(Icons.Default.AppSettingsAlt),
+                title = stringResource(R.string.technical_info),
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                TechnicalInfo(item)
+            }
             // More apps by dev
             if (item.authorHasMoreThanOneApp) {
                 val authorName = item.app.authorName!!
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index ef422eab3..4c911c667 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -45,6 +45,7 @@ data class AppDetailsItem(
      * Needed, because the [installedVersion] may not be available, e.g. too old.
      */
     val installedVersionCode: Long? = null,
+    val installedVersionName: String? = null,
     /**
      * The currently suggested version for installation.
      */
@@ -71,6 +72,7 @@ data class AppDetailsItem(
         versions: List<VersionItem>?,
         installedVersion: AppVersion?,
         installedVersionCode: Long?,
+        installedVersionName: String?,
         suggestedVersion: AppVersion?,
         possibleUpdate: AppVersion?,
         appPrefs: AppPrefs?,
@@ -102,6 +104,7 @@ data class AppDetailsItem(
         versions = versions,
         installedVersion = installedVersion,
         installedVersionCode = installedVersionCode,
+        installedVersionName = installedVersionName,
         suggestedVersion = suggestedVersion,
         possibleUpdate = possibleUpdate,
         appPrefs = appPrefs,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 6168c730a..7863469bb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -220,6 +220,7 @@ fun DetailsPresenter(
         },
         installedVersion = installedVersion,
         installedVersionCode = installedVersionCode,
+        installedVersionName = packageInfo?.versionName,
         suggestedVersion = suggestedVersion,
         possibleUpdate = possibleUpdate,
         appPrefs = appPrefs,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt b/next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
new file mode 100644
index 000000000..eced4bd3f
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
@@ -0,0 +1,56 @@
+package org.fdroid.ui.details
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.utils.testApp
+
+@Composable
+fun TechnicalInfo(item: AppDetailsItem) {
+    val items = mutableMapOf(
+        stringResource(R.string.package_name) to item.app.packageName
+    )
+    if (item.installedVersionCode != null) {
+        items[stringResource(R.string.installed_version)] =
+            "${item.installedVersionName} (${item.installedVersionCode})"
+    }
+    Column(
+        verticalArrangement = spacedBy(4.dp),
+        modifier = Modifier
+            .padding(start = 16.dp, bottom = 16.dp),
+    ) {
+        items.forEach { (name, content) ->
+            Row(horizontalArrangement = spacedBy(2.dp)) {
+                Text(
+                    text = name,
+                    style = MaterialTheme.typography.bodyMedium
+                )
+                SelectionContainer {
+                    Text(
+                        text = content,
+                        style = MaterialTheme.typography.bodyMedium,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        TechnicalInfo(testApp)
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 210495df8..62bea88f9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -93,8 +93,8 @@ val testVersion2 = object : PackageVersion {
     override val versionCode: Long = 23
     override val versionName: String = "23.42.0"
     override val added: Long = System.currentTimeMillis() - DAYS.toMillis(4)
-    override val size: Long? = 1024 * 1024 * 23
-    override val signer: SignerV2? = SignerV2(
+    override val size: Long = 1024 * 1024 * 23
+    override val signer: SignerV2 = SignerV2(
         listOf("271721a9cddc96660336c19a39ae3cca4375072c80d3c8170860c333d2252b90")
     )
     override val releaseChannels: List<String>? = null
@@ -219,6 +219,8 @@ val testApp = AppDetailsItem(
         ),
     ),
     installedVersion = testVersion2,
+    installedVersionCode = testVersion2.versionCode,
+    installedVersionName = testVersion2.versionName,
     suggestedVersion = null,
     possibleUpdate = testVersion1,
     proxy = null,
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 921961404..9f371d4a6 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -56,6 +56,9 @@
     <string name="donate_title">Donate</string>
     <string name="anti_features_title">This app has anti-features</string>
     <string name="developer_contact">Developer contact</string>
+    <string name="technical_info">Technical information</string>
+    <string name="package_name">Package Name:</string>
+    <string name="installed_version">Installed Version:</string>
     <string name="copy_link">Copy link</string>
     <string name="app_no_compatible_versions">This app is not compatible with your device.</string>
     <string name="app_no_compatible_signer">Can not update this app, because all versions have an incompatible signature.\n\nIf you don\'t receive updates through other means, you may need to uninstall and then reinstall this app. The app\'s data will be lost.</string>

From e23b1b089896498ab8d446815566a32a82f217a7 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 8 Dec 2025 15:17:23 -0300
Subject: [PATCH 122/180] Mark installed apps everywhere

and load their icon locally and not from the internet
---
 next/src/main/kotlin/org/fdroid/App.kt        | 13 +----
 .../org/fdroid/download/LocalIconFetcher.kt   |  2 +-
 .../org/fdroid/install/InstalledAppsCache.kt  |  5 ++
 .../org/fdroid/ui/apps/InstalledAppRow.kt     | 16 +++++--
 .../org/fdroid/ui/apps/InstallingAppRow.kt    |  3 +-
 .../kotlin/org/fdroid/ui/apps/MyAppItem.kt    |  4 +-
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |  9 ++--
 .../org/fdroid/ui/apps/UpdatableAppRow.kt     | 13 +++--
 .../org/fdroid/ui/details/AppDetailsHeader.kt | 25 ++++++----
 .../org/fdroid/ui/details/AppDetailsItem.kt   | 10 +++-
 .../org/fdroid/ui/discover/AppCarousel.kt     | 32 +++++++------
 .../org/fdroid/ui/discover/AppDiscoverItem.kt |  1 +
 .../org/fdroid/ui/discover/AppsSearch.kt      |  4 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   | 36 +++++++++++---
 .../kotlin/org/fdroid/ui/lists/AppList.kt     |  4 +-
 .../kotlin/org/fdroid/ui/lists/AppListItem.kt |  1 +
 .../kotlin/org/fdroid/ui/lists/AppListRow.kt  | 28 ++++++-----
 .../org/fdroid/ui/lists/AppListViewModel.kt   | 14 +++++-
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  |  4 +-
 .../repositories/add/AddRepoPreviewScreen.kt  |  2 +
 .../org/fdroid/ui/utils/InstalledBadge.kt     | 48 +++++++++++++++++++
 .../org/fdroid/updates/UpdatesManager.kt      |  9 ++--
 22 files changed, 202 insertions(+), 81 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/InstalledBadge.kt

diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/next/src/main/kotlin/org/fdroid/App.kt
index 0e66df2f5..3647fc7f9 100644
--- a/next/src/main/kotlin/org/fdroid/App.kt
+++ b/next/src/main/kotlin/org/fdroid/App.kt
@@ -13,7 +13,6 @@ import coil3.disk.DiskCache
 import coil3.disk.directory
 import coil3.key.Keyer
 import coil3.memory.MemoryCache
-import coil3.request.Options
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.HiltAndroidApp
@@ -103,17 +102,11 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
         return ImageLoader.Builder(context)
             .crossfade(true)
             .components {
-                val downloadRequestKeyer = object : Keyer<DownloadRequest> {
-                    override fun key(data: DownloadRequest, options: Options): String {
-                        return data.getCacheKey()
-                    }
-                }
+                val downloadRequestKeyer = Keyer<DownloadRequest> { data, _ -> data.getCacheKey() }
                 add(downloadRequestKeyer)
                 add(downloadRequestFetcherFactory)
 
-                val packageNameKeyer = object : Keyer<PackageName> {
-                    override fun key(data: PackageName, options: Options): String = data.packageName
-                }
+                val packageNameKeyer = Keyer<PackageName> { data, _ -> data.packageName }
                 add(packageNameKeyer)
                 add(LocalIconFetcher.Factory(context, downloadRequestFetcherFactory))
             }
@@ -123,8 +116,6 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
                     .build()
             }
             .diskCache {
-                // TODO disk cache needs to be manually filled by the Fetcher
-                //  this is not automatic like it is with Glide
                 DiskCache.Builder()
                     .directory(context.cacheDir.resolve("coil"))
                     .maxSizePercent(0.05)
diff --git a/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt b/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
index 73af4b010..2b4555c07 100644
--- a/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
+++ b/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
@@ -58,7 +58,7 @@ class LocalIconFetcher(
             data: PackageName,
             options: Options,
             imageLoader: ImageLoader,
-        ): Fetcher? = LocalIconFetcher(
+        ): Fetcher = LocalIconFetcher(
             packageManager = context.packageManager,
             data = data,
             downloadRequestFetcher = data.iconDownloadRequest?.let {
diff --git a/next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt b/next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
index 9ab988fd5..70b704a58 100644
--- a/next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
+++ b/next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
@@ -43,6 +43,11 @@ class InstalledAppsCache @Inject constructor(
         loadInstalledApps()
     }
 
+    fun isInstalled(packageName: String): Boolean {
+        // TODO on first start this may have to wait for installed apps to load
+        return _installedApps.value.contains(packageName)
+    }
+
     @UiThread
     private fun loadInstalledApps() {
         if (loadJob?.isActive == true) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
index 2f93a2ee0..f0a591c54 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
@@ -1,7 +1,10 @@
 package org.fdroid.ui.apps
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Error
 import androidx.compose.material3.BadgedBox
@@ -12,6 +15,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -20,8 +24,6 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.download.DownloadRequest
-import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.Names
@@ -41,12 +43,16 @@ fun InstalledAppRow(
                         imageVector = Icons.Filled.Error,
                         tint = MaterialTheme.colorScheme.error,
                         contentDescription =
-                        stringResource(R.string.notification_title_single_update_available),
-                        modifier = Modifier.size(24.dp),
+                            stringResource(R.string.my_apps_header_apps_with_issue),
+                        modifier = Modifier
+                            .clip(CircleShape)
+                            .background(MaterialTheme.colorScheme.surface)
+                            .padding(1.dp)
+                            .size(24.dp)
                     )
                 }) {
                     AsyncShimmerImage(
-                        model = PackageName(app.packageName, app.iconModel as? DownloadRequest),
+                        model = app.iconModel,
                         error = painterResource(R.drawable.ic_repo_app_default),
                         contentDescription = null,
                         modifier = Modifier
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
index 7324beb7b..1b8cedf4c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
@@ -20,7 +20,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
 import org.fdroid.ui.utils.AsyncShimmerImage
@@ -35,7 +34,7 @@ fun InstallingAppRow(
         ListItem(
             leadingContent = {
                 AsyncShimmerImage(
-                    model = PackageName(app.packageName, app.iconModel, false),
+                    model = app.iconModel,
                     error = painterResource(R.drawable.ic_repo_app_default),
                     contentDescription = null,
                     modifier = Modifier.size(48.dp),
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
index 4be3cb271..b5405af6c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
@@ -1,7 +1,7 @@
 package org.fdroid.ui.apps
 
 import org.fdroid.database.AppIssue
-import org.fdroid.download.DownloadRequest
+import org.fdroid.download.PackageName
 import org.fdroid.index.v2.PackageVersion
 import org.fdroid.install.InstallStateWithInfo
 
@@ -18,7 +18,7 @@ data class InstallingAppItem(
 ) : MyAppItem() {
     override val name: String = installState.name
     override val lastUpdated: Long = installState.lastUpdated
-    override val iconModel: DownloadRequest? = installState.iconDownloadRequest
+    override val iconModel: Any = PackageName(packageName, installState.iconDownloadRequest)
 }
 
 data class AppUpdateItem(
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index 33f231828..a06f13008 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -19,6 +19,8 @@ import kotlinx.coroutines.launch
 import mu.KotlinLogging
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.PackageName
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
@@ -56,14 +58,15 @@ class MyAppsViewModel @Inject constructor(
             val proxyConfig = settingsManager.proxyConfig
             db.getAppDao().getInstalledAppListItems(installedApps).map { list ->
                 list.map { app ->
+                    val backupModel = repoManager.getRepository(app.repoId)?.let { repo ->
+                        app.getIcon(localeList)?.getImageModel(repo, proxyConfig)
+                    } as? DownloadRequest
                     InstalledAppItem(
                         packageName = app.packageName,
                         name = app.name ?: "Unknown app",
                         installedVersionName = app.installedVersionName ?: "???",
                         lastUpdated = app.lastUpdated,
-                        iconModel = repoManager.getRepository(app.repoId)?.let { repo ->
-                            app.getIcon(localeList)?.getImageModel(repo, proxyConfig)
-                        },
+                        iconModel = PackageName(app.packageName, backupModel),
                     )
                 }
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index 6c7a0c9dd..84c17fe3e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -2,10 +2,12 @@ package org.fdroid.ui.apps
 
 import android.text.format.Formatter
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.NewReleases
 import androidx.compose.material3.BadgedBox
@@ -22,6 +24,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -33,8 +36,6 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.download.DownloadRequest
-import org.fdroid.download.PackageName
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.ExpandIconArrow
@@ -56,11 +57,15 @@ fun UpdatableAppRow(
                         tint = MaterialTheme.colorScheme.secondary,
                         contentDescription =
                         stringResource(R.string.notification_title_single_update_available),
-                        modifier = Modifier.size(24.dp),
+                        modifier = Modifier
+                            .clip(CircleShape)
+                            .background(MaterialTheme.colorScheme.surface)
+                            .padding(1.dp)
+                            .size(24.dp)
                     )
                 }) {
                     AsyncShimmerImage(
-                        model = PackageName(app.packageName, app.iconModel as? DownloadRequest),
+                        model = app.iconModel,
                         error = painterResource(R.drawable.ic_repo_app_default),
                         contentDescription = null,
                         modifier = Modifier
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index c38cc1187..e8ae916fc 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Cancel
+import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -37,6 +38,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Brush
@@ -58,6 +60,7 @@ import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.InstalledBadge
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.startActivitySafe
 import org.fdroid.ui.utils.testApp
@@ -106,17 +109,21 @@ fun AppDetailsHeader(
     Row(
         modifier = Modifier
             .padding(horizontal = 16.dp),
-        horizontalArrangement = spacedBy(8.dp),
+        horizontalArrangement = spacedBy(16.dp),
         verticalAlignment = CenterVertically,
     ) {
-        AsyncShimmerImage(
-            model = item.icon,
-            contentDescription = "",
-            error = painterResource(R.drawable.ic_repo_app_default),
-            modifier = Modifier
-                .size(64.dp)
-                .semantics { hideFromAccessibility() },
-        )
+        BadgedBox(badge = { if (item.installedVersionCode != null) InstalledBadge() }) {
+            AsyncShimmerImage(
+                model = item.icon,
+                contentDescription = "",
+                contentScale = ContentScale.Crop,
+                error = painterResource(R.drawable.ic_repo_app_default),
+                modifier = Modifier
+                    .size(64.dp)
+                    .clip(MaterialTheme.shapes.large)
+                    .semantics { hideFromAccessibility() },
+            )
+        }
         Column {
             SelectionContainer {
                 Text(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 4c911c667..a98315c0a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -12,6 +12,8 @@ import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppPrefs
 import org.fdroid.database.AppVersion
 import org.fdroid.database.Repository
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.PackageName
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.v2.PackageVersion
@@ -89,7 +91,13 @@ data class AppDetailsItem(
         name = dbApp.name ?: "Unknown App",
         summary = dbApp.summary,
         description = getHtmlDescription(dbApp.getDescription(localeList)),
-        icon = dbApp.getIcon(localeList)?.getImageModel(repository, proxy),
+        icon = if (installedVersionCode == null) {
+            dbApp.getIcon(localeList)?.getImageModel(repository, proxy)
+        } else {
+            val request =
+                dbApp.getIcon(localeList)?.getImageModel(repository, proxy) as? DownloadRequest
+            PackageName(dbApp.packageName, request)
+        },
         featureGraphic = dbApp.getFeatureGraphic(localeList)?.getImageModel(repository, proxy),
         phoneScreenshots = dbApp.getPhoneScreenshots(localeList).mapNotNull {
             it.getImageModel(repository, proxy)
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
index f12f41d4c..b0e24ee82 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -27,6 +28,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.InstalledBadge
 import org.fdroid.ui.utils.Names
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -76,15 +78,17 @@ fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
             .padding(8.dp)
             .clickable { onAppTap(app) },
     ) {
-        AsyncShimmerImage(
-            model = app.imageModel,
-            contentDescription = null,
-            contentScale = ContentScale.Fit,
-            modifier = Modifier
-                .requiredSize(76.dp)
-                .clip(MaterialTheme.shapes.medium)
-                .semantics { hideFromAccessibility() },
-        )
+        BadgedBox(badge = { if (app.isInstalled) InstalledBadge() }) {
+            AsyncShimmerImage(
+                model = app.imageModel,
+                contentDescription = null,
+                contentScale = ContentScale.Fit,
+                modifier = Modifier
+                    .requiredSize(76.dp)
+                    .clip(MaterialTheme.shapes.medium)
+                    .semantics { hideFromAccessibility() },
+            )
+        }
         Text(
             text = app.name,
             style = MaterialTheme.typography.bodySmall,
@@ -98,11 +102,11 @@ fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
 @Composable
 fun AppCarouselPreview() {
     val apps = listOf(
-        AppDiscoverItem("", Names.randomName),
-        AppDiscoverItem("", Names.randomName),
-        AppDiscoverItem("", Names.randomName),
-        AppDiscoverItem("", Names.randomName),
-        AppDiscoverItem("", Names.randomName),
+        AppDiscoverItem("", Names.randomName, false),
+        AppDiscoverItem("", Names.randomName, true),
+        AppDiscoverItem("", Names.randomName, false),
+        AppDiscoverItem("", Names.randomName, false),
+        AppDiscoverItem("", Names.randomName, false),
     )
     FDroidContent {
         AppCarousel("Preview Apps", apps, onTitleTap = {}) {}
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
index 5c989ee5e..a0d8995c7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
@@ -3,6 +3,7 @@ package org.fdroid.ui.discover
 class AppDiscoverItem(
     val packageName: String,
     val name: String,
+    val isInstalled: Boolean,
     val imageModel: Any? = null,
     val lastUpdated: Long = -1,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index d223ffaf7..296156d05 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -258,8 +258,8 @@ private fun AppsSearchPreview() {
                 CategoryItem("Money", "Money"),
             )
             val apps = listOf(
-                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null),
-                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null),
+                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, false, true, null),
+                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, true, null),
             )
             AppsSearch(state, SearchResults(apps, categories), {}, {}, {})
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 7ce1837f0..4df2bcdd6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -23,8 +23,11 @@ import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.database.AppOverviewItem
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.PackageName
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
+import org.fdroid.install.InstalledAppsCache
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListItem
@@ -44,6 +47,7 @@ class DiscoverViewModel @Inject constructor(
     updatesManager: UpdatesManager,
     private val settingsManager: SettingsManager,
     private val repoManager: RepoManager,
+    private val installedAppsCache: InstalledAppsCache,
     @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
 
@@ -121,14 +125,22 @@ class DiscoverViewModel @Inject constructor(
                 val proxyConfig = settingsManager.proxyConfig
                 db.getAppDao().getAppSearchItems(query).sortedDescending().mapNotNull {
                     val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
+                    val iconModel = it.getIcon(localeList)?.getImageModel(repository, proxyConfig)
+                        as? DownloadRequest
+                    val isInstalled = installedAppsCache.isInstalled(it.packageName)
                     AppListItem(
                         repoId = it.repoId,
                         packageName = it.packageName,
                         name = it.name.getBestLocale(localeList) ?: "Unknown",
                         summary = it.summary.getBestLocale(localeList) ?: "",
                         lastUpdated = it.lastUpdated,
+                        isInstalled = isInstalled,
                         isCompatible = true, // doesn't matter here, as we don't filter
-                        iconModel = it.getIcon(localeList)?.getImageModel(repository, proxyConfig),
+                        iconModel = if (isInstalled) {
+                            PackageName(it.packageName, iconModel)
+                        } else {
+                            iconModel
+                        },
                         categoryIds = it.categories?.toSet(),
                     )
                 }
@@ -158,10 +170,20 @@ class DiscoverViewModel @Inject constructor(
     private fun AppOverviewItem.toAppDiscoverItem(
         repository: Repository,
         proxyConfig: ProxyConfig?,
-    ) = AppDiscoverItem(
-        packageName = packageName,
-        name = getName(localeList) ?: "Unknown App",
-        lastUpdated = lastUpdated,
-        imageModel = getIcon(localeList)?.getImageModel(repository, proxyConfig),
-    )
+    ): AppDiscoverItem {
+        val isInstalled = installedAppsCache.isInstalled(packageName)
+        val imageModel =
+            getIcon(localeList)?.getImageModel(repository, proxyConfig) as? DownloadRequest
+        return AppDiscoverItem(
+            packageName = packageName,
+            name = getName(localeList) ?: "Unknown App",
+            lastUpdated = lastUpdated,
+            isInstalled = isInstalled,
+            imageModel = if (isInstalled) {
+                PackageName(packageName, imageModel)
+            } else {
+                imageModel
+            },
+        )
+    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 91d7ddcbf..c02082776 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -228,8 +228,8 @@ private fun Preview() {
     FDroidContent {
         val model = AppListModel(
             apps = listOf(
-                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null),
-                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null),
+                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, false, true, null),
+                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, true, null),
             ),
             sortBy = AppListSortOrder.NAME,
             filterIncompatible = true,
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
index d6aa606f4..de65ed327 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
@@ -6,6 +6,7 @@ data class AppListItem(
     val name: String,
     val summary: String,
     val lastUpdated: Long,
+    val isInstalled: Boolean,
     val isCompatible: Boolean,
     val iconModel: Any? = null,
     val categoryIds: Set<String>? = null,
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
index 5d74acc24..5e9f161f3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
@@ -3,6 +3,7 @@ package org.fdroid.ui.lists
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.size
+import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
@@ -18,6 +19,7 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.InstalledBadge
 
 @Composable
 fun AppListRow(
@@ -29,14 +31,16 @@ fun AppListRow(
         headlineContent = { Text(item.name) },
         supportingContent = { Text(item.summary) },
         leadingContent = {
-            AsyncShimmerImage(
-                model = item.iconModel,
-                error = painterResource(R.drawable.ic_repo_app_default),
-                contentDescription = null,
-                modifier = Modifier
-                    .size(48.dp)
-                    .semantics { hideFromAccessibility() },
-            )
+            BadgedBox(badge = { if (item.isInstalled) InstalledBadge() }) {
+                AsyncShimmerImage(
+                    model = item.iconModel,
+                    error = painterResource(R.drawable.ic_repo_app_default),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .size(48.dp)
+                        .semantics { hideFromAccessibility() },
+                )
+            }
         },
         colors = ListItemDefaults.colors(
             containerColor = if (isSelected) {
@@ -53,8 +57,8 @@ fun AppListRow(
 @Composable
 fun AppListRowPreview() {
     FDroidContent {
-        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null)
-        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null)
+        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, false, true, null)
+        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, true, null)
         Column {
             AppListRow(item1, false)
             AppListRow(item2, true)
@@ -66,8 +70,8 @@ fun AppListRowPreview() {
 @Composable
 fun AppListRowPreviewNight() {
     FDroidContent {
-        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null)
-        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null)
+        val item1 = AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, true, null)
+        val item2 = AppListItem(2, "2", "This is app 2", "It has summary 2", 0, false, true, null)
         Column {
             AppListRow(item1, false)
             AppListRow(item2, true)
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index bbf59e1dd..37d7a71a3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -23,8 +23,11 @@ import kotlinx.coroutines.launch
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.PackageName
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
+import org.fdroid.install.InstalledAppsCache
 import org.fdroid.settings.OnboardingManager
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.categories.CategoryItem
@@ -41,6 +44,7 @@ class AppListViewModel @Inject constructor(
     private val repoManager: RepoManager,
     private val settingsManager: SettingsManager,
     private val onboardingManager: OnboardingManager,
+    private val installedAppsCache: InstalledAppsCache,
 ) : AndroidViewModel(app), AppListActions {
 
     private val moleculeScope =
@@ -117,14 +121,22 @@ class AppListViewModel @Inject constructor(
         }.mapNotNull {
             val repository = repoManager.getRepository(it.repoId)
                 ?: return@mapNotNull null
+            val iconModel = it.getIcon(localeList)?.getImageModel(repository, proxyConfig)
+                as? DownloadRequest
+            val isInstalled = installedAppsCache.isInstalled(it.packageName)
             AppListItem(
                 repoId = it.repoId,
                 packageName = it.packageName,
                 name = it.getName(localeList) ?: "Unknown App",
                 summary = it.getSummary(localeList) ?: "Unknown",
                 lastUpdated = it.lastUpdated,
+                isInstalled = isInstalled,
                 isCompatible = it.isCompatible,
-                iconModel = it.getIcon(localeList)?.getImageModel(repository, proxyConfig),
+                iconModel = if (isInstalled) {
+                    PackageName(it.packageName, iconModel)
+                } else {
+                    iconModel
+                },
                 categoryIds = it.categories?.toSet(),
             )
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index cdfecff49..8a12047a0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -239,8 +239,8 @@ private fun Preview() {
     FDroidContent {
         val model = AppListModel(
             apps = listOf(
-                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, true, null),
-                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, null),
+                AppListItem(1, "1", "This is app 1", "It has summary 2", 0, false, true, null),
+                AppListItem(2, "2", "This is app 2", "It has summary 2", 0, true, true, null),
             ),
             sortBy = AppListSortOrder.NAME,
             filterIncompatible = Random.nextBoolean(),
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
index a32b0d6f3..399f3217c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
@@ -86,6 +86,7 @@ fun AddRepoPreviewScreen(
             }
             items(items = state.apps, key = { it.packageName }) { app ->
                 val repo = state.receivedRepo ?: error("no repo")
+                // TODO this conversion ideally doesn't happen in the UI layer
                 val item = AppListItem(
                     repoId = repo.repoId,
                     packageName = app.packageName,
@@ -93,6 +94,7 @@ fun AddRepoPreviewScreen(
                     summary = app.summary ?: "",
                     iconModel = app.getIcon(localeList)?.getImageModel(repo, proxyConfig),
                     lastUpdated = 1L,
+                    isInstalled = false,
                     isCompatible = true,
                 )
                 AppListRow(
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/InstalledBadge.kt b/next/src/main/kotlin/org/fdroid/ui/utils/InstalledBadge.kt
new file mode 100644
index 000000000..0cd9dbfea
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/InstalledBadge.kt
@@ -0,0 +1,48 @@
+package org.fdroid.ui.utils
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun InstalledBadge() = Icon(
+    imageVector = Icons.Filled.CheckCircle,
+    tint = MaterialTheme.colorScheme.secondary,
+    contentDescription = stringResource(R.string.app_installed),
+    modifier = Modifier
+        .clip(CircleShape)
+        .background(MaterialTheme.colorScheme.surface)
+        .padding(1.dp)
+        .size(24.dp)
+)
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        BadgedBox(badge = { InstalledBadge() }, modifier = Modifier.padding(16.dp)) {
+            Image(
+                painter = painterResource(R.drawable.ic_launcher),
+                contentDescription = null,
+                modifier = Modifier
+                    .size(48.dp),
+            )
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 6e0937b11..203d2887f 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -22,6 +22,8 @@ import org.fdroid.database.AvailableAppWithIssue
 import org.fdroid.database.DbAppChecker
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.UnavailableAppWithIssue
+import org.fdroid.download.DownloadRequest
+import org.fdroid.download.PackageName
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.AppInstallManager
@@ -103,6 +105,9 @@ class UpdatesManager @Inject constructor(
             val proxyConfig = settingsManager.proxyConfig
             val apps = dbAppChecker.getApps(packageInfoMap = packageInfoMap)
             val updates = apps.updates.map { update ->
+                val iconModel = repoManager.getRepository(update.repoId)?.let { repo ->
+                    update.getIcon(localeList)?.getImageModel(repo, proxyConfig)
+                } as? DownloadRequest
                 AppUpdateItem(
                     repoId = update.repoId,
                     packageName = update.packageName,
@@ -110,9 +115,7 @@ class UpdatesManager @Inject constructor(
                     installedVersionName = update.installedVersionName,
                     update = update.update,
                     whatsNew = update.update.getWhatsNew(localeList),
-                    iconModel = repoManager.getRepository(update.repoId)?.let { repo ->
-                        update.getIcon(localeList)?.getImageModel(repo, proxyConfig)
-                    },
+                    iconModel = PackageName(update.packageName, iconModel),
                 )
             }
             _updates.value = updates

From 50357a71a3715612a1e1ba0c2282d79289013e71 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 9 Dec 2025 10:38:17 -0300
Subject: [PATCH 123/180] Show most downloaded apps on discover screen

---
 .../src/main/assets/most_downloaded_apps.json | 52 +++++++++++++++++++
 .../org/fdroid/ui/discover/AppCarousel.kt     | 43 ++++++++-------
 .../kotlin/org/fdroid/ui/discover/Discover.kt | 16 +++++-
 .../fdroid/ui/discover/DiscoverPresenter.kt   |  5 ++
 .../fdroid/ui/discover/DiscoverViewModel.kt   | 37 +++++++++++--
 .../kotlin/org/fdroid/ui/lists/AppListType.kt |  3 ++
 .../org/fdroid/ui/lists/AppListViewModel.kt   | 12 ++++-
 next/src/main/res/values/strings-next.xml     |  1 +
 8 files changed, 143 insertions(+), 26 deletions(-)
 create mode 100644 next/src/main/assets/most_downloaded_apps.json

diff --git a/next/src/main/assets/most_downloaded_apps.json b/next/src/main/assets/most_downloaded_apps.json
new file mode 100644
index 000000000..7e9c782c6
--- /dev/null
+++ b/next/src/main/assets/most_downloaded_apps.json
@@ -0,0 +1,52 @@
+[
+  "com.termux",
+  "org.fdroid.fdroid",
+  "org.woheller69.arity",
+  "com.aurora.store",
+  "org.mozilla.fennec_fdroid",
+  "at.bitfire.davdroid",
+  "com.junkfood.seal",
+  "app.organicmaps",
+  "net.osmand.plus",
+  "ch.protonvpn.android",
+  "org.videolan.vlc",
+  "org.fossify.gallery",
+  "com.duckduckgo.mobile.android",
+  "com.fsck.k9",
+  "dev.imranr.obtainium.fdroid",
+  "com.nextcloud.client",
+  "com.machiav3lli.fdroid",
+  "InfinityLoop1309.NewPipeEnhanced",
+  "org.schabi.newpipe",
+  "net.thunderbird.android",
+  "de.tutao.tutanota",
+  "org.documentfoundation.libreoffice",
+  "com.artifex.mupdf.viewer.app",
+  "com.nononsenseapps.feeder",
+  "org.tasks",
+  "eu.faircode.email",
+  "org.kde.kdeconnect_tp",
+  "com.maxrave.simpmusic",
+  "com.kunzisoft.keepass.libre",
+  "de.danoeh.antennapod",
+  "com.looker.droidify",
+  "com.termux.api",
+  "deckers.thibault.aves.libre",
+  "org.samo_lego.canta",
+  "org.fossify.calendar",
+  "com.github.andreyasadchy.xtra",
+  "com.foobnix.pro.pdf.reader",
+  "org.fossify.messages",
+  "net.cozic.joplin",
+  "oss.krtirtho.spotube",
+  "im.vector.app",
+  "com.unciv.app",
+  "org.adaway",
+  "org.koitharu.kotatsu",
+  "io.github.muntashirakon.AppManager",
+  "com.artifex.mupdf.mini.app",
+  "com.anandnet.harmonymusic",
+  "com.beemdevelopment.aegis",
+  "com.github.libretube",
+  "org.breezyweather"
+]
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
index b0e24ee82..15b96e4ec 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
@@ -7,7 +7,10 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material3.BadgedBox
@@ -15,8 +18,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
-import androidx.compose.material3.carousel.rememberCarouselState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
@@ -40,8 +41,10 @@ fun AppCarousel(
     onTitleTap: () -> Unit,
     onAppTap: (AppDiscoverItem) -> Unit,
 ) {
-    val carouselState = rememberCarouselState { apps.size }
-    Column(modifier = modifier) {
+    Column(
+        verticalArrangement = spacedBy(8.dp),
+        modifier = modifier
+    ) {
         Row(
             verticalAlignment = CenterVertically,
             modifier = Modifier
@@ -59,13 +62,13 @@ fun AppCarousel(
                 contentDescription = null,
             )
         }
-        HorizontalUncontainedCarousel(
-            state = carouselState,
-            itemWidth = 80.dp,
-            itemSpacing = 8.dp,
+        LazyRow(
             contentPadding = PaddingValues(horizontal = 16.dp),
-        ) { index ->
-            AppBox(apps[index], onAppTap)
+            horizontalArrangement = spacedBy(16.dp),
+        ) {
+            items(apps, key = { it.packageName }) { app ->
+                AppBox(app, onAppTap)
+            }
         }
     }
 }
@@ -75,17 +78,17 @@ fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
     Column(
         verticalArrangement = spacedBy(8.dp),
         modifier = Modifier
-            .padding(8.dp)
+            .width(80.dp)
             .clickable { onAppTap(app) },
     ) {
         BadgedBox(badge = { if (app.isInstalled) InstalledBadge() }) {
             AsyncShimmerImage(
                 model = app.imageModel,
                 contentDescription = null,
-                contentScale = ContentScale.Fit,
+                contentScale = ContentScale.Crop,
                 modifier = Modifier
-                    .requiredSize(76.dp)
-                    .clip(MaterialTheme.shapes.medium)
+                    .size(76.dp)
+                    .clip(MaterialTheme.shapes.large)
                     .semantics { hideFromAccessibility() },
             )
         }
@@ -102,11 +105,11 @@ fun AppBox(app: AppDiscoverItem, onAppTap: (AppDiscoverItem) -> Unit) {
 @Composable
 fun AppCarouselPreview() {
     val apps = listOf(
-        AppDiscoverItem("", Names.randomName, false),
-        AppDiscoverItem("", Names.randomName, true),
-        AppDiscoverItem("", Names.randomName, false),
-        AppDiscoverItem("", Names.randomName, false),
-        AppDiscoverItem("", Names.randomName, false),
+        AppDiscoverItem("1", Names.randomName, false),
+        AppDiscoverItem("2", Names.randomName, true),
+        AppDiscoverItem("3", Names.randomName, false),
+        AppDiscoverItem("4", Names.randomName, false),
+        AppDiscoverItem("5", Names.randomName, false),
     )
     FDroidContent {
         AppCarousel("Preview Apps", apps, onTitleTap = {}) {}
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 072709847..dc896926c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -144,7 +144,8 @@ fun Discover(
                         },
                         onSearchCleared = onSearchCleared,
                         modifier = Modifier
-                            .padding(16.dp)
+                            .padding(top = 16.dp, bottom = 4.dp)
+                            .padding(horizontal = 16.dp)
                             .align(Alignment.CenterHorizontally),
                     )
                     if (discoverModel.newApps.isNotEmpty()) {
@@ -165,6 +166,17 @@ fun Discover(
                         onTitleTap = { onListTap(listRecentlyUpdated) },
                         onAppTap = onAppTap,
                     )
+                    if (!discoverModel.mostDownloadedApps.isNullOrEmpty()) {
+                        val listMostDownloaded = AppListType.MostDownloaded(
+                            stringResource(R.string.app_list_most_downloaded),
+                        )
+                        AppCarousel(
+                            title = listMostDownloaded.title,
+                            apps = discoverModel.mostDownloadedApps,
+                            onTitleTap = { onListTap(listMostDownloaded) },
+                            onAppTap = onAppTap,
+                        )
+                    }
                     val listAll = AppListType.All(
                         title = stringResource(R.string.app_list_all),
                     )
@@ -172,7 +184,7 @@ fun Discover(
                         onClick = { onListTap(listAll) },
                         modifier = Modifier
                             .align(End)
-                            .padding(16.dp),
+                            .padding(horizontal = 16.dp),
                     ) {
                         Text(listAll.title)
                     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 8b71fbd7b..75c8cc9f4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -3,6 +3,7 @@ package org.fdroid.ui.discover
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.Repository
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
@@ -13,6 +14,7 @@ import org.fdroid.ui.categories.CategoryItem
 fun DiscoverPresenter(
     newAppsFlow: Flow<List<AppDiscoverItem>>,
     recentlyUpdatedAppsFlow: Flow<List<AppDiscoverItem>>,
+    mostDownloadedAppsFlow: MutableStateFlow<List<AppDiscoverItem>?>,
     categoriesFlow: Flow<List<CategoryItem>>,
     repositoriesFlow: Flow<List<Repository>>,
     searchResultsFlow: StateFlow<SearchResults?>,
@@ -20,6 +22,7 @@ fun DiscoverPresenter(
 ): DiscoverModel {
     val newApps = newAppsFlow.collectAsState(null).value
     val recentlyUpdatedApps = recentlyUpdatedAppsFlow.collectAsState(null).value
+    val mostDownloadedApps = mostDownloadedAppsFlow.collectAsState().value
     val categories = categoriesFlow.collectAsState(null).value
     val searchResults = searchResultsFlow.collectAsState().value
 
@@ -42,6 +45,7 @@ fun DiscoverPresenter(
         LoadedDiscoverModel(
             newApps = newApps ?: emptyList(),
             recentlyUpdatedApps = recentlyUpdatedApps,
+            mostDownloadedApps = mostDownloadedApps,
             categories = categories?.groupBy { it.group },
             searchResults = searchResults,
         )
@@ -54,6 +58,7 @@ object NoEnabledReposDiscoverModel : DiscoverModel()
 data class LoadedDiscoverModel(
     val newApps: List<AppDiscoverItem>,
     val recentlyUpdatedApps: List<AppDiscoverItem>,
+    val mostDownloadedApps: List<AppDiscoverItem>?,
     val categories: Map<CategoryGroup, List<CategoryItem>>?,
     val searchResults: SearchResults? = null,
 ) : DiscoverModel()
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 4df2bcdd6..1780e0dbd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -17,7 +17,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromStream
 import mu.KotlinLogging
 import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.database.AppOverviewItem
@@ -41,7 +45,7 @@ import kotlin.time.measureTimedValue
 
 @HiltViewModel
 class DiscoverViewModel @Inject constructor(
-    app: Application,
+    private val app: Application,
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
     updatesManager: UpdatesManager,
@@ -58,20 +62,21 @@ class DiscoverViewModel @Inject constructor(
 
     val numUpdates = updatesManager.numUpdates
     val hasIssues = updatesManager.appsWithIssues.map { !it.isNullOrEmpty() }
-    val newApps = db.getAppDao().getNewAppsFlow().map { list ->
+    private val newApps = db.getAppDao().getNewAppsFlow().map { list ->
         val proxyConfig = settingsManager.proxyConfig
         list.mapNotNull {
             val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
             it.toAppDiscoverItem(repository, proxyConfig)
         }
     }
-    val recentlyUpdatedApps = db.getAppDao().getRecentlyUpdatedAppsFlow().map { list ->
+    private val recentlyUpdatedApps = db.getAppDao().getRecentlyUpdatedAppsFlow().map { list ->
         val proxyConfig = settingsManager.proxyConfig
         list.mapNotNull {
             val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
             it.toAppDiscoverItem(repository, proxyConfig)
         }
     }
+    private val mostDownloadedApps = MutableStateFlow<List<AppDiscoverItem>?>(null)
     private val categories = db.getRepositoryDao().getLiveCategories().asFlow().map { categories ->
         categories.map { category ->
             CategoryItem(
@@ -88,6 +93,7 @@ class DiscoverViewModel @Inject constructor(
             DiscoverPresenter(
                 newAppsFlow = newApps,
                 recentlyUpdatedAppsFlow = recentlyUpdatedApps,
+                mostDownloadedAppsFlow = mostDownloadedApps,
                 categoriesFlow = categories,
                 repositoriesFlow = repoManager.repositoriesState,
                 searchResultsFlow = searchResults,
@@ -96,6 +102,31 @@ class DiscoverViewModel @Inject constructor(
         }
     }
 
+    init {
+        loadMostDownloadedApps()
+    }
+
+    private fun loadMostDownloadedApps() {
+        viewModelScope.launch(ioScope.coroutineContext) {
+            val packageNames = try {
+                app.assets.open("most_downloaded_apps.json").use { inputStream ->
+                    @OptIn(ExperimentalSerializationApi::class)
+                    Json.decodeFromStream<List<String>>(inputStream)
+                }
+            } catch (e: Exception) {
+                log.error(e) { "Error loading most downloaded apps: " }
+                return@launch
+            }
+            db.getAppDao().getAppsFlow(packageNames).collect { apps ->
+                val proxyConfig = settingsManager.proxyConfig
+                mostDownloadedApps.value = apps.mapNotNull {
+                    val repository = repoManager.getRepository(it.repoId) ?: return@mapNotNull null
+                    it.toAppDiscoverItem(repository, proxyConfig)
+                }
+            }
+        }
+    }
+
     suspend fun search(term: String) = withContext(ioScope.coroutineContext) {
         // we need a way to make the app crash for testing, e.g. the crash reporter
         if (term == "CrashMe") error("BOOOOOOOOM!!!")
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
index 87121d790..d273430c3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
@@ -12,6 +12,9 @@ sealed class AppListType {
     @Serializable
     data class RecentlyUpdated(override val title: String) : AppListType()
 
+    @Serializable
+    data class MostDownloaded(override val title: String) : AppListType()
+
     @Serializable
     data class All(override val title: String) : AppListType()
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index 37d7a71a3..cefa1d8c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -20,6 +20,9 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromStream
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
@@ -38,7 +41,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class AppListViewModel @Inject constructor(
-    app: Application,
+    private val app: Application,
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
@@ -116,6 +119,13 @@ class AppListViewModel @Inject constructor(
             is AppListType.Category -> appDao.getAppsByCategory(type.categoryId)
             is AppListType.New -> appDao.getNewApps()
             is AppListType.RecentlyUpdated -> appDao.getRecentlyUpdatedApps()
+            is AppListType.MostDownloaded -> {
+                val packageNames = app.assets.open("most_downloaded_apps.json").use { inputStream ->
+                    @OptIn(ExperimentalSerializationApi::class)
+                    Json.decodeFromStream<List<String>>(inputStream)
+                }
+                appDao.getApps(packageNames)
+            }
             is AppListType.All -> appDao.getAllApps()
             is AppListType.Repository -> appDao.getAppsByRepository(type.repoId)
         }.mapNotNull {
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 9f371d4a6..9e7a940f8 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -18,6 +18,7 @@
 
     <string name="app_list_new">New apps</string>
     <string name="app_list_recently_updated">Recently updated</string>
+    <string name="app_list_most_downloaded">Most downloaded</string>
     <string name="app_list_all">All apps</string>
     <string name="app_list_author">Apps by %s</string>
 

From 78679d0f15c6ce1fabdb9a03e58a3da139ac40be Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 10 Dec 2025 10:17:32 -0300
Subject: [PATCH 124/180] Use assisted inject for ViewModels rather than
 LaunchedEffect

The advantage is that the information to be passed to the ViewModel is known at construction time and is final. So no issues with mutable values and potentially calling settings multiple times. The passed info defines the identity of the ViewModel.
---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    | 45 ++++++++---------
 .../org/fdroid/ui/details/AppDetails.kt       |  2 +-
 .../org/fdroid/ui/details/AppDetailsHeader.kt |  6 +--
 .../org/fdroid/ui/details/AppDetailsItem.kt   |  8 ++--
 .../org/fdroid/ui/details/AppDetailsMenu.kt   |  2 +-
 .../fdroid/ui/details/AppDetailsViewModel.kt  | 48 +++++++++----------
 .../org/fdroid/ui/lists/AppListViewModel.kt   | 25 +++++-----
 .../ui/repositories/add/AddRepoViewModel.kt   |  4 +-
 .../ui/repositories/details/RepoDetails.kt    |  2 +-
 .../details/RepoDetailsContent.kt             |  6 +--
 .../repositories/details/RepoDetailsInfo.kt   |  8 ++--
 .../details/RepoDetailsViewModel.kt           | 43 +++++++++--------
 .../ui/repositories/details/RepoSettings.kt   | 12 ++---
 .../org/fdroid/ui/utils/PreviewUtils.kt       | 26 +++-------
 14 files changed, 113 insertions(+), 124 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index dfb1bab79..f70b31839 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -152,12 +152,13 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
         entry<NavigationKey.AppDetails>(
             metadata = ListDetailSceneStrategy.detailPane("appdetails")
         ) {
-            val appDetailsViewModel = hiltViewModel<AppDetailsViewModel>()
-            LaunchedEffect(it.packageName) {
-                appDetailsViewModel.setAppDetails(it.packageName)
-            }
+            val viewModel = hiltViewModel<AppDetailsViewModel, AppDetailsViewModel.Factory>(
+                creationCallback = { factory ->
+                    factory.create(it.packageName)
+                }
+            )
             AppDetails(
-                item = appDetailsViewModel.appDetails.collectAsStateWithLifecycle().value,
+                item = viewModel.appDetails.collectAsStateWithLifecycle().value,
                 onNav = { navKey -> backStack.add(navKey) },
                 onBackNav = if (isBigScreen) null else {
                     { backStack.removeLastOrNull() }
@@ -170,20 +171,19 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 Text(stringResource(R.string.no_app_selected))
             },
         ) {
-            val appListViewModel = hiltViewModel<AppListViewModel>()
-            LaunchedEffect(it.type) {
-                appListViewModel.load(it.type)
-            }
+            val viewModel = hiltViewModel<AppListViewModel, AppListViewModel.Factory>(
+                creationCallback = { factory ->
+                    factory.create(it.type)
+                }
+            )
             val appListInfo = object : AppListInfo {
-                override val model =
-                    appListViewModel.appListModel.collectAsStateWithLifecycle().value
-                override val actions: AppListActions = appListViewModel
-                override val list: AppListType =
-                    appListViewModel.currentList.collectAsStateWithLifecycle().value
+                override val model = viewModel.appListModel.collectAsStateWithLifecycle().value
+                override val list: AppListType = it.type
+                override val actions: AppListActions = viewModel
                 override val showFilters: Boolean =
-                    appListViewModel.showFilters.collectAsStateWithLifecycle().value
+                    viewModel.showFilters.collectAsStateWithLifecycle().value
                 override val showOnboarding: Boolean =
-                    appListViewModel.showOnboarding.collectAsStateWithLifecycle().value
+                    viewModel.showOnboarding.collectAsStateWithLifecycle().value
             }
             AppList(
                 appListInfo = appListInfo,
@@ -238,14 +238,14 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
         entry<NavigationKey.RepoDetails>(
             metadata = ListDetailSceneStrategy.detailPane("repos")
         ) { navKey ->
-            val viewModel = hiltViewModel<RepoDetailsViewModel>()
-            LaunchedEffect(navKey) {
-                viewModel.setRepoId(navKey.repoId)
-            }
+            val viewModel = hiltViewModel<RepoDetailsViewModel, RepoDetailsViewModel.Factory>(
+                creationCallback = { factory ->
+                    factory.create(navKey.repoId)
+                }
+            )
             RepoDetails(
                 info = object : RepoDetailsInfo {
-                    override val model =
-                        viewModel.model.collectAsStateWithLifecycle().value
+                    override val model = viewModel.model.collectAsStateWithLifecycle().value
                     override val actions = viewModel
                 },
                 onShowAppsClicked = { title, repoId ->
@@ -258,6 +258,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
         }
         entry<NavigationKey.AddRepo> { navKey ->
             val viewModel = hiltViewModel<AddRepoViewModel>()
+            // this is for intents we receive via IntentRouter, usually the user provides URI later
             LaunchedEffect(navKey) {
                 if (navKey.uri != null) {
                     viewModel.onFetchRepo(navKey.uri)
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index 0abdada3e..e90fe6530 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -97,7 +97,7 @@ fun AppDetails(
             val state = item.installState
             if (state is InstallState.UserConfirmationNeeded) {
                 Log.i("AppDetails", "Requesting user confirmation... $state")
-                item.actions.requestUserConfirmation(item.app.packageName, state)
+                item.actions.requestUserConfirmation(state)
             } else if (state is InstallState.Error) {
                 showInstallError = true
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index e8ae916fc..d41b10e6f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -193,11 +193,11 @@ fun AppDetailsHeader(
                     // and we would run into infinite UI loops here, so there's a counter.
                     @Suppress("AssignedValueIsNeverRead")
                     numChecks += 1
-                    item.actions.checkUserConfirmation(item.app.packageName, state)
+                    item.actions.checkUserConfirmation(state)
                 } else if (state is InstallState.UserConfirmationNeeded) {
                     // we tried three times, so cancel install now
                     Log.i("AppDetailsHeader", "Cancel installation")
-                    item.actions.cancelInstall(item.app.packageName)
+                    item.actions.cancelInstall()
                 }
             }
         }
@@ -244,7 +244,7 @@ fun AppDetailsHeader(
                     }
                     var cancelled by remember { mutableStateOf(false) }
                     IconButton(onClick = {
-                        if (!cancelled) item.actions.cancelInstall(item.app.packageName)
+                        if (!cancelled) item.actions.cancelInstall()
                         cancelled = true
                     }) {
                         AnimatedVisibility(cancelled) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index a98315c0a..40b92d53e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -209,16 +209,16 @@ data class AppDetailsItem(
 
 class AppDetailsActions(
     val installAction: (AppMetadata, AppVersion, Any?) -> Unit,
-    val requestUserConfirmation: (String, InstallState.UserConfirmationNeeded) -> Unit,
+    val requestUserConfirmation: (InstallState.UserConfirmationNeeded) -> Unit,
     /**
      * A workaround for Android 10, 11, 12 and 13 where tapping outside the confirmation dialog
      * dismisses it without any feedback for us.
      * So when our activity resumes while we are in state [InstallState.UserConfirmationNeeded]
      * we need to call this method, so we can manually check if our session progressed or not.
      */
-    val checkUserConfirmation: (String, InstallState.UserConfirmationNeeded) -> Unit,
-    val cancelInstall: (String) -> Unit,
-    val onUninstallResult: (String, ActivityResult) -> Unit,
+    val checkUserConfirmation: (InstallState.UserConfirmationNeeded) -> Unit,
+    val cancelInstall: () -> Unit,
+    val onUninstallResult: (ActivityResult) -> Unit,
     val onRepoChanged: (Long) -> Unit,
     val onPreferredRepoChanged: (Long) -> Unit,
     val allowBetaVersions: () -> Unit,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
index 0d40aaa9e..602ff1da2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
@@ -33,7 +33,7 @@ fun AppDetailsMenu(
     val res = LocalResources.current
     val context = LocalContext.current
     val uninstallLauncher = rememberLauncherForActivityResult(StartActivityForResult()) {
-        item.actions.onUninstallResult(item.app.packageName, it)
+        item.actions.onUninstallResult(it)
     }
     DropdownMenu(
         expanded = expanded,
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index 2cf59e585..bd43e5fd6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -14,6 +14,9 @@ import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
 import coil3.SingletonImageLoader
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -38,11 +41,11 @@ import org.fdroid.repo.RepoPreLoader
 import org.fdroid.settings.SettingsManager
 import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
-import javax.inject.Inject
 
-@HiltViewModel
-class AppDetailsViewModel @Inject constructor(
+@HiltViewModel(assistedFactory = AppDetailsViewModel.Factory::class)
+class AppDetailsViewModel @AssistedInject constructor(
     private val app: Application,
+    @Assisted private val packageName: String,
     @param:IoDispatcher private val scope: CoroutineScope,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
@@ -76,15 +79,15 @@ class AppDetailsViewModel @Inject constructor(
         }
     }
 
-    fun setAppDetails(packageName: String) {
-        packageInfoFlow.value = null
-        loadPackageInfoFlow(packageName)
+    init {
+        loadPackageInfoFlow()
     }
 
-    private fun loadPackageInfoFlow(packageName: String) {
+    private fun loadPackageInfoFlow() {
         val packageManager = app.packageManager
         scope.launch {
             val packageInfo = try {
+                @Suppress("DEPRECATION")
                 packageManager.getPackageInfo(packageName, GET_SIGNATURES)
             } catch (_: PackageManager.NameNotFoundException) {
                 null
@@ -111,30 +114,24 @@ class AppDetailsViewModel @Inject constructor(
             )
             if (result is InstallState.Installed) {
                 // to reload packageInfoFlow with fresh packageInfo
-                loadPackageInfoFlow(appMetadata.packageName)
+                loadPackageInfoFlow()
             }
         }
     }
 
     @UiThread
-    fun requestUserConfirmation(
-        packageName: String,
-        installState: InstallState.UserConfirmationNeeded,
-    ) {
+    fun requestUserConfirmation(installState: InstallState.UserConfirmationNeeded) {
         scope.launch(Dispatchers.Main) {
             val result = appInstallManager.requestUserConfirmation(packageName, installState)
             if (result is InstallState.Installed) withContext(Dispatchers.Main) {
                 // to reload packageInfoFlow with fresh packageInfo
-                loadPackageInfoFlow(packageName)
+                loadPackageInfoFlow()
             }
         }
     }
 
     @UiThread
-    fun checkUserConfirmation(
-        packageName: String,
-        installState: InstallState.UserConfirmationNeeded,
-    ) {
+    fun checkUserConfirmation(installState: InstallState.UserConfirmationNeeded) {
         scope.launch(Dispatchers.Main) {
             delay(500) // wait a moment to increase chance that state got updated
             appInstallManager.checkUserConfirmation(packageName, installState)
@@ -142,16 +139,16 @@ class AppDetailsViewModel @Inject constructor(
     }
 
     @UiThread
-    fun cancelInstall(packageName: String) {
+    fun cancelInstall() {
         appInstallManager.cancel(packageName)
     }
 
     @UiThread
-    fun onUninstallResult(packageName: String, activityResult: ActivityResult) {
+    fun onUninstallResult(activityResult: ActivityResult) {
         val result = appInstallManager.onUninstallResult(packageName, activityResult)
         if (result is InstallState.Uninstalled) {
             // to reload packageInfoFlow with fresh packageInfo
-            loadPackageInfoFlow(packageName)
+            loadPackageInfoFlow()
         }
     }
 
@@ -162,7 +159,6 @@ class AppDetailsViewModel @Inject constructor(
 
     @UiThread
     fun onPreferredRepoChanged(repoId: Long) {
-        val packageName = packageInfoFlow.value?.packageName ?: error("Had not package name")
         scope.launch {
             repoManager.setPreferredRepoId(packageName, repoId).join()
             updatesManager.loadUpdates()
@@ -170,11 +166,8 @@ class AppDetailsViewModel @Inject constructor(
     }
 
     override fun onCleared() {
-        val packageName = packageInfoFlow.value?.packageName
         log.info { "App details screen left: $packageName" }
-        packageName?.let {
-            appInstallManager.cleanUp(it)
-        }
+        appInstallManager.cleanUp(packageName)
         // remove screenshots from disk cache to not fill it up quickly with large images
         val diskCache = SingletonImageLoader.get(application).diskCache
         if (diskCache != null) scope.launch {
@@ -213,6 +206,11 @@ class AppDetailsViewModel @Inject constructor(
             updatesManager.loadUpdates()
         }
     }
+
+    @AssistedFactory
+    interface Factory {
+        fun create(packageName: String): AppDetailsViewModel
+    }
 }
 
 class AppInfo(
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
index cefa1d8c4..05d2e6e30 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
@@ -1,7 +1,6 @@
 package org.fdroid.ui.lists
 
 import android.app.Application
-import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.AndroidViewModel
@@ -11,6 +10,9 @@ import androidx.lifecycle.viewModelScope
 import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -23,7 +25,6 @@ import kotlinx.coroutines.launch
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
-import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.DownloadRequest
@@ -37,11 +38,11 @@ import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.repositories.RepositoryItem
 import java.text.Collator
 import java.util.Locale
-import javax.inject.Inject
 
-@HiltViewModel
-class AppListViewModel @Inject constructor(
+@HiltViewModel(assistedFactory = AppListViewModel.Factory::class)
+class AppListViewModel @AssistedInject constructor(
     private val app: Application,
+    @Assisted val type: AppListType,
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
@@ -73,9 +74,6 @@ class AppListViewModel @Inject constructor(
     }
     private val query = MutableStateFlow("")
 
-    private val _currentList =
-        MutableStateFlow<AppListType>(AppListType.New(app.getString(R.string.app_list_new)))
-    val currentList = _currentList.asStateFlow()
     private val _showFilters = savedStateHandle.getMutableStateFlow("showFilters", false)
     val showFilters = _showFilters.asStateFlow()
 
@@ -100,11 +98,7 @@ class AppListViewModel @Inject constructor(
         }
     }
 
-    @UiThread
-    fun load(type: AppListType) {
-        apps.value = null
-        _currentList.value = type
-
+    init {
         viewModelScope.launch(Dispatchers.IO) {
             apps.value = loadApps(type)
         }
@@ -211,4 +205,9 @@ class AppListViewModel @Inject constructor(
     }
 
     override fun onOnboardingSeen() = onboardingManager.onFilterOnboardingSeen()
+
+    @AssistedFactory
+    interface Factory {
+        fun create(type: AppListType): AppListViewModel
+    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
index 542f634be..09258ba89 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
@@ -14,8 +14,8 @@ import javax.inject.Inject
 @HiltViewModel
 class AddRepoViewModel @Inject constructor(
     app: Application,
+    settingsManager: SettingsManager,
     private val repoManager: RepoManager,
-    private val settingsManager: SettingsManager,
 ) : AndroidViewModel(app) {
 
     private val log = KotlinLogging.logger { }
@@ -34,7 +34,7 @@ class AddRepoViewModel @Inject constructor(
             // TODO full only
         } else {
             repoManager.abortAddingRepository()
-            repoManager.fetchRepositoryPreview(uri.toString(), settingsManager.proxyConfig)
+            repoManager.fetchRepositoryPreview(uri.toString(), proxyConfig)
         }
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index 2c5aa3f2a..d8a7b97e7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -84,7 +84,7 @@ fun RepoDetails(
         info.actions.generateQrCode(repo)
     }
     if (repo != null && deleteDialog) DeleteDialog({ deleteDialog = false }) {
-        info.actions.deleteRepository(repo.repoId)
+        info.actions.deleteRepository()
         deleteDialog = false
         onBack()
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
index 75e12929e..5f0282b3b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
@@ -48,7 +48,7 @@ fun RepoDetailsContent(
             OfficialMirrors(
                 mirrors = info.model.officialMirrors,
                 setMirrorEnabled = { m, e ->
-                    info.actions.setMirrorEnabled(repo.repoId, m, e)
+                    info.actions.setMirrorEnabled(m, e)
                 },
             )
         }
@@ -56,12 +56,12 @@ fun RepoDetailsContent(
             UserMirrors(
                 mirrors = info.model.userMirrors,
                 setMirrorEnabled = { m, e ->
-                    info.actions.setMirrorEnabled(repo.repoId, m, e)
+                    info.actions.setMirrorEnabled(m, e)
                 },
                 onShareMirror = { mirror ->
                     mirror.share(context, repo.fingerprint)
                 },
-                onDeleteMirror = { info.actions.deleteUserMirror(repo.repoId, it) },
+                onDeleteMirror = { info.actions.deleteUserMirror(it) },
             )
         }
         FingerprintExpandable(repo.fingerprint)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
index ad14c46e3..c6408505a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
@@ -19,10 +19,10 @@ interface RepoDetailsInfo {
 }
 
 interface RepoDetailsActions {
-    fun deleteRepository(repoId: Long)
-    fun updateUsernameAndPassword(repoId: Long, username: String, password: String)
-    fun setMirrorEnabled(repoId: Long, mirror: Mirror, enabled: Boolean)
-    fun deleteUserMirror(repoId: Long, mirror: Mirror)
+    fun deleteRepository()
+    fun updateUsernameAndPassword(username: String, password: String)
+    fun setMirrorEnabled(mirror: Mirror, enabled: Boolean)
+    fun deleteUserMirror(mirror: Mirror)
     fun setArchiveRepoEnabled(enabled: Boolean)
     fun onOnboardingSeen()
     suspend fun generateQrCode(repo: Repository): Bitmap? {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
index 3f8c25f86..abfffb692 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
@@ -7,6 +7,9 @@ import androidx.lifecycle.viewModelScope
 import app.cash.molecule.AndroidUiDispatcher
 import app.cash.molecule.RecompositionMode.ContextClock
 import app.cash.molecule.launchMolecule
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -15,7 +18,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.getAndUpdate
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -30,11 +32,11 @@ import org.fdroid.settings.OnboardingManager
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.repositories.details.ArchiveState.UNKNOWN
 import org.fdroid.utils.IoDispatcher
-import javax.inject.Inject
 
-@HiltViewModel
-class RepoDetailsViewModel @Inject constructor(
+@HiltViewModel(assistedFactory = RepoDetailsViewModel.Factory::class)
+class RepoDetailsViewModel @AssistedInject constructor(
     app: Application,
+    @Assisted private val repoId: Long,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
     private val settingsManager: SettingsManager,
@@ -46,7 +48,6 @@ class RepoDetailsViewModel @Inject constructor(
     private val moleculeScope =
         CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
 
-    private val repoIdFlow = MutableStateFlow<Long?>(null)
     private val repoFlow = MutableStateFlow<Repository?>(null)
     private val numAppsFlow: Flow<Int?> = repoFlow.map { repo ->
         if (repo != null) {
@@ -68,13 +69,7 @@ class RepoDetailsViewModel @Inject constructor(
         }
     }
 
-    fun setRepoId(repoId: Long) {
-        val oldValue = repoIdFlow.getAndUpdate { repoId }
-        if (oldValue != null) {
-            log.warn { "setRepoId($repoId) was called more than once" }
-            return
-        }
-
+    init {
         viewModelScope.launch {
             repoManager.repositoriesState.collect { repos ->
                 val repo = repos.find { it.repoId == repoId }
@@ -88,13 +83,13 @@ class RepoDetailsViewModel @Inject constructor(
         archiveStateFlow.update { repo?.archiveState() ?: UNKNOWN }
     }
 
-    override fun deleteRepository(repoId: Long) {
+    override fun deleteRepository() {
         ioScope.launch {
             repoManager.deleteRepository(repoId)
         }
     }
 
-    override fun updateUsernameAndPassword(repoId: Long, username: String, password: String) {
+    override fun updateUsernameAndPassword(username: String, password: String) {
         ioScope.launch {
             repoManager.updateUsernameAndPassword(repoId, username, password)
             withContext(Dispatchers.Main) {
@@ -103,13 +98,13 @@ class RepoDetailsViewModel @Inject constructor(
         }
     }
 
-    override fun setMirrorEnabled(repoId: Long, mirror: Mirror, enabled: Boolean) {
+    override fun setMirrorEnabled(mirror: Mirror, enabled: Boolean) {
         ioScope.launch {
             repoManager.setMirrorEnabled(repoId, mirror, enabled)
         }
     }
 
-    override fun deleteUserMirror(repoId: Long, mirror: Mirror) {
+    override fun deleteUserMirror(mirror: Mirror) {
         ioScope.launch {
             repoManager.deleteUserMirror(repoId, mirror)
         }
@@ -120,11 +115,14 @@ class RepoDetailsViewModel @Inject constructor(
             val repo = repoFlow.value ?: return@launch
             archiveStateFlow.value = ArchiveState.LOADING
             try {
-                // TODO support proxy
-                val repoId = repoManager.setArchiveRepoEnabled(repo, enabled, null)
+                val archiveRepoId = repoManager.setArchiveRepoEnabled(
+                    repository = repo,
+                    enabled = enabled,
+                    proxy = settingsManager.proxyConfig,
+                )
                 archiveStateFlow.value = enabled.toArchiveState()
-                if (enabled && repoId != null) withContext(Dispatchers.Main) {
-                    RepoUpdateWorker.updateNow(application, repoId)
+                if (enabled && archiveRepoId != null) withContext(Dispatchers.Main) {
+                    RepoUpdateWorker.updateNow(application, archiveRepoId)
                 }
             } catch (e: Exception) {
                 log.error(e) { "Error toggling archive repo: " }
@@ -149,4 +147,9 @@ class RepoDetailsViewModel @Inject constructor(
     private fun Boolean.toArchiveState(): ArchiveState {
         return if (this) ArchiveState.ENABLED else ArchiveState.DISABLED
     }
+
+    @AssistedFactory
+    interface Factory {
+        fun create(repoId: Long): RepoDetailsViewModel
+    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
index 9214e5a8b..84d34d9bb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
@@ -29,7 +29,7 @@ fun RepoSettings(
     repo: Repository,
     archiveState: ArchiveState,
     onToggleArchiveClicked: (Boolean) -> Unit,
-    onCredentialsUpdated: (Long, String, String) -> Unit,
+    onCredentialsUpdated: (String, String) -> Unit,
 ) {
     ExpandableSection(
         icon = rememberVectorPainter(Icons.Default.Settings),
@@ -70,7 +70,7 @@ fun RepoSettings(
             val username = repo.username
             if (username != null && username.isNotBlank()) {
                 BasicAuth(username) { username, password ->
-                    onCredentialsUpdated(repo.repoId, username, password)
+                    onCredentialsUpdated(username, password)
                 }
             }
         }
@@ -81,7 +81,7 @@ fun RepoSettings(
 @Composable
 private fun PreviewUnknown() {
     FDroidContent {
-        RepoSettings(getRepository(), ArchiveState.UNKNOWN, {}) { _, _, _ -> }
+        RepoSettings(getRepository(), ArchiveState.UNKNOWN, {}) { _, _ -> }
     }
 }
 
@@ -89,7 +89,7 @@ private fun PreviewUnknown() {
 @Composable
 private fun PreviewLoading() {
     FDroidContent {
-        RepoSettings(getRepository(), ArchiveState.LOADING, {}) { _, _, _ -> }
+        RepoSettings(getRepository(), ArchiveState.LOADING, {}) { _, _ -> }
     }
 }
 
@@ -97,7 +97,7 @@ private fun PreviewLoading() {
 @Composable
 private fun PreviewEnabled() {
     FDroidContent {
-        RepoSettings(getRepository(), ArchiveState.ENABLED, {}) { _, _, _ -> }
+        RepoSettings(getRepository(), ArchiveState.ENABLED, {}) { _, _ -> }
     }
 }
 
@@ -105,6 +105,6 @@ private fun PreviewEnabled() {
 @Composable
 private fun PreviewDisabled() {
     FDroidContent {
-        RepoSettings(getRepository(), ArchiveState.DISABLED, {}) { _, _, _ -> }
+        RepoSettings(getRepository(), ArchiveState.DISABLED, {}) { _, _ -> }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index 62bea88f9..f68803fb0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -137,10 +137,10 @@ val testApp = AppDetailsItem(
     ),
     actions = AppDetailsActions(
         installAction = { _, _, _ -> },
-        requestUserConfirmation = { _, _ -> },
-        checkUserConfirmation = { _, _ -> },
+        requestUserConfirmation = { _ -> },
+        checkUserConfirmation = { _ -> },
         cancelInstall = {},
-        onUninstallResult = { _, _ -> },
+        onUninstallResult = { _ -> },
         onRepoChanged = {},
         onPreferredRepoChanged = {},
         allowBetaVersions = {},
@@ -387,22 +387,10 @@ fun getRepoDetailsInfo(
 ) = object : RepoDetailsInfo {
     override val model = model
     override val actions: RepoDetailsActions = object : RepoDetailsActions {
-        override fun deleteRepository(repoId: Long) {}
-        override fun updateUsernameAndPassword(
-            repoId: Long,
-            username: String,
-            password: String,
-        ) {
-        }
-
-        override fun setMirrorEnabled(
-            repoId: Long,
-            mirror: Mirror,
-            enabled: Boolean,
-        ) {
-        }
-
-        override fun deleteUserMirror(repoId: Long, mirror: Mirror) {}
+        override fun deleteRepository() {}
+        override fun updateUsernameAndPassword(username: String, password: String) {}
+        override fun setMirrorEnabled(mirror: Mirror, enabled: Boolean) {}
+        override fun deleteUserMirror(mirror: Mirror) {}
         override fun setArchiveRepoEnabled(enabled: Boolean) {}
         override fun onOnboardingSeen() {}
     }

From 3ea388d0a25477b9303a9184b9d314850f6cac83 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 9 Dec 2025 17:32:04 -0300
Subject: [PATCH 125/180] Allow hiding of found app issues

This hides only the current version code, so if an update with a higher version code also has an issue it will be shown again. This may be desirable especially for known vulnerabilities.
---
 .../org/fdroid/settings/SettingsConstants.kt  |  1 +
 .../org/fdroid/settings/SettingsManager.kt    | 26 ++++++++++++++
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  5 ++-
 .../org/fdroid/ui/apps/IgnoreIssueDialog.kt   | 35 +++++++++++++++++++
 .../kotlin/org/fdroid/ui/apps/MyAppItem.kt    |  1 +
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |  5 ---
 .../kotlin/org/fdroid/ui/apps/MyAppsInfo.kt   |  2 +-
 .../kotlin/org/fdroid/ui/apps/MyAppsList.kt   | 17 +++++++--
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     | 10 +++---
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  4 ++-
 .../org/fdroid/updates/UpdatesManager.kt      |  5 ++-
 next/src/main/res/values/strings-next.xml     |  3 ++
 12 files changed, 98 insertions(+), 16 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt

diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
index 15f7a21e5..ef3848478 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -34,4 +34,5 @@ object SettingsConstants {
         AppListSortOrder.NAME -> "name"
     }
 
+    const val PREF_KEY_IGNORED_APP_ISSUES = "ignoredAppIssues"
 }
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index 6cf1f638c..fa95a4d35 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -23,6 +23,7 @@ import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SHOW_INCOMPATIBLE
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
 import org.fdroid.settings.SettingsConstants.PREF_KEY_APP_LIST_SORT_ORDER
 import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES
+import org.fdroid.settings.SettingsConstants.PREF_KEY_IGNORED_APP_ISSUES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_LAST_UPDATE_CHECK
 import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_KEY_REPO_UPDATES
@@ -72,6 +73,24 @@ class SettingsManager @Inject constructor(
     private val _lastRepoUpdateFlow = MutableStateFlow(lastRepoUpdate)
     val lastRepoUpdateFlow = _lastRepoUpdateFlow.asStateFlow()
 
+    /**
+     * A set of package name for which we should not show app issues.
+     */
+    var ignoredAppIssues: Map<String, Long>
+        get() = try {
+            prefs.getStringSet(PREF_KEY_IGNORED_APP_ISSUES, emptySet<String>())?.associate {
+                val (packageName, versionCode) = it.split('|')
+                Pair(packageName, versionCode.toLong())
+            } ?: emptyMap()
+        } catch (e: Exception) {
+            log.error(e) { "Error parsing ignored app issues: " }
+            emptyMap()
+        }
+        private set(value) {
+            val newValue = value.map { (packageName, versionCode) -> "$packageName|$versionCode" }
+            prefs.edit { putStringSet(PREF_KEY_IGNORED_APP_ISSUES, newValue.toSet()) }
+        }
+
     val proxyConfig: ProxyConfig?
         get() {
             val proxyStr = prefs.getString(PREF_KEY_PROXY, PREF_DEFAULT_PROXY)
@@ -96,4 +115,11 @@ class SettingsManager @Inject constructor(
             putString(PREF_KEY_APP_LIST_SORT_ORDER, sortOrder.toSettings())
         }
     }
+
+    fun ignoreAppIssue(packageName: String, versionCode: Long) {
+        val newMap = ignoredAppIssues.toMutableMap().apply {
+            put(packageName, versionCode)
+        }
+        ignoredAppIssues = newMap
+    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index f70b31839..edda6590e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -31,6 +31,7 @@ import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallConfirmationState
+import org.fdroid.ui.apps.AppWithIssueItem
 import org.fdroid.ui.apps.MyApps
 import org.fdroid.ui.apps.MyAppsInfo
 import org.fdroid.ui.apps.MyAppsViewModel
@@ -120,7 +121,6 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
             val myAppsInfo = object : MyAppsInfo {
                 override val model = myAppsViewModel.myAppsModel.collectAsStateWithLifecycle().value
 
-                override fun refresh() = myAppsViewModel.refresh()
                 override fun updateAll() = myAppsViewModel.updateAll()
                 override fun changeSortOrder(sort: AppListSortOrder) =
                     myAppsViewModel.changeSortOrder(sort)
@@ -130,6 +130,9 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                     packageName: String,
                     state: InstallConfirmationState,
                 ) = myAppsViewModel.confirmAppInstall(packageName, state)
+
+                override fun ignoreAppIssue(item: AppWithIssueItem) =
+                    myAppsViewModel.ignoreAppIssue(item)
             }
             MyApps(
                 myAppsInfo = myAppsInfo,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt b/next/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt
new file mode 100644
index 000000000..0cc6dbadd
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt
@@ -0,0 +1,35 @@
+package org.fdroid.ui.apps
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import org.fdroid.R
+
+@Composable
+fun IgnoreIssueDialog(appName: String, onIgnore: () -> Unit, onDismiss: () -> Unit) {
+    AlertDialog(
+        title = {
+            Text(text = stringResource(R.string.my_apps_ignore_dialog_title))
+        },
+        text = {
+            Text(text = stringResource(R.string.my_apps_ignore_dialog_text, appName))
+        },
+        onDismissRequest = onDismiss,
+        confirmButton = {
+            TextButton(onClick = onIgnore) {
+                Text(
+                    text = stringResource(R.string.my_apps_ignore_dialog_button),
+                    color = MaterialTheme.colorScheme.error,
+                )
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(android.R.string.cancel))
+            }
+        }
+    )
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
index b5405af6c..4e03fbaf1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
@@ -37,6 +37,7 @@ data class AppWithIssueItem(
     override val packageName: String,
     override val name: String,
     override val installedVersionName: String,
+    val installedVersionCode: Long,
     val issue: AppIssue,
     override val lastUpdated: Long,
     override val iconModel: Any? = null,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index c0bcb48c4..c3a61aafc 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -38,7 +38,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle.State.STARTED
-import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
@@ -71,10 +70,6 @@ fun MyApps(
             }
         }
     }
-    LifecycleStartEffect(Unit) {
-        myAppsInfo.refresh()
-        onStopOrDispose { }
-    }
     // Ask user to confirm appToConfirm whenever it changes and we are in STARTED state.
     // In tests, waiting for RESUME didn't work, because the LaunchedEffect ran before.
     val lifecycleOwner = LocalLifecycleOwner.current
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
index fc8e531a2..615cc8344 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
@@ -5,11 +5,11 @@ import org.fdroid.install.InstallConfirmationState
 
 interface MyAppsInfo {
     val model: MyAppsModel
-    fun refresh()
     fun updateAll()
     fun changeSortOrder(sort: AppListSortOrder)
     fun search(query: String)
     fun confirmAppInstall(packageName: String, state: InstallConfirmationState)
+    fun ignoreAppIssue(item: AppWithIssueItem)
 }
 
 data class MyAppsModel(
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
index 0b4cfec27..832254300 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
@@ -2,6 +2,7 @@ package org.fdroid.ui.apps
 
 import androidx.annotation.RestrictTo
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -44,6 +45,7 @@ fun MyAppsList(
     var showUpdateAllButton by remember(updatableApps) {
         mutableStateOf(true)
     }
+    var showIssueIgnoreDialog by remember { mutableStateOf<AppWithIssueItem?>(null) }
     LazyColumn(
         state = lazyListState,
         modifier = modifier
@@ -156,8 +158,10 @@ fun MyAppsList(
                     }
                 }
                 val interactionModifier = if (currentPackageName == null) {
-                    Modifier.clickable(
+                    Modifier.combinedClickable(
                         onClick = onClick,
+                        onLongClick = { showIssueIgnoreDialog = app },
+                        onLongClickLabel = stringResource(R.string.my_apps_ignore_dialog_title),
                     )
                 } else {
                     Modifier.selectable(
@@ -169,7 +173,16 @@ fun MyAppsList(
                     .animateItem()
                     .then(interactionModifier)
                 InstalledAppRow(app, isSelected, modifier, hasIssue = true)
-                if (showNotAvailableDialog) NotAvailableDialog(app.packageName) {
+                // Dialogs
+                val appToIgnore = showIssueIgnoreDialog
+                if (appToIgnore != null) IgnoreIssueDialog(
+                    appName = appToIgnore.name,
+                    onIgnore = {
+                        myAppsInfo.ignoreAppIssue(appToIgnore)
+                        showIssueIgnoreDialog = null
+                    },
+                    onDismiss = { showIssueIgnoreDialog = null },
+                ) else if (showNotAvailableDialog) NotAvailableDialog(app.packageName) {
                     showNotAvailableDialog = false
                 }
             }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index a06f13008..8af4f5dc3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -101,11 +101,6 @@ class MyAppsViewModel @Inject constructor(
         sortOrder.value = sort
     }
 
-    fun refresh() {
-        // TODO check if really not needed anymore and if so remove
-        // updatesManager.loadUpdates()
-    }
-
     fun confirmAppInstall(packageName: String, state: InstallConfirmationState) {
         log.info { "Asking user to confirm install of $packageName..." }
         scope.launch(Dispatchers.Main) {
@@ -119,4 +114,9 @@ class MyAppsViewModel @Inject constructor(
             }
         }
     }
+
+    fun ignoreAppIssue(item: AppWithIssueItem) {
+        settingsManager.ignoreAppIssue(item.packageName, item.installedVersionCode)
+        updatesManager.loadUpdates()
+    }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index f68803fb0..da5c83e28 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -265,11 +265,11 @@ fun getAppListInfo(model: AppListModel) = object : AppListInfo {
 
 fun getMyAppsInfo(model: MyAppsModel): MyAppsInfo = object : MyAppsInfo {
     override val model = model
-    override fun refresh() {}
     override fun updateAll() {}
     override fun changeSortOrder(sort: AppListSortOrder) {}
     override fun search(query: String) {}
     override fun confirmAppInstall(packageName: String, state: InstallConfirmationState) {}
+    override fun ignoreAppIssue(item: AppWithIssueItem) {}
 }
 
 @RestrictTo(RestrictTo.Scope.TESTS)
@@ -312,6 +312,7 @@ internal val myAppsModel = MyAppsModel(
             packageName = "C1",
             name = Names.randomName,
             installedVersionName = "1",
+            installedVersionCode = 1,
             issue = KnownVulnerability(true),
             lastUpdated = System.currentTimeMillis() - DAYS.toMillis(5)
         ),
@@ -319,6 +320,7 @@ internal val myAppsModel = MyAppsModel(
             packageName = "C2",
             name = Names.randomName,
             installedVersionName = "2",
+            installedVersionCode = 2,
             issue = NotAvailable,
             lastUpdated = System.currentTimeMillis() - DAYS.toMillis(7)
         ),
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 203d2887f..9bb8d6c47 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -126,12 +126,14 @@ class UpdatesManager @Inject constructor(
                 else notificationManager.showAppUpdatesAvailableNotification(notificationStates)
             }
 
-            val issueItems = apps.issues.map { app ->
+            val issueItems = apps.issues.mapNotNull { app ->
+                if (app.packageName in settingsManager.ignoredAppIssues) return@mapNotNull null
                 when (app) {
                     is AvailableAppWithIssue -> AppWithIssueItem(
                         packageName = app.app.packageName,
                         name = app.app.getName(localeList) ?: "Unknown app",
                         installedVersionName = app.installVersionName,
+                        installedVersionCode = app.installVersionCode,
                         issue = app.issue,
                         lastUpdated = app.app.lastUpdated,
                         iconModel = PackageName(
@@ -144,6 +146,7 @@ class UpdatesManager @Inject constructor(
                         packageName = app.packageName,
                         name = app.name.toString(),
                         installedVersionName = app.installVersionName,
+                        installedVersionCode = app.installVersionCode,
                         issue = app.issue,
                         lastUpdated = -1,
                         iconModel = PackageName(app.packageName, null),
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 9e7a940f8..caa83db2d 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -15,6 +15,9 @@
 
     <string name="my_apps_empty">No apps installed.\n\nInstall apps and they will appear here.</string>
     <string name="my_apps_header_apps_with_issue">Apps with issues</string>
+    <string name="my_apps_ignore_dialog_title">Hide app issue</string>
+    <string name="my_apps_ignore_dialog_text">Do you want to hide the issue with the app \"%1$s\"?</string>
+    <string name="my_apps_ignore_dialog_button">Hide</string>
 
     <string name="app_list_new">New apps</string>
     <string name="app_list_recently_updated">Recently updated</string>

From 73a028d349f4f3fed662960a14f8f9b89d46e08f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 10 Dec 2025 17:19:51 -0300
Subject: [PATCH 126/180] Add phrase queries for better search results

---
 .../kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 1780e0dbd..79e3bfc01 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -133,7 +133,7 @@ class DiscoverViewModel @Inject constructor(
 
         val sanitized = term.replace(Regex.fromLiteral("\""), "")
         val splits = sanitized.split(' ').filter { it.isNotBlank() }
-        val query = splits.joinToString(" AND ") { word ->
+        val query = splits.joinToString(" ") { word ->
             var isCjk = false
             // go through word and separate CJK chars (if needed)
             val newString = word.toList().joinToString("") {
@@ -145,9 +145,11 @@ class DiscoverViewModel @Inject constructor(
             // add * to enable prefix matches
             if (isCjk) newString else "$newString*"
         }.let { firstPassQuery ->
-            // if we had more than one word, also look for both combined to find CamelCase names
+            // if we had more than one word, make a more complex query
             if (splits.size > 1) {
-                "$firstPassQuery OR ${splits.joinToString("")}*"
+                "$firstPassQuery " + // search* term* (implicit AND and prefix search)
+                    "OR ${splits.joinToString("")}* " + // camel case prefix
+                    "OR \"${splits.joinToString("* ")}*\"" // phrase query
             } else firstPassQuery
         }
         log.info { "Searching for: $query" }

From 7ef963e43156f75b82a6eb02043091974b95f3d2 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 12 Dec 2025 11:28:23 -0300
Subject: [PATCH 127/180] Fix proguard error about "no primary constructor"

and add an instrumentation test for it

We also tried fixing this via consumer rules in the database library, but failed.
---
 next/build.gradle.kts                         |  6 ++--
 next/proguard-rules.pro                       | 11 ++++++-
 .../fdroid/database/PrimaryConstructorTest.kt | 31 +++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 next/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt

diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 412be0e53..82bf51516 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -99,17 +99,17 @@ dependencies {
     ksp(libs.androidx.hilt.compiler)
 
     debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
 
     testImplementation(libs.junit)
     testImplementation(kotlin("test"))
     testImplementation(libs.robolectric)
     testImplementation(libs.slf4j.simple)
 
-    androidTestImplementation(kotlin("test"))
+    androidTestImplementation(libs.kotlin.test)
+    androidTestImplementation(libs.kotlin.reflect)
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
-    debugImplementation(libs.androidx.compose.ui.tooling)
-    debugImplementation(libs.androidx.ui.test.manifest)
 }
diff --git a/next/proguard-rules.pro b/next/proguard-rules.pro
index 58951ec3f..b37172aee 100644
--- a/next/proguard-rules.pro
+++ b/next/proguard-rules.pro
@@ -1,8 +1,17 @@
 -dontobfuscate
 -keepattributes SourceFile,LineNumberTable,Exceptions
--keep class org.fdroid.fdroid.** {*;}
+
+# Anything less causes issues like not finding primary constructor in ReflectionDiffer
+-keep class org.fdroid.** {*;}
 
 # Logging
 -keep class ch.qos.logback.classic.android.LogcatAppender
 -keepclassmembers class ch.qos.logback.** { *; }
 -keepclassmembers class  org.slf4j.impl.** { *; }
+
+# Needed for instrumentation tests (for some werid inexplicable reason)
+-keep class kotlin.LazyKt
+-keep class kotlin.collections.CollectionsKt
+
+# for debugging (comment in when needed)
+#-printconfiguration build/outputs/logs/r8-configuration.txt
diff --git a/next/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt b/next/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt
new file mode 100644
index 000000000..f3e9d7292
--- /dev/null
+++ b/next/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt
@@ -0,0 +1,31 @@
+package org.fdroid.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.reflect.full.primaryConstructor
+import kotlin.test.assertNotNull
+
+@RunWith(AndroidJUnit4::class)
+internal class PrimaryConstructorTest {
+
+    private val classes = listOf(
+        AntiFeature::class,
+        Category::class,
+        ReleaseChannel::class,
+        // recent minification removes the primary constructor of CoreRepository
+        // so we need to ensure it is still there for our reflection diffing
+        Class.forName("org.fdroid.database.CoreRepository").kotlin,
+    )
+
+    @Test
+    fun testPrimaryConstructor() {
+        classes.forEach {
+            assertNotNull(
+                actual = it.primaryConstructor,
+                message = "${it.simpleName} has no primary constructor",
+            )
+        }
+    }
+
+}

From f81060859d3c3f01b8476d4b0561198f1a08e76e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 10 Dec 2025 16:38:36 -0300
Subject: [PATCH 128/180] [db] Migration to version 10

adds a couple of fields we wanted for some time:
* isPrimary for mirrors
* repo errors
* app labels for pre-approved installs
---
 .../10.json                                   | 1057 +++++++++++++++++
 .../org/fdroid/database/FDroidDatabase.kt     |    3 +-
 .../java/org/fdroid/database/Repository.kt    |    8 +
 .../main/java/org/fdroid/database/Version.kt  |    1 +
 4 files changed, 1068 insertions(+), 1 deletion(-)
 create mode 100644 libs/database/schemas/org.fdroid.database.FDroidDatabaseInt/10.json

diff --git a/libs/database/schemas/org.fdroid.database.FDroidDatabaseInt/10.json b/libs/database/schemas/org.fdroid.database.FDroidDatabaseInt/10.json
new file mode 100644
index 000000000..7d6b060a1
--- /dev/null
+++ b/libs/database/schemas/org.fdroid.database.FDroidDatabaseInt/10.json
@@ -0,0 +1,1057 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 10,
+    "identityHash": "8f0f4908b8d68da8d14d4f7cd51f9861",
+    "entities": [
+      {
+        "tableName": "CoreRepository",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `icon` TEXT, `address` TEXT NOT NULL, `webBaseUrl` TEXT, `timestamp` INTEGER NOT NULL, `version` INTEGER, `formatVersion` TEXT, `maxAge` INTEGER, `description` TEXT NOT NULL, `certificate` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "webBaseUrl",
+            "columnName": "webBaseUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "formatVersion",
+            "columnName": "formatVersion",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "maxAge",
+            "columnName": "maxAge",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificate",
+            "columnName": "certificate",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "repoId"
+          ]
+        }
+      },
+      {
+        "tableName": "Mirror",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `url` TEXT NOT NULL, `countryCode` TEXT, `isPrimary` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`repoId`, `url`), FOREIGN KEY(`repoId`) REFERENCES `CoreRepository`(`repoId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "countryCode",
+            "columnName": "countryCode",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isPrimary",
+            "columnName": "isPrimary",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId",
+            "url"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "CoreRepository",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "repoId"
+            ],
+            "referencedColumns": [
+              "repoId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AntiFeature",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `id` TEXT NOT NULL, `icon` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, PRIMARY KEY(`repoId`, `id`), FOREIGN KEY(`repoId`) REFERENCES `CoreRepository`(`repoId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId",
+            "id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "CoreRepository",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "repoId"
+            ],
+            "referencedColumns": [
+              "repoId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Category",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `id` TEXT NOT NULL, `icon` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, PRIMARY KEY(`repoId`, `id`), FOREIGN KEY(`repoId`) REFERENCES `CoreRepository`(`repoId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId",
+            "id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "CoreRepository",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "repoId"
+            ],
+            "referencedColumns": [
+              "repoId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "ReleaseChannel",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `id` TEXT NOT NULL, `icon` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, PRIMARY KEY(`repoId`, `id`), FOREIGN KEY(`repoId`) REFERENCES `CoreRepository`(`repoId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId",
+            "id"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "CoreRepository",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "repoId"
+            ],
+            "referencedColumns": [
+              "repoId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "RepositoryPreferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `weight` INTEGER NOT NULL, `enabled` INTEGER NOT NULL, `lastUpdated` INTEGER, `lastETag` TEXT, `userMirrors` TEXT, `disabledMirrors` TEXT, `username` TEXT, `password` TEXT, `errorCount` INTEGER NOT NULL DEFAULT 0, `lastError` TEXT, PRIMARY KEY(`repoId`))",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "enabled",
+            "columnName": "enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastUpdated",
+            "columnName": "lastUpdated",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "lastETag",
+            "columnName": "lastETag",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "userMirrors",
+            "columnName": "userMirrors",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "disabledMirrors",
+            "columnName": "disabledMirrors",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "errorCount",
+            "columnName": "errorCount",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "lastError",
+            "columnName": "lastError",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId"
+          ]
+        }
+      },
+      {
+        "tableName": "AppMetadata",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `packageName` TEXT NOT NULL, `added` INTEGER NOT NULL, `lastUpdated` INTEGER NOT NULL, `name` TEXT, `summary` TEXT, `description` TEXT, `localizedName` TEXT, `localizedSummary` TEXT, `webSite` TEXT, `changelog` TEXT, `license` TEXT, `sourceCode` TEXT, `issueTracker` TEXT, `translation` TEXT, `preferredSigner` TEXT, `video` TEXT, `authorName` TEXT, `authorEmail` TEXT, `authorWebSite` TEXT, `authorPhone` TEXT, `donate` TEXT, `liberapayID` TEXT, `liberapay` TEXT, `openCollective` TEXT, `bitcoin` TEXT, `litecoin` TEXT, `flattrID` TEXT, `categories` TEXT, `isCompatible` INTEGER NOT NULL, PRIMARY KEY(`repoId`, `packageName`), FOREIGN KEY(`repoId`) REFERENCES `CoreRepository`(`repoId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "added",
+            "columnName": "added",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastUpdated",
+            "columnName": "lastUpdated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "summary",
+            "columnName": "summary",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "localizedName",
+            "columnName": "localizedName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "localizedSummary",
+            "columnName": "localizedSummary",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "webSite",
+            "columnName": "webSite",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "changelog",
+            "columnName": "changelog",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "license",
+            "columnName": "license",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "sourceCode",
+            "columnName": "sourceCode",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "issueTracker",
+            "columnName": "issueTracker",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "translation",
+            "columnName": "translation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "preferredSigner",
+            "columnName": "preferredSigner",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "video",
+            "columnName": "video",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "authorEmail",
+            "columnName": "authorEmail",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "authorWebSite",
+            "columnName": "authorWebSite",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "authorPhone",
+            "columnName": "authorPhone",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "donate",
+            "columnName": "donate",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "liberapayID",
+            "columnName": "liberapayID",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "liberapay",
+            "columnName": "liberapay",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openCollective",
+            "columnName": "openCollective",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "bitcoin",
+            "columnName": "bitcoin",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "litecoin",
+            "columnName": "litecoin",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "flattrID",
+            "columnName": "flattrID",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "categories",
+            "columnName": "categories",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isCompatible",
+            "columnName": "isCompatible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId",
+            "packageName"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "CoreRepository",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "repoId"
+            ],
+            "referencedColumns": [
+              "repoId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AppMetadataFts",
+        "createSql": "CREATE VIRTUAL TABLE IF NOT EXISTS `${TABLE_NAME}` USING FTS4(`repoId` INTEGER NOT NULL, `name` TEXT, `summary` TEXT, `description` TEXT, `authorName` TEXT, `packageName` TEXT NOT NULL, tokenize=unicode61 `remove_diacritics=1` `separators=.` `tokenchars=-`, content=`AppMetadata`, notindexed=`repoId`)",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "summary",
+            "columnName": "summary",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "authorName",
+            "columnName": "authorName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": []
+        },
+        "ftsVersion": "FTS4",
+        "ftsOptions": {
+          "tokenizer": "unicode61",
+          "tokenizerArgs": [
+            "remove_diacritics=1",
+            "separators=.",
+            "tokenchars=-"
+          ],
+          "contentTable": "AppMetadata",
+          "languageIdColumnName": "",
+          "matchInfo": "FTS4",
+          "notIndexedColumns": [
+            "repoId"
+          ],
+          "prefixSizes": [],
+          "preferredOrder": "ASC"
+        },
+        "contentSyncTriggers": [
+          "CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_AppMetadataFts_BEFORE_UPDATE BEFORE UPDATE ON `AppMetadata` BEGIN DELETE FROM `AppMetadataFts` WHERE `docid`=OLD.`rowid`; END",
+          "CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_AppMetadataFts_BEFORE_DELETE BEFORE DELETE ON `AppMetadata` BEGIN DELETE FROM `AppMetadataFts` WHERE `docid`=OLD.`rowid`; END",
+          "CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_AppMetadataFts_AFTER_UPDATE AFTER UPDATE ON `AppMetadata` BEGIN INSERT INTO `AppMetadataFts`(`docid`, `repoId`, `name`, `summary`, `description`, `authorName`, `packageName`) VALUES (NEW.`rowid`, NEW.`repoId`, NEW.`name`, NEW.`summary`, NEW.`description`, NEW.`authorName`, NEW.`packageName`); END",
+          "CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_AppMetadataFts_AFTER_INSERT AFTER INSERT ON `AppMetadata` BEGIN INSERT INTO `AppMetadataFts`(`docid`, `repoId`, `name`, `summary`, `description`, `authorName`, `packageName`) VALUES (NEW.`rowid`, NEW.`repoId`, NEW.`name`, NEW.`summary`, NEW.`description`, NEW.`authorName`, NEW.`packageName`); END"
+        ]
+      },
+      {
+        "tableName": "LocalizedFile",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `packageName` TEXT NOT NULL, `type` TEXT NOT NULL, `locale` TEXT NOT NULL, `name` TEXT NOT NULL, `sha256` TEXT, `size` INTEGER, `ipfsCidV1` TEXT, PRIMARY KEY(`repoId`, `packageName`, `type`, `locale`), FOREIGN KEY(`repoId`, `packageName`) REFERENCES `AppMetadata`(`repoId`, `packageName`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sha256",
+            "columnName": "sha256",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "ipfsCidV1",
+            "columnName": "ipfsCidV1",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId",
+            "packageName",
+            "type",
+            "locale"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AppMetadata",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "repoId",
+              "packageName"
+            ],
+            "referencedColumns": [
+              "repoId",
+              "packageName"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "LocalizedFileList",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `packageName` TEXT NOT NULL, `type` TEXT NOT NULL, `locale` TEXT NOT NULL, `name` TEXT NOT NULL, `sha256` TEXT, `size` INTEGER, `ipfsCidV1` TEXT, PRIMARY KEY(`repoId`, `packageName`, `type`, `locale`, `name`), FOREIGN KEY(`repoId`, `packageName`) REFERENCES `AppMetadata`(`repoId`, `packageName`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sha256",
+            "columnName": "sha256",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "size",
+            "columnName": "size",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "ipfsCidV1",
+            "columnName": "ipfsCidV1",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId",
+            "packageName",
+            "type",
+            "locale",
+            "name"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AppMetadata",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "repoId",
+              "packageName"
+            ],
+            "referencedColumns": [
+              "repoId",
+              "packageName"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "Version",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `packageName` TEXT NOT NULL, `versionId` TEXT NOT NULL, `added` INTEGER NOT NULL, `releaseChannels` TEXT, `antiFeatures` TEXT, `whatsNew` TEXT, `appLabel` TEXT, `isCompatible` INTEGER NOT NULL, `file_name` TEXT NOT NULL, `file_sha256` TEXT NOT NULL, `file_size` INTEGER, `file_ipfsCidV1` TEXT, `src_name` TEXT, `src_sha256` TEXT, `src_size` INTEGER, `src_ipfsCidV1` TEXT, `manifest_versionName` TEXT NOT NULL, `manifest_versionCode` INTEGER NOT NULL, `manifest_maxSdkVersion` INTEGER, `manifest_nativecode` TEXT, `manifest_features` TEXT, `manifest_usesSdk_minSdkVersion` INTEGER, `manifest_usesSdk_targetSdkVersion` INTEGER, `manifest_signer_sha256` TEXT, `manifest_signer_hasMultipleSigners` INTEGER, PRIMARY KEY(`repoId`, `packageName`, `versionId`), FOREIGN KEY(`repoId`, `packageName`) REFERENCES `AppMetadata`(`repoId`, `packageName`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionId",
+            "columnName": "versionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "added",
+            "columnName": "added",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "releaseChannels",
+            "columnName": "releaseChannels",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "antiFeatures",
+            "columnName": "antiFeatures",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "whatsNew",
+            "columnName": "whatsNew",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "appLabel",
+            "columnName": "appLabel",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isCompatible",
+            "columnName": "isCompatible",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "file.name",
+            "columnName": "file_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "file.sha256",
+            "columnName": "file_sha256",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "file.size",
+            "columnName": "file_size",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "file.ipfsCidV1",
+            "columnName": "file_ipfsCidV1",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "src.name",
+            "columnName": "src_name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "src.sha256",
+            "columnName": "src_sha256",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "src.size",
+            "columnName": "src_size",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "src.ipfsCidV1",
+            "columnName": "src_ipfsCidV1",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "manifest.versionName",
+            "columnName": "manifest_versionName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "manifest.versionCode",
+            "columnName": "manifest_versionCode",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "manifest.maxSdkVersion",
+            "columnName": "manifest_maxSdkVersion",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "manifest.nativecode",
+            "columnName": "manifest_nativecode",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "manifest.features",
+            "columnName": "manifest_features",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "manifest.usesSdk.minSdkVersion",
+            "columnName": "manifest_usesSdk_minSdkVersion",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "manifest.usesSdk.targetSdkVersion",
+            "columnName": "manifest_usesSdk_targetSdkVersion",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "manifest.signer.sha256",
+            "columnName": "manifest_signer_sha256",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "manifest.signer.hasMultipleSigners",
+            "columnName": "manifest_signer_hasMultipleSigners",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId",
+            "packageName",
+            "versionId"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "AppMetadata",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "repoId",
+              "packageName"
+            ],
+            "referencedColumns": [
+              "repoId",
+              "packageName"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "VersionedString",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`repoId` INTEGER NOT NULL, `packageName` TEXT NOT NULL, `versionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `version` INTEGER, PRIMARY KEY(`repoId`, `packageName`, `versionId`, `type`, `name`), FOREIGN KEY(`repoId`, `packageName`, `versionId`) REFERENCES `Version`(`repoId`, `packageName`, `versionId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "repoId",
+            "columnName": "repoId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionId",
+            "columnName": "versionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "repoId",
+            "packageName",
+            "versionId",
+            "type",
+            "name"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "Version",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "repoId",
+              "packageName",
+              "versionId"
+            ],
+            "referencedColumns": [
+              "repoId",
+              "packageName",
+              "versionId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "AppPrefs",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`packageName` TEXT NOT NULL, `ignoreVersionCodeUpdate` INTEGER NOT NULL, `preferredRepoId` INTEGER, `appPrefReleaseChannels` TEXT, PRIMARY KEY(`packageName`))",
+        "fields": [
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ignoreVersionCodeUpdate",
+            "columnName": "ignoreVersionCodeUpdate",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "preferredRepoId",
+            "columnName": "preferredRepoId",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "appPrefReleaseChannels",
+            "columnName": "appPrefReleaseChannels",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "packageName"
+          ]
+        }
+      }
+    ],
+    "views": [
+      {
+        "viewName": "LocalizedIcon",
+        "createSql": "CREATE VIEW `${VIEW_NAME}` AS SELECT * FROM LocalizedFile WHERE type='icon'"
+      },
+      {
+        "viewName": "HighestVersion",
+        "createSql": "CREATE VIEW `${VIEW_NAME}` AS SELECT repoId, packageName, antiFeatures FROM Version\n    GROUP BY repoId, packageName HAVING MAX(manifest_versionCode)"
+      },
+      {
+        "viewName": "PreferredRepo",
+        "createSql": "CREATE VIEW `${VIEW_NAME}` AS SELECT packageName, repoId AS preferredRepoId FROM AppMetadata\n    JOIN RepositoryPreferences AS pref USING (repoId)\n    LEFT JOIN AppPrefs USING (packageName)\n    WHERE pref.enabled = 1 AND (repoId = COALESCE(preferredRepoId, repoId) OR\n      NOT EXISTS (SELECT 1 FROM AppMetadata WHERE repoId=AppPrefs.preferredRepoId AND packageName=AppPrefs.packageName)\n    )\n    GROUP BY packageName HAVING MAX(pref.weight)"
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8f0f4908b8d68da8d14d4f7cd51f9861')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/libs/database/src/main/java/org/fdroid/database/FDroidDatabase.kt b/libs/database/src/main/java/org/fdroid/database/FDroidDatabase.kt
index 04c98325e..0298cd5e8 100644
--- a/libs/database/src/main/java/org/fdroid/database/FDroidDatabase.kt
+++ b/libs/database/src/main/java/org/fdroid/database/FDroidDatabase.kt
@@ -16,7 +16,7 @@ import java.util.concurrent.Callable
     // When bumping this version, please make sure to add one (or more) migration(s) below!
     // Consider also providing tests for that migration.
     // Don't forget to commit the new schema to the git repo as well.
-    version = 9,
+    version = 10,
     entities = [
         // repo
         CoreRepository::class,
@@ -51,6 +51,7 @@ import java.util.concurrent.Callable
         AutoMigration(6, 7),
         AutoMigration(7, 8, CountryCodeMigration::class),
         // 8 to 9 is a manual migration
+        AutoMigration(9, 10),
         // add future migrations above!
     ],
 )
diff --git a/libs/database/src/main/java/org/fdroid/database/Repository.kt b/libs/database/src/main/java/org/fdroid/database/Repository.kt
index a13100866..5b26a6b46 100644
--- a/libs/database/src/main/java/org/fdroid/database/Repository.kt
+++ b/libs/database/src/main/java/org/fdroid/database/Repository.kt
@@ -2,6 +2,7 @@ package org.fdroid.database
 
 import androidx.annotation.WorkerThread
 import androidx.core.os.LocaleListCompat
+import androidx.room.ColumnInfo
 import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.ForeignKey
@@ -263,6 +264,8 @@ internal data class Mirror(
     val repoId: Long,
     val url: String,
     val countryCode: String? = null,
+    @ColumnInfo(defaultValue = "0")
+    val isPrimary: Boolean = false,
 ) {
     internal companion object {
         const val TABLE = "Mirror"
@@ -271,6 +274,7 @@ internal data class Mirror(
     fun toDownloadMirror(): org.fdroid.download.Mirror = org.fdroid.download.Mirror(
         baseUrl = url,
         countryCode = countryCode,
+        // TODO add isPrimary = isPrimary,
     )
 }
 
@@ -278,6 +282,7 @@ internal fun MirrorV2.toMirror(repoId: Long) = Mirror(
     repoId = repoId,
     url = url,
     countryCode = countryCode,
+    // TODO add isPrimary = isPrimary,
 )
 
 internal fun List<MirrorV2>.toMirrors(repoId: Long): List<Mirror> {
@@ -417,6 +422,9 @@ internal data class RepositoryPreferences(
     val disabledMirrors: List<String>? = null,
     val username: String? = null,
     val password: String? = null,
+    @ColumnInfo(defaultValue = "0")
+    val errorCount: Int = 0,
+    val lastError: String? = null,
 ) {
     internal companion object {
         const val TABLE = "RepositoryPreferences"
diff --git a/libs/database/src/main/java/org/fdroid/database/Version.kt b/libs/database/src/main/java/org/fdroid/database/Version.kt
index d8866289b..f3021b672 100644
--- a/libs/database/src/main/java/org/fdroid/database/Version.kt
+++ b/libs/database/src/main/java/org/fdroid/database/Version.kt
@@ -48,6 +48,7 @@ internal data class Version(
     override val releaseChannels: List<String>? = emptyList(),
     val antiFeatures: Map<String, LocalizedTextV2>? = null,
     val whatsNew: LocalizedTextV2? = null,
+    val appLabel: LocalizedTextV2? = null,
     val isCompatible: Boolean,
 ) : PackageVersion {
     internal companion object {

From dea8a2e504c30f888efc4f0ca50fb50cbb88cbab Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 12 Dec 2025 12:15:42 -0300
Subject: [PATCH 129/180] [db] track and clear repo update errors

Historically, we've just shown a giant Toast for repo update errors, now we track them in the DB, so we can properly expose them in the UI.
---
 .../org/fdroid/index/v1/IndexV1UpdaterTest.kt |  9 ++++-
 .../java/org/fdroid/database/Repository.kt    |  4 ++
 .../java/org/fdroid/database/RepositoryDao.kt | 15 ++++++++
 .../java/org/fdroid/index/IndexUpdater.kt     | 38 +++++++++++++++++--
 .../org/fdroid/index/v1/IndexV1Updater.kt     |  5 ++-
 .../org/fdroid/index/v2/IndexV2Updater.kt     |  5 ++-
 .../java/org/fdroid/repo/RepoAdderTest.kt     |  6 +++
 7 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/libs/database/src/dbTest/java/org/fdroid/index/v1/IndexV1UpdaterTest.kt b/libs/database/src/dbTest/java/org/fdroid/index/v1/IndexV1UpdaterTest.kt
index fc2d1b021..b8706492d 100644
--- a/libs/database/src/dbTest/java/org/fdroid/index/v1/IndexV1UpdaterTest.kt
+++ b/libs/database/src/dbTest/java/org/fdroid/index/v1/IndexV1UpdaterTest.kt
@@ -129,7 +129,14 @@ internal class IndexV1UpdaterTest : DbTest() {
         assertIs<SigningException>(result.e)
 
         // check that the DB transaction was rolled back and the DB wasn't changed
-        assertEquals(repo, repoDao.getRepository(repoId) ?: fail())
+        // except for adding the error to the repo
+        val expectedRepo = repo.copy(
+            preferences = repo.preferences.copy(
+                errorCount = 1,
+                lastError = "Signing certificate does not match"
+            ),
+        )
+        assertEquals(expectedRepo, repoDao.getRepository(repoId) ?: fail())
         assertEquals(0, appDao.countApps())
         assertEquals(0, versionDao.countAppVersions())
     }
diff --git a/libs/database/src/main/java/org/fdroid/database/Repository.kt b/libs/database/src/main/java/org/fdroid/database/Repository.kt
index 5b26a6b46..26e2486f0 100644
--- a/libs/database/src/main/java/org/fdroid/database/Repository.kt
+++ b/libs/database/src/main/java/org/fdroid/database/Repository.kt
@@ -111,6 +111,7 @@ public data class Repository internal constructor(
         lastUpdated: Long,
         username: String? = null,
         password: String? = null,
+        lastError: String? = null,
     ) : this(
         repository = CoreRepository(
             repoId = repoId,
@@ -132,6 +133,7 @@ public data class Repository internal constructor(
             lastUpdated = lastUpdated,
             username = username,
             password = password,
+            lastError = lastError,
         )
     )
 
@@ -232,6 +234,8 @@ public data class Repository internal constructor(
         get() {
             return "https://fdroid.link/#$address?fingerprint=$fingerprint"
         }
+    public val errorCount: Int get() = preferences.errorCount
+    public val lastError: String? get() = preferences.lastError
 }
 
 // Dummy repo to use in Compose Previews and in tests
diff --git a/libs/database/src/main/java/org/fdroid/database/RepositoryDao.kt b/libs/database/src/main/java/org/fdroid/database/RepositoryDao.kt
index 816172f33..f82bfba35 100644
--- a/libs/database/src/main/java/org/fdroid/database/RepositoryDao.kt
+++ b/libs/database/src/main/java/org/fdroid/database/RepositoryDao.kt
@@ -442,6 +442,21 @@ internal interface RepositoryDaoInt : RepositoryDao {
     )
     fun getArchiveRepoId(cert: String): Long?
 
+    @Query(
+        """UPDATE ${RepositoryPreferences.TABLE}
+            SET errorCount = errorCount + 1, lastError = :errorMsg
+            WHERE repoId = :repoId
+        """
+    )
+    fun trackRepoUpdateError(repoId: Long, errorMsg: String)
+
+    @Query(
+        """UPDATE ${RepositoryPreferences.TABLE}
+            SET errorCount = 0, lastError = NULL WHERE repoId = :repoId
+        """
+    )
+    fun resetRepoUpdateError(repoId: Long)
+
     @Transaction
     override fun deleteRepository(repoId: Long) {
         deleteCoreRepository(repoId)
diff --git a/libs/database/src/main/java/org/fdroid/index/IndexUpdater.kt b/libs/database/src/main/java/org/fdroid/index/IndexUpdater.kt
index 506340bb9..94ad6cb5a 100644
--- a/libs/database/src/main/java/org/fdroid/index/IndexUpdater.kt
+++ b/libs/database/src/main/java/org/fdroid/index/IndexUpdater.kt
@@ -1,7 +1,10 @@
 package org.fdroid.index
 
 import android.net.Uri
+import androidx.annotation.VisibleForTesting
+import androidx.annotation.WorkerThread
 import org.fdroid.database.Repository
+import org.fdroid.database.RepositoryDaoInt
 import org.fdroid.download.Downloader
 import org.fdroid.download.NotFoundException
 import java.io.File
@@ -48,6 +51,8 @@ public fun interface TempFileProvider {
  * A class to update information of a [Repository] in the database with a new downloaded index.
  */
 public abstract class IndexUpdater {
+    @VisibleForTesting
+    internal abstract val repoDao: RepositoryDaoInt
 
     /**
      * The [IndexFormatVersion] used by this updater.
@@ -59,21 +64,46 @@ public abstract class IndexUpdater {
     /**
      * Updates an existing [repo] with a known [Repository.certificate].
      */
-    public fun update(repo: Repository): IndexUpdateResult = catchExceptions {
-        updateRepo(repo)
+    @WorkerThread
+    public fun update(repo: Repository): IndexUpdateResult = catchExceptions(repo) {
+        updateRepo(repo).also { result ->
+            // reset repo errors if repo updated fine again, but is still unchanged
+            if (repo.errorCount > 0 && result is IndexUpdateResult.Unchanged) {
+                repoDao.resetRepoUpdateError(repo.repoId)
+            }
+        }
     }
 
-    private fun catchExceptions(block: () -> IndexUpdateResult): IndexUpdateResult {
+    @WorkerThread
+    protected abstract fun updateRepo(repo: Repository): IndexUpdateResult
+
+    @WorkerThread
+    private fun catchExceptions(
+        repo: Repository,
+        block: () -> IndexUpdateResult,
+    ): IndexUpdateResult {
         return try {
             block()
         } catch (e: NotFoundException) {
+            onError(repo.repoId, e)
             IndexUpdateResult.NotFound
         } catch (e: Exception) {
+            onError(repo.repoId, e)
             IndexUpdateResult.Error(e)
         }
     }
 
-    protected abstract fun updateRepo(repo: Repository): IndexUpdateResult
+    @WorkerThread
+    private fun onError(repoId: Long, e: Exception) {
+        val msg = buildString {
+            append(e.localizedMessage ?: e.message ?: e.javaClass.simpleName)
+            e.cause?.let { cause ->
+                append("\n")
+                append(cause.localizedMessage ?: cause.message ?: cause.javaClass.simpleName)
+            }
+        }
+        repoDao.trackRepoUpdateError(repoId, msg)
+    }
 }
 
 internal fun Downloader.setIndexUpdateListener(
diff --git a/libs/database/src/main/java/org/fdroid/index/v1/IndexV1Updater.kt b/libs/database/src/main/java/org/fdroid/index/v1/IndexV1Updater.kt
index 505022730..a57dc0c36 100644
--- a/libs/database/src/main/java/org/fdroid/index/v1/IndexV1Updater.kt
+++ b/libs/database/src/main/java/org/fdroid/index/v1/IndexV1Updater.kt
@@ -8,6 +8,7 @@ import org.fdroid.database.DbV1StreamReceiver
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.FDroidDatabaseInt
 import org.fdroid.database.Repository
+import org.fdroid.database.RepositoryDaoInt
 import org.fdroid.download.DownloaderFactory
 import org.fdroid.index.IndexFormatVersion
 import org.fdroid.index.IndexFormatVersion.ONE
@@ -34,6 +35,7 @@ public class IndexV1Updater(
     private val log = KotlinLogging.logger {}
     public override val formatVersion: IndexFormatVersion = ONE
     private val db: FDroidDatabaseInt = database as FDroidDatabaseInt
+    override val repoDao: RepositoryDaoInt = db.getRepositoryDao()
 
     override fun updateRepo(repo: Repository): IndexUpdateResult {
         // Normally, we shouldn't allow repository downgrades and assert the condition below.
@@ -66,10 +68,11 @@ public class IndexV1Updater(
                     streamProcessor.process(inputStream)
                 }
                 // update RepositoryPreferences with timestamp and ETag (for v1)
-                val repoDao = db.getRepositoryDao()
                 val updatedPrefs = repo.preferences.copy(
                     lastUpdated = System.currentTimeMillis(),
                     lastETag = eTag,
+                    errorCount = 0,
+                    lastError = null,
                 )
                 repoDao.updateRepositoryPreferences(updatedPrefs)
             }
diff --git a/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt b/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt
index 87d10f022..5cd2ea3f3 100644
--- a/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt
+++ b/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt
@@ -6,6 +6,7 @@ import org.fdroid.database.DbV2StreamReceiver
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.FDroidDatabaseInt
 import org.fdroid.database.Repository
+import org.fdroid.database.RepositoryDaoInt
 import org.fdroid.download.DownloaderFactory
 import org.fdroid.index.IndexFormatVersion
 import org.fdroid.index.IndexFormatVersion.ONE
@@ -33,6 +34,7 @@ public class IndexV2Updater(
 
     public override val formatVersion: IndexFormatVersion = TWO
     private val db: FDroidDatabaseInt = database as FDroidDatabaseInt
+    override val repoDao: RepositoryDaoInt = db.getRepositoryDao()
 
     override fun updateRepo(repo: Repository): IndexUpdateResult {
         val (_, entry) = getCertAndEntry(repo, repo.certificate)
@@ -92,7 +94,6 @@ public class IndexV2Updater(
         try {
             downloader.download()
             file.inputStream().use { inputStream ->
-                val repoDao = db.getRepositoryDao()
                 db.runInTransaction {
                     // ensure somebody else hasn't updated the repo in the meantime
                     val currentTimestamp = repoDao.getRepository(repo.repoId)?.timestamp
@@ -108,6 +109,8 @@ public class IndexV2Updater(
                         ?: error("No repo prefs for ${repo.repoId}")
                     val updatedPrefs = repoPrefs.copy(
                         lastUpdated = System.currentTimeMillis(),
+                        errorCount = 0,
+                        lastError = null,
                     )
                     repoDao.updateRepositoryPreferences(updatedPrefs)
                 }
diff --git a/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt b/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
index 8f547c042..86c5e617d 100644
--- a/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
+++ b/libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
@@ -190,6 +190,8 @@ internal class RepoAdderTest {
             assertEquals(expectedResult, fetching.fetchResult)
 
             every { newRepo.formatVersion } returns IndexFormatVersion.TWO
+            every { newRepo.repoId } returns 1
+            every { repoDao.trackRepoUpdateError(1, any()) } just Runs
 
             repoAdder.addFetchedRepository()
 
@@ -225,6 +227,8 @@ internal class RepoAdderTest {
             assertIs<IsNewRepository>(fetching.fetchResult)
 
             every { newRepo.formatVersion } returns IndexFormatVersion.TWO
+            every { newRepo.repoId } returns 1
+            every { repoDao.trackRepoUpdateError(1, any()) } just Runs
 
             repoAdder.addFetchedRepository()
 
@@ -852,6 +856,8 @@ internal class RepoAdderTest {
             assertIs<Fetching>(awaitItem()) // still Fetching from last call
 
             every { newRepo.formatVersion } returns IndexFormatVersion.TWO
+            every { newRepo.repoId } returns 1
+            every { repoDao.trackRepoUpdateError(1, any()) } just Runs
             repoAdder.addFetchedRepository()
 
             assertIs<Adding>(awaitItem()) // now moved to Adding

From c0f90bf0b62acad84e4261eacb60e70755132dd5 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 17 Dec 2025 09:16:54 -0300
Subject: [PATCH 130/180] [db] don't progress report total bytes for entry.jar
 download

because we'll download another file afterwards and progress reporting would jump to 100% two times. Also entry.jar is really small, so downloading that is fast and doesn't benefit from detailed progress reporting anyway.
---
 .../src/main/java/org/fdroid/index/IndexUpdater.kt         | 3 +++
 .../src/main/java/org/fdroid/index/v2/IndexV2Updater.kt    | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libs/database/src/main/java/org/fdroid/index/IndexUpdater.kt b/libs/database/src/main/java/org/fdroid/index/IndexUpdater.kt
index 94ad6cb5a..8cdce3494 100644
--- a/libs/database/src/main/java/org/fdroid/index/IndexUpdater.kt
+++ b/libs/database/src/main/java/org/fdroid/index/IndexUpdater.kt
@@ -23,6 +23,9 @@ public sealed class IndexUpdateResult {
 }
 
 public interface IndexUpdateListener {
+    /**
+     * If [totalBytes] is 0 or less, it is unknown and indeterminate progress should be shown.
+     */
     public fun onDownloadProgress(repo: Repository, bytesRead: Long, totalBytes: Long)
     public fun onUpdateProgress(repo: Repository, appsProcessed: Int, totalApps: Int)
 }
diff --git a/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt b/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt
index 5cd2ea3f3..af8b28056 100644
--- a/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt
+++ b/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt
@@ -63,7 +63,12 @@ public class IndexV2Updater(
             indexFile = FileV2.fromPath("/$SIGNED_FILE_NAME"),
             destFile = file,
         ).apply {
-            setIndexUpdateListener(listener, repo)
+            if (listener != null) setListener { bytesRead, _ ->
+                // don't report a total for entry.jar,
+                // because we'll download another file afterwards
+                // and progress reporting would jump to 100% two times.
+                listener.onDownloadProgress(repo, bytesRead, -1)
+            }
         }
         try {
             downloader.download()

From 9f3a615b5a93a4228f28cbd00eea0dc42c23aa21 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 18 Dec 2025 17:07:39 -0300
Subject: [PATCH 131/180] [db] add missing API surface

---
 libs/database/api/database.api | 884 +++++++++++++++++++++++++++++++++
 1 file changed, 884 insertions(+)

diff --git a/libs/database/api/database.api b/libs/database/api/database.api
index e69de29bb..63ff7c4c5 100644
--- a/libs/database/api/database.api
+++ b/libs/database/api/database.api
@@ -0,0 +1,884 @@
+public final class org/fdroid/database/AntiFeature : org/fdroid/database/RepoAttribute {
+	public static final field TABLE Ljava/lang/String;
+	public fun <init> (JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
+	public synthetic fun <init> (JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component3 ()Ljava/util/Map;
+	public final fun copy (JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lorg/fdroid/database/AntiFeature;
+	public static synthetic fun copy$default (Lorg/fdroid/database/AntiFeature;JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lorg/fdroid/database/AntiFeature;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getIcon ()Ljava/util/Map;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/App : org/fdroid/database/MinimalApp {
+	public final fun component1 ()Lorg/fdroid/database/AppMetadata;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAuthorName ()Ljava/lang/String;
+	public final fun getDescription (Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public final fun getFeatureGraphic (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public fun getIcon (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public final fun getMetadata ()Lorg/fdroid/database/AppMetadata;
+	public fun getName ()Ljava/lang/String;
+	public fun getPackageName ()Ljava/lang/String;
+	public final fun getPhoneScreenshots (Landroidx/core/os/LocaleListCompat;)Ljava/util/List;
+	public final fun getPromoGraphic (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public fun getRepoId ()J
+	public final fun getSevenInchScreenshots (Landroidx/core/os/LocaleListCompat;)Ljava/util/List;
+	public fun getSummary ()Ljava/lang/String;
+	public final fun getTenInchScreenshots (Landroidx/core/os/LocaleListCompat;)Ljava/util/List;
+	public final fun getTvBanner (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public final fun getTvScreenshots (Landroidx/core/os/LocaleListCompat;)Ljava/util/List;
+	public final fun getVideo (Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public final fun getWearScreenshots (Landroidx/core/os/LocaleListCompat;)Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/AppCheckResult {
+	public fun <init> (Ljava/util/List;Ljava/util/List;)V
+	public final fun component1 ()Ljava/util/List;
+	public final fun component2 ()Ljava/util/List;
+	public final fun copy (Ljava/util/List;Ljava/util/List;)Lorg/fdroid/database/AppCheckResult;
+	public static synthetic fun copy$default (Lorg/fdroid/database/AppCheckResult;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lorg/fdroid/database/AppCheckResult;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getIssues ()Ljava/util/List;
+	public final fun getUpdates ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface class org/fdroid/database/AppDao {
+	public abstract fun getAllApps (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getApp (JLjava/lang/String;)Lorg/fdroid/database/App;
+	public abstract fun getApp (Ljava/lang/String;)Landroidx/lifecycle/LiveData;
+	public abstract fun getAppListItems (Landroid/content/pm/PackageManager;JLjava/lang/String;Lorg/fdroid/database/AppListSortOrder;)Landroidx/lifecycle/LiveData;
+	public abstract fun getAppListItems (Landroid/content/pm/PackageManager;Ljava/lang/String;Ljava/lang/String;Lorg/fdroid/database/AppListSortOrder;)Landroidx/lifecycle/LiveData;
+	public abstract fun getAppListItems (Landroid/content/pm/PackageManager;Ljava/lang/String;Lorg/fdroid/database/AppListSortOrder;)Landroidx/lifecycle/LiveData;
+	public abstract fun getAppListItemsForAuthor (Landroid/content/pm/PackageManager;Ljava/lang/String;Ljava/lang/String;Lorg/fdroid/database/AppListSortOrder;)Landroidx/lifecycle/LiveData;
+	public abstract fun getAppOverviewItems (I)Landroidx/lifecycle/LiveData;
+	public abstract fun getAppOverviewItems (Ljava/lang/String;I)Landroidx/lifecycle/LiveData;
+	public static synthetic fun getAppOverviewItems$default (Lorg/fdroid/database/AppDao;IILjava/lang/Object;)Landroidx/lifecycle/LiveData;
+	public static synthetic fun getAppOverviewItems$default (Lorg/fdroid/database/AppDao;Ljava/lang/String;IILjava/lang/Object;)Landroidx/lifecycle/LiveData;
+	public abstract fun getAppSearchItems (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getApps (Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getAppsByAuthor (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getAppsByCategory (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getAppsByRepository (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getAppsFlow (Ljava/util/List;)Lkotlinx/coroutines/flow/Flow;
+	public abstract fun getInstalledAppListItems (Landroid/content/pm/PackageManager;)Landroidx/lifecycle/LiveData;
+	public abstract fun getInstalledAppListItems (Ljava/util/Map;)Lkotlinx/coroutines/flow/Flow;
+	public abstract fun getNewApps (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun getNewApps$default (Lorg/fdroid/database/AppDao;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public abstract fun getNewAppsFlow (J)Lkotlinx/coroutines/flow/Flow;
+	public static synthetic fun getNewAppsFlow$default (Lorg/fdroid/database/AppDao;JILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+	public abstract fun getNumberOfAppsInCategory (Ljava/lang/String;)I
+	public abstract fun getNumberOfAppsInRepository (J)I
+	public abstract fun getRecentlyUpdatedApps (ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun getRecentlyUpdatedApps$default (Lorg/fdroid/database/AppDao;ILkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public abstract fun getRecentlyUpdatedAppsFlow (I)Lkotlinx/coroutines/flow/Flow;
+	public static synthetic fun getRecentlyUpdatedAppsFlow$default (Lorg/fdroid/database/AppDao;IILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+	public abstract fun getRepositoryIdsForApp (Ljava/lang/String;)Ljava/util/List;
+	public abstract fun hasAuthorMoreThanOneApp (Ljava/lang/String;)Landroidx/lifecycle/LiveData;
+	public abstract fun insert (JLjava/lang/String;Lorg/fdroid/index/v2/MetadataV2;Landroidx/core/os/LocaleListCompat;)V
+	public static synthetic fun insert$default (Lorg/fdroid/database/AppDao;JLjava/lang/String;Lorg/fdroid/index/v2/MetadataV2;Landroidx/core/os/LocaleListCompat;ILjava/lang/Object;)V
+	public abstract fun updateCompatibility (J)V
+}
+
+public final class org/fdroid/database/AppDao$DefaultImpls {
+	public static synthetic fun getAppOverviewItems$default (Lorg/fdroid/database/AppDao;IILjava/lang/Object;)Landroidx/lifecycle/LiveData;
+	public static synthetic fun getAppOverviewItems$default (Lorg/fdroid/database/AppDao;Ljava/lang/String;IILjava/lang/Object;)Landroidx/lifecycle/LiveData;
+	public static synthetic fun getNewApps$default (Lorg/fdroid/database/AppDao;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static synthetic fun getNewAppsFlow$default (Lorg/fdroid/database/AppDao;JILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+	public static synthetic fun getRecentlyUpdatedApps$default (Lorg/fdroid/database/AppDao;ILkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static synthetic fun getRecentlyUpdatedAppsFlow$default (Lorg/fdroid/database/AppDao;IILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+	public static synthetic fun insert$default (Lorg/fdroid/database/AppDao;JLjava/lang/String;Lorg/fdroid/index/v2/MetadataV2;Landroidx/core/os/LocaleListCompat;ILjava/lang/Object;)V
+}
+
+public abstract interface class org/fdroid/database/AppIssue {
+}
+
+public final class org/fdroid/database/AppListItem : org/fdroid/database/MinimalApp {
+	public final fun component1 ()J
+	public final fun component10 ()Ljava/lang/String;
+	public final fun component11 ()Ljava/lang/String;
+	public final fun component12 ()Ljava/lang/Long;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Ljava/lang/String;
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()J
+	public final fun component6 ()Ljava/util/List;
+	public final fun component9 ()Z
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAntiFeatureKeys ()Ljava/util/List;
+	public final fun getAntiFeatureReason (Ljava/lang/String;Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public final fun getCategories ()Ljava/util/List;
+	public fun getIcon (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public final fun getInstalledVersionCode ()Ljava/lang/Long;
+	public final fun getInstalledVersionName ()Ljava/lang/String;
+	public final fun getLastUpdated ()J
+	public fun getName ()Ljava/lang/String;
+	public fun getPackageName ()Ljava/lang/String;
+	public final fun getPreferredSigner ()Ljava/lang/String;
+	public fun getRepoId ()J
+	public fun getSummary ()Ljava/lang/String;
+	public fun hashCode ()I
+	public final fun isCompatible ()Z
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/AppListSortOrder : java/lang/Enum {
+	public static final field LAST_UPDATED Lorg/fdroid/database/AppListSortOrder;
+	public static final field NAME Lorg/fdroid/database/AppListSortOrder;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Lorg/fdroid/database/AppListSortOrder;
+	public static fun values ()[Lorg/fdroid/database/AppListSortOrder;
+}
+
+public final class org/fdroid/database/AppManifest : org/fdroid/index/v2/PackageManifest {
+	public fun <init> (Ljava/lang/String;JLorg/fdroid/index/v2/UsesSdkV2;Ljava/lang/Integer;Lorg/fdroid/index/v2/SignerV2;Ljava/util/List;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/lang/String;JLorg/fdroid/index/v2/UsesSdkV2;Ljava/lang/Integer;Lorg/fdroid/index/v2/SignerV2;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()J
+	public final fun component3 ()Lorg/fdroid/index/v2/UsesSdkV2;
+	public final fun component4 ()Ljava/lang/Integer;
+	public final fun component5 ()Lorg/fdroid/index/v2/SignerV2;
+	public final fun component6 ()Ljava/util/List;
+	public final fun component7 ()Ljava/util/List;
+	public final fun copy (Ljava/lang/String;JLorg/fdroid/index/v2/UsesSdkV2;Ljava/lang/Integer;Lorg/fdroid/index/v2/SignerV2;Ljava/util/List;Ljava/util/List;)Lorg/fdroid/database/AppManifest;
+	public static synthetic fun copy$default (Lorg/fdroid/database/AppManifest;Ljava/lang/String;JLorg/fdroid/index/v2/UsesSdkV2;Ljava/lang/Integer;Lorg/fdroid/index/v2/SignerV2;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lorg/fdroid/database/AppManifest;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getFeatureNames ()Ljava/util/List;
+	public final fun getFeatures ()Ljava/util/List;
+	public fun getMaxSdkVersion ()Ljava/lang/Integer;
+	public fun getMinSdkVersion ()Ljava/lang/Integer;
+	public fun getNativecode ()Ljava/util/List;
+	public final fun getSigner ()Lorg/fdroid/index/v2/SignerV2;
+	public fun getTargetSdkVersion ()Ljava/lang/Integer;
+	public final fun getUsesSdk ()Lorg/fdroid/index/v2/UsesSdkV2;
+	public final fun getVersionCode ()J
+	public final fun getVersionName ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/AppMetadata {
+	public static final field TABLE Ljava/lang/String;
+	public fun <init> (JLjava/lang/String;JJLjava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Z)V
+	public synthetic fun <init> (JLjava/lang/String;JJLjava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()J
+	public final fun component10 ()Ljava/lang/String;
+	public final fun component11 ()Ljava/lang/String;
+	public final fun component12 ()Ljava/lang/String;
+	public final fun component13 ()Ljava/lang/String;
+	public final fun component14 ()Ljava/lang/String;
+	public final fun component15 ()Ljava/lang/String;
+	public final fun component16 ()Ljava/lang/String;
+	public final fun component17 ()Ljava/util/Map;
+	public final fun component18 ()Ljava/lang/String;
+	public final fun component19 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component20 ()Ljava/lang/String;
+	public final fun component21 ()Ljava/lang/String;
+	public final fun component22 ()Ljava/util/List;
+	public final fun component23 ()Ljava/lang/String;
+	public final fun component24 ()Ljava/lang/String;
+	public final fun component25 ()Ljava/lang/String;
+	public final fun component26 ()Ljava/lang/String;
+	public final fun component27 ()Ljava/lang/String;
+	public final fun component28 ()Ljava/lang/String;
+	public final fun component29 ()Ljava/util/List;
+	public final fun component3 ()J
+	public final fun component30 ()Z
+	public final fun component4 ()J
+	public final fun component5 ()Ljava/util/Map;
+	public final fun component6 ()Ljava/util/Map;
+	public final fun component7 ()Ljava/util/Map;
+	public final fun component8 ()Ljava/lang/String;
+	public final fun component9 ()Ljava/lang/String;
+	public final fun copy (JLjava/lang/String;JJLjava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Z)Lorg/fdroid/database/AppMetadata;
+	public static synthetic fun copy$default (Lorg/fdroid/database/AppMetadata;JLjava/lang/String;JJLjava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ZILjava/lang/Object;)Lorg/fdroid/database/AppMetadata;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAdded ()J
+	public final fun getAuthorEmail ()Ljava/lang/String;
+	public final fun getAuthorName ()Ljava/lang/String;
+	public final fun getAuthorPhone ()Ljava/lang/String;
+	public final fun getAuthorWebSite ()Ljava/lang/String;
+	public final fun getBitcoin ()Ljava/lang/String;
+	public final fun getCategories ()Ljava/util/List;
+	public final fun getChangelog ()Ljava/lang/String;
+	public final fun getDescription ()Ljava/util/Map;
+	public final fun getDonate ()Ljava/util/List;
+	public final fun getFlattrID ()Ljava/lang/String;
+	public final fun getIssueTracker ()Ljava/lang/String;
+	public final fun getLastUpdated ()J
+	public final fun getLiberapay ()Ljava/lang/String;
+	public final fun getLiberapayID ()Ljava/lang/String;
+	public final fun getLicense ()Ljava/lang/String;
+	public final fun getLitecoin ()Ljava/lang/String;
+	public final fun getLocalizedName ()Ljava/lang/String;
+	public final fun getLocalizedSummary ()Ljava/lang/String;
+	public final fun getName ()Ljava/util/Map;
+	public final fun getOpenCollective ()Ljava/lang/String;
+	public final fun getPackageName ()Ljava/lang/String;
+	public final fun getPreferredSigner ()Ljava/lang/String;
+	public final fun getRepoId ()J
+	public final fun getSourceCode ()Ljava/lang/String;
+	public final fun getSummary ()Ljava/util/Map;
+	public final fun getTranslation ()Ljava/lang/String;
+	public final fun getVideo ()Ljava/util/Map;
+	public final fun getWebSite ()Ljava/lang/String;
+	public fun hashCode ()I
+	public final fun isCompatible ()Z
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/AppOverviewItem : org/fdroid/database/MinimalApp {
+	public final fun component1 ()J
+	public final fun component12 ()Z
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()J
+	public final fun component4 ()J
+	public final fun component5 ()Ljava/lang/String;
+	public final fun component6 ()Ljava/lang/String;
+	public final fun component9 ()Ljava/util/List;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAdded ()J
+	public final fun getAntiFeatureKeys ()Ljava/util/List;
+	public final fun getCategories ()Ljava/util/List;
+	public fun getIcon (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public final fun getLastUpdated ()J
+	public fun getName ()Ljava/lang/String;
+	public final fun getName (Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public fun getPackageName ()Ljava/lang/String;
+	public fun getRepoId ()J
+	public fun getSummary ()Ljava/lang/String;
+	public final fun getSummary (Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public fun hashCode ()I
+	public final fun isCompatible ()Z
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/AppPrefs : org/fdroid/PackagePreference {
+	public static final field TABLE Ljava/lang/String;
+	public fun <init> (Ljava/lang/String;JLjava/lang/Long;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/lang/String;JLjava/lang/Long;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()J
+	public final fun component3 ()Ljava/lang/Long;
+	public final fun copy (Ljava/lang/String;JLjava/lang/Long;Ljava/util/List;)Lorg/fdroid/database/AppPrefs;
+	public static synthetic fun copy$default (Lorg/fdroid/database/AppPrefs;Ljava/lang/String;JLjava/lang/Long;Ljava/util/List;ILjava/lang/Object;)Lorg/fdroid/database/AppPrefs;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getIgnoreAllUpdates ()Z
+	public fun getIgnoreVersionCodeUpdate ()J
+	public final fun getPackageName ()Ljava/lang/String;
+	public final fun getPreferredRepoId ()Ljava/lang/Long;
+	public fun getReleaseChannels ()Ljava/util/List;
+	public fun hashCode ()I
+	public final fun shouldIgnoreUpdate (J)Z
+	public fun toString ()Ljava/lang/String;
+	public final fun toggleIgnoreAllUpdates ()Lorg/fdroid/database/AppPrefs;
+	public final fun toggleIgnoreVersionCodeUpdate (J)Lorg/fdroid/database/AppPrefs;
+	public final fun toggleReleaseChannel (Ljava/lang/String;)Lorg/fdroid/database/AppPrefs;
+}
+
+public abstract interface class org/fdroid/database/AppPrefsDao {
+	public abstract fun getAppPrefs (Ljava/lang/String;)Landroidx/lifecycle/LiveData;
+	public abstract fun update (Lorg/fdroid/database/AppPrefs;)V
+}
+
+public final class org/fdroid/database/AppSearchItem : java/lang/Comparable {
+	public synthetic fun compareTo (Ljava/lang/Object;)I
+	public fun compareTo (Lorg/fdroid/database/AppSearchItem;)I
+	public final fun component1 ()J
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()J
+	public final fun component4 ()Ljava/util/Map;
+	public final fun component5 ()Ljava/util/Map;
+	public final fun component6 ()Ljava/util/Map;
+	public final fun component7 ()Ljava/lang/String;
+	public final fun component8 ()Ljava/util/List;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAuthorName ()Ljava/lang/String;
+	public final fun getCategories ()Ljava/util/List;
+	public final fun getDescription ()Ljava/util/Map;
+	public final fun getIcon (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public final fun getLastUpdated ()J
+	public final fun getName ()Ljava/util/Map;
+	public final fun getPackageName ()Ljava/lang/String;
+	public final fun getRepoId ()J
+	public final fun getScore ()D
+	public final fun getSummary ()Ljava/util/Map;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/AppVersion : org/fdroid/index/v2/PackageVersion {
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getAdded ()J
+	public final fun getAntiFeatureKeys ()Ljava/util/List;
+	public final fun getAntiFeatureReason (Ljava/lang/String;Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public final fun getFeatureNames ()Ljava/util/List;
+	public final fun getFile ()Lorg/fdroid/index/v2/FileV1;
+	public fun getHasKnownVulnerability ()Z
+	public final fun getManifest ()Lorg/fdroid/database/AppManifest;
+	public final fun getNativeCode ()Ljava/util/List;
+	public fun getPackageManifest ()Lorg/fdroid/index/v2/PackageManifest;
+	public final fun getPackageName ()Ljava/lang/String;
+	public fun getReleaseChannels ()Ljava/util/List;
+	public final fun getRepoId ()J
+	public fun getSigner ()Lorg/fdroid/index/v2/SignerV2;
+	public fun getSize ()Ljava/lang/Long;
+	public final fun getSrc ()Lorg/fdroid/index/v2/FileV2;
+	public final fun getUsesPermission ()Ljava/util/List;
+	public final fun getUsesPermissionSdk23 ()Ljava/util/List;
+	public fun getVersionCode ()J
+	public fun getVersionName ()Ljava/lang/String;
+	public final fun getWhatsNew (Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public fun hashCode ()I
+	public final fun isCompatible ()Z
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface class org/fdroid/database/AppWithIssue {
+	public abstract fun getInstallVersionName ()Ljava/lang/String;
+	public abstract fun getIssue ()Lorg/fdroid/database/AppIssue;
+	public abstract fun getPackageName ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/AvailableAppWithIssue : org/fdroid/database/AppWithIssue {
+	public fun <init> (Lorg/fdroid/database/AppOverviewItem;Ljava/lang/String;JLorg/fdroid/database/AppIssue;)V
+	public final fun component1 ()Lorg/fdroid/database/AppOverviewItem;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()J
+	public final fun component4 ()Lorg/fdroid/database/AppIssue;
+	public final fun copy (Lorg/fdroid/database/AppOverviewItem;Ljava/lang/String;JLorg/fdroid/database/AppIssue;)Lorg/fdroid/database/AvailableAppWithIssue;
+	public static synthetic fun copy$default (Lorg/fdroid/database/AvailableAppWithIssue;Lorg/fdroid/database/AppOverviewItem;Ljava/lang/String;JLorg/fdroid/database/AppIssue;ILjava/lang/Object;)Lorg/fdroid/database/AvailableAppWithIssue;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getApp ()Lorg/fdroid/database/AppOverviewItem;
+	public final fun getInstallVersionCode ()J
+	public fun getInstallVersionName ()Ljava/lang/String;
+	public fun getIssue ()Lorg/fdroid/database/AppIssue;
+	public fun getPackageName ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/Category : org/fdroid/database/RepoAttribute {
+	public static final field TABLE Ljava/lang/String;
+	public fun <init> (JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
+	public synthetic fun <init> (JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()J
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Ljava/util/Map;
+	public final fun copy (JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lorg/fdroid/database/Category;
+	public static synthetic fun copy$default (Lorg/fdroid/database/Category;JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lorg/fdroid/database/Category;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getIcon ()Ljava/util/Map;
+	public final fun getId ()Ljava/lang/String;
+	public final fun getRepoId ()J
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/DbAppChecker {
+	public fun <init> (Lorg/fdroid/database/FDroidDatabase;Landroid/content/Context;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/UpdateChecker;)V
+	public synthetic fun <init> (Lorg/fdroid/database/FDroidDatabase;Landroid/content/Context;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/UpdateChecker;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getApps (Ljava/util/Map;)Lorg/fdroid/database/AppCheckResult;
+}
+
+public final class org/fdroid/database/DbUpdateChecker {
+	public fun <init> (Lorg/fdroid/database/FDroidDatabase;Landroid/content/pm/PackageManager;)V
+	public fun <init> (Lorg/fdroid/database/FDroidDatabase;Landroid/content/pm/PackageManager;Lorg/fdroid/CompatibilityChecker;)V
+	public fun <init> (Lorg/fdroid/database/FDroidDatabase;Landroid/content/pm/PackageManager;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/UpdateChecker;)V
+	public synthetic fun <init> (Lorg/fdroid/database/FDroidDatabase;Landroid/content/pm/PackageManager;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/UpdateChecker;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getSuggestedVersion (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Z)Lorg/fdroid/database/AppVersion;
+	public static synthetic fun getSuggestedVersion$default (Lorg/fdroid/database/DbUpdateChecker;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;ZILjava/lang/Object;)Lorg/fdroid/database/AppVersion;
+	public final fun getUpdatableApps ()Ljava/util/List;
+	public final fun getUpdatableApps (Ljava/util/List;)Ljava/util/List;
+	public final fun getUpdatableApps (Ljava/util/List;Z)Ljava/util/List;
+	public final fun getUpdatableApps (Ljava/util/List;ZZ)Ljava/util/List;
+	public static synthetic fun getUpdatableApps$default (Lorg/fdroid/database/DbUpdateChecker;Ljava/util/List;ZZILjava/lang/Object;)Ljava/util/List;
+}
+
+public abstract interface class org/fdroid/database/FDroidDatabase {
+	public abstract fun afterLocalesChanged (Landroidx/core/os/LocaleListCompat;)V
+	public static synthetic fun afterLocalesChanged$default (Lorg/fdroid/database/FDroidDatabase;Landroidx/core/os/LocaleListCompat;ILjava/lang/Object;)V
+	public abstract fun clearAllAppData ()V
+	public abstract fun getAppDao ()Lorg/fdroid/database/AppDao;
+	public abstract fun getAppPrefsDao ()Lorg/fdroid/database/AppPrefsDao;
+	public abstract fun getRepositoryDao ()Lorg/fdroid/database/RepositoryDao;
+	public abstract fun getVersionDao ()Lorg/fdroid/database/VersionDao;
+	public abstract fun runInTransaction (Ljava/lang/Runnable;)V
+	public abstract fun runInTransaction (Ljava/util/concurrent/Callable;)Ljava/lang/Object;
+}
+
+public final class org/fdroid/database/FDroidDatabase$DefaultImpls {
+	public static synthetic fun afterLocalesChanged$default (Lorg/fdroid/database/FDroidDatabase;Landroidx/core/os/LocaleListCompat;ILjava/lang/Object;)V
+}
+
+public final class org/fdroid/database/FDroidDatabaseHolder {
+	public static final field INSTANCE Lorg/fdroid/database/FDroidDatabaseHolder;
+	public static final fun getDb (Landroid/content/Context;)Lorg/fdroid/database/FDroidDatabase;
+	public static final fun getDb (Landroid/content/Context;Ljava/lang/String;)Lorg/fdroid/database/FDroidDatabase;
+	public static final fun getDb (Landroid/content/Context;Ljava/lang/String;Lorg/fdroid/database/FDroidFixture;)Lorg/fdroid/database/FDroidDatabase;
+	public static synthetic fun getDb$default (Landroid/content/Context;Ljava/lang/String;Lorg/fdroid/database/FDroidFixture;ILjava/lang/Object;)Lorg/fdroid/database/FDroidDatabase;
+}
+
+public abstract interface class org/fdroid/database/FDroidFixture {
+	public abstract fun prePopulateDb (Lorg/fdroid/database/FDroidDatabase;)V
+}
+
+public final class org/fdroid/database/InitialRepository {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JZ)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;JZ)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;JZI)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;JZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Ljava/util/List;
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()Ljava/lang/String;
+	public final fun component6 ()J
+	public final fun component7 ()Z
+	public final fun component8 ()I
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;JZI)Lorg/fdroid/database/InitialRepository;
+	public static synthetic fun copy$default (Lorg/fdroid/database/InitialRepository;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;JZIILjava/lang/Object;)Lorg/fdroid/database/InitialRepository;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAddress ()Ljava/lang/String;
+	public final fun getCertificate ()Ljava/lang/String;
+	public final fun getDescription ()Ljava/lang/String;
+	public final fun getEnabled ()Z
+	public final fun getMirrors ()Ljava/util/List;
+	public final fun getName ()Ljava/lang/String;
+	public final fun getVersion ()J
+	public final fun getWeight ()I
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/KnownVulnerability : org/fdroid/database/AppIssue {
+	public fun <init> (Z)V
+	public final fun component1 ()Z
+	public final fun copy (Z)Lorg/fdroid/database/KnownVulnerability;
+	public static synthetic fun copy$default (Lorg/fdroid/database/KnownVulnerability;ZILjava/lang/Object;)Lorg/fdroid/database/KnownVulnerability;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFromPreferredRepo ()Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface class org/fdroid/database/MinimalApp {
+	public abstract fun getIcon (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public abstract fun getName ()Ljava/lang/String;
+	public abstract fun getPackageName ()Ljava/lang/String;
+	public abstract fun getRepoId ()J
+	public abstract fun getSummary ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/NewRepository {
+	public fun <init> (Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;Lorg/fdroid/index/IndexFormatVersion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;Lorg/fdroid/index/IndexFormatVersion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/util/Map;
+	public final fun component2 ()Ljava/util/Map;
+	public final fun component3 ()Ljava/lang/String;
+	public final fun component4 ()Lorg/fdroid/index/IndexFormatVersion;
+	public final fun component5 ()Ljava/lang/String;
+	public final fun component6 ()Ljava/lang/String;
+	public final fun component7 ()Ljava/lang/String;
+	public final fun copy (Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;Lorg/fdroid/index/IndexFormatVersion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/fdroid/database/NewRepository;
+	public static synthetic fun copy$default (Lorg/fdroid/database/NewRepository;Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;Lorg/fdroid/index/IndexFormatVersion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/fdroid/database/NewRepository;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAddress ()Ljava/lang/String;
+	public final fun getCertificate ()Ljava/lang/String;
+	public final fun getFormatVersion ()Lorg/fdroid/index/IndexFormatVersion;
+	public final fun getIcon ()Ljava/util/Map;
+	public final fun getName ()Ljava/util/Map;
+	public final fun getPassword ()Ljava/lang/String;
+	public final fun getUsername ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/NoCompatibleSigner : org/fdroid/database/AppIssue {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/Long;)V
+	public synthetic fun <init> (Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/Long;
+	public final fun copy (Ljava/lang/Long;)Lorg/fdroid/database/NoCompatibleSigner;
+	public static synthetic fun copy$default (Lorg/fdroid/database/NoCompatibleSigner;Ljava/lang/Long;ILjava/lang/Object;)Lorg/fdroid/database/NoCompatibleSigner;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getRepoIdWithCompatibleSigner ()Ljava/lang/Long;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/NotAvailable : org/fdroid/database/AppIssue {
+	public static final field INSTANCE Lorg/fdroid/database/NotAvailable;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/ReleaseChannel : org/fdroid/database/RepoAttribute {
+	public static final field TABLE Ljava/lang/String;
+	public fun <init> (JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
+	public synthetic fun <init> (JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component3 ()Ljava/util/Map;
+	public final fun copy (JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lorg/fdroid/database/ReleaseChannel;
+	public static synthetic fun copy$default (Lorg/fdroid/database/ReleaseChannel;JLjava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lorg/fdroid/database/ReleaseChannel;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getIcon ()Ljava/util/Map;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class org/fdroid/database/RepoAttribute {
+	public fun <init> ()V
+	public final fun getDescription (Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public abstract fun getIcon ()Ljava/util/Map;
+	public final fun getIcon (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public final fun getName (Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+}
+
+public final class org/fdroid/database/Repository {
+	public fun <init> (JLjava/lang/String;JLorg/fdroid/index/IndexFormatVersion;Ljava/lang/String;JIJ)V
+	public fun <init> (JLjava/lang/String;JLorg/fdroid/index/IndexFormatVersion;Ljava/lang/String;JIJLjava/lang/String;)V
+	public fun <init> (JLjava/lang/String;JLorg/fdroid/index/IndexFormatVersion;Ljava/lang/String;JIJLjava/lang/String;Ljava/lang/String;)V
+	public fun <init> (JLjava/lang/String;JLorg/fdroid/index/IndexFormatVersion;Ljava/lang/String;JIJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (JLjava/lang/String;JLorg/fdroid/index/IndexFormatVersion;Ljava/lang/String;JIJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAddress ()Ljava/lang/String;
+	public final fun getAllMirrors ()Ljava/util/List;
+	public final fun getAllMirrors (Z)Ljava/util/List;
+	public static synthetic fun getAllMirrors$default (Lorg/fdroid/database/Repository;ZILjava/lang/Object;)Ljava/util/List;
+	public final fun getAllOfficialMirrors ()Ljava/util/List;
+	public final fun getAllUserMirrors ()Ljava/util/List;
+	public final fun getAntiFeatures ()Ljava/util/Map;
+	public final fun getCategories ()Ljava/util/Map;
+	public final fun getCertificate ()Ljava/lang/String;
+	public final fun getDescription (Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public final fun getDisabledMirrors ()Ljava/util/List;
+	public final fun getEnabled ()Z
+	public final fun getErrorCount ()I
+	public final fun getFingerprint ()Ljava/lang/String;
+	public final fun getFormatVersion ()Lorg/fdroid/index/IndexFormatVersion;
+	public final fun getIcon (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public final fun getLastETag ()Ljava/lang/String;
+	public final fun getLastError ()Ljava/lang/String;
+	public final fun getLastUpdated ()Ljava/lang/Long;
+	public final fun getMirrors ()Ljava/util/List;
+	public final fun getName (Landroidx/core/os/LocaleListCompat;)Ljava/lang/String;
+	public final fun getPassword ()Ljava/lang/String;
+	public final fun getReleaseChannels ()Ljava/util/Map;
+	public final fun getRepoId ()J
+	public final fun getShareUri ()Ljava/lang/String;
+	public final fun getTimestamp ()J
+	public final fun getUserMirrors ()Ljava/util/List;
+	public final fun getUsername ()Ljava/lang/String;
+	public final fun getVersion ()J
+	public final fun getWebBaseUrl ()Ljava/lang/String;
+	public final fun getWeight ()I
+	public fun hashCode ()I
+	public final fun isArchiveRepo ()Z
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface class org/fdroid/database/RepositoryDao {
+	public abstract fun clearAll ()V
+	public abstract fun deleteRepository (J)V
+	public abstract fun getLiveCategories ()Landroidx/lifecycle/LiveData;
+	public abstract fun getLiveRepositories ()Landroidx/lifecycle/LiveData;
+	public abstract fun getRepositories ()Ljava/util/List;
+	public abstract fun getRepository (J)Lorg/fdroid/database/Repository;
+	public abstract fun insert (Lorg/fdroid/database/InitialRepository;)J
+	public abstract fun insert (Lorg/fdroid/database/NewRepository;)J
+	public abstract fun setRepositoryEnabled (JZ)V
+	public abstract fun updateDisabledMirrors (JLjava/util/List;)V
+	public abstract fun updateUserMirrors (JLjava/util/List;)V
+	public abstract fun updateUsernameAndPassword (JLjava/lang/String;Ljava/lang/String;)V
+	public abstract fun walCheckpoint ()V
+}
+
+public final class org/fdroid/database/RepositoryKt {
+	public static final fun getDUMMY_TEST_REPO ()Lorg/fdroid/database/Repository;
+}
+
+public final class org/fdroid/database/UnavailableAppWithIssue : org/fdroid/database/AppWithIssue {
+	public fun <init> (Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/String;J)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/CharSequence;
+	public final fun component3 ()Ljava/lang/String;
+	public final fun component4 ()J
+	public final fun copy (Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/String;J)Lorg/fdroid/database/UnavailableAppWithIssue;
+	public static synthetic fun copy$default (Lorg/fdroid/database/UnavailableAppWithIssue;Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/String;JILjava/lang/Object;)Lorg/fdroid/database/UnavailableAppWithIssue;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getInstallVersionCode ()J
+	public fun getInstallVersionName ()Ljava/lang/String;
+	public fun getIssue ()Lorg/fdroid/database/AppIssue;
+	public final fun getName ()Ljava/lang/CharSequence;
+	public fun getPackageName ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/UpdatableApp : org/fdroid/database/MinimalApp {
+	public final fun component1 ()J
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()J
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()Lorg/fdroid/database/AppVersion;
+	public final fun component6 ()Z
+	public final fun component7 ()Z
+	public final fun component8 ()Ljava/lang/String;
+	public final fun component9 ()Ljava/lang/String;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getHasKnownVulnerability ()Z
+	public fun getIcon (Landroidx/core/os/LocaleListCompat;)Lorg/fdroid/index/v2/FileV2;
+	public final fun getInstalledVersionCode ()J
+	public final fun getInstalledVersionName ()Ljava/lang/String;
+	public fun getName ()Ljava/lang/String;
+	public fun getPackageName ()Ljava/lang/String;
+	public fun getRepoId ()J
+	public fun getSummary ()Ljava/lang/String;
+	public final fun getUpdate ()Lorg/fdroid/database/AppVersion;
+	public fun hashCode ()I
+	public final fun isFromPreferredRepo ()Z
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/database/UpdateInOtherRepo : org/fdroid/database/AppIssue {
+	public fun <init> (J)V
+	public final fun component1 ()J
+	public final fun copy (J)Lorg/fdroid/database/UpdateInOtherRepo;
+	public static synthetic fun copy$default (Lorg/fdroid/database/UpdateInOtherRepo;JILjava/lang/Object;)Lorg/fdroid/database/UpdateInOtherRepo;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getRepoIdWithUpdate ()J
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface class org/fdroid/database/VersionDao {
+	public abstract fun getAppVersions (JLjava/lang/String;)Landroidx/lifecycle/LiveData;
+	public abstract fun getAppVersions (Ljava/lang/String;)Landroidx/lifecycle/LiveData;
+	public abstract fun insert (JLjava/lang/String;Ljava/util/Map;Lkotlin/jvm/functions/Function1;)V
+}
+
+public abstract class org/fdroid/download/DownloaderFactory {
+	public fun <init> ()V
+	public abstract fun create (Lorg/fdroid/database/Repository;Landroid/net/Uri;Lorg/fdroid/IndexFile;Ljava/io/File;)Lorg/fdroid/download/Downloader;
+	protected abstract fun create (Lorg/fdroid/database/Repository;Ljava/util/List;Landroid/net/Uri;Lorg/fdroid/IndexFile;Ljava/io/File;Lorg/fdroid/download/Mirror;)Lorg/fdroid/download/Downloader;
+	public final fun createWithTryFirstMirror (Lorg/fdroid/database/Repository;Landroid/net/Uri;Lorg/fdroid/IndexFile;Ljava/io/File;)Lorg/fdroid/download/Downloader;
+}
+
+public final class org/fdroid/index/IndexFormatVersion : java/lang/Enum {
+	public static final field ONE Lorg/fdroid/index/IndexFormatVersion;
+	public static final field TWO Lorg/fdroid/index/IndexFormatVersion;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Lorg/fdroid/index/IndexFormatVersion;
+	public static fun values ()[Lorg/fdroid/index/IndexFormatVersion;
+}
+
+public abstract interface class org/fdroid/index/IndexUpdateListener {
+	public abstract fun onDownloadProgress (Lorg/fdroid/database/Repository;JJ)V
+	public abstract fun onUpdateProgress (Lorg/fdroid/database/Repository;II)V
+}
+
+public abstract class org/fdroid/index/IndexUpdateResult {
+}
+
+public final class org/fdroid/index/IndexUpdateResult$Error : org/fdroid/index/IndexUpdateResult {
+	public fun <init> (Ljava/lang/Exception;)V
+	public final fun component1 ()Ljava/lang/Exception;
+	public final fun copy (Ljava/lang/Exception;)Lorg/fdroid/index/IndexUpdateResult$Error;
+	public static synthetic fun copy$default (Lorg/fdroid/index/IndexUpdateResult$Error;Ljava/lang/Exception;ILjava/lang/Object;)Lorg/fdroid/index/IndexUpdateResult$Error;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getE ()Ljava/lang/Exception;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/index/IndexUpdateResult$NotFound : org/fdroid/index/IndexUpdateResult {
+	public static final field INSTANCE Lorg/fdroid/index/IndexUpdateResult$NotFound;
+}
+
+public final class org/fdroid/index/IndexUpdateResult$Processed : org/fdroid/index/IndexUpdateResult {
+	public static final field INSTANCE Lorg/fdroid/index/IndexUpdateResult$Processed;
+}
+
+public final class org/fdroid/index/IndexUpdateResult$Unchanged : org/fdroid/index/IndexUpdateResult {
+	public static final field INSTANCE Lorg/fdroid/index/IndexUpdateResult$Unchanged;
+}
+
+public abstract class org/fdroid/index/IndexUpdater {
+	public fun <init> ()V
+	public abstract fun getFormatVersion ()Lorg/fdroid/index/IndexFormatVersion;
+	public final fun update (Lorg/fdroid/database/Repository;)Lorg/fdroid/index/IndexUpdateResult;
+	protected abstract fun updateRepo (Lorg/fdroid/database/Repository;)Lorg/fdroid/index/IndexUpdateResult;
+}
+
+public final class org/fdroid/index/RepoManager {
+	public fun <init> (Landroid/content/Context;Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/download/HttpManager;)V
+	public fun <init> (Landroid/content/Context;Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/download/HttpManager;Lorg/fdroid/index/RepoUriBuilder;)V
+	public fun <init> (Landroid/content/Context;Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/download/HttpManager;Lorg/fdroid/index/RepoUriBuilder;Lorg/fdroid/CompatibilityChecker;)V
+	public fun <init> (Landroid/content/Context;Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/download/HttpManager;Lorg/fdroid/index/RepoUriBuilder;Lorg/fdroid/CompatibilityChecker;Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Landroid/content/Context;Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/download/HttpManager;Lorg/fdroid/index/RepoUriBuilder;Lorg/fdroid/CompatibilityChecker;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun abortAddingRepository ()V
+	public final fun addFetchedRepository ()V
+	public final fun deleteRepository (J)V
+	public final fun deleteUserMirror (JLorg/fdroid/download/Mirror;)V
+	public final fun fetchRepositoryPreview (Ljava/lang/String;)V
+	public final fun fetchRepositoryPreview (Ljava/lang/String;Ljava/net/Proxy;)V
+	public static synthetic fun fetchRepositoryPreview$default (Lorg/fdroid/index/RepoManager;Ljava/lang/String;Ljava/net/Proxy;ILjava/lang/Object;)V
+	public final fun getAddRepoState ()Lkotlinx/coroutines/flow/StateFlow;
+	public final fun getLiveAddRepoState ()Landroidx/lifecycle/LiveData;
+	public final fun getLiveRepositories ()Landroidx/lifecycle/LiveData;
+	public final fun getRepositories ()Ljava/util/List;
+	public final fun getRepositoriesState ()Lkotlinx/coroutines/flow/StateFlow;
+	public final fun getRepository (J)Lorg/fdroid/database/Repository;
+	public final fun isSwapUri (Landroid/net/Uri;)Z
+	public final fun reorderRepositories (Lorg/fdroid/database/Repository;Lorg/fdroid/database/Repository;)V
+	public final fun setArchiveRepoEnabled (Lorg/fdroid/database/Repository;ZLjava/net/Proxy;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun setArchiveRepoEnabled$default (Lorg/fdroid/index/RepoManager;Lorg/fdroid/database/Repository;ZLjava/net/Proxy;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public final fun setMirrorEnabled (JLorg/fdroid/download/Mirror;Z)V
+	public final fun setPreferredRepoId (Ljava/lang/String;J)Lkotlinx/coroutines/Job;
+	public final fun setRepositoryEnabled (JZ)V
+	public final fun updateUsernameAndPassword (JLjava/lang/String;Ljava/lang/String;)V
+}
+
+public final class org/fdroid/index/RepoUpdater {
+	public fun <init> (Ljava/io/File;Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/index/RepoUriBuilder;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/index/IndexUpdateListener;)V
+	public synthetic fun <init> (Ljava/io/File;Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/index/RepoUriBuilder;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/index/IndexUpdateListener;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun update (Lorg/fdroid/database/Repository;)Lorg/fdroid/index/IndexUpdateResult;
+}
+
+public abstract interface class org/fdroid/index/RepoUriBuilder {
+	public abstract fun getUri (Lorg/fdroid/database/Repository;[Ljava/lang/String;)Landroid/net/Uri;
+}
+
+public abstract interface class org/fdroid/index/TempFileProvider {
+	public abstract fun createTempFile (Ljava/lang/String;)Ljava/io/File;
+}
+
+public final class org/fdroid/index/v1/IndexV1Updater : org/fdroid/index/IndexUpdater {
+	public fun <init> (Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/index/TempFileProvider;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/index/RepoUriBuilder;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/index/IndexUpdateListener;)V
+	public synthetic fun <init> (Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/index/TempFileProvider;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/index/RepoUriBuilder;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/index/IndexUpdateListener;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getFormatVersion ()Lorg/fdroid/index/IndexFormatVersion;
+}
+
+public final class org/fdroid/index/v1/IndexV1UpdaterKt {
+	public static final field SIGNED_FILE_NAME Ljava/lang/String;
+}
+
+public final class org/fdroid/index/v2/IndexV2Updater : org/fdroid/index/IndexUpdater {
+	public fun <init> (Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/index/TempFileProvider;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/index/RepoUriBuilder;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/index/IndexUpdateListener;)V
+	public synthetic fun <init> (Lorg/fdroid/database/FDroidDatabase;Lorg/fdroid/index/TempFileProvider;Lorg/fdroid/download/DownloaderFactory;Lorg/fdroid/index/RepoUriBuilder;Lorg/fdroid/CompatibilityChecker;Lorg/fdroid/index/IndexUpdateListener;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun getFormatVersion ()Lorg/fdroid/index/IndexFormatVersion;
+}
+
+public final class org/fdroid/index/v2/IndexV2UpdaterKt {
+	public static final field SIGNED_FILE_NAME Ljava/lang/String;
+}
+
+public final class org/fdroid/repo/AddRepoError : org/fdroid/repo/AddRepoState {
+	public fun <init> (Lorg/fdroid/repo/AddRepoError$ErrorType;Ljava/lang/Exception;)V
+	public synthetic fun <init> (Lorg/fdroid/repo/AddRepoError$ErrorType;Ljava/lang/Exception;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lorg/fdroid/repo/AddRepoError$ErrorType;
+	public final fun component2 ()Ljava/lang/Exception;
+	public final fun copy (Lorg/fdroid/repo/AddRepoError$ErrorType;Ljava/lang/Exception;)Lorg/fdroid/repo/AddRepoError;
+	public static synthetic fun copy$default (Lorg/fdroid/repo/AddRepoError;Lorg/fdroid/repo/AddRepoError$ErrorType;Ljava/lang/Exception;ILjava/lang/Object;)Lorg/fdroid/repo/AddRepoError;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getErrorType ()Lorg/fdroid/repo/AddRepoError$ErrorType;
+	public final fun getException ()Ljava/lang/Exception;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/repo/AddRepoError$ErrorType : java/lang/Enum {
+	public static final field INVALID_FINGERPRINT Lorg/fdroid/repo/AddRepoError$ErrorType;
+	public static final field INVALID_INDEX Lorg/fdroid/repo/AddRepoError$ErrorType;
+	public static final field IO_ERROR Lorg/fdroid/repo/AddRepoError$ErrorType;
+	public static final field IS_ARCHIVE_REPO Lorg/fdroid/repo/AddRepoError$ErrorType;
+	public static final field UNKNOWN_SOURCES_DISALLOWED Lorg/fdroid/repo/AddRepoError$ErrorType;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Lorg/fdroid/repo/AddRepoError$ErrorType;
+	public static fun values ()[Lorg/fdroid/repo/AddRepoError$ErrorType;
+}
+
+public abstract class org/fdroid/repo/AddRepoState {
+}
+
+public final class org/fdroid/repo/Added : org/fdroid/repo/AddRepoState {
+	public fun <init> (Lorg/fdroid/database/Repository;Lorg/fdroid/index/IndexUpdateResult;)V
+	public final fun getRepo ()Lorg/fdroid/database/Repository;
+	public final fun getUpdateResult ()Lorg/fdroid/index/IndexUpdateResult;
+}
+
+public final class org/fdroid/repo/Adding : org/fdroid/repo/AddRepoState {
+	public static final field INSTANCE Lorg/fdroid/repo/Adding;
+}
+
+public abstract class org/fdroid/repo/FetchResult {
+}
+
+public final class org/fdroid/repo/FetchResult$IsExistingMirror : org/fdroid/repo/FetchResult {
+	public fun <init> (J)V
+	public final fun component1 ()J
+	public final fun copy (J)Lorg/fdroid/repo/FetchResult$IsExistingMirror;
+	public static synthetic fun copy$default (Lorg/fdroid/repo/FetchResult$IsExistingMirror;JILjava/lang/Object;)Lorg/fdroid/repo/FetchResult$IsExistingMirror;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getExistingRepoId ()J
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/repo/FetchResult$IsExistingRepository : org/fdroid/repo/FetchResult {
+	public fun <init> (J)V
+	public final fun component1 ()J
+	public final fun copy (J)Lorg/fdroid/repo/FetchResult$IsExistingRepository;
+	public static synthetic fun copy$default (Lorg/fdroid/repo/FetchResult$IsExistingRepository;JILjava/lang/Object;)Lorg/fdroid/repo/FetchResult$IsExistingRepository;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getExistingRepoId ()J
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/repo/FetchResult$IsNewMirror : org/fdroid/repo/FetchResult {
+	public fun <init> (J)V
+	public final fun copy (J)Lorg/fdroid/repo/FetchResult$IsNewMirror;
+	public static synthetic fun copy$default (Lorg/fdroid/repo/FetchResult$IsNewMirror;JILjava/lang/Object;)Lorg/fdroid/repo/FetchResult$IsNewMirror;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/repo/FetchResult$IsNewRepoAndNewMirror : org/fdroid/repo/FetchResult {
+	public static final field INSTANCE Lorg/fdroid/repo/FetchResult$IsNewRepoAndNewMirror;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/repo/FetchResult$IsNewRepository : org/fdroid/repo/FetchResult {
+	public static final field INSTANCE Lorg/fdroid/repo/FetchResult$IsNewRepository;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/repo/Fetching : org/fdroid/repo/AddRepoState {
+	public fun <init> (Ljava/lang/String;Lorg/fdroid/database/Repository;Ljava/util/List;Lorg/fdroid/repo/FetchResult;Ljava/io/File;)V
+	public synthetic fun <init> (Ljava/lang/String;Lorg/fdroid/database/Repository;Ljava/util/List;Lorg/fdroid/repo/FetchResult;Ljava/io/File;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getApps ()Ljava/util/List;
+	public final fun getDone ()Z
+	public final fun getFetchResult ()Lorg/fdroid/repo/FetchResult;
+	public final fun getFetchUrl ()Ljava/lang/String;
+	public final fun getIndexFile ()Ljava/io/File;
+	public final fun getReceivedRepo ()Lorg/fdroid/database/Repository;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class org/fdroid/repo/None : org/fdroid/repo/AddRepoState {
+	public static final field INSTANCE Lorg/fdroid/repo/None;
+}
+

From e4db44b2f9f8d21e852a480a0e5964e6d4f3a8b3 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 12 Dec 2025 15:52:19 -0300
Subject: [PATCH 132/180] Show repo update errors in the UI

---
 .../org/fdroid/repo/RepoUpdateManager.kt      | 47 +++--------
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  2 +-
 .../org/fdroid/ui/apps/InstalledAppRow.kt     | 19 ++---
 .../org/fdroid/ui/apps/UpdatableAppRow.kt     | 28 +++----
 .../kotlin/org/fdroid/ui/discover/Discover.kt | 20 +++--
 .../fdroid/ui/discover/DiscoverPresenter.kt   |  6 ++
 .../fdroid/ui/discover/DiscoverViewModel.kt   |  2 +-
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  | 25 +-----
 .../fdroid/ui/repositories/Repositories.kt    | 34 ++------
 .../fdroid/ui/repositories/RepositoryItem.kt  |  4 +
 .../fdroid/ui/repositories/RepositoryRow.kt   | 42 ++++++++--
 .../ui/repositories/details/RepoDetails.kt    |  7 +-
 .../repositories/details/RepoDetailsHeader.kt | 27 ++++++
 .../kotlin/org/fdroid/ui/utils/BadgeIcon.kt   | 82 +++++++++++++++++++
 .../org/fdroid/ui/utils/InstalledBadge.kt     | 48 -----------
 .../org/fdroid/ui/utils/PreviewUtils.kt       | 37 +++++++++
 next/src/main/res/values/strings-next.xml     |  2 +
 17 files changed, 254 insertions(+), 178 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
 delete mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/InstalledBadge.kt

diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index de8b5c154..3d3e46245 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -22,10 +22,8 @@ import org.fdroid.index.IndexUpdateListener
 import org.fdroid.index.IndexUpdateResult
 import org.fdroid.index.RepoManager
 import org.fdroid.index.RepoUpdater
-import org.fdroid.index.v1.IndexV1Updater
 import org.fdroid.settings.SettingsManager
 import org.fdroid.updates.UpdatesManager
-import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -99,15 +97,6 @@ class RepoUpdateManager(
         compatibilityChecker = compatibilityChecker,
         listener = indexUpdateListener,
     ),
-    private val indexV1Updater: IndexV1Updater? = if (false) {
-        IndexV1Updater(
-            database = db,
-            tempFileProvider = { File.createTempFile("dl-", "", context.cacheDir) },
-            downloaderFactory = downloaderFactory,
-            compatibilityChecker = compatibilityChecker,
-            listener = indexUpdateListener,
-        )
-    } else null,
 ) {
 
     @Inject
@@ -130,7 +119,6 @@ class RepoUpdateManager(
     )
 
     private val log = KotlinLogging.logger { }
-    private val isUpdateNotificationEnabled = true
     private val _isUpdating = MutableStateFlow(false)
     val isUpdating = _isUpdating.asStateFlow()
 
@@ -163,7 +151,6 @@ class RepoUpdateManager(
         try {
             currentCoroutineContext().ensureActive()
             var reposUpdated = false
-            val repoErrors = mutableListOf<Pair<Repository, Exception>>()
             // always get repos fresh from DB, because
             // * when an update is requested early at app start,
             //   the repos above might not be available, yet
@@ -174,23 +161,17 @@ class RepoUpdateManager(
                 currentCoroutineContext().ensureActive()
 
                 // show notification
-                if (isUpdateNotificationEnabled) {
-                    val msg = context.getString(R.string.status_connecting_to_repo, repo.address)
-                    notificationManager.showUpdateRepoNotification(msg, throttle = false)
-                }
-
-                // indexV1Updater only gets used directly if forceIndexV1 was true
-                val result = indexV1Updater?.update(repo) ?: repoUpdater.update(repo)
-
+                val msg = context.getString(R.string.status_connecting_to_repo, repo.address)
+                notificationManager.showUpdateRepoNotification(msg, throttle = false)
+                // update repo
+                val result = repoUpdater.update(repo)
                 if (result is IndexUpdateResult.Processed) reposUpdated = true
                 else if (result is IndexUpdateResult.Error) {
-                    Log.e(TAG, "Error updating repository ${repo.address}", result.e)
-                    repoErrors.add(Pair(repo, result.e))
+                    log.error(result.e) { "Error updating repository ${repo.address} " }
                 }
             }
             db.getRepositoryDao().walCheckpoint()
             settingsManager.lastRepoUpdate = System.currentTimeMillis()
-            if (repoErrors.isNotEmpty()) showRepoErrors(repoErrors)
             if (reposUpdated) {
                 updatesManager.loadUpdates().join()
                 val numUpdates = updatesManager.numUpdates.value
@@ -213,15 +194,14 @@ class RepoUpdateManager(
         _isUpdating.value = true
         return try {
             // show notification
-            if (isUpdateNotificationEnabled) {
-                val msg = context.getString(R.string.status_connecting_to_repo, repo.address)
-                notificationManager.showUpdateRepoNotification(msg, throttle = false)
-            }
-
-            // indexV1Updater only gets used directly if forceIndexV1 was true
-            val result = indexV1Updater?.update(repo) ?: repoUpdater.update(repo)
+            val msg = context.getString(R.string.status_connecting_to_repo, repo.address)
+            notificationManager.showUpdateRepoNotification(msg, throttle = false)
+            // update repo
+            val result = repoUpdater.update(repo)
             if (result is IndexUpdateResult.Processed) {
                 updatesManager.loadUpdates()
+            } else if (result is IndexUpdateResult.Error) {
+                log.error(result.e) { "Error updating ${repo.address}: " }
             }
             result
         } finally {
@@ -230,9 +210,4 @@ class RepoUpdateManager(
             db.getRepositoryDao().walCheckpoint()
         }
     }
-
-    private fun showRepoErrors(repoErrors: List<Pair<Repository, Exception>>) {
-        // TODO
-    }
-
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index edda6590e..52b1554c0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -88,7 +88,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
         ) {
             val viewModel = hiltViewModel<DiscoverViewModel>()
             val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
-            val hasIssues = viewModel.hasIssues.collectAsState(false).value
+            val hasIssues = viewModel.hasAppIssues.collectAsState(false).value
             Discover(
                 discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
                 onListTap = {
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
index f0a591c54..2f34bca2f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
@@ -1,21 +1,16 @@
 package org.fdroid.ui.apps
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Error
 import androidx.compose.material3.BadgedBox
-import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -26,6 +21,7 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.BadgeIcon
 import org.fdroid.ui.utils.Names
 
 @Composable
@@ -39,16 +35,11 @@ fun InstalledAppRow(
         ListItem(
             leadingContent = {
                 BadgedBox(badge = {
-                    if (hasIssue) Icon(
-                        imageVector = Icons.Filled.Error,
-                        tint = MaterialTheme.colorScheme.error,
+                    if (hasIssue) BadgeIcon(
+                        icon = Icons.Filled.Error,
+                        color = MaterialTheme.colorScheme.error,
                         contentDescription =
-                            stringResource(R.string.my_apps_header_apps_with_issue),
-                        modifier = Modifier
-                            .clip(CircleShape)
-                            .background(MaterialTheme.colorScheme.surface)
-                            .padding(1.dp)
-                            .size(24.dp)
+                        stringResource(R.string.my_apps_header_apps_with_issue),
                     )
                 }) {
                     AsyncShimmerImage(
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index 84c17fe3e..b84837b04 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -2,17 +2,14 @@ package org.fdroid.ui.apps
 
 import android.text.format.Formatter
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.NewReleases
 import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.Card
-import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
@@ -24,7 +21,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -38,6 +34,7 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.BadgeIcon
 import org.fdroid.ui.utils.ExpandIconArrow
 import org.fdroid.ui.utils.getPreviewVersion
 
@@ -51,19 +48,16 @@ fun UpdatableAppRow(
     Column(modifier = modifier) {
         ListItem(
             leadingContent = {
-                BadgedBox(badge = {
-                    Icon(
-                        imageVector = Icons.Filled.NewReleases,
-                        tint = MaterialTheme.colorScheme.secondary,
-                        contentDescription =
-                        stringResource(R.string.notification_title_single_update_available),
-                        modifier = Modifier
-                            .clip(CircleShape)
-                            .background(MaterialTheme.colorScheme.surface)
-                            .padding(1.dp)
-                            .size(24.dp)
-                    )
-                }) {
+                BadgedBox(
+                    badge = {
+                        BadgeIcon(
+                            icon = Icons.Filled.NewReleases,
+                            color = MaterialTheme.colorScheme.secondary,
+                            contentDescription =
+                            stringResource(R.string.notification_title_single_update_available),
+                        )
+                    },
+                ) {
                     AsyncShimmerImage(
                         model = app.iconModel,
                         error = painterResource(R.drawable.ic_repo_app_default),
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 dc896926c..cb26c5cd5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -10,6 +10,8 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material3.Badge
+import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
@@ -74,11 +76,19 @@ fun Discover(
                 },
                 actions = {
                     topBarMenuItems.forEach { dest ->
-                        IconButton(onClick = { onNav(dest.id) }) {
-                            Icon(
-                                imageVector = dest.icon,
-                                contentDescription = stringResource(dest.label),
-                            )
+                        BadgedBox(badge = {
+                            val hasRepoIssues =
+                                (discoverModel as? LoadedDiscoverModel)?.hasRepoIssues == true
+                            if (dest.id == NavigationKey.Repos && hasRepoIssues) Badge {
+                                Text("")
+                            }
+                        }) {
+                            IconButton(onClick = { onNav(dest.id) }) {
+                                Icon(
+                                    imageVector = dest.icon,
+                                    contentDescription = stringResource(dest.label),
+                                )
+                            }
                         }
                     }
                     var menuExpanded by remember { mutableStateOf(false) }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 75c8cc9f4..275b855ac 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
 import org.fdroid.database.Repository
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
 import org.fdroid.ui.categories.CategoryGroup
@@ -42,12 +43,16 @@ fun DiscoverPresenter(
             LoadingDiscoverModel(isFirstStart)
         }
     } else {
+        val hasRepoIssues = repositoriesFlow.map { repos ->
+            repos.any { it.errorCount >= 5 }
+        }.collectAsState(false).value
         LoadedDiscoverModel(
             newApps = newApps ?: emptyList(),
             recentlyUpdatedApps = recentlyUpdatedApps,
             mostDownloadedApps = mostDownloadedApps,
             categories = categories?.groupBy { it.group },
             searchResults = searchResults,
+            hasRepoIssues = hasRepoIssues,
         )
     }
 }
@@ -61,4 +66,5 @@ data class LoadedDiscoverModel(
     val mostDownloadedApps: List<AppDiscoverItem>?,
     val categories: Map<CategoryGroup, List<CategoryItem>>?,
     val searchResults: SearchResults? = null,
+    val hasRepoIssues: Boolean,
 ) : DiscoverModel()
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 79e3bfc01..9391eaf1e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -61,7 +61,7 @@ class DiscoverViewModel @Inject constructor(
     private val collator = Collator.getInstance(Locale.getDefault())
 
     val numUpdates = updatesManager.numUpdates
-    val hasIssues = updatesManager.appsWithIssues.map { !it.isNullOrEmpty() }
+    val hasAppIssues = updatesManager.appsWithIssues.map { !it.isNullOrEmpty() }
     private val newApps = db.getAppDao().getNewAppsFlow().map { list ->
         val proxyConfig = settingsManager.proxyConfig
         list.mapNotNull {
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index 8a12047a0..33aed1b46 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -42,9 +42,9 @@ import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.icons.PackageVariant
-import org.fdroid.ui.repositories.RepositoryItem
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.getAppListInfo
+import org.fdroid.ui.utils.repoItems
 import kotlin.random.Random
 
 @Composable
@@ -254,28 +254,7 @@ private fun Preview() {
                 CategoryItem("doesn't exist", "Foo bar"),
             ),
             filteredCategoryIds = setOf("Browser"),
-            repositories = listOf(
-                RepositoryItem(
-                    repoId = 1,
-                    address = "http://example.org",
-                    name = "F-Droid",
-                    icon = null,
-                    timestamp = 42,
-                    lastUpdated = null,
-                    weight = 1,
-                    enabled = true,
-                ),
-                RepositoryItem(
-                    repoId = 2,
-                    address = "http://example.org",
-                    name = "Guardian Project Repository",
-                    icon = null,
-                    timestamp = 42,
-                    lastUpdated = null,
-                    weight = 2,
-                    enabled = true,
-                ),
-            ),
+            repositories = repoItems,
             filteredRepositoryIds = setOf(2),
         )
         val info = getAppListInfo(model)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index 4b0e6c775..f97b47b65 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.viktormykhailiv.compose.hints.HintHost
 import com.viktormykhailiv.compose.hints.rememberHint
 import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
@@ -40,6 +41,7 @@ import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.OnboardingCard
 import org.fdroid.ui.utils.getHintOverlayColor
 import org.fdroid.ui.utils.getRepositoriesInfo
+import org.fdroid.ui.utils.repoItems
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@@ -151,30 +153,12 @@ fun RepositoriesScaffoldLoadingPreview() {
     uiMode = UI_MODE_NIGHT_YES or UI_MODE_TYPE_NORMAL,
 )
 @Composable
-fun RepositoriesScaffoldPreview() {
-    FDroidContent {
-        val repos = listOf(
-            RepositoryItem(
-                repoId = 1,
-                address = "http://example.org",
-                timestamp = System.currentTimeMillis(),
-                lastUpdated = null,
-                weight = 1,
-                enabled = true,
-                name = "My first repository",
-            ),
-            RepositoryItem(
-                repoId = 2,
-                address = "http://example.com",
-                timestamp = System.currentTimeMillis(),
-                lastUpdated = null,
-                weight = 2,
-                enabled = false,
-                name = "My second repository",
-            ),
-        )
-        val model = RepositoryModel(repos, false, "42min. ago")
-        val info = getRepositoriesInfo(model, repos[0].repoId)
-        Repositories(info) { }
+private fun RepositoriesScaffoldPreview() {
+    HintHost {
+        FDroidContent {
+            val model = RepositoryModel(repoItems, false, "42min. ago")
+            val info = getRepositoriesInfo(model, repoItems[0].repoId)
+            Repositories(info) { }
+        }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
index 95178cab7..0f5bdc50b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
@@ -14,6 +14,7 @@ data class RepositoryItem(
     val lastUpdated: Long?,
     val weight: Int,
     val enabled: Boolean,
+    private val errorCount: Int,
 ) {
     constructor(repo: Repository, localeList: LocaleListCompat, proxy: ProxyConfig?) : this(
         repoId = repo.repoId,
@@ -24,5 +25,8 @@ data class RepositoryItem(
         lastUpdated = repo.lastUpdated,
         weight = repo.weight,
         enabled = repo.enabled,
+        errorCount = repo.errorCount,
     )
+
+    val hasIssue: Boolean = errorCount >= 3
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
index 57729e1c4..2a6da87fe 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
@@ -1,6 +1,10 @@
 package org.fdroid.ui.repositories
 
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
@@ -9,10 +13,14 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
+import org.fdroid.ui.utils.BadgeIcon
 import org.fdroid.ui.utils.asRelativeTimeString
+import org.fdroid.ui.utils.repoItems
 
 @Composable
 fun RepositoryRow(
@@ -23,17 +31,27 @@ fun RepositoryRow(
 ) {
     ListItem(
         leadingContent = {
-            AsyncShimmerImage(
-                model = repoItem.icon,
-                contentDescription = null,
-                modifier = Modifier.size(48.dp)
-            )
+            BadgedBox(
+                badge = {
+                    if (repoItem.hasIssue) BadgeIcon(
+                        icon = Icons.Filled.Error,
+                        color = MaterialTheme.colorScheme.error,
+                        contentDescription = stringResource(R.string.repo_has_update_error),
+                    )
+                },
+            ) {
+                AsyncShimmerImage(
+                    model = repoItem.icon,
+                    contentDescription = null,
+                    modifier = Modifier.size(48.dp)
+                )
+            }
         },
         headlineContent = {
             Text(repoItem.name)
         },
         supportingContent = {
-            val lastUpdated = if (repoItem.lastUpdated == null || repoItem.lastUpdated <= 0) {
+            val lastUpdated = if (repoItem.timestamp <= 0) {
                 stringResource(R.string.repositories_last_update_never)
             } else {
                 repoItem.timestamp.asRelativeTimeString()
@@ -53,3 +71,15 @@ fun RepositoryRow(
         modifier = modifier,
     )
 }
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        Column {
+            RepositoryRow(repoItems[0], false, {})
+            RepositoryRow(repoItems[1], true, {})
+            RepositoryRow(repoItems[2].copy(timestamp = 0), false, {})
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index d8a7b97e7..e2ce9c315 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.viktormykhailiv.compose.hints.HintHost
 import com.viktormykhailiv.compose.hints.rememberHint
 import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
@@ -167,7 +168,9 @@ fun RepoDetails(
 @Preview
 @Composable
 fun RepoDetailsScreenPreview() {
-    FDroidContent {
-        RepoDetails(getRepoDetailsInfo(), { _, _ -> }, {})
+    HintHost {
+        FDroidContent {
+            RepoDetails(getRepoDetailsInfo(), { _, _ -> }, {})
+        }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
index 5d6f97153..22155f99d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
@@ -8,11 +8,17 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.WarningAmber
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
@@ -94,6 +100,27 @@ fun RepoDetailsHeader(
                 )
             }
         }
+        if (repo.lastError != null) ElevatedCard(
+            colors = CardDefaults.elevatedCardColors(
+                containerColor = MaterialTheme.colorScheme.errorContainer,
+            ),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 8.dp),
+        ) {
+            Row(
+                horizontalArrangement = spacedBy(16.dp),
+                verticalAlignment = CenterVertically,
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            ) {
+                Icon(Icons.Default.WarningAmber, null)
+                Text(
+                    text = stringResource(R.string.repo_has_update_error_intro) +
+                        "\n\n${repo.lastError}",
+                    style = MaterialTheme.typography.bodyLarge
+                )
+            }
+        }
         if (repo.enabled) FDroidOutlineButton(
             stringResource(R.string.repo_num_apps_button),
             onClick = { onShowAppsClicked(name, repo.repoId) },
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt b/next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
new file mode 100644
index 000000000..526464087
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
@@ -0,0 +1,82 @@
+package org.fdroid.ui.utils
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.SecurityUpdate
+import androidx.compose.material3.BadgedBox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.fdroid.ui.theme.FDroidContent
+
+@Composable
+fun BadgeIcon(
+    icon: ImageVector,
+    contentDescription: String,
+    color: Color = MaterialTheme.colorScheme.error
+) = Icon(
+    imageVector = icon,
+    tint = color,
+    contentDescription = contentDescription,
+    modifier = Modifier
+        .clip(CircleShape)
+        .background(MaterialTheme.colorScheme.surface)
+        .padding(1.dp)
+        .size(24.dp)
+)
+
+@Composable
+fun InstalledBadge() = BadgeIcon(
+    icon = Icons.Filled.CheckCircle,
+    contentDescription = stringResource(R.string.app_installed),
+    color = MaterialTheme.colorScheme.secondary,
+)
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        Column {
+            BadgedBox(badge = {
+                BadgeIcon(
+                    icon = Icons.Filled.SecurityUpdate,
+                    contentDescription = stringResource(R.string.app_installed),
+                    color = MaterialTheme.colorScheme.error
+                )
+            }, modifier = Modifier.padding(16.dp)) {
+                Image(
+                    painter = painterResource(R.drawable.ic_launcher),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .size(48.dp),
+                )
+            }
+            BadgedBox(
+                badge = { InstalledBadge() },
+                modifier = Modifier.padding(16.dp)
+            ) {
+                Image(
+                    painter = painterResource(R.drawable.ic_launcher),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .size(48.dp),
+                )
+            }
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/InstalledBadge.kt b/next/src/main/kotlin/org/fdroid/ui/utils/InstalledBadge.kt
deleted file mode 100644
index 0cd9dbfea..000000000
--- a/next/src/main/kotlin/org/fdroid/ui/utils/InstalledBadge.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.fdroid.ui.utils
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.CheckCircle
-import androidx.compose.material3.BadgedBox
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
-
-@Composable
-fun InstalledBadge() = Icon(
-    imageVector = Icons.Filled.CheckCircle,
-    tint = MaterialTheme.colorScheme.secondary,
-    contentDescription = stringResource(R.string.app_installed),
-    modifier = Modifier
-        .clip(CircleShape)
-        .background(MaterialTheme.colorScheme.surface)
-        .padding(1.dp)
-        .size(24.dp)
-)
-
-@Preview
-@Composable
-private fun Preview() {
-    FDroidContent {
-        BadgedBox(badge = { InstalledBadge() }, modifier = Modifier.padding(16.dp)) {
-            Image(
-                painter = painterResource(R.drawable.ic_launcher),
-                contentDescription = null,
-                modifier = Modifier
-                    .size(48.dp),
-            )
-        }
-    }
-}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index da5c83e28..d596f7a1b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -348,6 +348,42 @@ internal val myAppsModel = MyAppsModel(
     sortOrder = AppListSortOrder.NAME,
 )
 
+val repoItems = listOf(
+    RepositoryItem(
+        repoId = 1,
+        address = "http://example.org",
+        name = "F-Droid",
+        icon = null,
+        timestamp = System.currentTimeMillis() - 1_111_111,
+        lastUpdated = System.currentTimeMillis() - 9_999_999,
+        weight = 1,
+        enabled = true,
+        errorCount = 0,
+    ),
+    RepositoryItem(
+        repoId = 2,
+        address = "http://example.org",
+        name = "Guardian Project Repository",
+        icon = null,
+        timestamp = System.currentTimeMillis() - 9_999_999,
+        lastUpdated = System.currentTimeMillis() - 99_999_999,
+        weight = 2,
+        enabled = true,
+        errorCount = 3,
+    ),
+    RepositoryItem(
+        repoId = 3,
+        address = "http://example.net",
+        name = "My first Repo",
+        icon = null,
+        timestamp = System.currentTimeMillis() - 888_888,
+        lastUpdated = System.currentTimeMillis(),
+        weight = 3,
+        enabled = true,
+        errorCount = 1,
+    ),
+)
+
 fun getRepositoriesInfo(
     model: RepositoryModel,
     currentRepositoryId: Long? = null,
@@ -409,4 +445,5 @@ fun getRepository(address: String = "https://example.org/repo") = Repository(
     lastUpdated = 1337,
     username = "foo",
     password = "bar",
+    lastError = "NotFoundException FooBar technical blabla"
 )
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index caa83db2d..cac44bf44 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -116,6 +116,8 @@
     <string name="clear">Clear</string>
     <string name="error">Error</string>
     <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
+    <string name="repo_has_update_error">Had errors updating</string>
+    <string name="repo_has_update_error_intro">An error occurred while trying to update this repository:</string>
     <string name="repo_last_update_upstream">Last update: %s</string>
     <string name="repo_basicauth_username">Username</string>
     <string name="repo_basicauth_password">Password</string>

From dfa6807c668d29c6c4617125090e50a33d7bff77 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 12 Dec 2025 16:31:19 -0300
Subject: [PATCH 133/180] Add new categories

---
 .../org/fdroid/ui/categories/CategoryGroup.kt |  1 +
 .../org/fdroid/ui/categories/CategoryItem.kt  | 35 +++++++++++++++++--
 next/src/main/res/values/strings-next.xml     |  3 +-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
index d0078a622..1a9b49d6c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
@@ -16,6 +16,7 @@ object CategoryGroups {
     val media = CategoryGroup("media", R.string.category_group_media)
     val communication = CategoryGroup("communication", R.string.category_group_communication)
     val device = CategoryGroup("device", R.string.category_group_device)
+    val network = CategoryGroup("network", R.string.category_group_network)
     val storage = CategoryGroup("storage", R.string.category_group_storage)
     val interests = CategoryGroup("interests", R.string.category_group_interests)
     val misc = CategoryGroup("misc", R.string.category_group_misc)
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
index 2829250d1..51d3ef0a3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
@@ -7,12 +7,17 @@ import androidx.compose.material.icons.automirrored.filled.Message
 import androidx.compose.material.icons.filled.AccessTime
 import androidx.compose.material.icons.filled.AccountBalanceWallet
 import androidx.compose.material.icons.filled.Airplay
+import androidx.compose.material.icons.filled.AllInbox
 import androidx.compose.material.icons.filled.AlternateEmail
+import androidx.compose.material.icons.filled.AppBlocking
+import androidx.compose.material.icons.filled.Apps
+import androidx.compose.material.icons.filled.BatteryChargingFull
 import androidx.compose.material.icons.filled.Bookmarks
 import androidx.compose.material.icons.filled.Brush
 import androidx.compose.material.icons.filled.Calculate
 import androidx.compose.material.icons.filled.CalendarMonth
 import androidx.compose.material.icons.filled.Category
+import androidx.compose.material.icons.filled.Church
 import androidx.compose.material.icons.filled.Cloud
 import androidx.compose.material.icons.filled.Collections
 import androidx.compose.material.icons.filled.CurrencyExchange
@@ -23,6 +28,7 @@ import androidx.compose.material.icons.filled.Draw
 import androidx.compose.material.icons.filled.EditNote
 import androidx.compose.material.icons.filled.EnhancedEncryption
 import androidx.compose.material.icons.filled.FitnessCenter
+import androidx.compose.material.icons.filled.FlashlightOn
 import androidx.compose.material.icons.filled.Games
 import androidx.compose.material.icons.filled.Groups
 import androidx.compose.material.icons.filled.HealthAndSafety
@@ -35,7 +41,9 @@ import androidx.compose.material.icons.filled.MonetizationOn
 import androidx.compose.material.icons.filled.Money
 import androidx.compose.material.icons.filled.MusicNote
 import androidx.compose.material.icons.filled.MusicVideo
+import androidx.compose.material.icons.filled.MyLocation
 import androidx.compose.material.icons.filled.Navigation
+import androidx.compose.material.icons.filled.NetworkCheck
 import androidx.compose.material.icons.filled.Newspaper
 import androidx.compose.material.icons.filled.NoteAlt
 import androidx.compose.material.icons.filled.OpenInBrowser
@@ -56,6 +64,7 @@ import androidx.compose.material.icons.filled.TrackChanges
 import androidx.compose.material.icons.filled.Translate
 import androidx.compose.material.icons.filled.UploadFile
 import androidx.compose.material.icons.filled.VideoChat
+import androidx.compose.material.icons.filled.VoiceChat
 import androidx.compose.material.icons.filled.VpnLock
 import androidx.compose.material.icons.filled.Wallet
 import androidx.compose.material.icons.filled.Wallpaper
@@ -65,11 +74,15 @@ import androidx.compose.ui.graphics.vector.ImageVector
 data class CategoryItem(val id: String, val name: String) {
     val imageVector: ImageVector
         get() = when (id) {
+            "AI Chat" -> Icons.Default.VoiceChat
+            "App Manager" -> Icons.Default.Apps
             "App Store & Updater" -> Icons.Default.Storefront
+            "Battery" -> Icons.Default.BatteryChargingFull
             "Bookmark" -> Icons.Default.Bookmarks
             "Browser" -> Icons.Default.OpenInBrowser
             "Calculator" -> Icons.Default.Calculate
             "Calendar & Agenda" -> Icons.Default.CalendarMonth
+            "Clock" -> Icons.Default.AccessTime
             "Cloud Storage & File Sync" -> Icons.Default.Cloud
             "Connectivity" -> Icons.Default.SignalCellularAlt
             "Development" -> Icons.Default.DeveloperMode
@@ -80,6 +93,8 @@ data class CategoryItem(val id: String, val name: String) {
             "File Encryption & Vault" -> Icons.Default.EnhancedEncryption
             "File Transfer" -> Icons.Default.UploadFile
             "Finance Manager" -> Icons.Default.MonetizationOn
+            "Firewall" -> Icons.Default.AppBlocking
+            "Flashlight" -> Icons.Default.FlashlightOn
             "Forum" -> Icons.Default.Image
             "Gallery" -> Icons.Default.PhotoSizeSelectActual
             "Games" -> Icons.Default.Games
@@ -87,14 +102,17 @@ data class CategoryItem(val id: String, val name: String) {
             "Habit Tracker" -> Icons.Default.TrackChanges
             "Icon Pack" -> Icons.Default.Collections
             "Internet" -> Icons.Default.Language
+            "Inventory" -> Icons.Default.AllInbox
             "Keyboard & IME" -> Icons.Default.Keyboard
             "Launcher" -> Icons.Default.Home
             "Local Media Player" -> Icons.Default.LocalPlay
+            "Location Tracker & Sharer" -> Icons.Default.MyLocation
             "Messaging" -> AutoMirrored.Default.Message
             "Money" -> Icons.Default.Money
             "Multimedia" -> Icons.Default.MusicVideo
             "Music Practice Tool" -> Icons.Default.MusicNote
             "Navigation" -> Icons.Default.Navigation
+            "Network Analyzer" -> Icons.Default.NetworkCheck
             "News" -> Icons.Default.Newspaper
             "Note" -> Icons.Default.NoteAlt
             "Online Media Player" -> Icons.Default.Airplay
@@ -105,6 +123,7 @@ data class CategoryItem(val id: String, val name: String) {
             "Public Transport" -> Icons.Default.DirectionsBus
             "Reading" -> AutoMirrored.Default.MenuBook
             "Recipe Manager" -> Icons.Default.RestaurantMenu
+            "Religion" -> Icons.Default.Church
             "Science & Education" -> Icons.Default.Science
             "Security" -> Icons.Default.Security
             "Shopping List" -> Icons.Default.ShoppingCart
@@ -128,21 +147,27 @@ data class CategoryItem(val id: String, val name: String) {
         }
     val group: CategoryGroup
         get() = when (id) {
+            "AI Chat" -> CategoryGroups.tools
+            "App Manager" -> CategoryGroups.device
             "App Store & Updater" -> CategoryGroups.device
+            "Battery" -> CategoryGroups.device
             "Bookmark" -> CategoryGroups.storage
             "Browser" -> CategoryGroups.productivity
             "Calculator" -> CategoryGroups.tools
             "Calendar & Agenda" -> CategoryGroups.productivity
+            "Clock" -> CategoryGroups.productivity
             "Cloud Storage & File Sync" -> CategoryGroups.storage
-            "Connectivity" -> CategoryGroups.device
+            "Connectivity" -> CategoryGroups.network
             "Development" -> CategoryGroups.interests
-            "DNS & Hosts" -> CategoryGroups.device
+            "DNS & Hosts" -> CategoryGroups.network
             "Draw" -> CategoryGroups.interests
             "Ebook Reader" -> CategoryGroups.media
             "Email" -> CategoryGroups.communication
             "File Encryption & Vault" -> CategoryGroups.storage
             "File Transfer" -> CategoryGroups.storage
             "Finance Manager" -> CategoryGroups.wallets
+            "Firewall" -> CategoryGroups.device
+            "Flashlight" -> CategoryGroups.tools
             "Forum" -> CategoryGroups.communication
             "Gallery" -> CategoryGroups.storage
             "Games" -> CategoryGroups.media
@@ -150,14 +175,17 @@ data class CategoryItem(val id: String, val name: String) {
             "Habit Tracker" -> CategoryGroups.productivity
             "Icon Pack" -> CategoryGroups.device
             "Internet" -> CategoryGroups.productivity
+            "Inventory" -> CategoryGroups.tools
             "Keyboard & IME" -> CategoryGroups.device
             "Launcher" -> CategoryGroups.device
             "Local Media Player" -> CategoryGroups.media
+            "Location Tracker & Sharer" -> CategoryGroups.tools
             "Messaging" -> CategoryGroups.communication
             "Money" -> CategoryGroups.wallets
             "Multimedia" -> CategoryGroups.media
             "Music Practice Tool" -> CategoryGroups.interests
             "Navigation" -> CategoryGroups.tools
+            "Network Analyzer" -> CategoryGroups.tools
             "News" -> CategoryGroups.interests
             "Note" -> CategoryGroups.storage
             "Online Media Player" -> CategoryGroups.media
@@ -168,6 +196,7 @@ data class CategoryItem(val id: String, val name: String) {
             "Public Transport" -> CategoryGroups.tools
             "Reading" -> CategoryGroups.media
             "Recipe Manager" -> CategoryGroups.interests
+            "Religion" -> CategoryGroups.interests
             "Science & Education" -> CategoryGroups.interests
             "Security" -> CategoryGroups.device
             "Shopping List" -> CategoryGroups.tools
@@ -181,7 +210,7 @@ data class CategoryItem(val id: String, val name: String) {
             "Translation & Dictionary" -> CategoryGroups.tools
             "Voice & Video Chat" -> CategoryGroups.communication
             "Unit Convertor" -> CategoryGroups.tools
-            "VPN & Proxy" -> CategoryGroups.device
+            "VPN & Proxy" -> CategoryGroups.network
             "Wallet" -> CategoryGroups.wallets
             "Wallpaper" -> CategoryGroups.device
             "Weather" -> CategoryGroups.tools
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index cac44bf44..466fffbae 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -43,10 +43,11 @@
 
     <string name="category_group_productivity">Productivity</string>
     <string name="category_group_tools">Tools</string>
-    <string name="category_group_wallets">Digital Wallets</string>
+    <string name="category_group_wallets">Finances &amp; Wallets</string>
     <string name="category_group_media">Entertainment &amp; Media</string>
     <string name="category_group_communication">Communication</string>
     <string name="category_group_device">Device</string>
+    <string name="category_group_network">Network</string>
     <string name="category_group_storage">Files &amp; Storage</string>
     <string name="category_group_interests">Interests</string>
     <string name="category_group_misc">Miscellaneous</string>

From 61fb334a346bca839b585ca4424e42dc48f4f290 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 12 Dec 2025 13:49:31 -0300
Subject: [PATCH 134/180] Add debugging statements and clean up ForegroundInfo

---
 .../kotlin/org/fdroid/NotificationManager.kt   |  2 ++
 .../org/fdroid/install/AppInstallManager.kt    |  1 +
 .../org/fdroid/install/AppInstallService.kt    |  5 +++--
 .../kotlin/org/fdroid/repo/RepoUpdateWorker.kt | 18 +++++++++---------
 .../org/fdroid/updates/AppUpdateWorker.kt      | 18 ++++++------------
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
index cbfce6aef..b960f2c91 100644
--- a/next/src/main/kotlin/org/fdroid/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -131,6 +131,7 @@ class NotificationManager @Inject constructor(
         // TODO we may need some throttling when many apps download at the same time
         val n = getAppInstallNotification(installNotificationState).build()
         if (checkSelfPermission(context, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
+            log.debug { "Show app install notification" }
             nm.notify(NOTIFICATION_ID_APP_INSTALLS, n)
         }
     }
@@ -153,6 +154,7 @@ class NotificationManager @Inject constructor(
     }
 
     fun cancelAppInstallNotification() {
+        log.debug { "Cancel app install notification" }
         nm.cancel(NOTIFICATION_ID_APP_INSTALLS)
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index 0f564b952..2f760d9f6 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -318,6 +318,7 @@ class AppInstallManager @Inject constructor(
         }
         val result =
             sessionInstallManager.install(sessionId, version.packageName, newState, file)
+        log.debug { "Install result: $result" }
         return if (result is InstallState.PreApproved &&
             result.result is PreApprovalResult.Error
         ) {
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt b/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
index f9520bacf..34404d01d 100644
--- a/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
+++ b/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
@@ -9,6 +9,7 @@ import androidx.core.app.ServiceCompat
 import dagger.hilt.android.AndroidEntryPoint
 import mu.KotlinLogging
 import org.fdroid.NotificationManager
+import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_APP_INSTALLS
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -40,9 +41,9 @@ class AppInstallService : Service() {
         try {
             ServiceCompat.startForeground(
                 this,
-                NotificationManager.NOTIFICATION_ID_APP_INSTALLS,
+                NOTIFICATION_ID_APP_INSTALLS,
                 notificationManager.getAppInstallNotification(notificationState).build(),
-                if (SDK_INT >= 30) FOREGROUND_SERVICE_TYPE_MANIFEST else 0,
+                if (SDK_INT >= 29) FOREGROUND_SERVICE_TYPE_MANIFEST else 0,
             )
         } catch (e: Exception) {
             log.error(e) { "Error starting foreground service: " }
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
index 7ee9165be..13837e7a5 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
@@ -1,7 +1,7 @@
 package org.fdroid.repo
 
 import android.content.Context
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
 import android.os.Build.VERSION.SDK_INT
 import android.util.Log
 import androidx.annotation.UiThread
@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.map
 import mu.KotlinLogging
 import org.fdroid.NotificationManager
 import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_REPO_UPDATE
+import org.fdroid.ui.utils.canStartForegroundService
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeUnit.MINUTES
 
@@ -112,9 +113,9 @@ class RepoUpdateWorker @AssistedInject constructor(
             }
         }
         try {
-            setForeground(getForegroundInfo())
+            if (canStartForegroundService(applicationContext)) setForeground(getForegroundInfo())
         } catch (e: Exception) {
-            log.error(e) { "Error while running setForeground" }
+            log.error(e) { "Error while running setForeground: " }
         }
         val repoId = inputData.getLong("repoId", -1)
         return try {
@@ -139,11 +140,10 @@ class RepoUpdateWorker @AssistedInject constructor(
     }
 
     override suspend fun getForegroundInfo(): ForegroundInfo {
-        val n = nm.getRepoUpdateNotification().build()
-        return if (SDK_INT >= 29) {
-            ForegroundInfo(NOTIFICATION_ID_REPO_UPDATE, n, FOREGROUND_SERVICE_TYPE_DATA_SYNC)
-        } else {
-            ForegroundInfo(NOTIFICATION_ID_REPO_UPDATE, n)
-        }
+        return ForegroundInfo(
+            NOTIFICATION_ID_REPO_UPDATE,
+            nm.getRepoUpdateNotification().build(),
+            if (SDK_INT >= 29) FOREGROUND_SERVICE_TYPE_MANIFEST else 0
+        )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
index dd10d987b..8d4c362a0 100644
--- a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
@@ -1,7 +1,7 @@
 package org.fdroid.updates
 
 import android.content.Context
-import android.content.pm.ServiceInfo
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
 import android.os.Build.VERSION.SDK_INT
 import android.util.Log
 import androidx.annotation.VisibleForTesting
@@ -25,7 +25,6 @@ import kotlinx.coroutines.joinAll
 import mu.KotlinLogging
 import org.fdroid.NotificationManager
 import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_APP_INSTALLS
-import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_REPO_UPDATE
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallNotificationState
 import org.fdroid.ui.utils.canStartForegroundService
@@ -129,15 +128,10 @@ class AppUpdateWorker @AssistedInject constructor(
     }
 
     override suspend fun getForegroundInfo(): ForegroundInfo {
-        val n = nm.getAppInstallNotification(InstallNotificationState()).build()
-        return if (SDK_INT >= 29) {
-            ForegroundInfo(
-                NOTIFICATION_ID_APP_INSTALLS,
-                n,
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
-            )
-        } else {
-            ForegroundInfo(NOTIFICATION_ID_REPO_UPDATE, n)
-        }
+        return ForegroundInfo(
+            NOTIFICATION_ID_APP_INSTALLS,
+            nm.getAppInstallNotification(InstallNotificationState()).build(),
+            if (SDK_INT >= 29) FOREGROUND_SERVICE_TYPE_MANIFEST else 0
+        )
     }
 }

From b5cc123dff37bddc579f7dd759a2ee9da62f8a3a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 15 Dec 2025 11:06:36 -0300
Subject: [PATCH 135/180] Support dynamic colors, but keep brand colors as
 default

---
 .../main/kotlin/org/fdroid/MainActivity.kt    |  12 +-
 .../org/fdroid/fdroid/ui/theme/Theme.kt       |   1 -
 .../org/fdroid/settings/SettingsConstants.kt  |   3 +
 .../org/fdroid/settings/SettingsManager.kt    |   6 +
 next/src/main/kotlin/org/fdroid/ui/About.kt   |   1 -
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   6 +-
 next/src/main/kotlin/org/fdroid/ui/Theme.kt   | 184 ++++++++++++++++++
 .../org/fdroid/ui/apps/InstalledAppRow.kt     |   2 +-
 .../org/fdroid/ui/apps/InstallingAppRow.kt    |   2 +-
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |   2 +-
 .../kotlin/org/fdroid/ui/apps/MyAppsList.kt   |   2 +-
 .../org/fdroid/ui/apps/NotAvailableDialog.kt  |   2 +-
 .../org/fdroid/ui/apps/UpdatableAppRow.kt     |   2 +-
 .../org/fdroid/ui/categories/CategoryChip.kt  |   2 +-
 .../org/fdroid/ui/categories/CategoryList.kt  |   2 +-
 .../main/kotlin/org/fdroid/ui/crash/Crash.kt  |   2 +-
 .../org/fdroid/ui/crash/CrashActivity.kt      |   2 +-
 .../org/fdroid/ui/crash/CrashContent.kt       |   2 +-
 .../org/fdroid/ui/details/AntiFeatures.kt     |   2 +-
 .../org/fdroid/ui/details/AppDetails.kt       |   2 +-
 .../org/fdroid/ui/details/AppDetailsHeader.kt |   2 +-
 .../org/fdroid/ui/details/AppDetailsMenu.kt   |   2 +-
 .../fdroid/ui/details/AppDetailsWarnings.kt   |   2 +-
 .../org/fdroid/ui/details/RepoChooser.kt      |   8 +-
 .../org/fdroid/ui/details/Screenshots.kt      |   2 +-
 .../org/fdroid/ui/details/TechnicalInfo.kt    |   2 +-
 .../kotlin/org/fdroid/ui/details/Versions.kt  |   2 +-
 .../org/fdroid/ui/discover/AppCarousel.kt     |   2 +-
 .../org/fdroid/ui/discover/AppsSearch.kt      |   2 +-
 .../kotlin/org/fdroid/ui/discover/Discover.kt |   2 +-
 .../kotlin/org/fdroid/ui/icons/License.kt     |   2 +-
 .../org/fdroid/ui/icons/PackageVariant.kt     |   2 +-
 .../kotlin/org/fdroid/ui/lists/AppList.kt     |   2 +-
 .../kotlin/org/fdroid/ui/lists/AppListRow.kt  |   2 +-
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  |   2 +-
 .../fdroid/ui/repositories/Repositories.kt    |   2 +-
 .../fdroid/ui/repositories/RepositoryRow.kt   |   2 +-
 .../ui/repositories/add/AddRepoErrorScreen.kt |   2 +-
 .../ui/repositories/add/AddRepoIntro.kt       |   2 +-
 .../repositories/add/AddRepoPreviewScreen.kt  |   4 +-
 .../repositories/add/AddRepoProgressScreen.kt |   4 +-
 .../ui/repositories/add/RepoPreviewHeader.kt  |   2 +-
 .../ui/repositories/details/BasicAuth.kt      |   2 +-
 .../repositories/details/OfficialMirrors.kt   |   2 +-
 .../ui/repositories/details/RepoDetails.kt    |   2 +-
 .../details/RepoDetailsContent.kt             |   2 +-
 .../repositories/details/RepoDetailsHeader.kt |   2 +-
 .../ui/repositories/details/RepoSettings.kt   |   2 +-
 .../ui/repositories/details/UserMirrors.kt    |   2 +-
 .../org/fdroid/ui/settings/PreferenceProxy.kt |   2 +-
 .../kotlin/org/fdroid/ui/settings/Settings.kt |  22 ++-
 .../org/fdroid/ui/utils/AsyncShimmerImage.kt  |   2 +-
 .../kotlin/org/fdroid/ui/utils/BadgeIcon.kt   |   2 +-
 .../fdroid/ui/utils/BigLoadingIndicator.kt    |   2 +-
 .../org/fdroid/ui/utils/FDroidSwitchRow.kt    |   2 +-
 .../org/fdroid/ui/utils/OnboardingCard.kt     |   2 +-
 next/src/main/res/values/strings-next.xml     |   2 +
 57 files changed, 282 insertions(+), 61 deletions(-)
 delete mode 120000 next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Theme.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/Theme.kt

diff --git a/next/src/main/kotlin/org/fdroid/MainActivity.kt b/next/src/main/kotlin/org/fdroid/MainActivity.kt
index 7b9227d76..347acd7fd 100644
--- a/next/src/main/kotlin/org/fdroid/MainActivity.kt
+++ b/next/src/main/kotlin/org/fdroid/MainActivity.kt
@@ -9,8 +9,12 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_DYNAMIC_COLORS
+import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.Main
+import javax.inject.Inject
 
 // Using [AppCompatActivity] and not [ComponentActivity] seems to be needed
 // for automatic theme changes when calling AppCompatDelegate.setDefaultNightMode()
@@ -20,11 +24,17 @@ class MainActivity : AppCompatActivity() {
     val requestPermissionLauncher = registerForActivityResult(RequestPermission()) { isGranted ->
     }
 
+    @Inject
+    lateinit var settingsManager: SettingsManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
-            Main {
+            val dynamicColors = settingsManager.dynamicColorFlow.collectAsStateWithLifecycle(
+                PREF_DEFAULT_DYNAMIC_COLORS
+            ).value
+            Main(dynamicColors) {
                 // inform OnNewIntentListeners about the initial intent (otherwise would be missed)
                 if (savedInstanceState == null && intent != null) {
                     onNewIntent(intent)
diff --git a/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Theme.kt b/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Theme.kt
deleted file mode 120000
index 895916611..000000000
--- a/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Theme.kt
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../app/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt
\ No newline at end of file
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
index ef3848478..025912c99 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -10,6 +10,9 @@ object SettingsConstants {
     const val PREF_KEY_THEME = "theme"
     const val PREF_DEFAULT_THEME = "followSystem"
 
+    const val PREF_KEY_DYNAMIC_COLORS = "dynamicColors"
+    const val PREF_DEFAULT_DYNAMIC_COLORS = false
+
     const val PREF_KEY_REPO_UPDATES = "repoUpdates"
     const val PREF_DEFAULT_REPO_UPDATES = true
 
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index fa95a4d35..f1b947d42 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -6,6 +6,7 @@ import androidx.core.content.edit
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.ktor.client.engine.ProxyBuilder
 import io.ktor.client.engine.ProxyConfig
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -16,6 +17,7 @@ import mu.KotlinLogging
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_APP_LIST_SORT_ORDER
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_AUTO_UPDATES
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_DYNAMIC_COLORS
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_REPO_UPDATES
@@ -23,6 +25,7 @@ import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SHOW_INCOMPATIBLE
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
 import org.fdroid.settings.SettingsConstants.PREF_KEY_APP_LIST_SORT_ORDER
 import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES
+import org.fdroid.settings.SettingsConstants.PREF_KEY_DYNAMIC_COLORS
 import org.fdroid.settings.SettingsConstants.PREF_KEY_IGNORED_APP_ISSUES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_LAST_UPDATE_CHECK
 import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
@@ -51,6 +54,9 @@ class SettingsManager @Inject constructor(
     val prefsFlow by lazy { createPreferenceFlow(prefs) }
     val theme get() = prefs.getString(PREF_KEY_THEME, PREF_DEFAULT_THEME)!!
     val themeFlow = prefsFlow.map { it.get<String>(PREF_KEY_THEME) }.distinctUntilChanged()
+    val dynamicColorFlow: Flow<Boolean> = prefsFlow.map {
+        it.get<Boolean>(PREF_KEY_DYNAMIC_COLORS) ?: PREF_DEFAULT_DYNAMIC_COLORS
+    }.distinctUntilChanged()
     val repoUpdates get() = prefs.getBoolean(PREF_KEY_REPO_UPDATES, PREF_DEFAULT_REPO_UPDATES)
     val repoUpdatesFlow
         get() = prefsFlow.map { it.get<Boolean>(PREF_KEY_REPO_UPDATES) }.distinctUntilChanged()
diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
index 82ee49c79..d41013ae7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -36,7 +36,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.BuildConfig.VERSION_NAME
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.utils.openUriSafe
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 52b1554c0..2b672b065 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -29,7 +29,6 @@ import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOW
 import com.viktormykhailiv.compose.hints.HintHost
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallConfirmationState
 import org.fdroid.ui.apps.AppWithIssueItem
 import org.fdroid.ui.apps.MyApps
@@ -59,7 +58,7 @@ import org.fdroid.ui.settings.SettingsViewModel
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
-fun Main(onListeningForIntent: () -> Unit = {}) {
+fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
     val backStack = rememberNavBackStack(NavigationKey.Discover)
     // set up intent routing by listening to new intents from activity
     val activity = (LocalActivity.current as ComponentActivity)
@@ -194,7 +193,6 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                     (backStack.last() as? NavigationKey.AppDetails)?.packageName
                 } else null,
                 onBackClicked = { backStack.removeLastOrNull() },
-                modifier = Modifier,
             ) { packageName ->
                 backStack.add(NavigationKey.AppDetails(packageName))
             }
@@ -300,7 +298,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
             About { backStack.removeLastOrNull() }
         }
     }
-    FDroidContent {
+    FDroidContent(dynamicColors = dynamicColors) {
         HintHost {
             NavDisplay(
                 backStack = backStack,
diff --git a/next/src/main/kotlin/org/fdroid/ui/Theme.kt b/next/src/main/kotlin/org/fdroid/ui/Theme.kt
new file mode 100644
index 000000000..bde49f2b8
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/Theme.kt
@@ -0,0 +1,184 @@
+package org.fdroid.ui
+
+import android.os.Build.VERSION.SDK_INT
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import org.fdroid.fdroid.ui.theme.backgroundLight
+import org.fdroid.fdroid.ui.theme.errorContainerDark
+import org.fdroid.fdroid.ui.theme.errorContainerLight
+import org.fdroid.fdroid.ui.theme.errorDark
+import org.fdroid.fdroid.ui.theme.errorLight
+import org.fdroid.fdroid.ui.theme.inverseOnSurfaceDark
+import org.fdroid.fdroid.ui.theme.inverseOnSurfaceLight
+import org.fdroid.fdroid.ui.theme.inversePrimaryDark
+import org.fdroid.fdroid.ui.theme.inversePrimaryLight
+import org.fdroid.fdroid.ui.theme.inverseSurfaceDark
+import org.fdroid.fdroid.ui.theme.inverseSurfaceLight
+import org.fdroid.fdroid.ui.theme.onBackgroundDark
+import org.fdroid.fdroid.ui.theme.onBackgroundLight
+import org.fdroid.fdroid.ui.theme.onErrorContainerDark
+import org.fdroid.fdroid.ui.theme.onErrorContainerLight
+import org.fdroid.fdroid.ui.theme.onErrorDark
+import org.fdroid.fdroid.ui.theme.onErrorLight
+import org.fdroid.fdroid.ui.theme.onPrimaryContainerDark
+import org.fdroid.fdroid.ui.theme.onPrimaryContainerLight
+import org.fdroid.fdroid.ui.theme.onPrimaryDark
+import org.fdroid.fdroid.ui.theme.onPrimaryLight
+import org.fdroid.fdroid.ui.theme.onSecondaryContainerDark
+import org.fdroid.fdroid.ui.theme.onSecondaryContainerLight
+import org.fdroid.fdroid.ui.theme.onSecondaryDark
+import org.fdroid.fdroid.ui.theme.onSecondaryLight
+import org.fdroid.fdroid.ui.theme.onSurfaceDark
+import org.fdroid.fdroid.ui.theme.onSurfaceLight
+import org.fdroid.fdroid.ui.theme.onSurfaceVariantDark
+import org.fdroid.fdroid.ui.theme.onSurfaceVariantLight
+import org.fdroid.fdroid.ui.theme.onTertiaryContainerDark
+import org.fdroid.fdroid.ui.theme.onTertiaryContainerLight
+import org.fdroid.fdroid.ui.theme.onTertiaryDark
+import org.fdroid.fdroid.ui.theme.onTertiaryLight
+import org.fdroid.fdroid.ui.theme.outlineDark
+import org.fdroid.fdroid.ui.theme.outlineLight
+import org.fdroid.fdroid.ui.theme.outlineVariantDark
+import org.fdroid.fdroid.ui.theme.outlineVariantLight
+import org.fdroid.fdroid.ui.theme.primaryContainerDark
+import org.fdroid.fdroid.ui.theme.primaryContainerLight
+import org.fdroid.fdroid.ui.theme.primaryDark
+import org.fdroid.fdroid.ui.theme.primaryLight
+import org.fdroid.fdroid.ui.theme.scrimDark
+import org.fdroid.fdroid.ui.theme.scrimLight
+import org.fdroid.fdroid.ui.theme.secondaryContainerDark
+import org.fdroid.fdroid.ui.theme.secondaryContainerLight
+import org.fdroid.fdroid.ui.theme.secondaryDark
+import org.fdroid.fdroid.ui.theme.secondaryLight
+import org.fdroid.fdroid.ui.theme.surfaceBrightDark
+import org.fdroid.fdroid.ui.theme.surfaceBrightLight
+import org.fdroid.fdroid.ui.theme.surfaceContainerDark
+import org.fdroid.fdroid.ui.theme.surfaceContainerHighDark
+import org.fdroid.fdroid.ui.theme.surfaceContainerHighLight
+import org.fdroid.fdroid.ui.theme.surfaceContainerHighestDark
+import org.fdroid.fdroid.ui.theme.surfaceContainerHighestLight
+import org.fdroid.fdroid.ui.theme.surfaceContainerLight
+import org.fdroid.fdroid.ui.theme.surfaceContainerLowDark
+import org.fdroid.fdroid.ui.theme.surfaceContainerLowLight
+import org.fdroid.fdroid.ui.theme.surfaceContainerLowestDark
+import org.fdroid.fdroid.ui.theme.surfaceContainerLowestLight
+import org.fdroid.fdroid.ui.theme.surfaceDimDark
+import org.fdroid.fdroid.ui.theme.surfaceDimLight
+import org.fdroid.fdroid.ui.theme.surfaceLight
+import org.fdroid.fdroid.ui.theme.surfaceVariantDark
+import org.fdroid.fdroid.ui.theme.surfaceVariantLight
+import org.fdroid.fdroid.ui.theme.tertiaryContainerDark
+import org.fdroid.fdroid.ui.theme.tertiaryContainerLight
+import org.fdroid.fdroid.ui.theme.tertiaryDark
+import org.fdroid.fdroid.ui.theme.tertiaryLight
+
+// The followings are generated by the Material Theme Builder with modifications
+// https://www.figma.com/community/plugin/1034969338659738588
+// Unused code are and themes with contrast are removed
+
+private val lightScheme = lightColorScheme(
+    primary = primaryLight,
+    onPrimary = onPrimaryLight,
+    primaryContainer = primaryContainerLight,
+    onPrimaryContainer = onPrimaryContainerLight,
+    secondary = secondaryLight,
+    onSecondary = onSecondaryLight,
+    secondaryContainer = secondaryContainerLight,
+    onSecondaryContainer = onSecondaryContainerLight,
+    tertiary = tertiaryLight,
+    onTertiary = onTertiaryLight,
+    tertiaryContainer = tertiaryContainerLight,
+    onTertiaryContainer = onTertiaryContainerLight,
+    error = errorLight,
+    onError = onErrorLight,
+    errorContainer = errorContainerLight,
+    onErrorContainer = onErrorContainerLight,
+    background = backgroundLight,
+    onBackground = onBackgroundLight,
+    surface = surfaceLight,
+    onSurface = onSurfaceLight,
+    surfaceVariant = surfaceVariantLight,
+    onSurfaceVariant = onSurfaceVariantLight,
+    outline = outlineLight,
+    outlineVariant = outlineVariantLight,
+    scrim = scrimLight,
+    inverseSurface = inverseSurfaceLight,
+    inverseOnSurface = inverseOnSurfaceLight,
+    inversePrimary = inversePrimaryLight,
+    surfaceDim = surfaceDimLight,
+    surfaceBright = surfaceBrightLight,
+    surfaceContainerLowest = surfaceContainerLowestLight,
+    surfaceContainerLow = surfaceContainerLowLight,
+    surfaceContainer = surfaceContainerLight,
+    surfaceContainerHigh = surfaceContainerHighLight,
+    surfaceContainerHighest = surfaceContainerHighestLight,
+)
+
+private val darkScheme = darkColorScheme(
+    primary = primaryDark,
+    onPrimary = onPrimaryDark,
+    primaryContainer = primaryContainerDark,
+    onPrimaryContainer = onPrimaryContainerDark,
+    secondary = secondaryDark,
+    onSecondary = onSecondaryDark,
+    secondaryContainer = secondaryContainerDark,
+    onSecondaryContainer = onSecondaryContainerDark,
+    tertiary = tertiaryDark,
+    onTertiary = onTertiaryDark,
+    tertiaryContainer = tertiaryContainerDark,
+    onTertiaryContainer = onTertiaryContainerDark,
+    error = errorDark,
+    onError = onErrorDark,
+    errorContainer = errorContainerDark,
+    onErrorContainer = onErrorContainerDark,
+    background = Color.Black, // TODO
+    onBackground = onBackgroundDark,
+    surface = Color(0xff1e1e1e), // TODO
+    onSurface = onSurfaceDark,
+    surfaceVariant = surfaceVariantDark,
+    onSurfaceVariant = onSurfaceVariantDark,
+    outline = outlineDark,
+    outlineVariant = outlineVariantDark,
+    scrim = scrimDark,
+    inverseSurface = inverseSurfaceDark,
+    inverseOnSurface = inverseOnSurfaceDark,
+    inversePrimary = inversePrimaryDark,
+    surfaceDim = surfaceDimDark,
+    surfaceBright = surfaceBrightDark,
+    surfaceContainerLowest = surfaceContainerLowestDark,
+    surfaceContainerLow = surfaceContainerLowDark,
+    surfaceContainer = surfaceContainerDark,
+    surfaceContainerHigh = surfaceContainerHighDark,
+    surfaceContainerHighest = surfaceContainerHighestDark,
+)
+
+@Composable
+fun FDroidContent(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    dynamicColors: Boolean = false,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        SDK_INT >= 31 && dynamicColors && darkTheme -> {
+            dynamicDarkColorScheme(LocalContext.current)
+        }
+        SDK_INT >= 31 && dynamicColors && !darkTheme -> {
+            dynamicLightColorScheme(LocalContext.current)
+        }
+        darkTheme -> darkScheme
+        else -> lightScheme
+    }
+    MaterialTheme(
+        colorScheme = colorScheme,
+    ) {
+        Surface(content = content)
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
index 2f34bca2f..d89fdc115 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.BadgeIcon
 import org.fdroid.ui.utils.Names
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
index 1b8cedf4c..ac6826d8f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
@@ -20,8 +20,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index c3a61aafc..4d6488de5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -43,9 +43,9 @@ import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppListSortOrder.LAST_UPDATED
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallConfirmationState
 import org.fdroid.ui.BottomBar
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.lists.TopSearchBar
 import org.fdroid.ui.utils.BigLoadingIndicator
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
index 832254300..2b5970153 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.database.NotAvailable
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.getMyAppsInfo
 import org.fdroid.ui.utils.myAppsModel
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt b/next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
index d7bb62c89..d9cf84763 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.startActivitySafe
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
index b84837b04..29ca70a8a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
@@ -32,7 +32,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.BadgeIcon
 import org.fdroid.ui.utils.ExpandIconArrow
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
index acd3fe678..9cfb486b3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
@@ -18,7 +18,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 @Composable
 fun CategoryChip(
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index 678f6fe2e..0e18ff70a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.lists.AppListType
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt b/next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
index c869cbc1d..fdc57cd5b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import kotlinx.coroutines.launch
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.utils.getLogName
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt b/next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
index 5f3372fba..891a1bac9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
@@ -8,7 +8,7 @@ import androidx.activity.enableEdgeToEdge
 import mu.KotlinLogging
 import org.acra.ReportField
 import org.acra.dialog.CrashReportDialogHelper
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import java.io.IOException
 
 class CrashActivity : ComponentActivity() {
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt b/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
index 6dc52d809..739f6a7a4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 @Composable
 fun CrashContent(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
index 5c2679534..26807650e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.testApp
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index e90fe6530..dd2c444c4 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -62,8 +62,8 @@ import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
 import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.icons.License
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index d41b10e6f..02e816bd2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -57,8 +57,8 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import coil3.compose.AsyncImage
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.install.InstallState
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.InstalledBadge
 import org.fdroid.ui.utils.asRelativeTimeString
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
index 602ff1da2..18837858a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.startActivitySafe
 import org.fdroid.ui.utils.testApp
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
index e87c4adf6..4ae495622 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
@@ -25,8 +25,8 @@ import org.fdroid.database.KnownVulnerability
 import org.fdroid.database.NoCompatibleSigner
 import org.fdroid.database.NotAvailable
 import org.fdroid.database.UpdateInOtherRepo
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.v2.ANTI_FEATURE_KNOWN_VULNERABILITY
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.testApp
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
index b32beb3d5..812310408 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
@@ -34,8 +34,8 @@ import androidx.core.os.LocaleListCompat
 import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.database.Repository
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.IndexFormatVersion.TWO
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.repositories.RepoIcon
 import org.fdroid.ui.utils.FDroidOutlineButton
 
@@ -175,7 +175,7 @@ private fun getRepoString(repo: Repository, isPreferred: Boolean) = buildAnnotat
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
 fun RepoChooserSingleRepoPreview() {
     val repo1 = Repository(1L, "1", 1L, TWO, "null", 1L, 1, 1L)
-    FDroidContent(pureBlack = true) {
+    FDroidContent {
         RepoChooser(listOf(repo1), 1L, 1L, null, {}, {})
     }
 }
@@ -186,7 +186,7 @@ fun RepoChooserPreview() {
     val repo1 = Repository(1L, "1", 1L, TWO, "null", 1L, 1, 1L)
     val repo2 = Repository(2L, "2", 2L, TWO, "null", 2L, 2, 2L)
     val repo3 = Repository(3L, "2", 3L, TWO, "null", 3L, 3, 3L)
-    FDroidContent(pureBlack = true) {
+    FDroidContent {
         RepoChooser(listOf(repo1, repo2, repo3), 1L, 1L, null, {}, {})
     }
 }
@@ -197,7 +197,7 @@ fun RepoChooserNightPreview() {
     val repo1 = Repository(1L, "1", 1L, TWO, "null", 1L, 1, 1L)
     val repo2 = Repository(2L, "2", 2L, TWO, "null", 2L, 2, 2L)
     val repo3 = Repository(3L, "2", 3L, TWO, "null", 3L, 3, 3L)
-    FDroidContent(pureBlack = true) {
+    FDroidContent {
         RepoChooser(listOf(repo1, repo2, repo3), 1L, 2L, null, {}, {})
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt b/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
index 01ca50a4a..d4d595f5c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.testApp
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt b/next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
index eced4bd3f..a9b33ab99 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.testApp
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index aad72b2a9..c8dadc9a2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import org.fdroid.R
 import org.fdroid.database.AppVersion
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.ExpandIconChevron
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.FDroidOutlineButton
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
index 15b96e4ec..4b289c907 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.InstalledBadge
 import org.fdroid.ui.utils.Names
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 296156d05..d8858ee2d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.categories.CategoryItem
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 cb26c5cd5..e3c9f22d7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -43,8 +43,8 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
 import kotlinx.coroutines.launch
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.ui.BottomBar
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.MainOverFlowMenu
 import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryList
diff --git a/next/src/main/kotlin/org/fdroid/ui/icons/License.kt b/next/src/main/kotlin/org/fdroid/ui/icons/License.kt
index 9df37380c..58f44edb7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/icons/License.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/icons/License.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 val License: ImageVector
     get() {
diff --git a/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt b/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
index a62418010..58e31b823 100644
--- a/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 val PackageVariant: ImageVector
     get() {
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index c02082776..3024de7bb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -54,7 +54,7 @@ import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.OnboardingCard
 import org.fdroid.ui.utils.getAppListInfo
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
index 5e9f161f3..f234d1476 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.InstalledBadge
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
index 33aed1b46..a3fbde1d8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
@@ -38,7 +38,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.icons.PackageVariant
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index f97b47b65..097454d38 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -36,7 +36,7 @@ import com.viktormykhailiv.compose.hints.rememberHint
 import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.OnboardingCard
 import org.fdroid.ui.utils.getHintOverlayColor
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
index 2a6da87fe..49d5f4c77 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.BadgeIcon
 import org.fdroid.ui.utils.asRelativeTimeString
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
index 679b6c1d9..628dac0e3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
@@ -26,13 +26,13 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.repo.AddRepoError
 import org.fdroid.repo.AddRepoError.ErrorType.INVALID_FINGERPRINT
 import org.fdroid.repo.AddRepoError.ErrorType.INVALID_INDEX
 import org.fdroid.repo.AddRepoError.ErrorType.IO_ERROR
 import org.fdroid.repo.AddRepoError.ErrorType.IS_ARCHIVE_REPO
 import org.fdroid.repo.AddRepoError.ErrorType.UNKNOWN_SOURCES_DISALLOWED
+import org.fdroid.ui.FDroidContent
 import java.io.IOException
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
index 606ad7191..9ffb6eedb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
@@ -67,8 +67,8 @@ import com.journeyapps.barcodescanner.ScanOptions
 import com.journeyapps.barcodescanner.ScanOptions.QR_CODE
 import kotlinx.coroutines.launch
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.repo.None
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.ExpandIconArrow
 import org.fdroid.ui.utils.FDroidButton
 import org.fdroid.ui.utils.FDroidOutlineButton
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
index 399f3217c..406e72b91 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
@@ -22,11 +22,11 @@ import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.database.MinimalApp
 import org.fdroid.download.getImageModel
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.index.v2.FileV2
 import org.fdroid.repo.FetchResult.IsNewRepoAndNewMirror
 import org.fdroid.repo.FetchResult.IsNewRepository
 import org.fdroid.repo.Fetching
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.lists.AppListItem
 import org.fdroid.ui.lists.AppListRow
 import org.fdroid.ui.utils.getRepository
@@ -139,7 +139,7 @@ private fun Preview() {
 
         override fun getIcon(localeList: LocaleListCompat): FileV2? = null
     }
-    FDroidContent(pureBlack = true) {
+    FDroidContent {
         AddRepoPreviewScreen(
             Fetching(address, repo, listOf(app1, app2, app3), IsNewRepository),
             proxyConfig = null,
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
index 01ee331a4..80aae4260 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
@@ -40,7 +40,7 @@ fun AddRepoProgressScreen(text: String, modifier: Modifier = Modifier) {
 @Preview
 @Composable
 private fun Preview() {
-    FDroidContent(pureBlack = true) {
+    FDroidContent {
         AddRepoProgressScreen(stringResource(R.string.repo_state_fetching))
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
index 84a66fcb0..bbd2a33e8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
@@ -26,13 +26,13 @@ import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
 import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.repo.FetchResult.IsExistingMirror
 import org.fdroid.repo.FetchResult.IsExistingRepository
 import org.fdroid.repo.FetchResult.IsNewMirror
 import org.fdroid.repo.FetchResult.IsNewRepoAndNewMirror
 import org.fdroid.repo.FetchResult.IsNewRepository
 import org.fdroid.repo.Fetching
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.repositories.RepoIcon
 import org.fdroid.ui.utils.FDroidButton
 import org.fdroid.ui.utils.asRelativeTimeString
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
index 79e25569b..171a3bda1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.FDroidOutlineButton
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
index 0f742da86..a1ff4a819 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.download.Mirror
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.ExpandableSection
 
 @Composable
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index e2ce9c315..a5b61abb5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -38,8 +38,8 @@ import com.viktormykhailiv.compose.hints.rememberHint
 import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.repo.RepoUpdateWorker
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.OnboardingCard
 import org.fdroid.ui.utils.getHintOverlayColor
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
index 5f0282b3b..056d17220 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.database.Repository
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.getRepoDetailsInfo
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
index 22155f99d..23d4e02b6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
@@ -29,7 +29,7 @@ import androidx.core.os.LocaleListCompat
 import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.database.Repository
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.repositories.RepoIcon
 import org.fdroid.ui.utils.FDroidOutlineButton
 import org.fdroid.ui.utils.asRelativeTimeString
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
index 84d34d9bb..fcecb8f50 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.database.Repository
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.FDroidOutlineButton
 import org.fdroid.ui.utils.FDroidSwitchRow
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
index cafcd81eb..73d9e4bd6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.download.Mirror
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.FDroidOutlineButton
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt b/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
index 98cd7b57d..a8bb30fdb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
@@ -24,9 +24,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import me.zhanghai.compose.preference.ProvidePreferenceLocals
 import me.zhanghai.compose.preference.textFieldPreference
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
+import org.fdroid.ui.FDroidContent
 import java.net.InetSocketAddress
 
 fun LazyListScope.preferenceProxy(
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index e29a477c5..ced709077 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.BrightnessMedium
+import androidx.compose.material.icons.filled.ColorLens
 import androidx.compose.material.icons.filled.Notifications
 import androidx.compose.material.icons.filled.Save
 import androidx.compose.material.icons.filled.SystemSecurityUpdate
@@ -54,15 +55,17 @@ import me.zhanghai.compose.preference.preferenceCategory
 import me.zhanghai.compose.preference.rememberPreferenceState
 import me.zhanghai.compose.preference.switchPreference
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_AUTO_UPDATES
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_DYNAMIC_COLORS
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_REPO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME
 import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES
+import org.fdroid.settings.SettingsConstants.PREF_KEY_DYNAMIC_COLORS
 import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_KEY_REPO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
+import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.startActivitySafe
 import org.fdroid.utils.getLogName
@@ -139,6 +142,23 @@ fun Settings(
                     },
                     summary = { Text(text = "${themeToString(it)}") },
                 )
+                if (SDK_INT >= 31) switchPreference(
+                    key = PREF_KEY_DYNAMIC_COLORS,
+                    defaultValue = PREF_DEFAULT_DYNAMIC_COLORS,
+                    title = {
+                        Text(stringResource(R.string.pref_dyn_colors_title))
+                    },
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Default.ColorLens,
+                            contentDescription = null,
+                            modifier = Modifier.semantics { hideFromAccessibility() },
+                        )
+                    },
+                    summary = {
+                        Text(text = stringResource(R.string.pref_dyn_colors_summary))
+                    },
+                )
                 if (SDK_INT >= 33) preference(
                     key = "languages",
                     icon = {
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt b/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
index 5634e4c46..8257aa8e7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil3.compose.SubcomposeAsyncImage
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 @Composable
 fun AsyncShimmerImage(
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt b/next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
index 526464087..67a74fac5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
@@ -22,7 +22,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 @Composable
 fun BadgeIcon(
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt b/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
index e69b53db8..ab3acc151 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt b/next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
index 1ee1b475f..4be3f521a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 @Composable
 fun FDroidSwitchRow(
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt b/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
index d337d8e2e..4ef3969cb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
-import org.fdroid.fdroid.ui.theme.FDroidContent
+import org.fdroid.ui.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 466fffbae..afc8afdac 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -126,6 +126,8 @@
     <string name="repo_force_update">Check for updates</string>
 
 
+    <string name="pref_dyn_colors_title">Use system colors</string>
+    <string name="pref_dyn_colors_summary">Apply dynamic colors from your system settings</string>
     <string name="pref_language_summary">Opens system language settings</string>
     <string name="pref_auto_updates_summary_enabled">Download and update apps daily when the device isn\'t being used</string>
     <string name="pref_auto_updates_summary_disabled">Auto-updates disabled • Apps will need to be updated manually</string>

From dd73012a9b3a7fde1f5710c2e7e947b6eb3e79f9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 16 Dec 2025 10:34:41 -0300
Subject: [PATCH 136/180] Warn user before downloading over metered connection

---
 .../org/fdroid/download/NetworkMonitor.kt     | 56 +++++++++++++++++++
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |  1 +
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |  2 +
 .../kotlin/org/fdroid/ui/apps/MyAppsInfo.kt   |  3 +
 .../kotlin/org/fdroid/ui/apps/MyAppsList.kt   | 27 ++++++++-
 .../org/fdroid/ui/apps/MyAppsPresenter.kt     | 15 +++++
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |  3 +
 .../org/fdroid/ui/details/AppDetailsHeader.kt | 40 ++++++++++---
 .../org/fdroid/ui/details/AppDetailsItem.kt   |  4 ++
 .../fdroid/ui/details/AppDetailsViewModel.kt  |  3 +
 .../org/fdroid/ui/details/DetailsPresenter.kt |  3 +
 .../kotlin/org/fdroid/ui/details/Versions.kt  | 26 ++++++++-
 .../org/fdroid/ui/repositories/add/AddRepo.kt |  9 ++-
 .../ui/repositories/add/AddRepoIntro.kt       | 42 +++++++++++---
 .../ui/repositories/add/AddRepoViewModel.kt   |  3 +
 .../ui/repositories/details/RepoDetails.kt    | 15 ++++-
 .../repositories/details/RepoDetailsInfo.kt   |  2 +
 .../details/RepoDetailsPresenter.kt           |  3 +
 .../details/RepoDetailsViewModel.kt           |  3 +
 .../ui/utils/MeteredConnectionDialog.kt       | 53 ++++++++++++++++++
 .../kotlin/org/fdroid/ui/utils/OfflineBar.kt  | 40 +++++++++++++
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  5 ++
 next/src/main/res/values/strings-next.xml     |  6 ++
 23 files changed, 340 insertions(+), 24 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt

diff --git a/next/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt b/next/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt
new file mode 100644
index 000000000..305346fc6
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt
@@ -0,0 +1,56 @@
+package org.fdroid.download
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET
+import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NetworkMonitor @Inject constructor(
+    @param:ApplicationContext private val context: Context,
+) : ConnectivityManager.NetworkCallback() {
+
+    private val connectivityManager =
+        context.getSystemService(ConnectivityManager::class.java) as ConnectivityManager
+    private val _networkState = MutableStateFlow(
+        connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)?.let {
+            NetworkState(it)
+        } ?: NetworkState(isOnline = false, isMetered = false)
+    )
+    val networkState = _networkState.asStateFlow()
+
+    init {
+        /**
+         * We are not using [ConnectivityManager.getActiveNetwork] or
+         * [ConnectivityManager.isActiveNetworkMetered], because often the active network is null.
+         * What we are doing instead is simpler and seems to work better.
+         */
+        connectivityManager.registerDefaultNetworkCallback(this)
+    }
+
+    override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+        _networkState.update { NetworkState(networkCapabilities) }
+    }
+
+    override fun onLost(network: Network) {
+        _networkState.update { NetworkState(isOnline = false, isMetered = false) }
+    }
+}
+
+data class NetworkState(
+    val isOnline: Boolean,
+    val isMetered: Boolean,
+) {
+    constructor(networkCapabilities: NetworkCapabilities) : this(
+        isOnline = networkCapabilities.hasCapability(NET_CAPABILITY_INTERNET),
+        isMetered = !networkCapabilities.hasCapability(NET_CAPABILITY_NOT_METERED),
+    )
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 2b672b065..bc4ea7176 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -267,6 +267,7 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
             }
             AddRepo(
                 state = viewModel.state.collectAsStateWithLifecycle().value,
+                networkStateFlow = viewModel.networkState,
                 proxyConfig = viewModel.proxyConfig,
                 onFetchRepo = viewModel::onFetchRepo,
                 onAddRepo = viewModel::addFetchedRepository,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 4d6488de5..75e9dc109 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -43,6 +43,7 @@ import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppListSortOrder.LAST_UPDATED
+import org.fdroid.download.NetworkState
 import org.fdroid.install.InstallConfirmationState
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.FDroidContent
@@ -205,6 +206,7 @@ fun MyAppsLoadingPreview() {
         appUpdates = null,
         installedApps = null,
         sortOrder = AppListSortOrder.NAME,
+        networkState = NetworkState(isOnline = false, isMetered = false),
     )
     FDroidContent {
         MyApps(
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
index 615cc8344..84a75b0a0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
@@ -1,6 +1,7 @@
 package org.fdroid.ui.apps
 
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.download.NetworkState
 import org.fdroid.install.InstallConfirmationState
 
 interface MyAppsInfo {
@@ -18,4 +19,6 @@ data class MyAppsModel(
     val appsWithIssue: List<AppWithIssueItem>? = null,
     val installedApps: List<InstalledAppItem>? = null,
     val sortOrder: AppListSortOrder = AppListSortOrder.NAME,
+    val networkState: NetworkState,
+    val appUpdatesBytes: Long? = null,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
index 2b5970153..3b894d9f9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
@@ -26,6 +26,8 @@ import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.database.NotAvailable
 import org.fdroid.ui.FDroidContent
+import org.fdroid.ui.utils.MeteredConnectionDialog
+import org.fdroid.ui.utils.OfflineBar
 import org.fdroid.ui.utils.getMyAppsInfo
 import org.fdroid.ui.utils.myAppsModel
 
@@ -45,6 +47,7 @@ fun MyAppsList(
     var showUpdateAllButton by remember(updatableApps) {
         mutableStateOf(true)
     }
+    var showMeteredDialog by remember { mutableStateOf<(() -> Unit)?>(null) }
     var showIssueIgnoreDialog by remember { mutableStateOf<AppWithIssueItem?>(null) }
     LazyColumn(
         state = lazyListState,
@@ -54,8 +57,13 @@ fun MyAppsList(
                 else Modifier.selectableGroup()
             ),
     ) {
-        // Updates header with Update all button (only show when there's a list below)
+        // Updates header with Update all button
         if (!updatableApps.isNullOrEmpty()) {
+            if (!myAppsInfo.model.networkState.isOnline) {
+                item(key = "OfflineBar", contentType = "offlineBar") {
+                    OfflineBar()
+                }
+            }
             item(key = "A", contentType = "header") {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Text(
@@ -67,8 +75,15 @@ fun MyAppsList(
                     )
                     if (showUpdateAllButton) Button(
                         onClick = {
-                            myAppsInfo.updateAll()
-                            showUpdateAllButton = false
+                            val installLambda = {
+                                myAppsInfo.updateAll()
+                                showUpdateAllButton = false
+                            }
+                            if (myAppsInfo.model.networkState.isMetered) {
+                                showMeteredDialog = installLambda
+                            } else {
+                                installLambda()
+                            }
                         },
                         modifier = Modifier.padding(end = 16.dp),
                     ) {
@@ -223,6 +238,12 @@ fun MyAppsList(
             InstalledAppRow(app, isSelected, modifier)
         }
     }
+    val meteredLambda = showMeteredDialog
+    if (meteredLambda != null) MeteredConnectionDialog(
+        numBytes = myAppsInfo.model.appUpdatesBytes,
+        onConfirm = { meteredLambda() },
+        onDismiss = { showMeteredDialog = null },
+    )
 }
 
 @Preview
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index b751a4f22..f729ba0f7 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -7,6 +7,7 @@ import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.download.NetworkState
 import org.fdroid.install.InstallState
 import org.fdroid.install.InstallStateWithInfo
 import org.fdroid.ui.utils.normalize
@@ -22,6 +23,7 @@ fun MyAppsPresenter(
     installedAppsFlow: Flow<List<InstalledAppItem>>,
     searchQueryFlow: StateFlow<String>,
     sortOrderFlow: StateFlow<AppListSortOrder>,
+    networkStateFlow: StateFlow<NetworkState>,
 ): MyAppsModel {
     val appUpdates = appUpdatesFlow.collectAsState().value
     val appInstallStates = appInstallStatesFlow.collectAsState().value
@@ -73,12 +75,25 @@ fun MyAppsPresenter(
                 it.name.normalize().contains(searchQuery, ignoreCase = true)
         }
     }
+    var updateBytes: Long? = 0L
+    updates?.forEach {
+        val size = it.update.size
+        if (size == null) {
+            // when we don't know the size of one update, we can't provide a total, so say null
+            updateBytes = null
+            return@forEach
+        } else {
+            updateBytes = updateBytes?.plus(size)
+        }
+    } ?: run { updateBytes = null }
     return MyAppsModel(
         installingApps = installingApps.sort(sortOrder),
         appUpdates = updates?.sort(sortOrder),
         appsWithIssue = withIssues?.sort(sortOrder),
         installedApps = installed?.sort(sortOrder),
         sortOrder = sortOrder,
+        networkState = networkStateFlow.collectAsState().value,
+        appUpdatesBytes = updateBytes,
     )
 }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index 8af4f5dc3..a69f1d558 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -20,6 +20,7 @@ import mu.KotlinLogging
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.DownloadRequest
+import org.fdroid.download.NetworkMonitor
 import org.fdroid.download.PackageName
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
@@ -41,6 +42,7 @@ class MyAppsViewModel @Inject constructor(
     private val settingsManager: SettingsManager,
     private val installedAppsCache: InstalledAppsCache,
     private val appInstallManager: AppInstallManager,
+    private val networkMonitor: NetworkMonitor,
     private val updatesManager: UpdatesManager,
     private val repoManager: RepoManager,
 ) : AndroidViewModel(app) {
@@ -83,6 +85,7 @@ class MyAppsViewModel @Inject constructor(
                 installedAppsFlow = installedAppItems,
                 searchQueryFlow = searchQuery,
                 sortOrderFlow = sortOrder,
+                networkStateFlow = networkMonitor.networkState,
             )
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 02e816bd2..37fe1dd92 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.absoluteOffset
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
@@ -57,10 +58,13 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import coil3.compose.AsyncImage
 import org.fdroid.R
+import org.fdroid.download.NetworkState
 import org.fdroid.install.InstallState
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.InstalledBadge
+import org.fdroid.ui.utils.MeteredConnectionDialog
+import org.fdroid.ui.utils.OfflineBar
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.startActivitySafe
 import org.fdroid.ui.utils.testApp
@@ -75,6 +79,7 @@ fun AppDetailsHeader(
     if (showTopSpacer) {
         Spacer(modifier = Modifier.padding(innerPadding))
     }
+    var showMeteredDialog by remember { mutableStateOf(false) }
     item.featureGraphic?.let { featureGraphic ->
         AsyncImage(
             model = featureGraphic,
@@ -105,7 +110,12 @@ fun AppDetailsHeader(
                 .semantics { hideFromAccessibility() },
         )
     }
+    // Offline bar, if no internet
+    if (!item.networkState.isOnline) {
+        OfflineBar(modifier = Modifier.absoluteOffset(y = (-16).dp))
+    }
     // Header
+    val version = item.suggestedVersion ?: item.versions?.first()?.version
     Row(
         modifier = Modifier
             .padding(horizontal = 16.dp),
@@ -140,7 +150,6 @@ fun AppDetailsHeader(
                 }
             }
             val lastUpdated = item.app.lastUpdated.asRelativeTimeString()
-            val version = item.suggestedVersion ?: item.versions?.first()?.version
             val size = version?.size?.let { size ->
                 Formatter.formatFileSize(LocalContext.current, size)
             }
@@ -279,10 +288,14 @@ fun AppDetailsHeader(
             // button is for either installing or updating
             Button(
                 onClick = {
-                    require(item.suggestedVersion != null) {
-                        "suggestedVersion was null"
+                    if (item.networkState.isMetered) {
+                        showMeteredDialog = true
+                    } else {
+                        require(item.suggestedVersion != null) {
+                            "suggestedVersion was null"
+                        }
+                        item.actions.installAction(item.app, item.suggestedVersion, item.icon)
                     }
-                    item.actions.installAction(item.app, item.suggestedVersion, item.icon)
                 },
                 modifier = Modifier.weight(1f)
             ) {
@@ -294,6 +307,14 @@ fun AppDetailsHeader(
             }
         }
     }
+    if (showMeteredDialog) MeteredConnectionDialog(
+        numBytes = version?.size,
+        onConfirm = {
+            require(item.suggestedVersion != null) { "suggestedVersion was null" }
+            item.actions.installAction(item.app, item.suggestedVersion, item.icon)
+        },
+        onDismiss = { showMeteredDialog = false },
+    )
 }
 
 @Preview
@@ -301,7 +322,7 @@ fun AppDetailsHeader(
 fun AppDetailsHeaderPreview() {
     FDroidContent {
         Column {
-            AppDetailsHeader(testApp, PaddingValues())
+            AppDetailsHeader(testApp, PaddingValues(top = 16.dp))
         }
     }
 }
@@ -309,10 +330,13 @@ fun AppDetailsHeaderPreview() {
 @Preview
 @Composable
 private fun PreviewProgress() {
-    FDroidContent {
+    FDroidContent(dynamicColors = true) {
         Column {
-            val app = testApp.copy(installState = InstallState.Starting("", "", "", 23))
-            AppDetailsHeader(app, PaddingValues())
+            val app = testApp.copy(
+                installState = InstallState.Starting("", "", "", 23),
+                networkState = NetworkState(true, isMetered = true),
+            )
+            AppDetailsHeader(app, PaddingValues(top = 16.dp))
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index 40b92d53e..f7832e2cd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -13,6 +13,7 @@ import org.fdroid.database.AppPrefs
 import org.fdroid.database.AppVersion
 import org.fdroid.database.Repository
 import org.fdroid.download.DownloadRequest
+import org.fdroid.download.NetworkState
 import org.fdroid.download.PackageName
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RELEASE_CHANNEL_BETA
@@ -25,6 +26,7 @@ data class AppDetailsItem(
     val app: AppMetadata,
     val actions: AppDetailsActions,
     val installState: InstallState,
+    val networkState: NetworkState,
     /**
      * The ID of the repo that is currently set as preferred.
      * Note that the repository ID of this [app] may be different.
@@ -71,6 +73,7 @@ data class AppDetailsItem(
         dbApp: App,
         actions: AppDetailsActions,
         installState: InstallState,
+        networkState: NetworkState,
         versions: List<VersionItem>?,
         installedVersion: AppVersion?,
         installedVersionCode: Long?,
@@ -86,6 +89,7 @@ data class AppDetailsItem(
         app = dbApp.metadata,
         actions = actions,
         installState = installState,
+        networkState = networkState,
         preferredRepoId = preferredRepoId,
         repositories = repositories,
         name = dbApp.name ?: "Unknown App",
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
index bd43e5fd6..3bc4558ae 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
@@ -32,6 +32,7 @@ import org.fdroid.database.AppMetadata
 import org.fdroid.database.AppVersion
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.download.DownloadRequest
+import org.fdroid.download.NetworkMonitor
 import org.fdroid.getCacheKey
 import org.fdroid.index.RELEASE_CHANNEL_BETA
 import org.fdroid.index.RepoManager
@@ -52,6 +53,7 @@ class AppDetailsViewModel @AssistedInject constructor(
     private val repoPreLoader: RepoPreLoader,
     private val updateChecker: UpdateChecker,
     private val updatesManager: UpdatesManager,
+    private val networkMonitor: NetworkMonitor,
     private val settingsManager: SettingsManager,
     private val appInstallManager: AppInstallManager,
 ) : AndroidViewModel(app) {
@@ -75,6 +77,7 @@ class AppDetailsViewModel @AssistedInject constructor(
                 packageInfoFlow = packageInfoFlow,
                 currentRepoIdFlow = currentRepoIdFlow,
                 appsWithIssuesFlow = updatesManager.appsWithIssues,
+                networkStateFlow = networkMonitor.networkState,
             )
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index 7863469bb..f037bcab0 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -20,6 +20,7 @@ import org.fdroid.database.AppPrefs
 import org.fdroid.database.AppVersion
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
+import org.fdroid.download.NetworkState
 import org.fdroid.index.RepoManager
 import org.fdroid.install.ApkFileProvider
 import org.fdroid.install.AppInstallManager
@@ -46,6 +47,7 @@ fun DetailsPresenter(
     packageInfoFlow: StateFlow<AppInfo?>,
     currentRepoIdFlow: StateFlow<Long?>,
     appsWithIssuesFlow: StateFlow<List<AppWithIssueItem>?>,
+    networkStateFlow: StateFlow<NetworkState>,
 ): AppDetailsItem? {
     val packagePair = packageInfoFlow.collectAsState().value ?: return null
     val packageName = packagePair.packageName
@@ -202,6 +204,7 @@ fun DetailsPresenter(
             shareIntent = getShareIntent(repo, packageName, app.name ?: ""),
         ),
         installState = installState,
+        networkState = networkStateFlow.collectAsState().value,
         versions = versions?.map { version ->
             val signerCompatible = installedSigner == null ||
                 version.signer?.sha256?.first() == installedSigner
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
index c8dadc9a2..96ed19843 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
@@ -16,6 +16,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
@@ -38,6 +39,7 @@ import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.ExpandIconChevron
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.FDroidOutlineButton
+import org.fdroid.ui.utils.MeteredConnectionDialog
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.testApp
 
@@ -56,6 +58,7 @@ fun Versions(
             item.versions?.forEach { versionItem ->
                 Version(
                     item = versionItem,
+                    isMetered = item.networkState.isMetered,
                     installAction = { version: AppVersion ->
                         item.actions.installAction(item.app, version, item.icon)
                     },
@@ -69,6 +72,7 @@ fun Versions(
 @Composable
 fun Version(
     item: VersionItem,
+    isMetered: Boolean,
     installAction: (AppVersion) -> Unit,
     scrollUp: suspend () -> Unit,
 ) {
@@ -128,6 +132,8 @@ fun Version(
             modifier = Modifier
                 .semantics { liveRegion = LiveRegionMode.Polite }
         ) {
+            val coroutineScope = rememberCoroutineScope()
+            var showMeteredDialog by remember { mutableStateOf(false) }
             Row(
                 horizontalArrangement = spacedBy(16.dp),
                 verticalAlignment = Alignment.CenterVertically,
@@ -204,14 +210,28 @@ fun Version(
                     FDroidOutlineButton(
                         text = stringResource(R.string.menu_install),
                         onClick = {
-                            installAction(item.version as AppVersion)
-                            coroutineScope.launch {
-                                scrollUp()
+                            if (isMetered) {
+                                showMeteredDialog = true
+                            } else {
+                                installAction(item.version as AppVersion)
+                                coroutineScope.launch {
+                                    scrollUp()
+                                }
                             }
                         },
                     )
                 }
             }
+            if (showMeteredDialog) MeteredConnectionDialog(
+                numBytes = item.version.size,
+                onConfirm = {
+                    installAction(item.version as AppVersion)
+                    coroutineScope.launch {
+                        scrollUp()
+                    }
+                },
+                onDismiss = { showMeteredDialog = false },
+            )
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
index e663c8bba..91fa69480 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
@@ -15,8 +15,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.core.os.LocaleListCompat
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import io.ktor.client.engine.ProxyConfig
+import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.R
+import org.fdroid.download.NetworkState
 import org.fdroid.index.IndexUpdateResult
 import org.fdroid.repo.AddRepoError
 import org.fdroid.repo.AddRepoState
@@ -31,6 +34,7 @@ import org.fdroid.repo.RepoUpdateWorker
 @Composable
 fun AddRepo(
     state: AddRepoState,
+    networkStateFlow: StateFlow<NetworkState>,
     proxyConfig: ProxyConfig?,
     onFetchRepo: (String) -> Unit,
     onAddRepo: () -> Unit,
@@ -65,7 +69,10 @@ fun AddRepo(
         },
     ) { paddingValues ->
         when (state) {
-            None -> AddRepoIntroContent(onFetchRepo, Modifier.padding(paddingValues))
+            None -> {
+                val networkState = networkStateFlow.collectAsStateWithLifecycle().value
+                AddRepoIntroContent(networkState, onFetchRepo, Modifier.padding(paddingValues))
+            }
             is Fetching -> {
                 if (state.receivedRepo == null) {
                     AddRepoProgressScreen(
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
index 9ffb6eedb..3d6b1c4b8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
@@ -65,17 +65,25 @@ import com.google.zxing.client.android.Intents.Scan.SCAN_TYPE
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
 import com.journeyapps.barcodescanner.ScanOptions.QR_CODE
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import org.fdroid.R
+import org.fdroid.download.NetworkState
 import org.fdroid.repo.None
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.ExpandIconArrow
 import org.fdroid.ui.utils.FDroidButton
 import org.fdroid.ui.utils.FDroidOutlineButton
+import org.fdroid.ui.utils.MeteredConnectionDialog
+import org.fdroid.ui.utils.OfflineBar
 import org.fdroid.ui.utils.startActivitySafe
 
 @Composable
-fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modifier) {
+fun AddRepoIntroContent(
+    networkState: NetworkState,
+    onFetchRepo: (String) -> Unit,
+    modifier: Modifier = Modifier
+) {
     val scrollState = rememberScrollState()
     val context = LocalContext.current
     val isPreview = LocalInspectionMode.current
@@ -102,6 +110,7 @@ fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modi
         showPermissionWarning = !isGranted
         if (isGranted) startScanning()
     }
+    var showMeteredDialog by remember { mutableStateOf<(() -> Unit)?>(null) }
     Column(
         verticalArrangement = spacedBy(16.dp),
         horizontalAlignment = CenterHorizontally,
@@ -111,6 +120,7 @@ fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modi
             .verticalScroll(scrollState)
             .padding(16.dp),
     ) {
+        if (!networkState.isOnline) OfflineBar()
         Text(
             text = stringResource(R.string.repo_intro),
             style = MaterialTheme.typography.bodyLarge,
@@ -119,11 +129,15 @@ fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modi
             stringResource(R.string.repo_scan_qr_code),
             imageVector = Icons.Filled.QrCode,
             onClick = {
-                if (checkSelfPermission(context, CAMERA) == PERMISSION_GRANTED) {
-                    startScanning()
-                } else {
-                    permissionLauncher.launch(CAMERA)
+                val scanLambda = {
+                    if (checkSelfPermission(context, CAMERA) == PERMISSION_GRANTED) {
+                        startScanning()
+                    } else {
+                        permissionLauncher.launch(CAMERA)
+                    }
                 }
+                if (networkState.isMetered) showMeteredDialog = scanLambda
+                else scanLambda()
             },
         )
         AnimatedVisibility(
@@ -219,19 +233,30 @@ fun AddRepoIntroContent(onFetchRepo: (String) -> Unit, modifier: Modifier = Modi
                     Spacer(modifier = Modifier.weight(1f))
                     FDroidButton(
                         text = stringResource(R.string.repo_add_add),
-                        onClick = { onFetchRepo(textState.value.text) },
+                        onClick = {
+                            if (networkState.isMetered) showMeteredDialog = {
+                                onFetchRepo(textState.value.text)
+                            } else onFetchRepo(textState.value.text)
+                        },
                     )
                 }
             }
         }
     }
+    val meteredLambda = showMeteredDialog
+    if (meteredLambda != null) MeteredConnectionDialog(
+        numBytes = null,
+        onConfirm = { meteredLambda() },
+        onDismiss = { showMeteredDialog = null },
+    )
 }
 
 @Composable
 @Preview
 private fun Preview() {
     FDroidContent {
-        AddRepo(None, null, {}, {}, {}, { _, _ -> }) {}
+        val networkStateFlow = MutableStateFlow(NetworkState(isOnline = true, isMetered = false))
+        AddRepo(None, networkStateFlow, null, {}, {}, {}, { _, _ -> }) {}
     }
 }
 
@@ -239,6 +264,7 @@ private fun Preview() {
 @Preview(uiMode = UI_MODE_NIGHT_YES, widthDp = 720, heightDp = 360)
 private fun PreviewNight() {
     FDroidContent {
-        AddRepo(None, null, {}, {}, {}, { _, _ -> }) {}
+        val networkStateFlow = MutableStateFlow(NetworkState(isOnline = false, isMetered = false))
+        AddRepo(None, networkStateFlow, null, {}, {}, {}, { _, _ -> }) {}
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
index 09258ba89..e0b90df16 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.AndroidViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.StateFlow
 import mu.KotlinLogging
+import org.fdroid.download.NetworkMonitor
 import org.fdroid.index.RepoManager
 import org.fdroid.repo.AddRepoState
 import org.fdroid.settings.SettingsManager
@@ -14,6 +15,7 @@ import javax.inject.Inject
 @HiltViewModel
 class AddRepoViewModel @Inject constructor(
     app: Application,
+    networkMonitor: NetworkMonitor,
     settingsManager: SettingsManager,
     private val repoManager: RepoManager,
 ) : AndroidViewModel(app) {
@@ -22,6 +24,7 @@ class AddRepoViewModel @Inject constructor(
     val state: StateFlow<AddRepoState> = repoManager.addRepoState
 
     val proxyConfig = settingsManager.proxyConfig
+    val networkState = networkMonitor.networkState
 
     override fun onCleared() {
         log.info { "onCleared() abort adding repository" }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index a5b61abb5..e0ea133a5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -41,6 +41,7 @@ import org.fdroid.R
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.BigLoadingIndicator
+import org.fdroid.ui.utils.MeteredConnectionDialog
 import org.fdroid.ui.utils.OnboardingCard
 import org.fdroid.ui.utils.getHintOverlayColor
 import org.fdroid.ui.utils.getRepoDetailsInfo
@@ -81,14 +82,24 @@ fun RepoDetails(
 
     var qrCodeDialog by remember { mutableStateOf(false) }
     var deleteDialog by remember { mutableStateOf(false) }
+    var showMeteredDialog by remember { mutableStateOf<(() -> Unit)?>(null) }
+    // QrCode dialog
     if (repo != null && qrCodeDialog) QrCodeDialog({ qrCodeDialog = false }) {
         info.actions.generateQrCode(repo)
     }
+    // Repo delete dialog
     if (repo != null && deleteDialog) DeleteDialog({ deleteDialog = false }) {
         info.actions.deleteRepository()
         deleteDialog = false
         onBack()
     }
+    // Metered warning dialog
+    val meteredLambda = showMeteredDialog
+    if (meteredLambda != null) MeteredConnectionDialog(
+        numBytes = null,
+        onConfirm = { meteredLambda() },
+        onDismiss = { showMeteredDialog = null },
+    )
     Scaffold(topBar = {
         TopAppBar(
             navigationIcon = {
@@ -129,7 +140,9 @@ fun RepoDetails(
                         text = { Text(stringResource(R.string.repo_force_update)) },
                         onClick = {
                             menuExpanded = false
-                            RepoUpdateWorker.updateNow(context, repo.repoId)
+                            if (info.model.networkState.isMetered) showMeteredDialog = {
+                                RepoUpdateWorker.updateNow(context, repo.repoId)
+                            } else RepoUpdateWorker.updateNow(context, repo.repoId)
                         },
                         leadingIcon = {
                             Icon(
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
index c6408505a..ce832d97b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
@@ -9,6 +9,7 @@ import io.ktor.client.engine.ProxyConfig
 import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
+import org.fdroid.download.NetworkState
 import org.fdroid.ui.utils.flagEmoji
 import org.fdroid.ui.utils.generateQrBitmap
 import org.fdroid.ui.utils.startActivitySafe
@@ -41,6 +42,7 @@ data class RepoDetailsModel(
     val userMirrors: List<UserMirrorItem>,
     val archiveState: ArchiveState,
     val showOnboarding: Boolean,
+    val networkState: NetworkState,
     val proxy: ProxyConfig?,
 ) {
     /**
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
index fa96d2f29..a95ffacc1 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
@@ -6,6 +6,7 @@ import io.ktor.client.engine.ProxyConfig
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.Repository
+import org.fdroid.download.NetworkState
 
 @Composable
 fun RepoDetailsPresenter(
@@ -13,6 +14,7 @@ fun RepoDetailsPresenter(
     numAppsFlow: Flow<Int?>,
     archiveStateFlow: StateFlow<ArchiveState>,
     showOnboardingFlow: StateFlow<Boolean>,
+    networkStateFlow: StateFlow<NetworkState>,
     proxyConfig: ProxyConfig?,
 ): RepoDetailsModel {
     val repo = repoFlow.collectAsState(null).value
@@ -32,6 +34,7 @@ fun RepoDetailsPresenter(
         } ?: emptyList(),
         archiveState = archiveStateFlow.collectAsState().value,
         showOnboarding = showOnboardingFlow.collectAsState().value,
+        networkState = networkStateFlow.collectAsState().value,
         proxy = proxyConfig,
     )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
index abfffb692..5ca6f496d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
@@ -26,6 +26,7 @@ import mu.KotlinLogging
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
+import org.fdroid.download.NetworkMonitor
 import org.fdroid.index.RepoManager
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.OnboardingManager
@@ -37,6 +38,7 @@ import org.fdroid.utils.IoDispatcher
 class RepoDetailsViewModel @AssistedInject constructor(
     app: Application,
     @Assisted private val repoId: Long,
+    networkMonitor: NetworkMonitor,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
     private val settingsManager: SettingsManager,
@@ -64,6 +66,7 @@ class RepoDetailsViewModel @AssistedInject constructor(
                 numAppsFlow = numAppsFlow,
                 archiveStateFlow = archiveStateFlow,
                 showOnboardingFlow = showOnboarding,
+                networkStateFlow = networkMonitor.networkState,
                 proxyConfig = settingsManager.proxyConfig,
             )
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt b/next/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt
new file mode 100644
index 000000000..6aaccfca3
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt
@@ -0,0 +1,53 @@
+package org.fdroid.ui.utils
+
+import android.text.format.Formatter
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import org.fdroid.R
+
+@Composable
+fun MeteredConnectionDialog(numBytes: Long?, onConfirm: () -> Unit, onDismiss: () -> Unit) {
+    AlertDialog(
+        title = {
+            Text(text = stringResource(R.string.dialog_metered_title))
+        },
+        text = {
+            val s = if (numBytes == null) {
+                stringResource(R.string.dialog_metered_text_no_size)
+            } else {
+                val sizeStr = Formatter.formatFileSize(LocalContext.current, numBytes)
+                stringResource(R.string.dialog_metered_text, sizeStr)
+            }
+            Text(text = s)
+        },
+        onDismissRequest = onDismiss,
+        confirmButton = {
+            TextButton(onClick = {
+                onDismiss()
+                onConfirm()
+            }) {
+                Text(
+                    text = stringResource(R.string.dialog_metered_button),
+                    color = MaterialTheme.colorScheme.error,
+                )
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(android.R.string.cancel))
+            }
+        }
+    )
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    MeteredConnectionDialog(9_999_999, {}, {})
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt b/next/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt
new file mode 100644
index 000000000..a416028fc
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt
@@ -0,0 +1,40 @@
+package org.fdroid.ui.utils
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.ui.FDroidContent
+
+@Composable
+fun OfflineBar(modifier: Modifier = Modifier) {
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = modifier
+            .background(MaterialTheme.colorScheme.errorContainer)
+            .fillMaxWidth()
+    ) {
+        Text(
+            text = stringResource(R.string.banner_no_internet),
+            style = MaterialTheme.typography.labelMedium,
+            modifier = Modifier.padding(4.dp)
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        OfflineBar()
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index d596f7a1b..ae86b2ea5 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -10,6 +10,7 @@ import org.fdroid.database.KnownVulnerability
 import org.fdroid.database.NotAvailable
 import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
+import org.fdroid.download.NetworkState
 import org.fdroid.index.IndexFormatVersion
 import org.fdroid.index.v2.PackageManifest
 import org.fdroid.index.v2.PackageVersion
@@ -152,6 +153,7 @@ val testApp = AppDetailsItem(
         shareIntent = Intent(),
     ),
     installState = InstallState.Unknown,
+    networkState = NetworkState(isOnline = false, isMetered = false),
     appPrefs = AppPrefs("org.schabi.newpipe"),
     name = "New Pipe",
     summary = "Lightweight YouTube frontend",
@@ -346,6 +348,8 @@ internal val myAppsModel = MyAppsModel(
         )
     ),
     sortOrder = AppListSortOrder.NAME,
+    networkState = NetworkState(isOnline = false, isMetered = false),
+    appUpdatesBytes = null,
 )
 
 val repoItems = listOf(
@@ -420,6 +424,7 @@ fun getRepoDetailsInfo(
         ),
         archiveState = ArchiveState.LOADING,
         showOnboarding = false,
+        networkState = NetworkState(isOnline = false, isMetered = false),
         proxy = null,
     ),
 ) = object : RepoDetailsInfo {
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index afc8afdac..4e9775653 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -41,6 +41,12 @@
     <string name="filter_selected">selected</string>
     <string name="category">Category</string>
 
+    <string name="dialog_metered_title">Continue with mobile data?</string>
+    <!-- The placeholder will be replaced with a size string such as "13 MB" -->
+    <string name="dialog_metered_text">You are currently on a metered internet connection. Do you want to continue downloading %1$s?</string>
+    <string name="dialog_metered_text_no_size">You are currently on a metered internet connection. Do you want to continue downloading?</string>
+    <string name="dialog_metered_button">Download</string>
+
     <string name="category_group_productivity">Productivity</string>
     <string name="category_group_tools">Tools</string>
     <string name="category_group_wallets">Finances &amp; Wallets</string>

From de2c77a647d68264e306c0f4ea23664a838e53a4 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 16 Dec 2025 11:49:12 -0300
Subject: [PATCH 137/180] Require opt-in to screenshot loading on mobile data

---
 .../org/fdroid/ui/details/AppDetails.kt       |   2 +-
 .../org/fdroid/ui/details/Screenshots.kt      |  59 +++++++++++++++++-
 .../res/drawable/screenshots_placeholder.png  | Bin 0 -> 158066 bytes
 next/src/main/res/values/strings-next.xml     |   1 +
 4 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 next/src/main/res/drawable/screenshots_placeholder.png

diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index dd2c444c4..aa21e94f9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -199,7 +199,7 @@ fun AppDetails(
             }
             // Screenshots
             if (item.phoneScreenshots.isNotEmpty()) {
-                Screenshots(item.phoneScreenshots)
+                Screenshots(item.networkState.isMetered, item.phoneScreenshots)
             }
             // Donate card
             if (item.showDonate) ElevatedCard(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt b/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
index d4d595f5c..3237605e6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
@@ -1,6 +1,8 @@
 package org.fdroid.ui.details
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -12,10 +14,13 @@ import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Error
 import androidx.compose.material.icons.filled.Image
+import androidx.compose.material3.ElevatedButton
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.ModalBottomSheetProperties
 import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.material3.carousel.HorizontalUncontainedCarousel
 import androidx.compose.material3.carousel.rememberCarouselState
 import androidx.compose.material3.rememberModalBottomSheetState
@@ -24,18 +29,60 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment.Companion.Center
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.fdroid.R
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.AsyncShimmerImage
 import org.fdroid.ui.utils.testApp
 
+@Composable
+fun Screenshots(isMetered: Boolean, phoneScreenshots: List<Any>) {
+    var showEvenWhenMetered by remember { mutableStateOf(false) }
+    if (isMetered && !showEvenWhenMetered) Box(
+        contentAlignment = Center,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(top = 8.dp)
+            .padding(horizontal = 16.dp)
+            .clickable { showEvenWhenMetered = true }
+    ) {
+        Image(
+            painterResource(R.drawable.screenshots_placeholder),
+            contentDescription = null,
+            contentScale = ContentScale.FillWidth,
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(MaterialTheme.shapes.large)
+                .semantics { hideFromAccessibility() }
+        )
+        ElevatedButton(
+            onClick = { showEvenWhenMetered = true },
+            modifier = Modifier.padding(horizontal = 16.dp)
+        ) {
+            Text(
+                text = stringResource(R.string.screenshots_metered),
+                textAlign = TextAlign.Center,
+            )
+        }
+    } else {
+        Screenshots(phoneScreenshots)
+    }
+}
+
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-fun Screenshots(phoneScreenshots: List<Any>) {
+private fun Screenshots(phoneScreenshots: List<Any>) {
     val carouselState = rememberCarouselState { phoneScreenshots.size }
     var showScreenshot by remember { mutableStateOf<Int?>(null) }
     val screenshotIndex = showScreenshot
@@ -91,6 +138,14 @@ fun Screenshots(phoneScreenshots: List<Any>) {
 @Composable
 private fun Preview() {
     FDroidContent {
-        Screenshots(testApp.phoneScreenshots)
+        Screenshots(false, testApp.phoneScreenshots)
+    }
+}
+
+@Preview(widthDp = 300)
+@Composable
+private fun PreviewMetered() {
+    FDroidContent {
+        Screenshots(true, testApp.phoneScreenshots)
     }
 }
diff --git a/next/src/main/res/drawable/screenshots_placeholder.png b/next/src/main/res/drawable/screenshots_placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..94698f3aa3ed1b950629519d31c05b99ce2ccca3
GIT binary patch
literal 158066
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

literal 0
HcmV?d00001

diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 4e9775653..6c0dfc357 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -46,6 +46,7 @@
     <string name="dialog_metered_text">You are currently on a metered internet connection. Do you want to continue downloading %1$s?</string>
     <string name="dialog_metered_text_no_size">You are currently on a metered internet connection. Do you want to continue downloading?</string>
     <string name="dialog_metered_button">Download</string>
+    <string name="screenshots_metered">Tap to load screenshots via mobile data</string>
 
     <string name="category_group_productivity">Productivity</string>
     <string name="category_group_tools">Tools</string>

From 7dd57b82dccc6e4c619cad3f8fb1479e4c1833ea Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 16 Dec 2025 18:08:06 -0300
Subject: [PATCH 138/180] Show progress bar on first start

also track repo update progress
---
 .../org/fdroid/repo/RepoUpdateManager.kt      | 152 ++++++++++++------
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  42 ++---
 .../fdroid/ui/discover/DiscoverPresenter.kt   |  20 ++-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |   3 +
 .../org/fdroid/ui/discover/FirstStart.kt      |  99 ++++++++++++
 5 files changed, 239 insertions(+), 77 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt

diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index 3d3e46245..3932076f2 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -3,6 +3,9 @@ package org.fdroid.repo
 import android.content.Context
 import android.text.format.Formatter
 import android.util.Log
+import androidx.annotation.FloatRange
+import androidx.annotation.IntRange
+import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.currentCoroutineContext
@@ -10,6 +13,7 @@ import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
 import mu.KotlinLogging
 import org.fdroid.CompatibilityChecker
 import org.fdroid.CompatibilityCheckerImpl
@@ -31,7 +35,7 @@ private val TAG = RepoUpdateManager::class.java.simpleName
 private const val MIN_UPDATE_INTERVAL_MILLIS = 15_000
 
 @Singleton
-class RepoUpdateManager(
+class RepoUpdateManager @VisibleForTesting internal constructor(
     private val context: Context,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
@@ -43,59 +47,14 @@ class RepoUpdateManager(
         packageManager = context.packageManager,
         forceTouchApps = false,
     ),
-    private val indexUpdateListener: IndexUpdateListener = object : IndexUpdateListener {
-        override fun onDownloadProgress(repo: Repository, bytesRead: Long, totalBytes: Long) {
-            Log.d(TAG, "Downloading ${repo.address} ($bytesRead/$totalBytes)")
-
-            val percent = if (totalBytes > 0) {
-                getPercent(bytesRead, totalBytes)
-            } else {
-                -1
-            }
-            val size = Formatter.formatFileSize(context, bytesRead)
-            val message: String = if (totalBytes == -1L) {
-                context.getString(R.string.status_download_unknown_size, repo.address, size)
-            } else {
-                val totalSize = Formatter.formatFileSize(context, totalBytes)
-                context.getString(R.string.status_download, repo.address, size, totalSize, percent)
-            }
-            notificationManager.showUpdateRepoNotification(msg = message, progress = percent)
-        }
-
-        /**
-         * If an updater is unable to know how many apps it has to process (i.e. it
-         * is streaming apps to the database or performing a large database query
-         * which touches all apps, but is unable to report progress), then it call
-         * this listener with [totalApps] = 0. Doing so will result in a message of
-         * "Saving app details" sent to the user. If you know how many apps you have
-         * processed, then a message of "Saving app details (x/total)" is displayed.
-         */
-        override fun onUpdateProgress(repo: Repository, appsProcessed: Int, totalApps: Int) {
-            Log.d(TAG, "Committing ${repo.address} ($appsProcessed/$totalApps)")
-
-            if (totalApps > 0) notificationManager.showUpdateRepoNotification(
-                msg = context.getString(
-                    R.string.status_inserting_x_apps,
-                    appsProcessed,
-                    totalApps,
-                    repo.address,
-                ),
-                progress = getPercent(appsProcessed.toLong(), totalApps.toLong())
-            ) else notificationManager.showUpdateRepoNotification(
-                msg = context.getString(R.string.status_inserting_apps),
-            )
-        }
-
-        fun getPercent(current: Long, total: Long): Int {
-            return (100L * current / total).toInt()
-        }
-    },
+    private val repoUpdateListener: RepoUpdateListener =
+        RepoUpdateListener(context, notificationManager),
     private val repoUpdater: RepoUpdater = RepoUpdater(
         tempDir = context.cacheDir,
         db = db,
         downloaderFactory = downloaderFactory,
         compatibilityChecker = compatibilityChecker,
-        listener = indexUpdateListener,
+        listener = repoUpdateListener,
     ),
 ) {
 
@@ -121,6 +80,7 @@ class RepoUpdateManager(
     private val log = KotlinLogging.logger { }
     private val _isUpdating = MutableStateFlow(false)
     val isUpdating = _isUpdating.asStateFlow()
+    val repoUpdateState = repoUpdateListener.updateState
 
     /**
      * The time in milliseconds of the (earliest!) next automatic repo update check.
@@ -165,6 +125,7 @@ class RepoUpdateManager(
                 notificationManager.showUpdateRepoNotification(msg, throttle = false)
                 // update repo
                 val result = repoUpdater.update(repo)
+                log.info { "Update repo result: $result" }
                 if (result is IndexUpdateResult.Processed) reposUpdated = true
                 else if (result is IndexUpdateResult.Error) {
                     log.error(result.e) { "Error updating repository ${repo.address} " }
@@ -198,6 +159,7 @@ class RepoUpdateManager(
             notificationManager.showUpdateRepoNotification(msg, throttle = false)
             // update repo
             val result = repoUpdater.update(repo)
+            log.info { "Update repo result: $result" }
             if (result is IndexUpdateResult.Processed) {
                 updatesManager.loadUpdates()
             } else if (result is IndexUpdateResult.Error) {
@@ -211,3 +173,95 @@ class RepoUpdateManager(
         }
     }
 }
+
+@VisibleForTesting
+internal class RepoUpdateListener(
+    private val context: Context,
+    private val notificationManager: NotificationManager,
+) : IndexUpdateListener {
+
+    private val _updateState = MutableStateFlow<RepoUpdateState?>(null)
+    val updateState = _updateState.asStateFlow()
+    private var lastUpdateProgress = 0L
+
+    override fun onDownloadProgress(repo: Repository, bytesRead: Long, totalBytes: Long) {
+        Log.d(TAG, "Downloading ${repo.address} ($bytesRead/$totalBytes)")
+
+        val percent = getPercent(bytesRead, totalBytes)
+        val size = Formatter.formatFileSize(context, bytesRead)
+        val message: String = if (totalBytes == -1L) {
+            context.getString(R.string.status_download_unknown_size, repo.address, size)
+        } else {
+            val totalSize = Formatter.formatFileSize(context, totalBytes)
+            context.getString(R.string.status_download, repo.address, size, totalSize, percent)
+        }
+        notificationManager.showUpdateRepoNotification(msg = message, progress = percent)
+        _updateState.update { RepoUpdateState(repo.repoId, true, percent) }
+    }
+
+    /**
+     * If an updater is unable to know how many apps it has to process (i.e. it
+     * is streaming apps to the database or performing a large database query
+     * which touches all apps, but is unable to report progress), then it call
+     * this listener with [totalApps] = 0. Doing so will result in a message of
+     * "Saving app details" sent to the user. If you know how many apps you have
+     * processed, then a message of "Saving app details (x/total)" is displayed.
+     */
+    override fun onUpdateProgress(repo: Repository, appsProcessed: Int, totalApps: Int) {
+        // Don't update progress, if we already have updated once within the last second
+        if (System.currentTimeMillis() - lastUpdateProgress < 1000 && appsProcessed != totalApps) {
+            return
+        }
+        Log.d(TAG, "Committing ${repo.address} ($appsProcessed/$totalApps)")
+
+        if (totalApps > 0) {
+            val percent = getPercent(appsProcessed.toLong(), totalApps.toLong())
+            notificationManager.showUpdateRepoNotification(
+                msg = context.getString(
+                    R.string.status_inserting_x_apps,
+                    appsProcessed,
+                    totalApps,
+                    repo.address,
+                ),
+                progress = percent
+            )
+            _updateState.update { RepoUpdateState(repo.repoId, false, percent) }
+        } else {
+            notificationManager.showUpdateRepoNotification(
+                msg = context.getString(R.string.status_inserting_apps),
+            )
+            _updateState.update { RepoUpdateState(repo.repoId, false, 0f) }
+        }
+        lastUpdateProgress = System.currentTimeMillis()
+    }
+
+    private fun getPercent(current: Long, total: Long): Int {
+        if (total <= 0) return 0
+        return (100L * current / total).toInt()
+    }
+}
+
+/**
+ * There's two types of progress. First, there's the download, so [isDownloading] is true.
+ * Then there's inserting the repo data into the DB, there [isDownloading] is false.
+ * The [stepProgress] gets re-used for both.
+ *
+ * An external unified view on that is given as [progress].
+ */
+data class RepoUpdateState(
+    val repoId: Long,
+    private val isDownloading: Boolean,
+    @param:FloatRange(from = 0.0, to = 1.0) private val stepProgress: Float,
+) {
+    constructor(
+        repoId: Long,
+        isDownloading: Boolean,
+        @IntRange(from = 0, to = 100) percent: Int,
+    ) : this(
+        repoId = repoId,
+        isDownloading = isDownloading,
+        stepProgress = percent.toFloat() / 100,
+    )
+
+    val progress: Float = if (isDownloading) stepProgress / 2 else 0.5f + stepProgress / 2
+}
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 e3c9f22d7..263c4277e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -34,15 +34,13 @@ 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
-import androidx.compose.ui.semantics.LiveRegionMode
-import androidx.compose.ui.semantics.liveRegion
-import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
 import kotlinx.coroutines.launch
 import org.fdroid.R
+import org.fdroid.repo.RepoUpdateState
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.MainOverFlowMenu
@@ -122,22 +120,8 @@ fun Discover(
                 .padding(paddingValues)
         ) {
             when (discoverModel) {
-                is LoadingDiscoverModel -> {
-                    AnimatedVisibility(
-                        visible = discoverModel.isFirstStart,
-                        modifier = Modifier
-                            .semantics { liveRegion = LiveRegionMode.Polite },
-                    ) {
-                        Text(
-                            stringResource(R.string.first_start_loading),
-                            textAlign = TextAlign.Center,
-                            modifier = Modifier
-                                .padding(16.dp)
-                                .fillMaxWidth()
-                        )
-                    }
-                    BigLoadingIndicator()
-                }
+                is FirstStartDiscoverModel -> FirstStart(discoverModel.repoUpdateState)
+                is LoadingDiscoverModel -> BigLoadingIndicator()
                 is LoadedDiscoverModel -> {
                     AppsSearch(
                         searchBarState = searchBarState,
@@ -223,12 +207,30 @@ fun Discover(
     }
 }
 
+@Preview
+@Composable
+fun FirstStartDiscoverPreview() {
+    FDroidContent {
+        Discover(
+            discoverModel = FirstStartDiscoverModel(RepoUpdateState(1, true, 0.25f)),
+            numUpdates = 23,
+            hasIssues = true,
+            isBigScreen = false,
+            onSearch = {},
+            onSearchCleared = {},
+            onListTap = {},
+            onAppTap = {},
+            onNav = {},
+        )
+    }
+}
+
 @Preview
 @Composable
 fun LoadingDiscoverPreview() {
     FDroidContent {
         Discover(
-            discoverModel = LoadingDiscoverModel(true),
+            discoverModel = LoadingDiscoverModel,
             numUpdates = 23,
             hasIssues = true,
             isBigScreen = false,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index 275b855ac..bd7a5f5a8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import org.fdroid.database.Repository
+import org.fdroid.repo.RepoUpdateState
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
 import org.fdroid.ui.categories.CategoryGroup
 import org.fdroid.ui.categories.CategoryItem
@@ -20,6 +21,7 @@ fun DiscoverPresenter(
     repositoriesFlow: Flow<List<Repository>>,
     searchResultsFlow: StateFlow<SearchResults?>,
     lastRepoUpdate: Long,
+    repoUpdateStateFlow: StateFlow<RepoUpdateState?>,
 ): DiscoverModel {
     val newApps = newAppsFlow.collectAsState(null).value
     val recentlyUpdatedApps = recentlyUpdatedAppsFlow.collectAsState(null).value
@@ -33,14 +35,12 @@ fun DiscoverPresenter(
     return if (recentlyUpdatedApps.isNullOrEmpty()) {
         val repositories = repositoriesFlow.collectAsState(null).value
         val isFirstStart = lastRepoUpdate < PREF_DEFAULT_LAST_UPDATE_CHECK.toLong()
-        if (newApps == null && recentlyUpdatedApps == null) {
-            // we don't know yet if this
-            LoadingDiscoverModel(isFirstStart)
-        } else if (repositories?.all { !it.enabled } == true) {
+        if (repositories?.all { !it.enabled } == true) {
             NoEnabledReposDiscoverModel
+        } else if (isFirstStart) {
+            FirstStartDiscoverModel(repoUpdateStateFlow.collectAsState().value)
         } else {
-            // apps are empty, if we have enabled repos assume this is first start (still loading)
-            LoadingDiscoverModel(isFirstStart)
+            LoadingDiscoverModel
         }
     } else {
         val hasRepoIssues = repositoriesFlow.map { repos ->
@@ -58,8 +58,12 @@ fun DiscoverPresenter(
 }
 
 sealed class DiscoverModel
-data class LoadingDiscoverModel(val isFirstStart: Boolean) : DiscoverModel()
-object NoEnabledReposDiscoverModel : DiscoverModel()
+data class FirstStartDiscoverModel(
+    val repoUpdateState: RepoUpdateState?,
+) : DiscoverModel()
+
+data object LoadingDiscoverModel : DiscoverModel()
+data object NoEnabledReposDiscoverModel : DiscoverModel()
 data class LoadedDiscoverModel(
     val newApps: List<AppDiscoverItem>,
     val recentlyUpdatedApps: List<AppDiscoverItem>,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 9391eaf1e..181147bef 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -32,6 +32,7 @@ import org.fdroid.download.PackageName
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
 import org.fdroid.install.InstalledAppsCache
+import org.fdroid.repo.RepoUpdateManager
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListItem
@@ -51,6 +52,7 @@ class DiscoverViewModel @Inject constructor(
     updatesManager: UpdatesManager,
     private val settingsManager: SettingsManager,
     private val repoManager: RepoManager,
+    private val repoUpdateManager: RepoUpdateManager,
     private val installedAppsCache: InstalledAppsCache,
     @param:IoDispatcher private val ioScope: CoroutineScope,
 ) : AndroidViewModel(app) {
@@ -98,6 +100,7 @@ class DiscoverViewModel @Inject constructor(
                 repositoriesFlow = repoManager.repositoriesState,
                 searchResultsFlow = searchResults,
                 lastRepoUpdate = settingsManager.lastRepoUpdate,
+                repoUpdateStateFlow = repoUpdateManager.repoUpdateState,
             )
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt b/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
new file mode 100644
index 000000000..3049cccba
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
@@ -0,0 +1,99 @@
+package org.fdroid.ui.discover
+
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.CircularWavyProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.ProgressIndicatorDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.repo.RepoUpdateState
+import org.fdroid.ui.FDroidContent
+
+@Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+fun ColumnScope.FirstStart(repoUpdateState: RepoUpdateState?) {
+    Text(
+        stringResource(R.string.first_start_loading),
+        textAlign = TextAlign.Center,
+        modifier = Modifier
+            .padding(16.dp)
+            .fillMaxWidth()
+    )
+    // use thicker stroke for larger circle
+    val stroke = Stroke(
+        width = with(LocalDensity.current) {
+            6.dp.toPx()
+        },
+        cap = StrokeCap.Round,
+    )
+    val progressModifier = Modifier
+        .padding(16.dp)
+        .size(128.dp)
+        .align(Alignment.CenterHorizontally)
+    // show indeterminate circle if we don't have any progress (may take a bit to start)
+    if ((repoUpdateState?.progress ?: 0f) == 0f) CircularWavyProgressIndicator(
+        wavelength = 24.dp,
+        stroke = stroke,
+        trackStroke = stroke,
+        modifier = progressModifier,
+    ) else {
+        // animate real progress (download and DB insertion)
+        val animatedProgress by animateFloatAsState(
+            targetValue = repoUpdateState?.progress ?: 0f,
+            animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
+        )
+        CircularWavyProgressIndicator(
+            progress = { animatedProgress },
+            wavelength = 24.dp,
+            stroke = stroke,
+            trackStroke = stroke,
+            modifier = progressModifier,
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun NullPreview() {
+    FDroidContent {
+        Column {
+            FirstStart(null)
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun DownloadPreview() {
+    FDroidContent {
+        Column {
+            FirstStart(RepoUpdateState(1L, true, 0.25f))
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun UpdatePreview() {
+    FDroidContent {
+        Column {
+            FirstStart(RepoUpdateState(1L, false, 0.75f))
+        }
+    }
+}

From 15e2be4dc7cb93fdbda062f74fa57e823c7fbd29 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 17 Dec 2025 10:27:54 -0300
Subject: [PATCH 139/180] Improve repo update notification

---
 .../org/fdroid/repo/RepoUpdateManager.kt      | 55 +++++++++++--------
 .../repositories/details/RepoDetailsHeader.kt |  5 +-
 .../kotlin/org/fdroid/ui/utils/UiUtils.kt     |  5 ++
 next/src/main/res/values/strings-next.xml     |  7 +++
 4 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index 3932076f2..06206aa4d 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -2,11 +2,11 @@ package org.fdroid.repo
 
 import android.content.Context
 import android.text.format.Formatter
-import android.util.Log
 import androidx.annotation.FloatRange
 import androidx.annotation.IntRange
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
+import androidx.core.os.LocaleListCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
@@ -27,6 +27,7 @@ import org.fdroid.index.IndexUpdateResult
 import org.fdroid.index.RepoManager
 import org.fdroid.index.RepoUpdater
 import org.fdroid.settings.SettingsManager
+import org.fdroid.ui.utils.addressForUi
 import org.fdroid.updates.UpdatesManager
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -121,11 +122,13 @@ class RepoUpdateManager @VisibleForTesting internal constructor(
                 currentCoroutineContext().ensureActive()
 
                 // show notification
-                val msg = context.getString(R.string.status_connecting_to_repo, repo.address)
+                val repoName = repo.getName(LocaleListCompat.getDefault())
+                val msg = context.getString(R.string.notification_repo_update_default, repoName)
                 notificationManager.showUpdateRepoNotification(msg, throttle = false)
                 // update repo
                 val result = repoUpdater.update(repo)
                 log.info { "Update repo result: $result" }
+                repoUpdateListener.onUpdateFinished()
                 if (result is IndexUpdateResult.Processed) reposUpdated = true
                 else if (result is IndexUpdateResult.Error) {
                     log.error(result.e) { "Error updating repository ${repo.address} " }
@@ -155,11 +158,13 @@ class RepoUpdateManager @VisibleForTesting internal constructor(
         _isUpdating.value = true
         return try {
             // show notification
-            val msg = context.getString(R.string.status_connecting_to_repo, repo.address)
+            val repoName = repo.getName(LocaleListCompat.getDefault())
+            val msg = context.getString(R.string.notification_repo_update_default, repoName)
             notificationManager.showUpdateRepoNotification(msg, throttle = false)
             // update repo
             val result = repoUpdater.update(repo)
             log.info { "Update repo result: $result" }
+            repoUpdateListener.onUpdateFinished()
             if (result is IndexUpdateResult.Processed) {
                 updatesManager.loadUpdates()
             } else if (result is IndexUpdateResult.Error) {
@@ -180,22 +185,24 @@ internal class RepoUpdateListener(
     private val notificationManager: NotificationManager,
 ) : IndexUpdateListener {
 
+    private val log = KotlinLogging.logger { }
     private val _updateState = MutableStateFlow<RepoUpdateState?>(null)
     val updateState = _updateState.asStateFlow()
     private var lastUpdateProgress = 0L
 
     override fun onDownloadProgress(repo: Repository, bytesRead: Long, totalBytes: Long) {
-        Log.d(TAG, "Downloading ${repo.address} ($bytesRead/$totalBytes)")
+        log.debug { "Downloading ${repo.address} ($bytesRead/$totalBytes)" }
 
         val percent = getPercent(bytesRead, totalBytes)
         val size = Formatter.formatFileSize(context, bytesRead)
-        val message: String = if (totalBytes == -1L) {
-            context.getString(R.string.status_download_unknown_size, repo.address, size)
-        } else {
-            val totalSize = Formatter.formatFileSize(context, totalBytes)
-            context.getString(R.string.status_download, repo.address, size, totalSize, percent)
-        }
-        notificationManager.showUpdateRepoNotification(msg = message, progress = percent)
+        notificationManager.showUpdateRepoNotification(
+            msg = context.getString(
+                R.string.notification_repo_update_downloading,
+                size, repo.addressForUi
+            ),
+            throttle = bytesRead != totalBytes,
+            progress = percent,
+        )
         _updateState.update { RepoUpdateState(repo.repoId, true, percent) }
     }
 
@@ -212,29 +219,33 @@ internal class RepoUpdateListener(
         if (System.currentTimeMillis() - lastUpdateProgress < 1000 && appsProcessed != totalApps) {
             return
         }
-        Log.d(TAG, "Committing ${repo.address} ($appsProcessed/$totalApps)")
+        log.debug { "Committing ${repo.address} ($appsProcessed/$totalApps)" }
 
+        val repoName = repo.getName(LocaleListCompat.getDefault())
+        val msg = context.resources.getQuantityString(
+            R.plurals.notification_repo_update_saving,
+            appsProcessed,
+            appsProcessed, repoName,
+        )
         if (totalApps > 0) {
             val percent = getPercent(appsProcessed.toLong(), totalApps.toLong())
             notificationManager.showUpdateRepoNotification(
-                msg = context.getString(
-                    R.string.status_inserting_x_apps,
-                    appsProcessed,
-                    totalApps,
-                    repo.address,
-                ),
-                progress = percent
+                msg = msg,
+                throttle = appsProcessed != totalApps,
+                progress = percent,
             )
             _updateState.update { RepoUpdateState(repo.repoId, false, percent) }
         } else {
-            notificationManager.showUpdateRepoNotification(
-                msg = context.getString(R.string.status_inserting_apps),
-            )
+            notificationManager.showUpdateRepoNotification(msg)
             _updateState.update { RepoUpdateState(repo.repoId, false, 0f) }
         }
         lastUpdateProgress = System.currentTimeMillis()
     }
 
+    fun onUpdateFinished() {
+        _updateState.update { null }
+    }
+
     private fun getPercent(current: Long, total: Long): Int {
         if (total <= 0) return 0
         return (100L * current / total).toInt()
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
index 23d4e02b6..fbfc82078 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
@@ -32,6 +32,7 @@ import org.fdroid.database.Repository
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.repositories.RepoIcon
 import org.fdroid.ui.utils.FDroidOutlineButton
+import org.fdroid.ui.utils.addressForUi
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.getRepository
 
@@ -76,9 +77,7 @@ fun RepoDetailsHeader(
                     style = MaterialTheme.typography.headlineMediumEmphasized,
                 )
                 Text(
-                    text = repo.address
-                        .replaceFirst("https://", "")
-                        .replaceFirst("/repo", ""),
+                    text = repo.addressForUi,
                     style = MaterialTheme.typography.bodyMedium,
                 )
                 if (numberOfApps != null) Text(
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
index f84009734..32e1b1d6e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
@@ -19,6 +19,7 @@ import com.google.zxing.BarcodeFormat
 import com.google.zxing.qrcode.QRCodeWriter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.fdroid.database.Repository
 import java.text.Normalizer
 import java.text.Normalizer.Form.NFKD
 
@@ -106,6 +107,10 @@ val String.flagEmoji: String?
         return flagEmoji
     }
 
+val Repository.addressForUi: String
+    get() = address.replaceFirst("https://", "")
+        .replaceFirst("/repo", "")
+
 fun canStartForegroundService(context: Context): Boolean {
     val powerManager = ContextCompat.getSystemService(context, PowerManager::class.java)
         ?: return false
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 6c0dfc357..bf2c7b25c 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -101,6 +101,13 @@
     <string name="notification_channel_install_success_description">Displays a notification after apps were installed automatically.</string>
     <string name="notification_channel_updates_available_title">Available app updates</string>
     <string name="notification_channel_updates_available_description">Displays a notification after repositories were updated and app updates were found.</string>
+
+    <string name="notification_repo_update_default">Connecting to %1$s…</string>
+    <string name="notification_repo_update_downloading">Downloaded %1$s from %2$s</string>
+    <plurals name="notification_repo_update_saving">
+        <item quantity="one">Saved %1$d app from %2$s</item>
+        <item quantity="other">Saved %1$d apps from %2$s</item>
+    </plurals>
     <plurals name="notification_installing_title">
         <item quantity="one">Installing %1$d app…</item>
         <item quantity="other">Installing %1$d apps…</item>

From db89eb474971ab748c7e804b08f95c589950bd09 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 17 Dec 2025 10:46:35 -0300
Subject: [PATCH 140/180] Show repo update progress on repo details screen

and show update button more prominently
---
 .../ui/repositories/details/RepoDetails.kt    | 26 +++++++------------
 .../details/RepoDetailsContent.kt             | 23 ++++++++++++++--
 .../repositories/details/RepoDetailsInfo.kt   |  2 ++
 .../details/RepoDetailsPresenter.kt           |  3 +++
 .../details/RepoDetailsViewModel.kt           |  6 +++++
 .../org/fdroid/ui/utils/PreviewUtils.kt       |  2 ++
 6 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index e0ea133a5..77bbba6db 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -125,6 +125,16 @@ fun RepoDetails(
                         contentDescription = stringResource(R.string.show_repository_qr)
                     )
                 }
+                IconButton(onClick = {
+                    if (info.model.networkState.isMetered) showMeteredDialog = {
+                        RepoUpdateWorker.updateNow(context, repo.repoId)
+                    } else RepoUpdateWorker.updateNow(context, repo.repoId)
+                }) {
+                    Icon(
+                        imageVector = Icons.Default.Update,
+                        contentDescription = stringResource(R.string.repo_force_update)
+                    )
+                }
                 var menuExpanded by remember { mutableStateOf(false) }
                 IconButton(onClick = { menuExpanded = !menuExpanded }) {
                     Icon(
@@ -136,22 +146,6 @@ fun RepoDetails(
                     expanded = menuExpanded,
                     onDismissRequest = { menuExpanded = false }
                 ) {
-                    DropdownMenuItem(
-                        text = { Text(stringResource(R.string.repo_force_update)) },
-                        onClick = {
-                            menuExpanded = false
-                            if (info.model.networkState.isMetered) showMeteredDialog = {
-                                RepoUpdateWorker.updateNow(context, repo.repoId)
-                            } else RepoUpdateWorker.updateNow(context, repo.repoId)
-                        },
-                        leadingIcon = {
-                            Icon(
-                                imageVector = Icons.Default.Update,
-                                contentDescription = null,
-                                modifier = Modifier.semantics { hideFromAccessibility() },
-                            )
-                        }
-                    )
                     DropdownMenuItem(
                         text = { Text(stringResource(R.string.delete)) },
                         onClick = {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
index 056d17220..5b6faebc2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
@@ -1,5 +1,6 @@
 package org.fdroid.ui.repositories.details
 
+import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -8,9 +9,12 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Fingerprint
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.LinearWavyProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalContext
@@ -18,6 +22,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.viktormykhailiv.compose.hints.HintHost
 import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.ui.FDroidContent
@@ -25,6 +30,7 @@ import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.getRepoDetailsInfo
 
 @Composable
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 fun RepoDetailsContent(
     info: RepoDetailsInfo,
     onShowAppsClicked: (String, Long) -> Unit,
@@ -38,6 +44,17 @@ fun RepoDetailsContent(
             .fillMaxWidth()
             .verticalScroll(rememberScrollState()),
     ) {
+        // show progress here as well, if repo is currently updating
+        if (info.model.updateState != null) {
+            val animatedProgress by animateFloatAsState(
+                targetValue = info.model.updateState?.progress ?: 0f,
+            )
+            LinearWavyProgressIndicator(
+                progress = { animatedProgress },
+                stopSize = 0.dp,
+                modifier = Modifier.fillMaxWidth()
+            )
+        }
         RepoDetailsHeader(
             repo = repo,
             numberOfApps = info.model.numberApps,
@@ -95,7 +112,9 @@ private fun FingerprintExpandable(
 @Composable
 @Preview
 private fun Preview() {
-    FDroidContent {
-        RepoDetails(getRepoDetailsInfo(), { _, _ -> }, {})
+    HintHost {
+        FDroidContent {
+            RepoDetails(getRepoDetailsInfo(), { _, _ -> }, {})
+        }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
index ce832d97b..38e9fec61 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
@@ -10,6 +10,7 @@ import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
 import org.fdroid.download.NetworkState
+import org.fdroid.repo.RepoUpdateState
 import org.fdroid.ui.utils.flagEmoji
 import org.fdroid.ui.utils.generateQrBitmap
 import org.fdroid.ui.utils.startActivitySafe
@@ -42,6 +43,7 @@ data class RepoDetailsModel(
     val userMirrors: List<UserMirrorItem>,
     val archiveState: ArchiveState,
     val showOnboarding: Boolean,
+    val updateState: RepoUpdateState?,
     val networkState: NetworkState,
     val proxy: ProxyConfig?,
 ) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
index a95ffacc1..31221961a 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.Repository
 import org.fdroid.download.NetworkState
+import org.fdroid.repo.RepoUpdateState
 
 @Composable
 fun RepoDetailsPresenter(
@@ -14,6 +15,7 @@ fun RepoDetailsPresenter(
     numAppsFlow: Flow<Int?>,
     archiveStateFlow: StateFlow<ArchiveState>,
     showOnboardingFlow: StateFlow<Boolean>,
+    updateFlow: Flow<RepoUpdateState?>,
     networkStateFlow: StateFlow<NetworkState>,
     proxyConfig: ProxyConfig?,
 ): RepoDetailsModel {
@@ -34,6 +36,7 @@ fun RepoDetailsPresenter(
         } ?: emptyList(),
         archiveState = archiveStateFlow.collectAsState().value,
         showOnboarding = showOnboardingFlow.collectAsState().value,
+        updateState = updateFlow.collectAsState(null).value,
         networkState = networkStateFlow.collectAsState().value,
         proxy = proxyConfig,
     )
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
index 5ca6f496d..2dc85ea51 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
@@ -28,6 +28,7 @@ import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
 import org.fdroid.download.NetworkMonitor
 import org.fdroid.index.RepoManager
+import org.fdroid.repo.RepoUpdateManager
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.OnboardingManager
 import org.fdroid.settings.SettingsManager
@@ -41,6 +42,7 @@ class RepoDetailsViewModel @AssistedInject constructor(
     networkMonitor: NetworkMonitor,
     private val db: FDroidDatabase,
     private val repoManager: RepoManager,
+    repoUpdateManager: RepoUpdateManager,
     private val settingsManager: SettingsManager,
     private val onboardingManager: OnboardingManager,
     @param:IoDispatcher private val ioScope: CoroutineScope,
@@ -58,6 +60,9 @@ class RepoDetailsViewModel @AssistedInject constructor(
     }.flowOn(Dispatchers.IO).distinctUntilChanged()
     private val archiveStateFlow = MutableStateFlow(UNKNOWN)
     private val showOnboarding = onboardingManager.showRepoDetailsOnboarding
+    private val updateFlow = repoUpdateManager.repoUpdateState.map {
+        if (it?.repoId == repoId) it else null
+    }
 
     val model: StateFlow<RepoDetailsModel> by lazy(LazyThreadSafetyMode.NONE) {
         moleculeScope.launchMolecule(mode = ContextClock) {
@@ -66,6 +71,7 @@ class RepoDetailsViewModel @AssistedInject constructor(
                 numAppsFlow = numAppsFlow,
                 archiveStateFlow = archiveStateFlow,
                 showOnboardingFlow = showOnboarding,
+                updateFlow = updateFlow,
                 networkStateFlow = networkMonitor.networkState,
                 proxyConfig = settingsManager.proxyConfig,
             )
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index ae86b2ea5..a6437b543 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -17,6 +17,7 @@ import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
 import org.fdroid.install.InstallConfirmationState
 import org.fdroid.install.InstallState
+import org.fdroid.repo.RepoUpdateState
 import org.fdroid.ui.apps.AppUpdateItem
 import org.fdroid.ui.apps.AppWithIssueItem
 import org.fdroid.ui.apps.InstalledAppItem
@@ -424,6 +425,7 @@ fun getRepoDetailsInfo(
         ),
         archiveState = ArchiveState.LOADING,
         showOnboarding = false,
+        updateState = RepoUpdateState(42L, true, 0.75f),
         networkState = NetworkState(isOnline = false, isMetered = false),
         proxy = null,
     ),

From c29ae7736e6532b87ef4561d353942e9c855d9cb Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 17 Dec 2025 12:11:12 -0300
Subject: [PATCH 141/180] Don't load updates on very first start

it may find apps we had installed before, but are not (yet) in any repo, so it will show issues already during initial repo fetch
---
 next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt  | 1 +
 .../main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt  | 4 +---
 .../main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt  | 2 +-
 next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt    | 5 ++++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index f1b947d42..b283e9adb 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -78,6 +78,7 @@ class SettingsManager @Inject constructor(
         }
     private val _lastRepoUpdateFlow = MutableStateFlow(lastRepoUpdate)
     val lastRepoUpdateFlow = _lastRepoUpdateFlow.asStateFlow()
+    val isFirstStart get() = lastRepoUpdate <= PREF_DEFAULT_LAST_UPDATE_CHECK.toLong()
 
     /**
      * A set of package name for which we should not show app issues.
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index bd7a5f5a8..b8acc55f9 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import org.fdroid.database.Repository
 import org.fdroid.repo.RepoUpdateState
-import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_LAST_UPDATE_CHECK
 import org.fdroid.ui.categories.CategoryGroup
 import org.fdroid.ui.categories.CategoryItem
 
@@ -20,7 +19,7 @@ fun DiscoverPresenter(
     categoriesFlow: Flow<List<CategoryItem>>,
     repositoriesFlow: Flow<List<Repository>>,
     searchResultsFlow: StateFlow<SearchResults?>,
-    lastRepoUpdate: Long,
+    isFirstStart: Boolean,
     repoUpdateStateFlow: StateFlow<RepoUpdateState?>,
 ): DiscoverModel {
     val newApps = newAppsFlow.collectAsState(null).value
@@ -34,7 +33,6 @@ fun DiscoverPresenter(
     // So if we don't have those, we are still loading, have no enabled repo, or this is first start
     return if (recentlyUpdatedApps.isNullOrEmpty()) {
         val repositories = repositoriesFlow.collectAsState(null).value
-        val isFirstStart = lastRepoUpdate < PREF_DEFAULT_LAST_UPDATE_CHECK.toLong()
         if (repositories?.all { !it.enabled } == true) {
             NoEnabledReposDiscoverModel
         } else if (isFirstStart) {
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 181147bef..15fc1404f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -99,7 +99,7 @@ class DiscoverViewModel @Inject constructor(
                 categoriesFlow = categories,
                 repositoriesFlow = repoManager.repositoriesState,
                 searchResultsFlow = searchResults,
-                lastRepoUpdate = settingsManager.lastRepoUpdate,
+                isFirstStart = settingsManager.isFirstStart,
                 repoUpdateStateFlow = repoUpdateManager.repoUpdateState,
             )
         }
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 9bb8d6c47..4acdcf8b0 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -90,7 +90,8 @@ class UpdatesManager @Inject constructor(
         coroutineScope.launch {
             // refresh updates whenever installed apps change
             installedAppsCache.installedApps.collect {
-                loadUpdates(it)
+                // don't load updates on very first start or we may find issues too early
+                if (!settingsManager.isFirstStart) loadUpdates(it)
             }
         }
     }
@@ -151,6 +152,8 @@ class UpdatesManager @Inject constructor(
                         lastUpdated = -1,
                         iconModel = PackageName(app.packageName, null),
                     )
+                }.also {
+                    log.error { "ISSUE: $it" }
                 }
             }
             _appsWithIssues.value = issueItems

From 165b434ee3c2618eb4249149c8c08c3424563db0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 17 Dec 2025 16:46:55 -0300
Subject: [PATCH 142/180] Handle offline or metered network on first start

by informing the user about the situation and delaying initial repo update until they are ready
---
 .../main/kotlin/org/fdroid/db/InitialData.kt  |   4 +-
 .../org/fdroid/repo/RepoUpdateManager.kt      |  35 +++--
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  21 ++-
 .../fdroid/ui/discover/DiscoverPresenter.kt   |   5 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |   5 +
 .../org/fdroid/ui/discover/FirstStart.kt      | 147 ++++++++++++------
 .../details/RepoDetailsContent.kt             |   8 +-
 .../org/fdroid/ui/utils/PreviewUtils.kt       |   4 +-
 next/src/main/res/values/strings-next.xml     |   4 +
 9 files changed, 159 insertions(+), 74 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/db/InitialData.kt b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
index 0c2b1085a..9df4e10f8 100644
--- a/next/src/main/kotlin/org/fdroid/db/InitialData.kt
+++ b/next/src/main/kotlin/org/fdroid/db/InitialData.kt
@@ -5,7 +5,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.FDroidFixture
 import org.fdroid.repo.RepoPreLoader
-import org.fdroid.repo.RepoUpdateWorker
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -16,6 +15,7 @@ class InitialData @Inject constructor(
 ) : FDroidFixture {
     override fun prePopulateDb(db: FDroidDatabase) {
         repoPreLoader.addPreloadedRepositories(db)
-        RepoUpdateWorker.updateNow(context)
+        // we are kicking off the initial update from the UI,
+        // not here to account for metered connection
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index 06206aa4d..6fafde103 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -32,7 +32,6 @@ import org.fdroid.updates.UpdatesManager
 import javax.inject.Inject
 import javax.inject.Singleton
 
-private val TAG = RepoUpdateManager::class.java.simpleName
 private const val MIN_UPDATE_INTERVAL_MILLIS = 15_000
 
 @Singleton
@@ -128,14 +127,17 @@ class RepoUpdateManager @VisibleForTesting internal constructor(
                 // update repo
                 val result = repoUpdater.update(repo)
                 log.info { "Update repo result: $result" }
-                repoUpdateListener.onUpdateFinished()
+                repoUpdateListener.onUpdateFinished(repo.repoId, result)
                 if (result is IndexUpdateResult.Processed) reposUpdated = true
                 else if (result is IndexUpdateResult.Error) {
                     log.error(result.e) { "Error updating repository ${repo.address} " }
                 }
             }
             db.getRepositoryDao().walCheckpoint()
-            settingsManager.lastRepoUpdate = System.currentTimeMillis()
+            // don't update time on first start when repos failed to update
+            if (!settingsManager.isFirstStart || reposUpdated) {
+                settingsManager.lastRepoUpdate = System.currentTimeMillis()
+            }
             if (reposUpdated) {
                 updatesManager.loadUpdates().join()
                 val numUpdates = updatesManager.numUpdates.value
@@ -164,7 +166,7 @@ class RepoUpdateManager @VisibleForTesting internal constructor(
             // update repo
             val result = repoUpdater.update(repo)
             log.info { "Update repo result: $result" }
-            repoUpdateListener.onUpdateFinished()
+            repoUpdateListener.onUpdateFinished(repo.repoId, result)
             if (result is IndexUpdateResult.Processed) {
                 updatesManager.loadUpdates()
             } else if (result is IndexUpdateResult.Error) {
@@ -203,7 +205,7 @@ internal class RepoUpdateListener(
             throttle = bytesRead != totalBytes,
             progress = percent,
         )
-        _updateState.update { RepoUpdateState(repo.repoId, true, percent) }
+        _updateState.update { RepoUpdateProgress(repo.repoId, true, percent) }
     }
 
     /**
@@ -234,16 +236,16 @@ internal class RepoUpdateListener(
                 throttle = appsProcessed != totalApps,
                 progress = percent,
             )
-            _updateState.update { RepoUpdateState(repo.repoId, false, percent) }
+            _updateState.update { RepoUpdateProgress(repo.repoId, false, percent) }
         } else {
             notificationManager.showUpdateRepoNotification(msg)
-            _updateState.update { RepoUpdateState(repo.repoId, false, 0f) }
+            _updateState.update { RepoUpdateProgress(repo.repoId, false, 0f) }
         }
         lastUpdateProgress = System.currentTimeMillis()
     }
 
-    fun onUpdateFinished() {
-        _updateState.update { null }
+    fun onUpdateFinished(repoId: Long, result: IndexUpdateResult) {
+        _updateState.update { RepoUpdateFinished(repoId, result) }
     }
 
     private fun getPercent(current: Long, total: Long): Int {
@@ -252,6 +254,10 @@ internal class RepoUpdateListener(
     }
 }
 
+sealed interface RepoUpdateState {
+    val repoId: Long
+}
+
 /**
  * There's two types of progress. First, there's the download, so [isDownloading] is true.
  * Then there's inserting the repo data into the DB, there [isDownloading] is false.
@@ -259,11 +265,11 @@ internal class RepoUpdateListener(
  *
  * An external unified view on that is given as [progress].
  */
-data class RepoUpdateState(
-    val repoId: Long,
+data class RepoUpdateProgress(
+    override val repoId: Long,
     private val isDownloading: Boolean,
     @param:FloatRange(from = 0.0, to = 1.0) private val stepProgress: Float,
-) {
+) : RepoUpdateState {
     constructor(
         repoId: Long,
         isDownloading: Boolean,
@@ -276,3 +282,8 @@ data class RepoUpdateState(
 
     val progress: Float = if (isDownloading) stepProgress / 2 else 0.5f + stepProgress / 2
 }
+
+data class RepoUpdateFinished(
+    override val repoId: Long,
+    val result: IndexUpdateResult,
+) : RepoUpdateState
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 263c4277e..73da26bcc 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -2,6 +2,7 @@ package org.fdroid.ui.discover
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -40,7 +41,8 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
 import kotlinx.coroutines.launch
 import org.fdroid.R
-import org.fdroid.repo.RepoUpdateState
+import org.fdroid.download.NetworkState
+import org.fdroid.repo.RepoUpdateProgress
 import org.fdroid.ui.BottomBar
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.MainOverFlowMenu
@@ -113,14 +115,18 @@ fun Discover(
     ) { paddingValues ->
         val scope = rememberCoroutineScope()
         Column(
-            Modifier
+            verticalArrangement = Arrangement.Center,
+            modifier = Modifier
                 .focusable() // workaround for https://issuetracker.google.com/issues/445720462
                 .fillMaxSize()
                 .verticalScroll(rememberScrollState())
                 .padding(paddingValues)
         ) {
             when (discoverModel) {
-                is FirstStartDiscoverModel -> FirstStart(discoverModel.repoUpdateState)
+                is FirstStartDiscoverModel -> FirstStart(
+                    networkState = discoverModel.networkState,
+                    repoUpdateState = discoverModel.repoUpdateState,
+                )
                 is LoadingDiscoverModel -> BigLoadingIndicator()
                 is LoadedDiscoverModel -> {
                     AppsSearch(
@@ -212,9 +218,12 @@ fun Discover(
 fun FirstStartDiscoverPreview() {
     FDroidContent {
         Discover(
-            discoverModel = FirstStartDiscoverModel(RepoUpdateState(1, true, 0.25f)),
-            numUpdates = 23,
-            hasIssues = true,
+            discoverModel = FirstStartDiscoverModel(
+                NetworkState(true, isMetered = false),
+                RepoUpdateProgress(1, true, 0.25f),
+            ),
+            numUpdates = 0,
+            hasIssues = false,
             isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index b8acc55f9..b5e0a3d42 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import org.fdroid.database.Repository
+import org.fdroid.download.NetworkState
 import org.fdroid.repo.RepoUpdateState
 import org.fdroid.ui.categories.CategoryGroup
 import org.fdroid.ui.categories.CategoryItem
@@ -20,6 +21,7 @@ fun DiscoverPresenter(
     repositoriesFlow: Flow<List<Repository>>,
     searchResultsFlow: StateFlow<SearchResults?>,
     isFirstStart: Boolean,
+    networkState: NetworkState,
     repoUpdateStateFlow: StateFlow<RepoUpdateState?>,
 ): DiscoverModel {
     val newApps = newAppsFlow.collectAsState(null).value
@@ -36,7 +38,7 @@ fun DiscoverPresenter(
         if (repositories?.all { !it.enabled } == true) {
             NoEnabledReposDiscoverModel
         } else if (isFirstStart) {
-            FirstStartDiscoverModel(repoUpdateStateFlow.collectAsState().value)
+            FirstStartDiscoverModel(networkState, repoUpdateStateFlow.collectAsState().value)
         } else {
             LoadingDiscoverModel
         }
@@ -57,6 +59,7 @@ fun DiscoverPresenter(
 
 sealed class DiscoverModel
 data class FirstStartDiscoverModel(
+    val networkState: NetworkState,
     val repoUpdateState: RepoUpdateState?,
 ) : DiscoverModel()
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 15fc1404f..cfa2fe9ac 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -28,6 +28,7 @@ import org.fdroid.database.AppOverviewItem
 import org.fdroid.database.FDroidDatabase
 import org.fdroid.database.Repository
 import org.fdroid.download.DownloadRequest
+import org.fdroid.download.NetworkMonitor
 import org.fdroid.download.PackageName
 import org.fdroid.download.getImageModel
 import org.fdroid.index.RepoManager
@@ -50,6 +51,7 @@ class DiscoverViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
     updatesManager: UpdatesManager,
+    networkMonitor: NetworkMonitor,
     private val settingsManager: SettingsManager,
     private val repoManager: RepoManager,
     private val repoUpdateManager: RepoUpdateManager,
@@ -100,6 +102,9 @@ class DiscoverViewModel @Inject constructor(
                 repositoriesFlow = repoManager.repositoriesState,
                 searchResultsFlow = searchResults,
                 isFirstStart = settingsManager.isFirstStart,
+                // not observing the flow, but just taking the current value,
+                // because we kick off repo updates from the UI depending on this state
+                networkState = networkMonitor.networkState.value,
                 repoUpdateStateFlow = repoUpdateManager.repoUpdateState,
             )
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt b/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
index 3049cccba..da9749a89 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
@@ -6,84 +6,134 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Button
 import androidx.compose.material3.CircularWavyProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.ProgressIndicatorDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
+import org.fdroid.download.NetworkState
+import org.fdroid.index.IndexUpdateResult
+import org.fdroid.repo.RepoUpdateFinished
+import org.fdroid.repo.RepoUpdateProgress
 import org.fdroid.repo.RepoUpdateState
+import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.ui.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
-fun ColumnScope.FirstStart(repoUpdateState: RepoUpdateState?) {
-    Text(
-        stringResource(R.string.first_start_loading),
-        textAlign = TextAlign.Center,
-        modifier = Modifier
-            .padding(16.dp)
-            .fillMaxWidth()
-    )
-    // use thicker stroke for larger circle
-    val stroke = Stroke(
-        width = with(LocalDensity.current) {
-            6.dp.toPx()
-        },
-        cap = StrokeCap.Round,
-    )
-    val progressModifier = Modifier
-        .padding(16.dp)
-        .size(128.dp)
-        .align(Alignment.CenterHorizontally)
-    // show indeterminate circle if we don't have any progress (may take a bit to start)
-    if ((repoUpdateState?.progress ?: 0f) == 0f) CircularWavyProgressIndicator(
-        wavelength = 24.dp,
-        stroke = stroke,
-        trackStroke = stroke,
-        modifier = progressModifier,
-    ) else {
-        // animate real progress (download and DB insertion)
-        val animatedProgress by animateFloatAsState(
-            targetValue = repoUpdateState?.progress ?: 0f,
-            animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
+fun ColumnScope.FirstStart(networkState: NetworkState, repoUpdateState: RepoUpdateState?) {
+    val context = LocalContext.current
+    var override by rememberSaveable { mutableStateOf(false) }
+    // reset override on error, so user can press button again for re-try
+    LaunchedEffect(repoUpdateState) {
+        if (repoUpdateState is RepoUpdateFinished &&
+            repoUpdateState.result is IndexUpdateResult.Error
+        ) override = false
+        // TODO it would be nice to surface normal update errors better and also let the user retry
+    }
+    if ((!networkState.isOnline || networkState.isMetered) && !override) {
+        // offline or metered, not overridden
+        val res = if (networkState.isMetered) {
+            stringResource(R.string.first_start_metered)
+        } else {
+            stringResource(R.string.first_start_offline)
+        }
+        Text(
+            text = stringResource(R.string.first_start_intro),
+            textAlign = TextAlign.Center,
+            modifier = Modifier
+                .padding(16.dp)
+                .fillMaxWidth()
         )
-        CircularWavyProgressIndicator(
-            progress = { animatedProgress },
+        Text(
+            text = res,
+            textAlign = TextAlign.Center,
+            modifier = Modifier
+                .padding(16.dp)
+                .fillMaxWidth()
+        )
+        Button(
+            onClick = { override = true },
+            modifier = Modifier.align(CenterHorizontally),
+        ) {
+            Text(stringResource(R.string.first_start_button))
+        }
+    } else {
+        // happy path or user set override
+        LaunchedEffect(Unit) {
+            RepoUpdateWorker.updateNow(context)
+        }
+        Text(
+            text = stringResource(R.string.first_start_loading),
+            textAlign = TextAlign.Center,
+            modifier = Modifier
+                .padding(16.dp)
+                .fillMaxWidth()
+        )
+        // use thicker stroke for larger circle
+        val stroke = Stroke(
+            width = with(LocalDensity.current) {
+                6.dp.toPx()
+            },
+            cap = StrokeCap.Round,
+        )
+        val progressModifier = Modifier
+            .padding(16.dp)
+            .size(128.dp)
+            .align(CenterHorizontally)
+        // show indeterminate circle if we don't have any progress (may take a bit to start)
+        val progress = (repoUpdateState as? RepoUpdateProgress)?.progress ?: 0f
+        if (progress == 0f) CircularWavyProgressIndicator(
             wavelength = 24.dp,
             stroke = stroke,
             trackStroke = stroke,
             modifier = progressModifier,
-        )
-    }
-}
-
-@Preview
-@Composable
-private fun NullPreview() {
-    FDroidContent {
-        Column {
-            FirstStart(null)
+        ) else {
+            // animate real progress (download and DB insertion)
+            val animatedProgress by animateFloatAsState(targetValue = progress)
+            CircularWavyProgressIndicator(
+                progress = { animatedProgress },
+                wavelength = 24.dp,
+                stroke = stroke,
+                trackStroke = stroke,
+                modifier = progressModifier,
+            )
         }
     }
 }
 
 @Preview
 @Composable
-private fun DownloadPreview() {
+private fun OfflinePreview() {
     FDroidContent {
         Column {
-            FirstStart(RepoUpdateState(1L, true, 0.25f))
+            FirstStart(NetworkState(isOnline = false, isMetered = false), null)
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun MeteredPreview() {
+    FDroidContent {
+        Column {
+            FirstStart(NetworkState(isOnline = true, isMetered = true), null)
         }
     }
 }
@@ -93,7 +143,10 @@ private fun DownloadPreview() {
 private fun UpdatePreview() {
     FDroidContent {
         Column {
-            FirstStart(RepoUpdateState(1L, false, 0.75f))
+            FirstStart(
+                networkState = NetworkState(isOnline = true, isMetered = false),
+                repoUpdateState = RepoUpdateProgress(1L, false, 0.5f)
+            )
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
index 5b6faebc2..ac436c05e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
@@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp
 import com.viktormykhailiv.compose.hints.HintHost
 import org.fdroid.R
 import org.fdroid.database.Repository
+import org.fdroid.repo.RepoUpdateProgress
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.getRepoDetailsInfo
@@ -45,10 +46,9 @@ fun RepoDetailsContent(
             .verticalScroll(rememberScrollState()),
     ) {
         // show progress here as well, if repo is currently updating
-        if (info.model.updateState != null) {
-            val animatedProgress by animateFloatAsState(
-                targetValue = info.model.updateState?.progress ?: 0f,
-            )
+        val updateState = info.model.updateState
+        if (updateState is RepoUpdateProgress) {
+            val animatedProgress by animateFloatAsState(targetValue = updateState.progress)
             LinearWavyProgressIndicator(
                 progress = { animatedProgress },
                 stopSize = 0.dp,
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
index a6437b543..e805efdaf 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
@@ -17,7 +17,7 @@ import org.fdroid.index.v2.PackageVersion
 import org.fdroid.index.v2.SignerV2
 import org.fdroid.install.InstallConfirmationState
 import org.fdroid.install.InstallState
-import org.fdroid.repo.RepoUpdateState
+import org.fdroid.repo.RepoUpdateProgress
 import org.fdroid.ui.apps.AppUpdateItem
 import org.fdroid.ui.apps.AppWithIssueItem
 import org.fdroid.ui.apps.InstalledAppItem
@@ -425,7 +425,7 @@ fun getRepoDetailsInfo(
         ),
         archiveState = ArchiveState.LOADING,
         showOnboarding = false,
-        updateState = RepoUpdateState(42L, true, 0.75f),
+        updateState = RepoUpdateProgress(42L, true, 0.75f),
         networkState = NetworkState(isOnline = false, isMetered = false),
         proxy = null,
     ),
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index bf2c7b25c..be4d99834 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -9,6 +9,10 @@
     <string name="menu_apps_my">My apps</string>
 
     <string name="first_start_loading">Retrieving apps…\n\nThis may take some time.</string>
+    <string name="first_start_intro">We need to download the latest app repository to get you started.</string>
+    <string name="first_start_offline">However, you seem to be offline. Connect to the internet and tap the button below when ready.</string>
+    <string name="first_start_metered">However, you are on mobile data and we\'ll need to download more than 10 MB. Tap the button below when ready to download.</string>
+    <string name="first_start_button">Download app repository</string>
     <string name="no_repos_enabled">No repositories enabled.\nEnable or add at least one repository to see apps.</string>
     <string name="no_app_selected">No app selected</string>
     <string name="no_repository_selected">No repository selected</string>

From 3940a329113f18b37ca01163ab2d8521c80fb1f0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 18 Dec 2025 11:34:11 -0300
Subject: [PATCH 143/180] Remove cached APKs after 24h

the clean up is piggybacking on repo updates
---
 .../kotlin/org/fdroid/install/CacheCleaner.kt | 39 +++++++++++++++++++
 .../org/fdroid/repo/RepoUpdateWorker.kt       |  5 +++
 2 files changed, 44 insertions(+)
 create mode 100644 next/src/main/kotlin/org/fdroid/install/CacheCleaner.kt

diff --git a/next/src/main/kotlin/org/fdroid/install/CacheCleaner.kt b/next/src/main/kotlin/org/fdroid/install/CacheCleaner.kt
new file mode 100644
index 000000000..007650c66
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/install/CacheCleaner.kt
@@ -0,0 +1,39 @@
+package org.fdroid.install
+
+import android.content.Context
+import androidx.annotation.WorkerThread
+import dagger.hilt.android.qualifiers.ApplicationContext
+import mu.KotlinLogging
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val DELETE_OLDER_THAN_MILLIS = 8_640_000 // 24h
+
+@Singleton
+class CacheCleaner @Inject constructor(
+    @param:ApplicationContext private val context: Context,
+) {
+    private val log = KotlinLogging.logger { }
+    private val shaRegex = "^[a-zA-Z0-9]{64}$".toRegex()
+
+    @WorkerThread
+    fun clean() {
+        log.info { "Cleaning up old files..," }
+        try {
+            context.cacheDir.listFiles()?.forEach { file ->
+                if (file.isFile && shaRegex.matches(file.name) && file.isTooOld()) {
+                    log.debug { "Deleting ${file.name}..." }
+                    file.delete()
+                }
+            } ?: throw NullPointerException("listFiles() returned null")
+        } catch (e: Exception) {
+            log.error(e) { "Error deleting old cached files: " }
+        }
+    }
+
+    private fun File.isTooOld(): Boolean {
+        val age = System.currentTimeMillis() - lastModified()
+        return age >= DELETE_OLDER_THAN_MILLIS
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
index 13837e7a5..ddc50a7e5 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.map
 import mu.KotlinLogging
 import org.fdroid.NotificationManager
 import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_REPO_UPDATE
+import org.fdroid.install.CacheCleaner
 import org.fdroid.ui.utils.canStartForegroundService
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeUnit.MINUTES
@@ -38,6 +39,7 @@ class RepoUpdateWorker @AssistedInject constructor(
     @Assisted appContext: Context,
     @Assisted workerParams: WorkerParameters,
     private val repoUpdateManager: RepoUpdateManager,
+    private val cacheCleaner: CacheCleaner,
     private val nm: NotificationManager,
 ) : CoroutineWorker(appContext, workerParams) {
 
@@ -122,6 +124,9 @@ class RepoUpdateWorker @AssistedInject constructor(
             currentCoroutineContext().ensureActive()
             if (repoId >= 0) repoUpdateManager.updateRepo(repoId)
             else repoUpdateManager.updateRepos()
+            // use opportunity to clean up cached APKs
+            cacheCleaner.clean()
+            // return result
             Result.success()
         } catch (e: Exception) {
             log.error(e) { "Error updating repos" }

From e92180af87afc641ec6b3192cb047540c410e0c1 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 18 Dec 2025 14:55:08 -0300
Subject: [PATCH 144/180] Allow updates even on metered connections

For this, the update toggles in settings are replaced with a ListPreference with three states: only on wifi, always and never.
---
 .../org/fdroid/repo/RepoUpdateWorker.kt       | 11 +++-
 .../org/fdroid/settings/SettingsConstants.kt  | 18 +++--
 .../org/fdroid/settings/SettingsManager.kt    | 16 +++--
 .../kotlin/org/fdroid/ui/settings/Settings.kt | 66 ++++++++++++++-----
 .../fdroid/ui/settings/SettingsViewModel.kt   | 12 ++--
 .../org/fdroid/updates/AppUpdateWorker.kt     | 12 +++-
 next/src/main/res/values/strings-next.xml     | 13 ++--
 7 files changed, 107 insertions(+), 41 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
index ddc50a7e5..317e8e408 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
@@ -28,6 +28,7 @@ import mu.KotlinLogging
 import org.fdroid.NotificationManager
 import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_REPO_UPDATE
 import org.fdroid.install.CacheCleaner
+import org.fdroid.settings.SettingsConstants.AutoUpdateValues
 import org.fdroid.ui.utils.canStartForegroundService
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeUnit.MINUTES
@@ -68,11 +69,15 @@ class RepoUpdateWorker @AssistedInject constructor(
         }
 
         @JvmStatic
-        fun scheduleOrCancel(context: Context, enabled: Boolean) {
+        fun scheduleOrCancel(context: Context, autoUpdate: AutoUpdateValues) {
             val workManager = WorkManager.getInstance(context)
-            if (enabled) {
+            if (autoUpdate != AutoUpdateValues.Never) {
                 Log.i(TAG, "scheduleOrCancel: enqueueUniquePeriodicWork")
-                val networkType = NetworkType.UNMETERED
+                val networkType = if (autoUpdate == AutoUpdateValues.Always) {
+                    NetworkType.CONNECTED
+                } else {
+                    NetworkType.UNMETERED
+                }
                 val constraints = Constraints.Builder()
                     .setRequiresBatteryNotLow(true)
                     .setRequiresStorageNotLow(true)
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
index 025912c99..808a9ab71 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -1,6 +1,7 @@
 package org.fdroid.settings
 
 import org.fdroid.database.AppListSortOrder
+import org.fdroid.settings.SettingsConstants.AutoUpdateValues
 
 object SettingsConstants {
 
@@ -13,11 +14,13 @@ object SettingsConstants {
     const val PREF_KEY_DYNAMIC_COLORS = "dynamicColors"
     const val PREF_DEFAULT_DYNAMIC_COLORS = false
 
-    const val PREF_KEY_REPO_UPDATES = "repoUpdates"
-    const val PREF_DEFAULT_REPO_UPDATES = true
+    enum class AutoUpdateValues { OnlyWifi, Always, Never }
 
-    const val PREF_KEY_AUTO_UPDATES = "autoUpdates"
-    const val PREF_DEFAULT_AUTO_UPDATES = true
+    const val PREF_KEY_REPO_UPDATES = "repoAutoUpdates"
+    val PREF_DEFAULT_REPO_UPDATES = AutoUpdateValues.OnlyWifi.name
+
+    const val PREF_KEY_AUTO_UPDATES = "appAutoUpdates"
+    val PREF_DEFAULT_AUTO_UPDATES = AutoUpdateValues.OnlyWifi.name
 
     const val PREF_KEY_PROXY = "proxy"
     const val PREF_DEFAULT_PROXY = ""
@@ -39,3 +42,10 @@ object SettingsConstants {
 
     const val PREF_KEY_IGNORED_APP_ISSUES = "ignoredAppIssues"
 }
+
+fun String?.toAutoUpdateValue() = try {
+    if (this == null) AutoUpdateValues.OnlyWifi
+    else AutoUpdateValues.valueOf(this)
+} catch (_: IllegalArgumentException) {
+    AutoUpdateValues.OnlyWifi
+}
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index b283e9adb..72ed65f64 100644
--- a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -57,12 +57,20 @@ class SettingsManager @Inject constructor(
     val dynamicColorFlow: Flow<Boolean> = prefsFlow.map {
         it.get<Boolean>(PREF_KEY_DYNAMIC_COLORS) ?: PREF_DEFAULT_DYNAMIC_COLORS
     }.distinctUntilChanged()
-    val repoUpdates get() = prefs.getBoolean(PREF_KEY_REPO_UPDATES, PREF_DEFAULT_REPO_UPDATES)
+    val repoUpdates
+        get() = prefs.getString(PREF_KEY_REPO_UPDATES, PREF_DEFAULT_REPO_UPDATES)
+            .toAutoUpdateValue()
     val repoUpdatesFlow
-        get() = prefsFlow.map { it.get<Boolean>(PREF_KEY_REPO_UPDATES) }.distinctUntilChanged()
-    val autoUpdateApps get() = prefs.getBoolean(PREF_KEY_AUTO_UPDATES, PREF_DEFAULT_AUTO_UPDATES)
+        get() = prefsFlow.map {
+            it.get<String>(PREF_KEY_REPO_UPDATES).toAutoUpdateValue()
+        }.distinctUntilChanged()
+    val autoUpdateApps
+        get() = prefs.getString(PREF_KEY_AUTO_UPDATES, PREF_DEFAULT_AUTO_UPDATES)
+            .toAutoUpdateValue()
     val autoUpdateAppsFlow
-        get() = prefsFlow.map { it.get<Boolean>(PREF_KEY_AUTO_UPDATES) }.distinctUntilChanged()
+        get() = prefsFlow.map {
+            it.get<String>(PREF_KEY_AUTO_UPDATES).toAutoUpdateValue()
+        }.distinctUntilChanged()
     var lastRepoUpdate: Long
         get() = try {
             prefs.getInt(PREF_KEY_LAST_UPDATE_CHECK, PREF_DEFAULT_LAST_UPDATE_CHECK)
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
index ced709077..f71eaf8ae 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
@@ -55,6 +55,10 @@ import me.zhanghai.compose.preference.preferenceCategory
 import me.zhanghai.compose.preference.rememberPreferenceState
 import me.zhanghai.compose.preference.switchPreference
 import org.fdroid.R
+import org.fdroid.settings.SettingsConstants.AutoUpdateValues
+import org.fdroid.settings.SettingsConstants.AutoUpdateValues.Always
+import org.fdroid.settings.SettingsConstants.AutoUpdateValues.Never
+import org.fdroid.settings.SettingsConstants.AutoUpdateValues.OnlyWifi
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_AUTO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_DYNAMIC_COLORS
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY
@@ -65,6 +69,7 @@ import org.fdroid.settings.SettingsConstants.PREF_KEY_DYNAMIC_COLORS
 import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY
 import org.fdroid.settings.SettingsConstants.PREF_KEY_REPO_UPDATES
 import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME
+import org.fdroid.settings.toAutoUpdateValue
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.asRelativeTimeString
 import org.fdroid.ui.utils.startActivitySafe
@@ -199,14 +204,14 @@ fun Settings(
                     key = "pref_category_updates",
                     title = { Text(stringResource(R.string.updates)) },
                 )
-                switchPreference(
+                listPreference(
                     key = PREF_KEY_REPO_UPDATES,
                     defaultValue = PREF_DEFAULT_REPO_UPDATES,
                     title = {
                         Text(stringResource(R.string.pref_repo_updates_title))
                     },
-                    icon = { repoUpdatesEnabled ->
-                        if (repoUpdatesEnabled) Icon(
+                    icon = { strValue ->
+                        if (strValue != Never.name) Icon(
                             imageVector = Icons.Default.SystemSecurityUpdate,
                             contentDescription = null,
                             modifier = Modifier.semantics { hideFromAccessibility() },
@@ -217,8 +222,8 @@ fun Settings(
                             modifier = Modifier.semantics { hideFromAccessibility() },
                         )
                     },
-                    summary = { repoUpdatesEnabled ->
-                        if (repoUpdatesEnabled) {
+                    summary = { strValue ->
+                        if (strValue != Never.name) {
                             val nextUpdate =
                                 model.nextRepoUpdateFlow.collectAsState(Long.MAX_VALUE).value
                             val nextUpdateStr = if (nextUpdate == Long.MAX_VALUE) {
@@ -234,26 +239,39 @@ fun Settings(
                                     nextUpdate.asRelativeTimeString()
                                 )
                             }
-                            val s = stringResource(R.string.pref_repo_updates_summary_enabled) +
-                                "\n\n" + nextUpdateStr
-                            Text(s)
+                            val s = if (strValue == OnlyWifi.name) {
+                                stringResource(R.string.pref_repo_updates_summary_only_wifi)
+                            } else if (strValue == Always.name) {
+                                stringResource(R.string.pref_repo_updates_summary_always)
+                            } else error("Unknown value: $strValue")
+                            Text(s + "\n" + nextUpdateStr)
                         } else {
                             Text(
-                                text = stringResource(R.string.pref_repo_updates_summary_disabled),
+                                text = stringResource(R.string.pref_repo_updates_summary_never),
                                 color = MaterialTheme.colorScheme.error,
                             )
                         }
                     },
+                    values = AutoUpdateValues.entries.map { it.name },
+                    valueToText = { value: String ->
+                        AnnotatedString(
+                            when (value.toAutoUpdateValue()) {
+                                OnlyWifi -> res.getString(R.string.pref_auto_updates_only_wifi)
+                                Always -> res.getString(R.string.pref_auto_updates_only_always)
+                                Never -> res.getString(R.string.pref_auto_updates_only_never)
+                            }
+                        )
+                    },
                 )
-                switchPreference(
+                listPreference(
                     key = PREF_KEY_AUTO_UPDATES,
                     defaultValue = PREF_DEFAULT_AUTO_UPDATES,
                     title = {
                         Text(stringResource(R.string.update_auto_install))
                     },
-                    icon = { autoUpdatesEnabled ->
+                    icon = { strValue ->
                         Icon(
-                            imageVector = if (autoUpdatesEnabled) {
+                            imageVector = if (strValue != Never.name) {
                                 Icons.Default.Update
                             } else {
                                 Icons.Default.UpdateDisabled
@@ -262,8 +280,8 @@ fun Settings(
                             modifier = Modifier.semantics { hideFromAccessibility() },
                         )
                     },
-                    summary = { autoUpdatesEnabled ->
-                        val s = if (autoUpdatesEnabled) {
+                    summary = { strValue ->
+                        val s = if (strValue != Never.name) {
                             val nextUpdate =
                                 model.nextAppUpdateFlow.collectAsState(Long.MAX_VALUE).value
                             val nextUpdateStr = if (nextUpdate == Long.MAX_VALUE) {
@@ -279,13 +297,27 @@ fun Settings(
                                     nextUpdate.asRelativeTimeString()
                                 )
                             }
-                            stringResource(R.string.pref_auto_updates_summary_enabled) +
-                                "\n\n" + nextUpdateStr
+                            val s = if (strValue == OnlyWifi.name) {
+                                stringResource(R.string.pref_auto_updates_summary_only_wifi)
+                            } else if (strValue == Always.name) {
+                                stringResource(R.string.pref_auto_updates_summary_always)
+                            } else error("Unknown value: $strValue")
+                            s + "\n" + nextUpdateStr
                         } else {
-                            stringResource(R.string.pref_auto_updates_summary_disabled)
+                            stringResource(R.string.pref_auto_updates_summary_never)
                         }
                         Text(s)
                     },
+                    values = AutoUpdateValues.entries.map { it.name },
+                    valueToText = { value: String ->
+                        AnnotatedString(
+                            when (value.toAutoUpdateValue()) {
+                                OnlyWifi -> res.getString(R.string.pref_auto_updates_only_wifi)
+                                Always -> res.getString(R.string.pref_auto_updates_only_always)
+                                Never -> res.getString(R.string.pref_auto_updates_only_never)
+                            }
+                        )
+                    },
                 )
                 preferenceCategory(
                     key = "pref_category_network",
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
index e9572c8ef..67c6c7779 100644
--- a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
@@ -48,15 +48,15 @@ class SettingsViewModel @Inject constructor(
             }
         }
         viewModelScope.launch {
-            // react to repo-update changes
-            settingsManager.repoUpdatesFlow.drop(1).collect { enable ->
-                if (enable != null) RepoUpdateWorker.scheduleOrCancel(application, enable)
+            // react to repo auto update changes
+            settingsManager.repoUpdatesFlow.drop(1).collect { value ->
+                RepoUpdateWorker.scheduleOrCancel(application, value)
             }
         }
         viewModelScope.launch {
-            // react to auto-update changes
-            settingsManager.autoUpdateAppsFlow.drop(1).collect { enable ->
-                if (enable != null) AppUpdateWorker.scheduleOrCancel(application, enable)
+            // react to app auto update changes
+            settingsManager.autoUpdateAppsFlow.drop(1).collect { value ->
+                AppUpdateWorker.scheduleOrCancel(application, value)
             }
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
index 8d4c362a0..7263ee0fe 100644
--- a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
@@ -27,6 +27,7 @@ import org.fdroid.NotificationManager
 import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_APP_INSTALLS
 import org.fdroid.install.AppInstallManager
 import org.fdroid.install.InstallNotificationState
+import org.fdroid.settings.SettingsConstants.AutoUpdateValues
 import org.fdroid.ui.utils.canStartForegroundService
 import java.util.concurrent.TimeUnit
 
@@ -46,15 +47,20 @@ class AppUpdateWorker @AssistedInject constructor(
         internal const val UNIQUE_WORK_NAME_APP_UPDATE = "autoAppUpdate"
 
         @JvmStatic
-        fun scheduleOrCancel(context: Context, doAutoUpdates: Boolean) {
+        fun scheduleOrCancel(context: Context, autoUpdate: AutoUpdateValues) {
             val workManager = WorkManager.getInstance(context)
-            if (doAutoUpdates) {
+            if (autoUpdate != AutoUpdateValues.Never) {
                 Log.i(TAG, "scheduleOrCancel: enqueueUniquePeriodicWork")
+                val networkType = if (autoUpdate == AutoUpdateValues.Always) {
+                    NetworkType.CONNECTED
+                } else {
+                    NetworkType.UNMETERED
+                }
                 val constraints = Constraints.Builder()
                     .setRequiresBatteryNotLow(true)
                     .setRequiresStorageNotLow(true)
                     .setRequiresDeviceIdle(true)
-                    .setRequiredNetworkType(NetworkType.UNMETERED)
+                    .setRequiredNetworkType(networkType)
                     .build()
                 val workRequest = PeriodicWorkRequestBuilder<AppUpdateWorker>(
                     repeatInterval = TimeUnit.HOURS.toMillis(24),
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index be4d99834..3039a4dd7 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -147,11 +147,16 @@
     <string name="pref_dyn_colors_title">Use system colors</string>
     <string name="pref_dyn_colors_summary">Apply dynamic colors from your system settings</string>
     <string name="pref_language_summary">Opens system language settings</string>
-    <string name="pref_auto_updates_summary_enabled">Download and update apps daily when the device isn\'t being used</string>
-    <string name="pref_auto_updates_summary_disabled">Auto-updates disabled • Apps will need to be updated manually</string>
+    <string name="pref_auto_updates_only_wifi">Only on WiFi</string>
+    <string name="pref_auto_updates_only_always">Always (even on mobile data)</string>
+    <string name="pref_auto_updates_only_never">Never</string>
+    <string name="pref_auto_updates_summary_only_wifi">Download and update apps daily when on WiFi and the device isn\'t being used.</string>
+    <string name="pref_auto_updates_summary_always">Download and update apps daily even on mobile data when the device isn\'t being used.</string>
+    <string name="pref_auto_updates_summary_never">Auto-updates disabled • Apps will need to be updated manually</string>
     <string name="pref_repo_updates_title">Check for updates</string>
-    <string name="pref_repo_updates_summary_enabled">Automatically ask all repositories for app updates</string>
-    <string name="pref_repo_updates_summary_disabled">Do NOT check for updates • Apps will become outdated</string>
+    <string name="pref_repo_updates_summary_only_wifi">Periodically ask all repositories for app updates, but only when on WiFi.</string>
+    <string name="pref_repo_updates_summary_always">Periodically ask all repositories for app updates even when on mobile data.</string>
+    <string name="pref_repo_updates_summary_never">Do NOT check for updates • Apps will become outdated</string>
     <string name="pref_category_network">Network</string>
     <string name="pref_proxy_title">Connect via SOCKS proxy</string>
     <string name="pref_proxy_disabled">Connect to the internet without proxy</string>

From 036b9b6dd12d5aab4525f9cb453ff68adaf528ca Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 18 Dec 2025 16:52:52 -0300
Subject: [PATCH 145/180] Upgrade dependencies

---
 gradle/libs.versions.toml                  | 55 +++++++++++-----------
 next/build.gradle.kts                      | 17 +++++--
 next/src/main/kotlin/org/fdroid/ui/Main.kt |  2 +-
 3 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c9e9fa4fb..3fc86804f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,22 +1,22 @@
 [versions]
 compileSdk = "36"
-kotlin = "2.2.21"
-androidGradlePlugin = "8.11.1" # 8.12.0 pulls in aapt2 which has issue on buildserver
-androidKspPlugin = "2.2.21-2.0.4" # first version needs to match kotlin version
-hilt = "2.56.2"
-hiltWork = "1.2.0"
-hiltNavigationCompose = "1.2.0"
+kotlin = "2.3.0"
+androidGradlePlugin = "8.13.2"
+androidKspPlugin = "2.3.4"
+hilt = "2.57.2"
+hiltWork = "1.3.0"
+hiltNavigationCompose = "1.3.0"
 dokka = "2.1.0"
-mavenPublish = "0.34.0"
-jlleitschuhKtlint = "13.1.0"
+mavenPublish = "0.35.0"
+jlleitschuhKtlint = "14.0.1"
 
-kotlinxSerializationCore = "1.8.1"
+kotlinxSerializationCore = "1.9.0"
 kotlinxSerializationJson = "1.9.0"
 kotlinxCoroutinesTest = "1.10.2"
 
-ktor = "3.3.1"
+ktor = "3.3.3"
 okhttp = "4.12.0"
-room = "2.8.3"
+room = "2.8.4"
 glide = "5.0.5"
 glideCompose = "1.0.0-beta08"
 coilCompose = "3.3.0"
@@ -27,18 +27,18 @@ composePreference = "2.1.0"
 androidxCoreKtx = "1.17.0"
 androidxAppcompat = "1.7.1"
 androidxPreferenceKtx = "1.2.1"
-androidxLifecycleLivedataKtx = "2.9.4"
-androidxWork = "2.10.5"
+androidxLifecycleLivedataKtx = "2.10.0"
+androidxWork = "2.11.0"
 androidxDocumentfile = "1.1.0"
 androidxLocalbroadcastmanager = "1.1.0"
-androidxHiltCompiler = "1.2.0"
+androidxHiltCompiler = "1.3.0"
 androidxRecyclerview = "1.4.0"
 androidxConstraintlayout = "2.2.1"
-androidxSwipeRefreshLayout = "1.1.0"
+androidxSwipeRefreshLayout = "1.2.0"
 androidxVectordrawable = "1.2.0"
 androidxGridlayout = "1.1.0"
-androidxComposeBom = "2025.11.01"
-androidxActivityCompose = "1.12.0"
+androidxComposeBom = "2025.12.01"
+androidxActivityCompose = "1.12.2"
 accompanistDrawablepainter = "0.37.3"
 
 # navigation3
@@ -48,8 +48,7 @@ material3AdaptiveNav3 = "1.0.0-alpha03"
 
 material = "1.13.0"
 
-#noinspection GradleDependency newer version need minSdk 24 or library desugering
-zxingCore = "3.3.3"
+zxingCore = "3.5.4"
 guardianprojectNetcipher = "2.2.0-alpha"
 guardianprojectPanic = "1.0"
 acra = "5.13.1"
@@ -57,7 +56,7 @@ adapterdelegates4 = "4.3.2"
 #noinspection GradleDependency Commons IO > 2.5 uses java.nio.file, which requires desugaring
 commonsIo = "2.6"
 commonsNet = "3.6"
-bouncycastle = "1.82"
+bouncycastle = "1.83"
 #noinspection NewerVersionAvailable upgrade to 3.6.1 failed BonjourManagerTest
 jmdns = "3.5.5"
 nanohttpd = "2.3.1"
@@ -68,21 +67,21 @@ rxandroid = "3.0.2"
 
 slf4jApi = "2.0.17"
 microutilsKotlinLogging = "3.0.5"
-logbackClassic = "1.5.19"
+logbackClassic = "1.5.22"
 logbackAndroid = "3.0.0"
 
 junit = "4.13.2"
 mockk = "1.14.6"
 robolectric = "4.16"
-androidxTestCore = "1.6.1"
-androidxTestRunner = "1.6.2"
-androidxTestExtJunit = "1.2.1"
+androidxTestCore = "1.7.0"
+androidxTestRunner = "1.7.0"
+androidxTestExtJunit = "1.3.0"
 androidxCoreTesting = "2.2.0"
-androidxTestCoreKtx = "1.6.1"
-androidxEspressoCore = "3.6.1"
-androidxTestRules = "1.6.1"
+androidxTestCoreKtx = "1.7.0"
+androidxEspressoCore = "3.7.0"
+androidxTestRules = "1.7.0"
 androidxTestUiautomator = "2.3.0"
-androidxTestMonitor = "1.7.2"
+androidxTestMonitor = "1.8.0"
 mockitoCore = "5.1.1"
 hamcrest = "2.2"
 goncalossilvaResources = "0.2.1"
diff --git a/next/build.gradle.kts b/next/build.gradle.kts
index 82bf51516..0b824601e 100644
--- a/next/build.gradle.kts
+++ b/next/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.android.ksp)
@@ -37,11 +39,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     buildFeatures {
         compose = true
@@ -97,6 +96,8 @@ dependencies {
     implementation(libs.androidx.hilt.navigation.compose)
     ksp(libs.hilt.android.compiler)
     ksp(libs.androidx.hilt.compiler)
+    // https://github.com/google/dagger/issues/5001
+    ksp("org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0")
 
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
@@ -113,3 +114,9 @@ dependencies {
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
 }
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index bc4ea7176..3a0ddc2a3 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -16,7 +16,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.NavEntry

From ed7456d55b0d4783aa03212a7e9835b0524e4de7 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 18 Dec 2025 17:44:22 -0300
Subject: [PATCH 146/180] Fix some issues the new linter complained about

---
 .../main/kotlin/org/fdroid/ui/categories/CategoryList.kt   | 6 +++---
 .../kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt     | 7 ++-----
 .../kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt     | 6 ++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index 0e18ff70a..ca3d04c3c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -9,7 +9,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -34,9 +34,9 @@ fun CategoryList(
             modifier = Modifier.padding(bottom = 8.dp, start = 4.dp),
         )
         // we'll sort the groups here, because before we didn't have the context to get names
-        val context = LocalContext.current
+        val res = LocalResources.current
         val sortedMap = remember(categoryMap) {
-            val comparator = compareBy<CategoryGroup> { context.getString(it.name) }
+            val comparator = compareBy<CategoryGroup> { res.getString(it.name) }
             categoryMap.toSortedMap(comparator)
         }
         sortedMap.forEach { (group, categories) ->
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
index b5e0a3d42..f6589c3ad 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
@@ -5,7 +5,6 @@ import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
 import org.fdroid.database.Repository
 import org.fdroid.download.NetworkState
 import org.fdroid.repo.RepoUpdateState
@@ -23,6 +22,7 @@ fun DiscoverPresenter(
     isFirstStart: Boolean,
     networkState: NetworkState,
     repoUpdateStateFlow: StateFlow<RepoUpdateState?>,
+    hasRepoIssuesFlow: Flow<Boolean>,
 ): DiscoverModel {
     val newApps = newAppsFlow.collectAsState(null).value
     val recentlyUpdatedApps = recentlyUpdatedAppsFlow.collectAsState(null).value
@@ -43,16 +43,13 @@ fun DiscoverPresenter(
             LoadingDiscoverModel
         }
     } else {
-        val hasRepoIssues = repositoriesFlow.map { repos ->
-            repos.any { it.errorCount >= 5 }
-        }.collectAsState(false).value
         LoadedDiscoverModel(
             newApps = newApps ?: emptyList(),
             recentlyUpdatedApps = recentlyUpdatedApps,
             mostDownloadedApps = mostDownloadedApps,
             categories = categories?.groupBy { it.group },
             searchResults = searchResults,
-            hasRepoIssues = hasRepoIssues,
+            hasRepoIssues = hasRepoIssuesFlow.collectAsState(false).value,
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index cfa2fe9ac..ebc2f88a6 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -1,5 +1,6 @@
 package org.fdroid.ui.discover
 
+import android.annotation.SuppressLint
 import android.app.Application
 import android.database.sqlite.SQLiteException
 import androidx.core.os.LocaleListCompat
@@ -90,9 +91,13 @@ class DiscoverViewModel @Inject constructor(
         }.sortedWith { c1, c2 -> collator.compare(c1.name, c2.name) }
     }
     private val searchResults = MutableStateFlow<SearchResults?>(null)
+    private val hasRepoIssues = repoManager.repositoriesState.map { repos ->
+        repos.any { it.errorCount >= 5 }
+    }
 
     val localeList = LocaleListCompat.getDefault()
     val discoverModel: StateFlow<DiscoverModel> by lazy(LazyThreadSafetyMode.NONE) {
+        @SuppressLint("StateFlowValueCalledInComposition") // see comment below
         moleculeScope.launchMolecule(mode = ContextClock) {
             DiscoverPresenter(
                 newAppsFlow = newApps,
@@ -106,6 +111,7 @@ class DiscoverViewModel @Inject constructor(
                 // because we kick off repo updates from the UI depending on this state
                 networkState = networkMonitor.networkState.value,
                 repoUpdateStateFlow = repoUpdateManager.repoUpdateState,
+                hasRepoIssuesFlow = hasRepoIssues,
             )
         }
     }

From 7a3d3aed1d3870bfbbc4762e422b7d9414a66558 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 19 Dec 2025 12:08:16 -0300
Subject: [PATCH 147/180] Improve adaptive navigation

Shows a NavigationRail on big screens now and uses separate back stacks for main nav destinations
---
 .../main/kotlin/org/fdroid/MainActivity.kt    |  15 +-
 .../kotlin/org/fdroid/NotificationManager.kt  |   2 +-
 next/src/main/kotlin/org/fdroid/ui/Main.kt    | 188 ++++++++++++------
 .../kotlin/org/fdroid/ui/MainViewModel.kt     |  18 ++
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |  19 +-
 .../kotlin/org/fdroid/ui/apps/MyAppsList.kt   |   2 -
 .../org/fdroid/ui/categories/CategoryList.kt  |   2 +-
 .../org/fdroid/ui/details/AppDetails.kt       |   2 +-
 .../org/fdroid/ui/discover/AppsSearch.kt      |   2 +-
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  23 +--
 .../DiscoverOverflowMenu.kt}                  |   6 +-
 .../fdroid/ui/discover/DiscoverViewModel.kt   |   4 -
 .../fdroid/ui/{ => navigation}/BottomBar.kt   |  75 +++++--
 .../ui/{ => navigation}/IntentRouter.kt       |  22 +-
 .../NavigationKey.kt}                         |  30 ++-
 .../fdroid/ui/navigation/NavigationState.kt   | 110 ++++++++++
 .../org/fdroid/ui/navigation/Navigator.kt     |  60 ++++++
 .../fdroid/ui/repositories/Repositories.kt    |  10 +-
 .../ui/repositories/details/RepoDetails.kt    |   6 +-
 .../{main => }/details/HtmlDescriptionTest.kt |   3 +-
 .../ui/{ => navigation}/IntentRouterTest.kt   |  28 +--
 21 files changed, 437 insertions(+), 190 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/MainViewModel.kt
 rename next/src/main/kotlin/org/fdroid/ui/{MainOverflowMenu.kt => discover/DiscoverOverflowMenu.kt} (88%)
 rename next/src/main/kotlin/org/fdroid/ui/{ => navigation}/BottomBar.kt (68%)
 rename next/src/main/kotlin/org/fdroid/ui/{ => navigation}/IntentRouter.kt (71%)
 rename next/src/main/kotlin/org/fdroid/ui/{Navigation.kt => navigation/NavigationKey.kt} (73%)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt
 rename next/src/test/java/org/fdroid/ui/{main => }/details/HtmlDescriptionTest.kt (97%)
 rename next/src/test/java/org/fdroid/ui/{ => navigation}/IntentRouterTest.kt (80%)

diff --git a/next/src/main/kotlin/org/fdroid/MainActivity.kt b/next/src/main/kotlin/org/fdroid/MainActivity.kt
index 347acd7fd..28e5d09dd 100644
--- a/next/src/main/kotlin/org/fdroid/MainActivity.kt
+++ b/next/src/main/kotlin/org/fdroid/MainActivity.kt
@@ -9,32 +9,21 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
-import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_DYNAMIC_COLORS
-import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.Main
-import javax.inject.Inject
 
 // Using [AppCompatActivity] and not [ComponentActivity] seems to be needed
 // for automatic theme changes when calling AppCompatDelegate.setDefaultNightMode()
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
-    val requestPermissionLauncher = registerForActivityResult(RequestPermission()) { isGranted ->
-    }
-
-    @Inject
-    lateinit var settingsManager: SettingsManager
+    val requestPermissionLauncher = registerForActivityResult(RequestPermission()) {}
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
-            val dynamicColors = settingsManager.dynamicColorFlow.collectAsStateWithLifecycle(
-                PREF_DEFAULT_DYNAMIC_COLORS
-            ).value
-            Main(dynamicColors) {
+            Main {
                 // inform OnNewIntentListeners about the initial intent (otherwise would be missed)
                 if (savedInstanceState == null && intent != null) {
                     onNewIntent(intent)
diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
index b960f2c91..272d68e28 100644
--- a/next/src/main/kotlin/org/fdroid/NotificationManager.kt
+++ b/next/src/main/kotlin/org/fdroid/NotificationManager.kt
@@ -21,7 +21,7 @@ import androidx.core.content.ContextCompat.checkSelfPermission
 import dagger.hilt.android.qualifiers.ApplicationContext
 import mu.KotlinLogging
 import org.fdroid.install.InstallNotificationState
-import org.fdroid.ui.IntentRouter.Companion.ACTION_MY_APPS
+import org.fdroid.ui.navigation.IntentRouter.Companion.ACTION_MY_APPS
 import org.fdroid.updates.UpdateNotificationState
 import javax.inject.Inject
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 3a0ddc2a3..0b5e35e8d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -2,6 +2,13 @@ package org.fdroid.ui
 
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.LocalActivity
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
@@ -11,25 +18,23 @@ import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneSt
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment.Companion.Center
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
-import androidx.navigation3.runtime.rememberNavBackStack
-import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
-import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import com.viktormykhailiv.compose.hints.HintHost
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.install.InstallConfirmationState
+import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_DYNAMIC_COLORS
 import org.fdroid.ui.apps.AppWithIssueItem
 import org.fdroid.ui.apps.MyApps
 import org.fdroid.ui.apps.MyAppsInfo
@@ -43,6 +48,15 @@ import org.fdroid.ui.lists.AppListActions
 import org.fdroid.ui.lists.AppListInfo
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.lists.AppListViewModel
+import org.fdroid.ui.navigation.BottomBar
+import org.fdroid.ui.navigation.IntentRouter
+import org.fdroid.ui.navigation.MainNavKey
+import org.fdroid.ui.navigation.NavigationKey
+import org.fdroid.ui.navigation.NavigationRail
+import org.fdroid.ui.navigation.Navigator
+import org.fdroid.ui.navigation.rememberNavigationState
+import org.fdroid.ui.navigation.toEntries
+import org.fdroid.ui.navigation.topLevelRoutes
 import org.fdroid.ui.repositories.Repositories
 import org.fdroid.ui.repositories.RepositoriesViewModel
 import org.fdroid.ui.repositories.RepositoryInfo
@@ -58,12 +72,16 @@ import org.fdroid.ui.settings.SettingsViewModel
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
-fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
-    val backStack = rememberNavBackStack(NavigationKey.Discover)
+fun Main(onListeningForIntent: () -> Unit = {}) {
+    val navigationState = rememberNavigationState(
+        startRoute = NavigationKey.Discover,
+        topLevelRoutes = topLevelRoutes,
+    )
+    val navigator = remember { Navigator(navigationState) }
     // set up intent routing by listening to new intents from activity
     val activity = (LocalActivity.current as ComponentActivity)
-    DisposableEffect(backStack) {
-        val intentListener = IntentRouter(backStack)
+    DisposableEffect(navigator) {
+        val intentListener = IntentRouter(navigator)
         activity.addOnNewIntentListener(intentListener)
         onListeningForIntent() // call this to get informed about initial intents we have missed
         onDispose { activity.removeOnNewIntentListener(intentListener) }
@@ -72,11 +90,9 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
     val windowAdaptiveInfo = currentWindowAdaptiveInfo()
     val directive = remember(windowAdaptiveInfo) {
         calculatePaneScaffoldDirective(windowAdaptiveInfo)
-            .copy(horizontalPartitionSpacerSize = 0.dp)
-    }
-    val isBigScreen = remember(windowAdaptiveInfo) {
-        windowAdaptiveInfo.windowSizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND)
+            .copy(horizontalPartitionSpacerSize = 2.dp)
     }
+    val isBigScreen = directive.maxHorizontalPartitions > 1
     val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>(directive = directive)
 
     val entryProvider: (NavKey) -> NavEntry<NavKey> = entryProvider {
@@ -86,26 +102,20 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
             },
         ) {
             val viewModel = hiltViewModel<DiscoverViewModel>()
-            val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle(0).value
-            val hasIssues = viewModel.hasAppIssues.collectAsState(false).value
             Discover(
                 discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
                 onListTap = {
-                    backStack.add(NavigationKey.AppList(it))
+                    navigator.navigate(NavigationKey.AppList(it))
                 },
                 onAppTap = {
-                    backStack.add(NavigationKey.AppDetails(it.packageName))
-                },
-                onNav = { navKey ->
-                    if (navKey == NavigationKey.MyApps) {
-                        // reset back stack when going to My Apps
-                        while (backStack.isNotEmpty()) backStack.removeLastOrNull()
+                    val new = NavigationKey.AppDetails(it.packageName)
+                    if (navigator.last is NavigationKey.AppDetails) {
+                        navigator.replaceLast(new)
+                    } else {
+                        navigator.navigate(new)
                     }
-                    backStack.add(navKey)
                 },
-                numUpdates = numUpdates,
-                hasIssues = hasIssues,
-                isBigScreen = isBigScreen,
+                onNav = { navKey -> navigator.navigate(navKey) },
                 onSearch = viewModel::search,
                 onSearchCleared = viewModel::onSearchCleared,
                 modifier = Modifier,
@@ -136,19 +146,16 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
             MyApps(
                 myAppsInfo = myAppsInfo,
                 currentPackageName = if (isBigScreen) {
-                    (backStack.last() as? NavigationKey.AppDetails)?.packageName
+                    (navigator.last as? NavigationKey.AppDetails)?.packageName
                 } else null,
                 onAppItemClick = {
-                    backStack.add(NavigationKey.AppDetails(it))
-                },
-                onNav = { navKey ->
-                    if (navKey == NavigationKey.Discover) {
-                        // reset back stack when going to Discover
-                        while (backStack.isNotEmpty()) backStack.removeLastOrNull()
+                    val new = NavigationKey.AppDetails(it)
+                    if (navigator.last is NavigationKey.AppDetails) {
+                        navigator.replaceLast(new)
+                    } else {
+                        navigator.navigate(new)
                     }
-                    backStack.add(navKey)
                 },
-                isBigScreen = isBigScreen,
             )
         }
         entry<NavigationKey.AppDetails>(
@@ -161,9 +168,9 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
             )
             AppDetails(
                 item = viewModel.appDetails.collectAsStateWithLifecycle().value,
-                onNav = { navKey -> backStack.add(navKey) },
+                onNav = { navKey -> navigator.navigate(navKey) },
                 onBackNav = if (isBigScreen) null else {
-                    { backStack.removeLastOrNull() }
+                    { navigator.goBack() }
                 },
                 modifier = Modifier,
             )
@@ -190,11 +197,16 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
             AppList(
                 appListInfo = appListInfo,
                 currentPackageName = if (isBigScreen) {
-                    (backStack.last() as? NavigationKey.AppDetails)?.packageName
+                    (navigator.last as? NavigationKey.AppDetails)?.packageName
                 } else null,
-                onBackClicked = { backStack.removeLastOrNull() },
+                onBackClicked = { navigator.goBack() },
             ) { packageName ->
-                backStack.add(NavigationKey.AppDetails(packageName))
+                val new = NavigationKey.AppDetails(packageName)
+                if (navigator.last is NavigationKey.AppDetails) {
+                    navigator.replaceLast(new)
+                } else {
+                    navigator.navigate(new)
+                }
             }
         }
         entry<NavigationKey.Repos>(
@@ -208,20 +220,26 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
                     viewModel.model.collectAsStateWithLifecycle().value
 
                 override val currentRepositoryId: Long? = if (isBigScreen) {
-                    (backStack.last() as? NavigationKey.RepoDetails)?.repoId
+                    (navigator.last as? NavigationKey.RepoDetails)?.repoId
                 } else null
 
                 override fun onOnboardingSeen() = viewModel.onOnboardingSeen()
 
                 override fun onRepositorySelected(repositoryItem: RepositoryItem) {
-                    backStack.add(NavigationKey.RepoDetails(repositoryItem.repoId))
+                    val last = navigator.last
+                    val new = NavigationKey.RepoDetails(repositoryItem.repoId)
+                    if (last is NavigationKey.RepoDetails) {
+                        navigator.replaceLast(new)
+                    } else {
+                        navigator.navigate(new)
+                    }
                 }
 
                 override fun onRepositoryEnabled(repoId: Long, enabled: Boolean) =
                     viewModel.onRepositoryEnabled(repoId, enabled)
 
                 override fun onAddRepo() {
-                    backStack.add(NavigationKey.AddRepo())
+                    navigator.navigate(NavigationKey.AddRepo())
                 }
 
                 override fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long) =
@@ -233,7 +251,7 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
                 ) = viewModel.onRepositoriesFinishedMoving(fromRepoId, toRepoId)
             }
             Repositories(info) {
-                backStack.removeLastOrNull()
+                navigator.goBack()
             }
         }
         entry<NavigationKey.RepoDetails>(
@@ -251,11 +269,12 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
                 },
                 onShowAppsClicked = { title, repoId ->
                     val type = AppListType.Repository(title, repoId)
-                    backStack.add(NavigationKey.AppList(type))
+                    navigator.navigate(NavigationKey.AppList(type))
                 },
-            ) {
-                backStack.removeLastOrNull()
-            }
+                onBackNav = if (isBigScreen) null else {
+                    { navigator.goBack() }
+                },
+            )
         }
         entry<NavigationKey.AddRepo> { navKey ->
             val viewModel = hiltViewModel<AddRepoViewModel>()
@@ -272,16 +291,16 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
                 onFetchRepo = viewModel::onFetchRepo,
                 onAddRepo = viewModel::addFetchedRepository,
                 onExistingRepo = { repoId ->
-                    backStack.removeLastOrNull()
-                    backStack.add(NavigationKey.RepoDetails(repoId))
+                    navigator.goBack()
+                    navigator.navigate(NavigationKey.RepoDetails(repoId))
                 },
                 onRepoAdded = { title, repoId ->
-                    backStack.removeLastOrNull()
-                    backStack.add(NavigationKey.RepoDetails(repoId))
+                    navigator.goBack()
+                    navigator.navigate(NavigationKey.RepoDetails(repoId))
                     val type = AppListType.Repository(title, repoId)
-                    backStack.add(NavigationKey.AppList(type))
+                    navigator.navigate(NavigationKey.AppList(type))
                 },
-                onBackClicked = { backStack.removeLastOrNull() },
+                onBackClicked = { navigator.goBack() },
             )
         }
         entry(NavigationKey.Settings) {
@@ -290,26 +309,63 @@ fun Main(dynamicColors: Boolean, onListeningForIntent: () -> Unit = {}) {
                 model = viewModel.model,
                 onSaveLogcat = {
                     viewModel.onSaveLogcat(it)
-                    backStack.removeLastOrNull()
+                    navigator.goBack()
                 },
-                onBackClicked = { backStack.removeLastOrNull() },
+                onBackClicked = { navigator.goBack() },
             )
         }
         entry(NavigationKey.About) {
-            About { backStack.removeLastOrNull() }
+            About { navigator.goBack() }
         }
     }
+    val viewModel = hiltViewModel<MainViewModel>()
+    val dynamicColors =
+        viewModel.dynamicColors.collectAsStateWithLifecycle(PREF_DEFAULT_DYNAMIC_COLORS).value
+    val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle().value
+    val hasAppIssues = viewModel.hasAppIssues.collectAsStateWithLifecycle(false).value
+    val navDisplay = @Composable { modifier: Modifier ->
+        NavDisplay(
+            entries = navigationState.toEntries(entryProvider),
+            contentAlignment = Center,
+            sceneStrategy = listDetailStrategy,
+            onBack = { navigator.goBack() },
+            modifier = modifier,
+        )
+    }
     FDroidContent(dynamicColors = dynamicColors) {
         HintHost {
-            NavDisplay(
-                backStack = backStack,
-                sceneStrategy = listDetailStrategy,
-                entryDecorators = listOf(
-                    rememberSaveableStateHolderNavEntryDecorator(),
-                    rememberViewModelStoreNavEntryDecorator(),
-                ),
-                entryProvider = entryProvider,
-            )
+            if (isBigScreen) Row {
+                NavigationRail(
+                    numUpdates = numUpdates,
+                    hasIssues = hasAppIssues,
+                    currentNavKey = navigationState.topLevelRoute,
+                    onNav = { navKey -> navigator.navigate(navKey) },
+                    modifier = Modifier.padding(top = 16.dp)
+                )
+                // need to consume start insets or some phones leave a lot of space there
+                navDisplay(Modifier.consumeWindowInsets(PaddingValues(start = 64.dp)))
+            } else if (navigator.last is MainNavKey) {
+                Scaffold(bottomBar = {
+                    BottomBar(
+                        numUpdates = numUpdates,
+                        hasIssues = hasAppIssues,
+                        currentNavKey = navigationState.topLevelRoute,
+                        onNav = { navKey -> navigator.navigate(navKey) },
+                    )
+                }) { paddingValues ->
+                    // we only apply the bottom padding here, so content stays above bottom bar
+                    // but we need to consume the navigation bar height manually
+                    val bottom = with(LocalDensity.current) {
+                        WindowInsets.navigationBars.getBottom(this).toDp()
+                    }
+                    val modifier = Modifier
+                        .consumeWindowInsets(PaddingValues(bottom = bottom))
+                        .padding(bottom = paddingValues.calculateBottomPadding())
+                    navDisplay(modifier)
+                }
+            } else {
+                navDisplay(Modifier)
+            }
         }
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/MainViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/MainViewModel.kt
new file mode 100644
index 000000000..2331218fc
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/MainViewModel.kt
@@ -0,0 +1,18 @@
+package org.fdroid.ui
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.map
+import org.fdroid.settings.SettingsManager
+import org.fdroid.updates.UpdatesManager
+import javax.inject.Inject
+
+@HiltViewModel
+class MainViewModel @Inject constructor(
+    settingsManager: SettingsManager,
+    updatesManager: UpdatesManager,
+) : ViewModel() {
+    val dynamicColors = settingsManager.dynamicColorFlow
+    val numUpdates = updatesManager.numUpdates
+    val hasAppIssues = updatesManager.appsWithIssues.map { !it.isNullOrEmpty() }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 75e9dc109..a528ebf61 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -39,15 +39,12 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle.State.STARTED
 import androidx.lifecycle.compose.LocalLifecycleOwner
-import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.database.AppListSortOrder.LAST_UPDATED
 import org.fdroid.download.NetworkState
 import org.fdroid.install.InstallConfirmationState
-import org.fdroid.ui.BottomBar
 import org.fdroid.ui.FDroidContent
-import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.lists.TopSearchBar
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.getMyAppsInfo
@@ -59,8 +56,6 @@ fun MyApps(
     myAppsInfo: MyAppsInfo,
     currentPackageName: String?,
     onAppItemClick: (String) -> Unit,
-    onNav: (NavKey) -> Unit,
-    isBigScreen: Boolean,
     modifier: Modifier = Modifier,
 ) {
     val myAppsModel = myAppsInfo.model
@@ -158,14 +153,6 @@ fun MyApps(
                 scrollBehavior = scrollBehavior,
             )
         },
-        bottomBar = {
-            if (!isBigScreen) BottomBar(
-                numUpdates = updatableApps?.size ?: 0,
-                hasIssues = !myAppsModel.appsWithIssue.isNullOrEmpty(),
-                currentNavKey = NavigationKey.MyApps,
-                onNav = onNav,
-            )
-        },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         val lazyListState = rememberLazyListState()
@@ -192,7 +179,7 @@ fun MyApps(
                 currentPackageName = currentPackageName,
                 lazyListState = lazyListState,
                 onAppItemClick = onAppItemClick,
-                modifier = modifier.padding(paddingValues),
+                modifier = Modifier.padding(paddingValues),
             )
         }
     }
@@ -213,8 +200,6 @@ fun MyAppsLoadingPreview() {
             myAppsInfo = getMyAppsInfo(model),
             currentPackageName = null,
             onAppItemClick = {},
-            onNav = {},
-            isBigScreen = false,
         )
     }
 }
@@ -228,8 +213,6 @@ fun MyAppsPreview() {
             myAppsInfo = getMyAppsInfo(myAppsModel),
             currentPackageName = null,
             onAppItemClick = {},
-            onNav = {},
-            isBigScreen = false,
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
index 3b894d9f9..c88afa16d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
@@ -255,8 +255,6 @@ private fun MyAppsListPreview() {
             myAppsInfo = getMyAppsInfo(myAppsModel),
             currentPackageName = null,
             onAppItemClick = {},
-            onNav = {},
-            isBigScreen = false,
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
index ca3d04c3c..9ee70addd 100644
--- a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
@@ -16,8 +16,8 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
 import org.fdroid.ui.FDroidContent
-import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.lists.AppListType
+import org.fdroid.ui.navigation.NavigationKey
 
 @Composable
 fun CategoryList(
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index aa21e94f9..d34c7cbcf 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -64,10 +64,10 @@ import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.R
 import org.fdroid.install.InstallState
 import org.fdroid.ui.FDroidContent
-import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.icons.License
 import org.fdroid.ui.lists.AppListType
+import org.fdroid.ui.navigation.NavigationKey
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.ExpandableSection
 import org.fdroid.ui.utils.testApp
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index d8858ee2d..43f55e938 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -36,12 +36,12 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.ui.FDroidContent
-import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListItem
 import org.fdroid.ui.lists.AppListRow
 import org.fdroid.ui.lists.AppListType
+import org.fdroid.ui.navigation.NavigationKey
 import org.fdroid.ui.utils.BigLoadingIndicator
 
 /**
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 73da26bcc..2a934b149 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -43,22 +43,17 @@ import kotlinx.coroutines.launch
 import org.fdroid.R
 import org.fdroid.download.NetworkState
 import org.fdroid.repo.RepoUpdateProgress
-import org.fdroid.ui.BottomBar
 import org.fdroid.ui.FDroidContent
-import org.fdroid.ui.MainOverFlowMenu
-import org.fdroid.ui.NavigationKey
 import org.fdroid.ui.categories.CategoryList
 import org.fdroid.ui.lists.AppListType
-import org.fdroid.ui.topBarMenuItems
+import org.fdroid.ui.navigation.NavigationKey
+import org.fdroid.ui.navigation.topBarMenuItems
 import org.fdroid.ui.utils.BigLoadingIndicator
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun Discover(
     discoverModel: DiscoverModel,
-    numUpdates: Int,
-    hasIssues: Boolean,
-    isBigScreen: Boolean,
     onSearch: suspend (String) -> Unit,
     onSearchCleared: () -> Unit,
     onListTap: (AppListType) -> Unit,
@@ -98,7 +93,7 @@ fun Discover(
                             contentDescription = stringResource(R.string.more),
                         )
                     }
-                    MainOverFlowMenu(menuExpanded, {
+                    DiscoverOverFlowMenu(menuExpanded, {
                         menuExpanded = false
                         onNav(it.id)
                     }) {
@@ -108,9 +103,6 @@ fun Discover(
                 scrollBehavior = scrollBehavior,
             )
         },
-        bottomBar = {
-            if (!isBigScreen) BottomBar(numUpdates, hasIssues, NavigationKey.Discover, onNav)
-        },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
         val scope = rememberCoroutineScope()
@@ -222,9 +214,6 @@ fun FirstStartDiscoverPreview() {
                 NetworkState(true, isMetered = false),
                 RepoUpdateProgress(1, true, 0.25f),
             ),
-            numUpdates = 0,
-            hasIssues = false,
-            isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
             onListTap = {},
@@ -240,9 +229,6 @@ fun LoadingDiscoverPreview() {
     FDroidContent {
         Discover(
             discoverModel = LoadingDiscoverModel,
-            numUpdates = 23,
-            hasIssues = true,
-            isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
             onListTap = {},
@@ -258,9 +244,6 @@ private fun NoEnabledReposPreview() {
     FDroidContent {
         Discover(
             discoverModel = NoEnabledReposDiscoverModel,
-            numUpdates = 0,
-            hasIssues = true,
-            isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
             onListTap = {},
diff --git a/next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
similarity index 88%
rename from next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt
rename to next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
index 71cda2d27..06e0ff71e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/MainOverflowMenu.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
@@ -1,4 +1,4 @@
-package org.fdroid.ui
+package org.fdroid.ui.discover
 
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -9,9 +9,11 @@ import androidx.compose.ui.Modifier
 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
 
 @Composable
-fun MainOverFlowMenu(
+fun DiscoverOverFlowMenu(
     menuExpanded: Boolean,
     onItemClicked: (NavDestinations) -> Unit,
     onDismissRequest: () -> Unit,
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index ebc2f88a6..9939bd249 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -39,7 +39,6 @@ import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.categories.CategoryItem
 import org.fdroid.ui.lists.AppListItem
 import org.fdroid.ui.utils.normalize
-import org.fdroid.updates.UpdatesManager
 import org.fdroid.utils.IoDispatcher
 import java.text.Collator
 import java.util.Locale
@@ -51,7 +50,6 @@ class DiscoverViewModel @Inject constructor(
     private val app: Application,
     savedStateHandle: SavedStateHandle,
     private val db: FDroidDatabase,
-    updatesManager: UpdatesManager,
     networkMonitor: NetworkMonitor,
     private val settingsManager: SettingsManager,
     private val repoManager: RepoManager,
@@ -65,8 +63,6 @@ class DiscoverViewModel @Inject constructor(
         CoroutineScope(viewModelScope.coroutineContext + AndroidUiDispatcher.Main)
     private val collator = Collator.getInstance(Locale.getDefault())
 
-    val numUpdates = updatesManager.numUpdates
-    val hasAppIssues = updatesManager.appsWithIssues.map { !it.isNullOrEmpty() }
     private val newApps = db.getAppDao().getNewAppsFlow().map { list ->
         val proxyConfig = settingsManager.proxyConfig
         list.mapNotNull {
diff --git a/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt b/next/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt
similarity index 68%
rename from next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
rename to next/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt
index e2c25d3b1..0a6b6aa15 100644
--- a/next/src/main/kotlin/org/fdroid/ui/BottomBar.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt
@@ -1,5 +1,6 @@
-package org.fdroid.ui
+package org.fdroid.ui.navigation
 
+import androidx.compose.foundation.layout.Row
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Error
 import androidx.compose.material3.Badge
@@ -20,33 +21,35 @@ import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation3.runtime.NavKey
 import org.fdroid.R
+import org.fdroid.ui.FDroidContent
 
 @Composable
 fun BottomBar(
     numUpdates: Int,
     hasIssues: Boolean,
     currentNavKey: NavKey,
-    onNav: (NavigationKey) -> Unit,
+    onNav: (MainNavKey) -> Unit,
 ) {
     val res = LocalResources.current
     NavigationBar {
-        BottomNavDestinations.entries.forEach { dest ->
+        topLevelRoutes.forEach { dest ->
             NavigationBarItem(
                 icon = { NavIcon(dest, numUpdates, hasIssues) },
                 label = { Text(stringResource(dest.label)) },
-                selected = dest.key == currentNavKey,
+                selected = dest == currentNavKey,
                 colors = NavigationBarItemDefaults.colors(
                     indicatorColor = MaterialTheme.colorScheme.primary,
                     selectedTextColor = MaterialTheme.colorScheme.primary,
                     selectedIconColor = contentColorFor(MaterialTheme.colorScheme.primary),
                 ),
                 onClick = {
-                    if (dest.key != currentNavKey) onNav(dest.key)
+                    if (dest != currentNavKey) onNav(dest)
                 },
                 modifier = Modifier.semantics {
-                    if (dest == BottomNavDestinations.MY_APPS) {
+                    if (dest == NavigationKey.MyApps) {
                         if (numUpdates > 0) {
                             stateDescription =
                                 res.getString(R.string.notification_channel_updates_available_title)
@@ -66,26 +69,26 @@ fun NavigationRail(
     numUpdates: Int,
     hasIssues: Boolean,
     currentNavKey: NavKey,
-    onNav: (NavigationKey) -> Unit,
-    modifier: Modifier,
+    onNav: (MainNavKey) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val res = LocalResources.current
     NavigationRail(modifier) {
-        BottomNavDestinations.entries.forEach { dest ->
+        topLevelRoutes.forEach { dest ->
             NavigationRailItem(
                 icon = { NavIcon(dest, numUpdates, hasIssues) },
                 label = { Text(stringResource(dest.label)) },
-                selected = dest.key == currentNavKey,
+                selected = dest == currentNavKey,
                 colors = NavigationRailItemDefaults.colors(
                     indicatorColor = MaterialTheme.colorScheme.primary,
                     selectedTextColor = MaterialTheme.colorScheme.primary,
                     selectedIconColor = contentColorFor(MaterialTheme.colorScheme.primary),
                 ),
                 onClick = {
-                    if (dest.key != currentNavKey) onNav(dest.key)
+                    if (dest != currentNavKey) onNav(dest)
                 },
                 modifier = Modifier.semantics {
-                    if (dest == BottomNavDestinations.MY_APPS) {
+                    if (dest == NavigationKey.MyApps) {
                         if (numUpdates > 0) {
                             stateDescription =
                                 res.getString(R.string.notification_channel_updates_available_title)
@@ -101,14 +104,14 @@ fun NavigationRail(
 }
 
 @Composable
-private fun NavIcon(dest: BottomNavDestinations, numUpdates: Int, hasIssues: Boolean) {
+private fun NavIcon(dest: MainNavKey, numUpdates: Int, hasIssues: Boolean) {
     BadgedBox(
         badge = {
-            if (dest == BottomNavDestinations.MY_APPS && numUpdates > 0) {
+            if (dest == NavigationKey.MyApps && numUpdates > 0) {
                 Badge(containerColor = MaterialTheme.colorScheme.secondary) {
                     Text(text = numUpdates.toString())
                 }
-            } else if (dest == BottomNavDestinations.MY_APPS && hasIssues) {
+            } else if (dest == NavigationKey.MyApps && hasIssues) {
                 Icon(
                     imageVector = Icons.Default.Error,
                     tint = MaterialTheme.colorScheme.error,
@@ -123,3 +126,45 @@ private fun NavIcon(dest: BottomNavDestinations, numUpdates: Int, hasIssues: Boo
         )
     }
 }
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        Row {
+            NavigationRail(
+                numUpdates = 3,
+                hasIssues = false,
+                currentNavKey = NavigationKey.Discover,
+                onNav = {},
+            )
+            BottomBar(
+                numUpdates = 3,
+                hasIssues = false,
+                currentNavKey = NavigationKey.Discover,
+                onNav = {},
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun PreviewIssues() {
+    FDroidContent {
+        Row {
+            NavigationRail(
+                numUpdates = 0,
+                hasIssues = true,
+                currentNavKey = NavigationKey.MyApps,
+                onNav = {},
+            )
+            BottomBar(
+                numUpdates = 0,
+                hasIssues = true,
+                currentNavKey = NavigationKey.MyApps,
+                onNav = {},
+            )
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt b/next/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt
similarity index 71%
rename from next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
rename to next/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt
index 3c2640415..1bf92697b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/IntentRouter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt
@@ -1,4 +1,4 @@
-package org.fdroid.ui
+package org.fdroid.ui.navigation
 
 import android.content.Intent
 import android.content.Intent.ACTION_MAIN
@@ -6,11 +6,9 @@ import android.content.Intent.ACTION_SHOW_APP_INFO
 import android.content.Intent.EXTRA_PACKAGE_NAME
 import android.os.Build.VERSION.SDK_INT
 import androidx.core.util.Consumer
-import androidx.navigation3.runtime.NavBackStack
-import androidx.navigation3.runtime.NavKey
 import mu.KotlinLogging
 
-class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Intent> {
+class IntentRouter(private val navigator: Navigator) : Consumer<Intent> {
     private val log = KotlinLogging.logger { }
     private val packageNameRegex = "[A-Za-z\\d_.]+".toRegex()
 
@@ -27,7 +25,7 @@ class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Inten
         } else if (ACTION_SHOW_APP_INFO == intent.action) { // App Details
             val packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME) ?: return
             if (packageName.matches(packageNameRegex)) {
-                backStack.add(NavigationKey.AppDetails(packageName))
+                navigator.navigate(NavigationKey.AppDetails(packageName))
             } else {
                 log.warn { "Malformed package name: $packageName" }
             }
@@ -36,27 +34,23 @@ class IntentRouter(private val backStack: NavBackStack<NavKey>) : Consumer<Inten
             if (uri.scheme == "market" && uri.host == "details") {
                 val packageName = uri.getQueryParameter("id") ?: return
                 if (packageName.matches(packageNameRegex)) {
-                    backStack.add(NavigationKey.AppDetails(packageName))
+                    navigator.navigate(NavigationKey.AppDetails(packageName))
                 } else {
                     log.warn { "Malformed package name: $packageName" }
                 }
             } else if (uri.path?.matches(packagesUrlRegex) == true) {
                 val packageName = uri.lastPathSegment ?: return
-                backStack.add(NavigationKey.AppDetails(packageName))
+                navigator.navigate(NavigationKey.AppDetails(packageName))
             } else if (uri.scheme == "fdroidrepos" ||
                 uri.scheme == "FDROIDREPOS" ||
                 (uri.scheme == "https" && uri.host == "fdroid.link")
             ) {
-                backStack.add(NavigationKey.AddRepo(uri.toString()))
+                navigator.navigate(NavigationKey.AddRepo(uri.toString()))
             }
         } else if (ACTION_MY_APPS == intent.action) {
-            val lastOnBackStack = backStack.lastOrNull()
+            val lastOnBackStack = navigator.last
             if (lastOnBackStack !is NavigationKey.MyApps) {
-                if (lastOnBackStack is NavigationKey.Discover) {
-                    // reset back stack when going to My Apps from Discover
-                    while (backStack.isNotEmpty()) backStack.removeLastOrNull()
-                }
-                backStack.add(NavigationKey.MyApps)
+                navigator.navigate(NavigationKey.MyApps)
             }
         } else {
             log.warn { "Unknown intent: $intent - uri: $uri $SDK_INT" }
diff --git a/next/src/main/kotlin/org/fdroid/ui/Navigation.kt b/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
similarity index 73%
rename from next/src/main/kotlin/org/fdroid/ui/Navigation.kt
rename to next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
index 6ab5f2960..e6ee759cf 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Navigation.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
@@ -1,4 +1,4 @@
-package org.fdroid.ui
+package org.fdroid.ui.navigation
 
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
@@ -16,10 +16,16 @@ import org.fdroid.ui.lists.AppListType
 sealed interface NavigationKey : NavKey {
 
     @Serializable
-    data object Discover : NavigationKey
+    data object Discover : NavigationKey, MainNavKey {
+        override val label: Int = R.string.menu_discover
+        override val icon: ImageVector = Icons.Filled.Explore
+    }
 
     @Serializable
-    data object MyApps : NavigationKey
+    data object MyApps : NavigationKey, MainNavKey {
+        override val label: Int = R.string.menu_apps_my
+        override val icon: ImageVector = Icons.Filled.Apps
+    }
 
     @Serializable
     data class AppDetails(val packageName: String) : NavigationKey
@@ -44,18 +50,20 @@ sealed interface NavigationKey : NavKey {
 
 }
 
-enum class BottomNavDestinations(
-    val key: NavigationKey,
-    @StringRes val label: Int,
-    val icon: ImageVector,
-) {
-    DISCOVER(NavigationKey.Discover, R.string.menu_discover, Icons.Filled.Explore),
-    MY_APPS(NavigationKey.MyApps, R.string.menu_apps_my, Icons.Filled.Apps),
+sealed interface MainNavKey : NavKey {
+    @get:StringRes
+    val label: Int
+    val icon: ImageVector
 }
 
+val topLevelRoutes = listOf<MainNavKey>(
+    NavigationKey.Discover,
+    NavigationKey.MyApps,
+)
+
 sealed class NavDestinations(
     val id: NavigationKey,
-    @StringRes val label: Int,
+    @param:StringRes val label: Int,
     val icon: ImageVector,
 ) {
     object Repos :
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt b/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt
new file mode 100644
index 000000000..72aaae03f
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * From: https://github.com/android/nav3-recipes/blob/549398ffeefbdf8c0b09b71a098cd14b1520695b/app/src/main/java/com/example/nav3recipes/multiplestacks/NavigationState.kt
+ */
+
+package org.fdroid.ui.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSerializable
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.runtime.toMutableStateList
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavEntry
+import androidx.navigation3.runtime.NavKey
+import androidx.navigation3.runtime.rememberDecoratedNavEntries
+import androidx.navigation3.runtime.rememberNavBackStack
+import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
+import androidx.navigation3.runtime.serialization.NavKeySerializer
+import androidx.savedstate.compose.serialization.serializers.MutableStateSerializer
+
+/**
+ * Create a navigation state that persists config changes and process death.
+ */
+@Composable
+fun rememberNavigationState(
+    startRoute: NavKey,
+    topLevelRoutes: List<NavKey>
+): NavigationState {
+    val topLevelRoute = rememberSerializable(
+        startRoute, topLevelRoutes,
+        serializer = MutableStateSerializer(NavKeySerializer())
+    ) {
+        mutableStateOf(startRoute)
+    }
+
+    val backStacks = topLevelRoutes.associateWith { key -> rememberNavBackStack(key) }
+
+    return remember(startRoute, topLevelRoutes) {
+        NavigationState(
+            startRoute = startRoute,
+            topLevelRoute = topLevelRoute,
+            backStacks = backStacks
+        )
+    }
+}
+
+/**
+ * State holder for navigation state.
+ *
+ * @param startRoute - the start route. The user will exit the app through this route.
+ * @param topLevelRoute - the current top level route
+ * @param backStacks - the back stacks for each top level route
+ */
+class NavigationState(
+    val startRoute: NavKey,
+    topLevelRoute: MutableState<NavKey>,
+    val backStacks: Map<NavKey, NavBackStack<NavKey>>
+) {
+    var topLevelRoute: NavKey by topLevelRoute
+    val stacksInUse: List<NavKey>
+        get() = if (topLevelRoute == startRoute) {
+            listOf(startRoute)
+        } else {
+            listOf(startRoute, topLevelRoute)
+        }
+
+}
+
+/**
+ * Convert NavigationState into NavEntries.
+ */
+@Composable
+fun NavigationState.toEntries(
+    entryProvider: (NavKey) -> NavEntry<NavKey>
+): SnapshotStateList<NavEntry<NavKey>> {
+    val decoratedEntries = backStacks.mapValues { (_, stack) ->
+        val decorators = listOf(
+            rememberSaveableStateHolderNavEntryDecorator<NavKey>(),
+            rememberViewModelStoreNavEntryDecorator(),
+        )
+        rememberDecoratedNavEntries(
+            backStack = stack,
+            entryDecorators = decorators,
+            entryProvider = entryProvider
+        )
+    }
+
+    return stacksInUse
+        .flatMap { decoratedEntries[it] ?: emptyList() }
+        .toMutableStateList()
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt b/next/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt
new file mode 100644
index 000000000..4b97e6bd4
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * From: https://github.com/android/nav3-recipes/blob/549398ffeefbdf8c0b09b71a098cd14b1520695b/app/src/main/java/com/example/nav3recipes/multiplestacks/Navigator.kt
+ */
+
+package org.fdroid.ui.navigation
+
+import androidx.navigation3.runtime.NavKey
+
+/**
+ * Handles navigation events (forward and back) by updating the navigation state.
+ */
+class Navigator(val state: NavigationState) {
+    val last: NavKey?
+        get() {
+            val currentStack = state.backStacks[state.topLevelRoute]
+                ?: error("Stack for ${state.topLevelRoute} not found")
+            return currentStack.lastOrNull()
+        }
+
+    fun navigate(route: NavKey) {
+        if (route in state.backStacks.keys) {
+            // This is a top level route, just switch to it
+            state.topLevelRoute = route
+        } else {
+            state.backStacks[state.topLevelRoute]?.add(route)
+        }
+    }
+
+    fun replaceLast(route: NavKey) {
+        val stack = state.backStacks[state.topLevelRoute] ?: return
+        stack[stack.lastIndex] = route
+    }
+
+    fun goBack() {
+        val currentStack = state.backStacks[state.topLevelRoute]
+            ?: error("Stack for ${state.topLevelRoute} not found")
+        val currentRoute = currentStack.last()
+
+        // If we're at the base of the current route, go back to the start route stack.
+        if (currentRoute == state.topLevelRoute) {
+            state.topLevelRoute = state.startRoute
+        } else {
+            currentStack.removeLastOrNull()
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index 097454d38..e0c7cb758 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -141,10 +141,12 @@ fun Repositories(
 )
 @Composable
 fun RepositoriesScaffoldLoadingPreview() {
-    FDroidContent {
-        val model = RepositoryModel(null, false, "never")
-        val info = getRepositoriesInfo(model)
-        Repositories(info) {}
+    HintHost {
+        FDroidContent {
+            val model = RepositoryModel(null, false, "never")
+            val info = getRepositoriesInfo(model)
+            Repositories(info) {}
+        }
     }
 }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index 77bbba6db..1e98edcb2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -51,7 +51,7 @@ import org.fdroid.ui.utils.getRepoDetailsInfo
 fun RepoDetails(
     info: RepoDetailsInfo,
     onShowAppsClicked: (String, Long) -> Unit,
-    onBack: () -> Unit,
+    onBackNav: (() -> Unit)?,
 ) {
     val context = LocalContext.current
     val repo = info.model.repo
@@ -91,7 +91,7 @@ fun RepoDetails(
     if (repo != null && deleteDialog) DeleteDialog({ deleteDialog = false }) {
         info.actions.deleteRepository()
         deleteDialog = false
-        onBack()
+        onBackNav?.invoke()
     }
     // Metered warning dialog
     val meteredLambda = showMeteredDialog
@@ -103,7 +103,7 @@ fun RepoDetails(
     Scaffold(topBar = {
         TopAppBar(
             navigationIcon = {
-                IconButton(onClick = onBack) {
+                if (onBackNav != null) IconButton(onClick = onBackNav) {
                     Icon(
                         imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                         contentDescription = stringResource(R.string.back),
diff --git a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt b/next/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt
similarity index 97%
rename from next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
rename to next/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt
index ce57d9a27..7da6d113f 100644
--- a/next/src/test/java/org/fdroid/ui/main/details/HtmlDescriptionTest.kt
+++ b/next/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt
@@ -1,6 +1,5 @@
-package org.fdroid.ui.main.details
+package org.fdroid.ui.details
 
-import org.fdroid.ui.details.getHtmlDescription
 import org.junit.Test
 import kotlin.test.assertEquals
 
diff --git a/next/src/test/java/org/fdroid/ui/IntentRouterTest.kt b/next/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt
similarity index 80%
rename from next/src/test/java/org/fdroid/ui/IntentRouterTest.kt
rename to next/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt
index 2b87a9bef..ecc88781f 100644
--- a/next/src/test/java/org/fdroid/ui/IntentRouterTest.kt
+++ b/next/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt
@@ -1,13 +1,13 @@
-package org.fdroid.ui
+package org.fdroid.ui.navigation
 
 import android.content.Intent
 import android.content.Intent.ACTION_SHOW_APP_INFO
 import android.content.Intent.ACTION_VIEW
 import android.content.Intent.CATEGORY_BROWSABLE
 import android.content.Intent.EXTRA_PACKAGE_NAME
+import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
 import androidx.navigation3.runtime.NavBackStack
-import androidx.navigation3.runtime.NavKey
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -18,8 +18,15 @@ import kotlin.test.assertEquals
 @RunWith(RobolectricTestRunner::class)
 class IntentRouterTest {
 
-    private val backstack: NavBackStack<NavKey> = NavBackStack()
-    private val intentRouter = IntentRouter(backstack)
+    val navigationState = NavigationState(
+        startRoute = NavigationKey.Discover,
+        topLevelRoute = mutableStateOf(NavigationKey.Discover),
+        backStacks = topLevelRoutes.associateWith { key ->
+            NavBackStack(key)
+        }
+    )
+    val navigator = Navigator(navigationState)
+    private val intentRouter = IntentRouter(navigator)
 
     @Test
     fun testBrowserUris() {
@@ -37,8 +44,7 @@ class IntentRouterTest {
                 data = url.toUri()
             }
             intentRouter.accept(i)
-            assertEquals(1, backstack.size)
-            assertEquals(NavigationKey.AppDetails(packageName), backstack.removeLastOrNull())
+            assertEquals(NavigationKey.AppDetails(packageName), navigator.last)
         }
     }
 
@@ -58,7 +64,7 @@ class IntentRouterTest {
                 data = url.toUri()
             }
             intentRouter.accept(i)
-            assertEquals(0, backstack.size)
+            assertEquals(NavigationKey.Discover, navigator.last)
         }
     }
 
@@ -70,8 +76,7 @@ class IntentRouterTest {
             putExtra(EXTRA_PACKAGE_NAME, packageName)
         }
         intentRouter.accept(i)
-        assertEquals(1, backstack.size)
-        assertEquals(NavigationKey.AppDetails(packageName), backstack.removeLastOrNull())
+        assertEquals(NavigationKey.AppDetails(packageName), navigator.last)
     }
 
     @Test
@@ -82,7 +87,7 @@ class IntentRouterTest {
             putExtra(EXTRA_PACKAGE_NAME, packageName)
         }
         intentRouter.accept(i)
-        assertEquals(0, backstack.size)
+        assertEquals(NavigationKey.Discover, navigator.last)
     }
 
     @Test
@@ -97,8 +102,7 @@ class IntentRouterTest {
                 data = uri.toUri()
             }
             intentRouter.accept(i)
-            assertEquals(1, backstack.size)
-            assertEquals(NavigationKey.AddRepo(uri), backstack.removeLastOrNull())
+            assertEquals(NavigationKey.AddRepo(uri), navigator.last)
         }
     }
 

From d84b30ae26528efd1644e3ca27ba3d00365ff676 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 19 Dec 2025 17:08:33 -0300
Subject: [PATCH 148/180] Improve big screen pages when no app/repo is selected

---
 next/src/main/kotlin/org/fdroid/ui/About.kt   | 71 ++++++++++---------
 next/src/main/kotlin/org/fdroid/ui/Main.kt    | 30 ++++----
 .../org/fdroid/ui/details/NoAppSelected.kt    | 52 ++++++++++++++
 .../fdroid/ui/repositories/NoRepoSelected.kt  | 59 +++++++++++++++
 .../fdroid/ui/repositories/Repositories.kt    |  7 +-
 next/src/main/res/values/strings-next.xml     |  2 -
 6 files changed, 169 insertions(+), 52 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
index d41013ae7..e35088bef 100644
--- a/next/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -40,12 +40,12 @@ import org.fdroid.ui.utils.openUriSafe
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-fun About(onBackClicked: () -> Unit) {
+fun About(onBackClicked: (() -> Unit)?) {
     Scaffold(
         topBar = {
             TopAppBar(
                 navigationIcon = {
-                    IconButton(onClick = onBackClicked) {
+                    if (onBackClicked != null) IconButton(onClick = onBackClicked) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Default.ArrowBack,
                             contentDescription = stringResource(R.string.back),
@@ -66,37 +66,7 @@ fun About(onBackClicked: () -> Unit) {
                 .verticalScroll(scrollableState)
         ) {
             AboutHeader(modifier = Modifier.padding(top = 32.dp))
-            SelectionContainer {
-                Text(
-                    text = stringResource(R.string.about_text),
-                    style = MaterialTheme.typography.bodyLarge,
-                    modifier = Modifier.padding(top = 24.dp),
-                )
-            }
-            Column(modifier = Modifier.padding(top = 24.dp, bottom = 16.dp)) {
-                val uriHandler = LocalUriHandler.current
-                Text(
-                    text = stringResource(R.string.links),
-                    fontWeight = FontWeight.Bold,
-                    style = MaterialTheme.typography.bodyLarge,
-                )
-                Text(
-                    text = stringResource(R.string.menu_website),
-                    style = MaterialTheme.typography.bodyLarge,
-                    color = MaterialTheme.colorScheme.secondary,
-                    modifier = Modifier
-                        .padding(top = 4.dp)
-                        .clickable { uriHandler.openUriSafe("https://f-droid.org") }
-                )
-                Text(
-                    text = stringResource(R.string.about_source),
-                    style = MaterialTheme.typography.bodyLarge,
-                    color = MaterialTheme.colorScheme.secondary,
-                    modifier = Modifier
-                        .padding(top = 4.dp)
-                        .clickable { uriHandler.openUriSafe("https://gitlab.com/fdroid") }
-                )
-            }
+            AboutContent()
             Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
         }
     }
@@ -125,6 +95,41 @@ fun AboutHeader(modifier: Modifier = Modifier) {
     }
 }
 
+@Composable
+fun AboutContent() {
+    SelectionContainer {
+        Text(
+            text = stringResource(R.string.about_text),
+            style = MaterialTheme.typography.bodyLarge,
+            modifier = Modifier.padding(top = 24.dp),
+        )
+    }
+    Column(modifier = Modifier.padding(top = 24.dp, bottom = 16.dp)) {
+        val uriHandler = LocalUriHandler.current
+        Text(
+            text = stringResource(R.string.links),
+            fontWeight = FontWeight.Bold,
+            style = MaterialTheme.typography.bodyLarge,
+        )
+        Text(
+            text = stringResource(R.string.menu_website),
+            style = MaterialTheme.typography.bodyLarge,
+            color = MaterialTheme.colorScheme.secondary,
+            modifier = Modifier
+                .padding(top = 4.dp)
+                .clickable { uriHandler.openUriSafe("https://f-droid.org") }
+        )
+        Text(
+            text = stringResource(R.string.about_source),
+            style = MaterialTheme.typography.bodyLarge,
+            color = MaterialTheme.colorScheme.secondary,
+            modifier = Modifier
+                .padding(top = 4.dp)
+                .clickable { uriHandler.openUriSafe("https://gitlab.com/fdroid") }
+        )
+    }
+}
+
 @Preview(showBackground = true)
 @Composable
 fun AboutPreview() {
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 0b5e35e8d..9f68222fb 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.material3.adaptive.layout.calculatePaneScaffoldDirective
@@ -22,7 +21,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment.Companion.Center
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -31,7 +29,6 @@ import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.ui.NavDisplay
 import com.viktormykhailiv.compose.hints.HintHost
-import org.fdroid.R
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.install.InstallConfirmationState
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_DYNAMIC_COLORS
@@ -41,6 +38,7 @@ import org.fdroid.ui.apps.MyAppsInfo
 import org.fdroid.ui.apps.MyAppsViewModel
 import org.fdroid.ui.details.AppDetails
 import org.fdroid.ui.details.AppDetailsViewModel
+import org.fdroid.ui.details.NoAppSelected
 import org.fdroid.ui.discover.Discover
 import org.fdroid.ui.discover.DiscoverViewModel
 import org.fdroid.ui.lists.AppList
@@ -57,6 +55,7 @@ import org.fdroid.ui.navigation.Navigator
 import org.fdroid.ui.navigation.rememberNavigationState
 import org.fdroid.ui.navigation.toEntries
 import org.fdroid.ui.navigation.topLevelRoutes
+import org.fdroid.ui.repositories.NoRepoSelected
 import org.fdroid.ui.repositories.Repositories
 import org.fdroid.ui.repositories.RepositoriesViewModel
 import org.fdroid.ui.repositories.RepositoryInfo
@@ -98,7 +97,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
     val entryProvider: (NavKey) -> NavEntry<NavKey> = entryProvider {
         entry<NavigationKey.Discover>(
             metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                Text(stringResource(R.string.no_app_selected))
+                NoAppSelected()
             },
         ) {
             val viewModel = hiltViewModel<DiscoverViewModel>()
@@ -122,9 +121,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
             )
         }
         entry<NavigationKey.MyApps>(
-            metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                Text(stringResource(R.string.no_app_selected))
-            },
+            metadata = ListDetailSceneStrategy.listPane("appdetails"),
         ) {
             val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
             val myAppsInfo = object : MyAppsInfo {
@@ -176,9 +173,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
             )
         }
         entry<NavigationKey.AppList>(
-            metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                Text(stringResource(R.string.no_app_selected))
-            },
+            metadata = ListDetailSceneStrategy.listPane("appdetails"),
         ) {
             val viewModel = hiltViewModel<AppListViewModel, AppListViewModel.Factory>(
                 creationCallback = { factory ->
@@ -211,7 +206,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
         }
         entry<NavigationKey.Repos>(
             metadata = ListDetailSceneStrategy.listPane("repos") {
-                Text(text = stringResource(R.string.no_repository_selected))
+                NoRepoSelected()
             },
         ) {
             val viewModel = hiltViewModel<RepositoriesViewModel>()
@@ -250,7 +245,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                     toRepoId: Long,
                 ) = viewModel.onRepositoriesFinishedMoving(fromRepoId, toRepoId)
             }
-            Repositories(info) {
+            Repositories(info, isBigScreen) {
                 navigator.goBack()
             }
         }
@@ -314,8 +309,15 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
                 onBackClicked = { navigator.goBack() },
             )
         }
-        entry(NavigationKey.About) {
-            About { navigator.goBack() }
+        entry(
+            key = NavigationKey.About,
+            metadata = ListDetailSceneStrategy.detailPane("appdetails"),
+        ) {
+            About(
+                onBackClicked = if (isBigScreen) null else {
+                    { navigator.goBack() }
+                },
+            )
         }
     }
     val viewModel = hiltViewModel<MainViewModel>()
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt b/next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
new file mode 100644
index 000000000..05ccef68b
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
@@ -0,0 +1,52 @@
+package org.fdroid.ui.details
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeContentPadding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.Center
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.ui.AboutContent
+import org.fdroid.ui.AboutHeader
+import org.fdroid.ui.FDroidContent
+
+@Composable
+fun NoAppSelected() {
+    Box(
+        contentAlignment = Center,
+        modifier = Modifier
+            .fillMaxSize()
+            .background(MaterialTheme.colorScheme.background)
+            .safeContentPadding()
+            .padding(horizontal = 32.dp)
+            .verticalScroll(rememberScrollState())
+    ) {
+        Column(
+            modifier = Modifier.fillMaxSize(fraction = 0.7f)
+        ) {
+            AboutHeader(modifier = Modifier.padding(top = 32.dp))
+            AboutContent()
+            Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        NoAppSelected()
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
new file mode 100644
index 000000000..09f944ed2
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
@@ -0,0 +1,59 @@
+package org.fdroid.ui.repositories
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeContentPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Alignment.Companion.Center
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.fdroid.R
+import org.fdroid.ui.FDroidContent
+import org.fdroid.ui.icons.PackageVariant
+
+@Composable
+fun NoRepoSelected() {
+    Box(
+        contentAlignment = Center,
+        modifier = Modifier
+            .fillMaxSize()
+            .background(MaterialTheme.colorScheme.background)
+            .safeContentPadding()
+            .padding(32.dp)
+    ) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = spacedBy(32.dp)
+        ) {
+            Icon(
+                imageVector = PackageVariant,
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.surfaceContainerHigh,
+                modifier = Modifier.size(64.dp)
+            )
+            Text(
+                text = stringResource(R.string.repo_list_info_text),
+                modifier = Modifier.fillMaxSize(fraction = 0.7f)
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    FDroidContent {
+        NoRepoSelected()
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index e0c7cb758..5412a0839 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -47,6 +47,7 @@ import org.fdroid.ui.utils.repoItems
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun Repositories(
     info: RepositoryInfo,
+    isBigScreen: Boolean,
     onBackClicked: () -> Unit,
 ) {
     val hintController = rememberHintController(
@@ -68,7 +69,7 @@ fun Repositories(
     }
     val hintAnchor = rememberHintAnchorState(hint)
     LaunchedEffect(info.model.showOnboarding) {
-        if (info.model.showOnboarding) {
+        if (!isBigScreen && info.model.showOnboarding) {
             hintController.show(hintAnchor)
             info.onOnboardingSeen()
         }
@@ -145,7 +146,7 @@ fun RepositoriesScaffoldLoadingPreview() {
         FDroidContent {
             val model = RepositoryModel(null, false, "never")
             val info = getRepositoriesInfo(model)
-            Repositories(info) {}
+            Repositories(info, true) {}
         }
     }
 }
@@ -160,7 +161,7 @@ private fun RepositoriesScaffoldPreview() {
         FDroidContent {
             val model = RepositoryModel(repoItems, false, "42min. ago")
             val info = getRepositoriesInfo(model, repoItems[0].repoId)
-            Repositories(info) { }
+            Repositories(info, true) { }
         }
     }
 }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index 3039a4dd7..b01641793 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -14,8 +14,6 @@
     <string name="first_start_metered">However, you are on mobile data and we\'ll need to download more than 10 MB. Tap the button below when ready to download.</string>
     <string name="first_start_button">Download app repository</string>
     <string name="no_repos_enabled">No repositories enabled.\nEnable or add at least one repository to see apps.</string>
-    <string name="no_app_selected">No app selected</string>
-    <string name="no_repository_selected">No repository selected</string>
 
     <string name="my_apps_empty">No apps installed.\n\nInstall apps and they will appear here.</string>
     <string name="my_apps_header_apps_with_issue">Apps with issues</string>

From ba899ad94b4ef0b43412f38772052370cee92709 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 22 Dec 2025 09:37:08 -0300
Subject: [PATCH 149/180] Improve repository details

better copy and metered dialog when enabling repo while metered
---
 .../org/fdroid/ui/repositories/NoRepoSelected.kt  |  9 +++++----
 .../org/fdroid/ui/repositories/Repositories.kt    | 15 +++++++++++++--
 .../fdroid/ui/repositories/RepositoriesList.kt    | 13 ++++++++++++-
 .../ui/repositories/RepositoriesPresenter.kt      |  5 ++++-
 .../ui/repositories/RepositoriesViewModel.kt      |  3 +++
 .../org/fdroid/ui/repositories/RepositoryInfo.kt  |  3 +++
 .../fdroid/ui/repositories/details/RepoDetails.kt |  2 +-
 .../ui/repositories/details/RepoDetailsHeader.kt  |  8 ++++----
 next/src/main/res/values/strings-next.xml         |  3 ++-
 9 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
index 09f944ed2..3440c4b22 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
@@ -6,8 +6,9 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeContentPadding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -28,9 +29,9 @@ fun NoRepoSelected() {
         contentAlignment = Center,
         modifier = Modifier
             .fillMaxSize()
+            .verticalScroll(rememberScrollState())
             .background(MaterialTheme.colorScheme.background)
-            .safeContentPadding()
-            .padding(32.dp)
+            .padding(16.dp)
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
@@ -50,7 +51,7 @@ fun NoRepoSelected() {
     }
 }
 
-@Preview
+@Preview(widthDp = 200, heightDp = 400)
 @Composable
 private fun Preview() {
     FDroidContent {
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index 5412a0839..d29e665a2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -36,6 +36,7 @@ import com.viktormykhailiv.compose.hints.rememberHint
 import com.viktormykhailiv.compose.hints.rememberHintAnchorState
 import com.viktormykhailiv.compose.hints.rememberHintController
 import org.fdroid.R
+import org.fdroid.download.NetworkState
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.utils.BigLoadingIndicator
 import org.fdroid.ui.utils.OnboardingCard
@@ -144,7 +145,12 @@ fun Repositories(
 fun RepositoriesScaffoldLoadingPreview() {
     HintHost {
         FDroidContent {
-            val model = RepositoryModel(null, false, "never")
+            val model = RepositoryModel(
+                repositories = null,
+                showOnboarding = false,
+                lastCheckForUpdate = "never",
+                networkState = NetworkState(isOnline = true, isMetered = false),
+            )
             val info = getRepositoriesInfo(model)
             Repositories(info, true) {}
         }
@@ -159,7 +165,12 @@ fun RepositoriesScaffoldLoadingPreview() {
 private fun RepositoriesScaffoldPreview() {
     HintHost {
         FDroidContent {
-            val model = RepositoryModel(repoItems, false, "42min. ago")
+            val model = RepositoryModel(
+                repositories = repoItems,
+                showOnboarding = false,
+                lastCheckForUpdate = "42min. ago",
+                networkState = NetworkState(isOnline = true, isMetered = false),
+            )
             val info = getRepositoriesInfo(model, repoItems[0].repoId)
             Repositories(info, true) { }
         }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
index 7ece1866b..840d43f6d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import org.fdroid.R
 import org.fdroid.ui.utils.DraggableItem
+import org.fdroid.ui.utils.MeteredConnectionDialog
 import org.fdroid.ui.utils.dragContainer
 import org.fdroid.ui.utils.rememberDragDropState
 
@@ -39,6 +40,7 @@ fun RepositoriesList(
 ) {
     val repositories = info.model.repositories ?: return
     var showDisableRepoDialog by remember { mutableStateOf<Long?>(null) }
+    var showMeteredDialog by remember { mutableStateOf<(() -> Unit)?>(null) }
     val currentRepositoryId = info.currentRepositoryId
     val dragDropState = rememberDragDropState(
         lazyListState = listState,
@@ -89,7 +91,9 @@ fun RepositoriesList(
                     isSelected = isSelected,
                     onRepoEnabled = { enabled ->
                         if (enabled) {
-                            info.onRepositoryEnabled(repoItem.repoId, true)
+                            if (info.model.networkState.isMetered) showMeteredDialog = {
+                                info.onRepositoryEnabled(repoItem.repoId, true)
+                            } else info.onRepositoryEnabled(repoItem.repoId, true)
                         } else {
                             showDisableRepoDialog = repoItem.repoId
                         }
@@ -135,4 +139,11 @@ fun RepositoriesList(
             }
         )
     }
+    // Metered warning dialog
+    val meteredLambda = showMeteredDialog
+    if (meteredLambda != null) MeteredConnectionDialog(
+        numBytes = null,
+        onConfirm = { meteredLambda() },
+        onDismiss = { showMeteredDialog = null },
+    )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
index 4ee029571..f71c4c91c 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.R
+import org.fdroid.download.NetworkState
 import org.fdroid.ui.utils.asRelativeTimeString
 
 @Composable
@@ -14,6 +15,7 @@ fun RepositoriesPresenter(
     repoSortingMapFlow: StateFlow<Map<Long, Int>>,
     showOnboardingFlow: StateFlow<Boolean>,
     lastUpdateFlow: StateFlow<Long>,
+    networkStateFlow: StateFlow<NetworkState>,
 ): RepositoryModel {
     val repositories = repositoriesFlow.collectAsState().value
     val repoSortingMap = repoSortingMapFlow.collectAsState().value
@@ -27,6 +29,7 @@ fun RepositoriesPresenter(
             context.getString(R.string.repositories_last_update_never)
         } else {
             lastUpdated.asRelativeTimeString()
-        }
+        },
+        networkState = networkStateFlow.collectAsState().value,
     )
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
index f6d8e6d9f..6e1012dbe 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
@@ -18,6 +18,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mu.KotlinLogging
 import org.fdroid.database.Repository
+import org.fdroid.download.NetworkMonitor
 import org.fdroid.index.RepoManager
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.OnboardingManager
@@ -29,6 +30,7 @@ import javax.inject.Inject
 @HiltViewModel
 class RepositoriesViewModel @Inject constructor(
     app: Application,
+    networkMonitor: NetworkMonitor,
     private val repoManager: RepoManager,
     private val updateManager: UpdatesManager,
     private val settingsManager: SettingsManager,
@@ -61,6 +63,7 @@ class RepositoriesViewModel @Inject constructor(
                 repoSortingMapFlow = repoSortingMap,
                 showOnboardingFlow = showOnboarding,
                 lastUpdateFlow = settingsManager.lastRepoUpdateFlow,
+                networkStateFlow = networkMonitor.networkState,
             )
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
index 8f3e2cf4b..1b827d903 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
@@ -1,5 +1,7 @@
 package org.fdroid.ui.repositories
 
+import org.fdroid.download.NetworkState
+
 interface RepositoryInfo {
     val model: RepositoryModel
     val currentRepositoryId: Long?
@@ -15,4 +17,5 @@ data class RepositoryModel(
     val repositories: List<RepositoryItem>?,
     val showOnboarding: Boolean,
     val lastCheckForUpdate: String,
+    val networkState: NetworkState,
 )
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index 1e98edcb2..15859420b 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -125,7 +125,7 @@ fun RepoDetails(
                         contentDescription = stringResource(R.string.show_repository_qr)
                     )
                 }
-                IconButton(onClick = {
+                IconButton(enabled = repo.enabled, onClick = {
                     if (info.model.networkState.isMetered) showMeteredDialog = {
                         RepoUpdateWorker.updateNow(context, repo.repoId)
                     } else RepoUpdateWorker.updateNow(context, repo.repoId)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
index fbfc82078..01149b989 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
@@ -53,11 +53,11 @@ fun RepoDetailsHeader(
     } else {
         repo.timestamp.asRelativeTimeString()
     }
-    val lastIndexUpdate = stringResource(R.string.repo_last_update_upstream, lastIndexTime)
+    val lastPublishedTime = stringResource(R.string.repo_last_update_upstream, lastIndexTime)
 
-    val lastUpdatedTime = repo.lastUpdated?.asRelativeTimeString()
+    val lastDownloadedTime = repo.lastUpdated?.asRelativeTimeString()
         ?: stringResource(R.string.repositories_last_update_never)
-    val lastUpdated = stringResource(R.string.last_updated, lastUpdatedTime)
+    val lastUpdated = stringResource(R.string.repo_last_update_downloaded, lastDownloadedTime)
 
     Column(
         verticalArrangement = spacedBy(8.dp),
@@ -90,7 +90,7 @@ fun RepoDetailsHeader(
                 )
                 Spacer(modifier = Modifier.height(8.dp))
                 Text(
-                    text = lastIndexUpdate,
+                    text = lastPublishedTime,
                     style = MaterialTheme.typography.bodySmall,
                 )
                 Text(
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index b01641793..ea030404b 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -135,7 +135,8 @@
     <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
     <string name="repo_has_update_error">Had errors updating</string>
     <string name="repo_has_update_error_intro">An error occurred while trying to update this repository:</string>
-    <string name="repo_last_update_upstream">Last update: %s</string>
+    <string name="repo_last_update_upstream">Published %s</string>
+    <string name="repo_last_update_downloaded">Downloaded %s</string>
     <string name="repo_basicauth_username">Username</string>
     <string name="repo_basicauth_password">Password</string>
     <string name="repo_basicauth_edit">Save Changes</string>

From 62f87e5b5b8eca3111eaadb2030a4b84c82dbfae Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 22 Dec 2025 10:21:24 -0300
Subject: [PATCH 150/180] Improve inset padding for lists

The secret is to use contentPadding, not padding with the Modifier.
---
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |  2 +-
 .../kotlin/org/fdroid/ui/apps/MyAppsList.kt   |  3 +++
 .../kotlin/org/fdroid/ui/lists/AppList.kt     | 19 ++++++-------------
 .../fdroid/ui/repositories/Repositories.kt    |  5 ++++-
 .../ui/repositories/RepositoriesList.kt       |  6 ++++--
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index a528ebf61..76c27eb08 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -179,7 +179,7 @@ fun MyApps(
                 currentPackageName = currentPackageName,
                 lazyListState = lazyListState,
                 onAppItemClick = onAppItemClick,
-                modifier = Modifier.padding(paddingValues),
+                paddingValues = paddingValues,
             )
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
index c88afa16d..e3b077482 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
@@ -3,6 +3,7 @@ package org.fdroid.ui.apps
 import androidx.annotation.RestrictTo
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -37,6 +38,7 @@ fun MyAppsList(
     currentPackageName: String?,
     lazyListState: LazyListState,
     onAppItemClick: (String) -> Unit,
+    paddingValues: PaddingValues,
     modifier: Modifier = Modifier,
 ) {
     val updatableApps = myAppsInfo.model.appUpdates
@@ -51,6 +53,7 @@ fun MyAppsList(
     var showIssueIgnoreDialog by remember { mutableStateOf<AppWithIssueItem?>(null) }
     LazyColumn(
         state = lazyListState,
+        contentPadding = paddingValues,
         modifier = modifier
             .then(
                 if (currentPackageName == null) Modifier
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
index 3024de7bb..0655c50d8 100644
--- a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
@@ -1,17 +1,14 @@
 package org.fdroid.ui.lists
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.layout.plus
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
@@ -158,9 +155,7 @@ fun AppList(
             LazyListState()
         }
         Column(
-            modifier = Modifier
-                .padding(paddingValues)
-                .fillMaxSize()
+            modifier = Modifier.fillMaxSize()
         ) {
             val apps = appListInfo.model.apps
             if (apps == null) BigLoadingIndicator()
@@ -170,12 +165,13 @@ fun AppList(
                     textAlign = TextAlign.Center,
                     modifier = Modifier
                         .fillMaxSize()
+                        .padding(paddingValues)
                         .padding(16.dp),
                 )
             } else LazyColumn(
                 state = listState,
-                contentPadding = PaddingValues(vertical = 8.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp),
+                contentPadding = paddingValues + PaddingValues(top = 8.dp),
+                verticalArrangement = spacedBy(8.dp),
                 modifier = Modifier.then(
                     if (currentPackageName == null) Modifier
                     else Modifier.selectableGroup()
@@ -203,9 +199,6 @@ fun AppList(
                             .then(interactionModifier)
                     )
                 }
-                item(contentType = "S") {
-                    Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
-                }
             }
             // Bottom Sheet
             val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
index d29e665a2..67930de59 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
@@ -4,6 +4,7 @@ import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -131,8 +132,10 @@ fun Repositories(
         else RepositoriesList(
             info = info,
             listState = listState,
+            // we split up top and bottom padding to not cause bugs with list drag and drop
+            paddingValues = PaddingValues(bottom = paddingValues.calculateBottomPadding()),
             modifier = Modifier
-                .padding(paddingValues),
+                .padding(top = paddingValues.calculateTopPadding()),
         )
     }
 }
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
index 840d43f6d..73f29f0e2 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.plus
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -35,8 +36,9 @@ import org.fdroid.ui.utils.rememberDragDropState
 @Composable
 fun RepositoriesList(
     info: RepositoryInfo,
-    modifier: Modifier = Modifier,
     listState: LazyListState,
+    paddingValues: PaddingValues,
+    modifier: Modifier = Modifier,
 ) {
     val repositories = info.model.repositories ?: return
     var showDisableRepoDialog by remember { mutableStateOf<Long?>(null) }
@@ -57,7 +59,7 @@ fun RepositoriesList(
     )
     LazyColumn(
         state = listState,
-        contentPadding = PaddingValues(vertical = 8.dp),
+        contentPadding = paddingValues + PaddingValues(top = 8.dp),
         verticalArrangement = spacedBy(8.dp),
         modifier = modifier
             .then(

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 151/180] 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,
 )

From 00860f5aabc9312638a32356fa12a91c5ba75584 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 22 Dec 2025 17:22:14 -0300
Subject: [PATCH 152/180] Turn 'My apps' overflow menu into sort menu

---
 next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 76c27eb08..1383f0973 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Sort
 import androidx.compose.material.icons.filled.AccessTime
-import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.SortByAlpha
 import androidx.compose.material3.DropdownMenu
@@ -108,7 +108,7 @@ fun MyApps(
                     var sortByMenuExpanded by remember { mutableStateOf(false) }
                     IconButton(onClick = { sortByMenuExpanded = !sortByMenuExpanded }) {
                         Icon(
-                            imageVector = Icons.Default.MoreVert,
+                            imageVector = Icons.AutoMirrored.Default.Sort,
                             contentDescription = stringResource(R.string.more),
                         )
                     }

From 8e1793e7fadd8fa6c22a4997a088b47f02cb2f8d Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 23 Dec 2025 11:03:59 -0300
Subject: [PATCH 153/180] Fix state restoration on top level screens

by reworking the NavDisplay related code
---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    | 315 +++---------------
 .../kotlin/org/fdroid/ui/apps/MyAppsEntry.kt  |  54 +++
 .../org/fdroid/ui/details/AppDetailsEntry.kt  |  33 ++
 .../kotlin/org/fdroid/ui/discover/Discover.kt |  11 +-
 .../org/fdroid/ui/discover/DiscoverEntry.kt   |  43 +++
 .../org/fdroid/ui/lists/AppListEntry.kt       |  49 +++
 .../org/fdroid/ui/repositories/RepoEntry.kt   | 118 +++++++
 7 files changed, 354 insertions(+), 269 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 9f68222fb..5ba194b60 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -16,9 +16,7 @@ import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
 import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneStrategy
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment.Companion.Center
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
@@ -29,23 +27,11 @@ import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.ui.NavDisplay
 import com.viktormykhailiv.compose.hints.HintHost
-import org.fdroid.database.AppListSortOrder
-import org.fdroid.install.InstallConfirmationState
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_DYNAMIC_COLORS
-import org.fdroid.ui.apps.AppWithIssueItem
-import org.fdroid.ui.apps.MyApps
-import org.fdroid.ui.apps.MyAppsInfo
-import org.fdroid.ui.apps.MyAppsViewModel
-import org.fdroid.ui.details.AppDetails
-import org.fdroid.ui.details.AppDetailsViewModel
-import org.fdroid.ui.details.NoAppSelected
-import org.fdroid.ui.discover.Discover
-import org.fdroid.ui.discover.DiscoverViewModel
-import org.fdroid.ui.lists.AppList
-import org.fdroid.ui.lists.AppListActions
-import org.fdroid.ui.lists.AppListInfo
-import org.fdroid.ui.lists.AppListType
-import org.fdroid.ui.lists.AppListViewModel
+import org.fdroid.ui.apps.myAppsEntry
+import org.fdroid.ui.details.appDetailsEntry
+import org.fdroid.ui.discover.discoverEntry
+import org.fdroid.ui.lists.appListEntry
 import org.fdroid.ui.navigation.BottomBar
 import org.fdroid.ui.navigation.IntentRouter
 import org.fdroid.ui.navigation.MainNavKey
@@ -55,17 +41,7 @@ import org.fdroid.ui.navigation.Navigator
 import org.fdroid.ui.navigation.rememberNavigationState
 import org.fdroid.ui.navigation.toEntries
 import org.fdroid.ui.navigation.topLevelRoutes
-import org.fdroid.ui.repositories.NoRepoSelected
-import org.fdroid.ui.repositories.Repositories
-import org.fdroid.ui.repositories.RepositoriesViewModel
-import org.fdroid.ui.repositories.RepositoryInfo
-import org.fdroid.ui.repositories.RepositoryItem
-import org.fdroid.ui.repositories.RepositoryModel
-import org.fdroid.ui.repositories.add.AddRepo
-import org.fdroid.ui.repositories.add.AddRepoViewModel
-import org.fdroid.ui.repositories.details.RepoDetails
-import org.fdroid.ui.repositories.details.RepoDetailsInfo
-import org.fdroid.ui.repositories.details.RepoDetailsViewModel
+import org.fdroid.ui.repositories.repoEntry
 import org.fdroid.ui.settings.Settings
 import org.fdroid.ui.settings.SettingsViewModel
 
@@ -95,209 +71,11 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
     val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>(directive = directive)
 
     val entryProvider: (NavKey) -> NavEntry<NavKey> = entryProvider {
-        entry<NavigationKey.Discover>(
-            metadata = ListDetailSceneStrategy.listPane("appdetails") {
-                NoAppSelected()
-            },
-        ) {
-            val viewModel = hiltViewModel<DiscoverViewModel>()
-            Discover(
-                discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
-                onListTap = {
-                    navigator.navigate(NavigationKey.AppList(it))
-                },
-                onAppTap = {
-                    val new = NavigationKey.AppDetails(it.packageName)
-                    if (navigator.last is NavigationKey.AppDetails) {
-                        navigator.replaceLast(new)
-                    } else {
-                        navigator.navigate(new)
-                    }
-                },
-                onNav = { navKey -> navigator.navigate(navKey) },
-                onSearch = viewModel::search,
-                onSearchCleared = viewModel::onSearchCleared,
-                modifier = Modifier,
-            )
-        }
-        entry<NavigationKey.MyApps>(
-            metadata = ListDetailSceneStrategy.listPane("appdetails"),
-        ) {
-            val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
-            val myAppsInfo = object : MyAppsInfo {
-                override val model = myAppsViewModel.myAppsModel.collectAsStateWithLifecycle().value
-
-                override fun updateAll() = myAppsViewModel.updateAll()
-                override fun changeSortOrder(sort: AppListSortOrder) =
-                    myAppsViewModel.changeSortOrder(sort)
-
-                override fun search(query: String) = myAppsViewModel.search(query)
-                override fun confirmAppInstall(
-                    packageName: String,
-                    state: InstallConfirmationState,
-                ) = myAppsViewModel.confirmAppInstall(packageName, state)
-
-                override fun ignoreAppIssue(item: AppWithIssueItem) =
-                    myAppsViewModel.ignoreAppIssue(item)
-            }
-            MyApps(
-                myAppsInfo = myAppsInfo,
-                currentPackageName = if (isBigScreen) {
-                    (navigator.last as? NavigationKey.AppDetails)?.packageName
-                } else null,
-                onAppItemClick = {
-                    val new = NavigationKey.AppDetails(it)
-                    if (navigator.last is NavigationKey.AppDetails) {
-                        navigator.replaceLast(new)
-                    } else {
-                        navigator.navigate(new)
-                    }
-                },
-            )
-        }
-        entry<NavigationKey.AppDetails>(
-            metadata = ListDetailSceneStrategy.detailPane("appdetails")
-        ) {
-            val viewModel = hiltViewModel<AppDetailsViewModel, AppDetailsViewModel.Factory>(
-                creationCallback = { factory ->
-                    factory.create(it.packageName)
-                }
-            )
-            AppDetails(
-                item = viewModel.appDetails.collectAsStateWithLifecycle().value,
-                onNav = { navKey -> navigator.navigate(navKey) },
-                onBackNav = if (isBigScreen) null else {
-                    { navigator.goBack() }
-                },
-                modifier = Modifier,
-            )
-        }
-        entry<NavigationKey.AppList>(
-            metadata = ListDetailSceneStrategy.listPane("appdetails"),
-        ) {
-            val viewModel = hiltViewModel<AppListViewModel, AppListViewModel.Factory>(
-                creationCallback = { factory ->
-                    factory.create(it.type)
-                }
-            )
-            val appListInfo = object : AppListInfo {
-                override val model = viewModel.appListModel.collectAsStateWithLifecycle().value
-                override val list: AppListType = it.type
-                override val actions: AppListActions = viewModel
-                override val showFilters: Boolean =
-                    viewModel.showFilters.collectAsStateWithLifecycle().value
-                override val showOnboarding: Boolean =
-                    viewModel.showOnboarding.collectAsStateWithLifecycle().value
-            }
-            AppList(
-                appListInfo = appListInfo,
-                currentPackageName = if (isBigScreen) {
-                    (navigator.last as? NavigationKey.AppDetails)?.packageName
-                } else null,
-                onBackClicked = { navigator.goBack() },
-            ) { packageName ->
-                val new = NavigationKey.AppDetails(packageName)
-                if (navigator.last is NavigationKey.AppDetails) {
-                    navigator.replaceLast(new)
-                } else {
-                    navigator.navigate(new)
-                }
-            }
-        }
-        entry<NavigationKey.Repos>(
-            metadata = ListDetailSceneStrategy.listPane("repos") {
-                NoRepoSelected()
-            },
-        ) {
-            val viewModel = hiltViewModel<RepositoriesViewModel>()
-            val info = object : RepositoryInfo {
-                override val model: RepositoryModel =
-                    viewModel.model.collectAsStateWithLifecycle().value
-
-                override val currentRepositoryId: Long? = if (isBigScreen) {
-                    (navigator.last as? NavigationKey.RepoDetails)?.repoId
-                } else null
-
-                override fun onOnboardingSeen() = viewModel.onOnboardingSeen()
-
-                override fun onRepositorySelected(repositoryItem: RepositoryItem) {
-                    val last = navigator.last
-                    val new = NavigationKey.RepoDetails(repositoryItem.repoId)
-                    if (last is NavigationKey.RepoDetails) {
-                        navigator.replaceLast(new)
-                    } else {
-                        navigator.navigate(new)
-                    }
-                }
-
-                override fun onRepositoryEnabled(repoId: Long, enabled: Boolean) =
-                    viewModel.onRepositoryEnabled(repoId, enabled)
-
-                override fun onAddRepo() {
-                    navigator.navigate(NavigationKey.AddRepo())
-                }
-
-                override fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long) =
-                    viewModel.onRepositoriesMoved(fromRepoId, toRepoId)
-
-                override fun onRepositoriesFinishedMoving(
-                    fromRepoId: Long,
-                    toRepoId: Long,
-                ) = viewModel.onRepositoriesFinishedMoving(fromRepoId, toRepoId)
-            }
-            Repositories(info, isBigScreen) {
-                navigator.goBack()
-            }
-        }
-        entry<NavigationKey.RepoDetails>(
-            metadata = ListDetailSceneStrategy.detailPane("repos")
-        ) { navKey ->
-            val viewModel = hiltViewModel<RepoDetailsViewModel, RepoDetailsViewModel.Factory>(
-                creationCallback = { factory ->
-                    factory.create(navKey.repoId)
-                }
-            )
-            RepoDetails(
-                info = object : RepoDetailsInfo {
-                    override val model = viewModel.model.collectAsStateWithLifecycle().value
-                    override val actions = viewModel
-                },
-                onShowAppsClicked = { title, repoId ->
-                    val type = AppListType.Repository(title, repoId)
-                    navigator.navigate(NavigationKey.AppList(type))
-                },
-                onBackNav = if (isBigScreen) null else {
-                    { navigator.goBack() }
-                },
-            )
-        }
-        entry<NavigationKey.AddRepo> { navKey ->
-            val viewModel = hiltViewModel<AddRepoViewModel>()
-            // this is for intents we receive via IntentRouter, usually the user provides URI later
-            LaunchedEffect(navKey) {
-                if (navKey.uri != null) {
-                    viewModel.onFetchRepo(navKey.uri)
-                }
-            }
-            AddRepo(
-                state = viewModel.state.collectAsStateWithLifecycle().value,
-                networkStateFlow = viewModel.networkState,
-                proxyConfig = viewModel.proxyConfig,
-                onFetchRepo = viewModel::onFetchRepo,
-                onAddRepo = viewModel::addFetchedRepository,
-                onExistingRepo = { repoId ->
-                    navigator.goBack()
-                    navigator.navigate(NavigationKey.RepoDetails(repoId))
-                },
-                onRepoAdded = { title, repoId ->
-                    navigator.goBack()
-                    navigator.navigate(NavigationKey.RepoDetails(repoId))
-                    val type = AppListType.Repository(title, repoId)
-                    navigator.navigate(NavigationKey.AppList(type))
-                },
-                onBackClicked = { navigator.goBack() },
-            )
-        }
+        discoverEntry(navigator, isBigScreen)
+        myAppsEntry(navigator, isBigScreen)
+        appDetailsEntry(navigator, isBigScreen)
+        appListEntry(navigator, isBigScreen)
+        repoEntry(navigator, isBigScreen)
         entry(NavigationKey.Settings) {
             val viewModel = hiltViewModel<SettingsViewModel>()
             Settings(
@@ -320,53 +98,60 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
             )
         }
     }
+    val showBottomBar = !isBigScreen && navigator.last is MainNavKey
     val viewModel = hiltViewModel<MainViewModel>()
     val dynamicColors =
         viewModel.dynamicColors.collectAsStateWithLifecycle(PREF_DEFAULT_DYNAMIC_COLORS).value
     val numUpdates = viewModel.numUpdates.collectAsStateWithLifecycle().value
     val hasAppIssues = viewModel.hasAppIssues.collectAsStateWithLifecycle(false).value
-    val navDisplay = @Composable { modifier: Modifier ->
-        NavDisplay(
-            entries = navigationState.toEntries(entryProvider),
-            contentAlignment = Center,
-            sceneStrategy = listDetailStrategy,
-            onBack = { navigator.goBack() },
-            modifier = modifier,
-        )
-    }
     FDroidContent(dynamicColors = dynamicColors) {
         HintHost {
-            if (isBigScreen) Row {
-                NavigationRail(
-                    numUpdates = numUpdates,
-                    hasIssues = hasAppIssues,
-                    currentNavKey = navigationState.topLevelRoute,
-                    onNav = { navKey -> navigator.navigate(navKey) },
-                    modifier = Modifier.padding(top = 16.dp)
-                )
-                // need to consume start insets or some phones leave a lot of space there
-                navDisplay(Modifier.consumeWindowInsets(PaddingValues(start = 64.dp)))
-            } else if (navigator.last is MainNavKey) {
-                Scaffold(bottomBar = {
-                    BottomBar(
+            Scaffold(
+                bottomBar = if (showBottomBar) {
+                    {
+                        BottomBar(
+                            numUpdates = numUpdates,
+                            hasIssues = hasAppIssues,
+                            currentNavKey = navigationState.topLevelRoute,
+                            onNav = { navKey -> navigator.navigate(navKey) },
+                        )
+                    }
+                } else {
+                    {}
+                },
+            ) { paddingValues ->
+                Row {
+                    // show nav rail only on big screen (at least two partitions)
+                    if (isBigScreen) NavigationRail(
                         numUpdates = numUpdates,
                         hasIssues = hasAppIssues,
                         currentNavKey = navigationState.topLevelRoute,
                         onNav = { navKey -> navigator.navigate(navKey) },
                     )
-                }) { paddingValues ->
-                    // we only apply the bottom padding here, so content stays above bottom bar
-                    // but we need to consume the navigation bar height manually
-                    val bottom = with(LocalDensity.current) {
-                        WindowInsets.navigationBars.getBottom(this).toDp()
+                    val modifier = if (isBigScreen) {
+                        // need to consume start insets or some phones leave a lot of space there
+                        Modifier.consumeWindowInsets(PaddingValues(start = 64.dp))
+                    } else if (showBottomBar) {
+                        // we only apply the bottom padding here, so content stays above bottom bar
+                        // but we need to consume the navigation bar height manually
+                        val bottom = with(LocalDensity.current) {
+                            WindowInsets.navigationBars.getBottom(this).toDp()
+                        }
+                        Modifier
+                            .consumeWindowInsets(PaddingValues(bottom = bottom))
+                            .padding(bottom = paddingValues.calculateBottomPadding())
+                    } else {
+                        Modifier
                     }
-                    val modifier = Modifier
-                        .consumeWindowInsets(PaddingValues(bottom = bottom))
-                        .padding(bottom = paddingValues.calculateBottomPadding())
-                    navDisplay(modifier)
+                    // this needs to a have a fixed place or state saving breaks,
+                    // so all moving pieces with conditionals are above
+                    NavDisplay(
+                        entries = navigationState.toEntries(entryProvider),
+                        sceneStrategy = listDetailStrategy,
+                        onBack = { navigator.goBack() },
+                        modifier = modifier,
+                    )
                 }
-            } else {
-                navDisplay(Modifier)
             }
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt
new file mode 100644
index 000000000..62b0c236a
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt
@@ -0,0 +1,54 @@
+package org.fdroid.ui.apps
+
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.EntryProviderScope
+import androidx.navigation3.runtime.NavKey
+import org.fdroid.database.AppListSortOrder
+import org.fdroid.install.InstallConfirmationState
+import org.fdroid.ui.navigation.NavigationKey
+import org.fdroid.ui.navigation.Navigator
+
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+fun EntryProviderScope<NavKey>.myAppsEntry(
+    navigator: Navigator,
+    isBigScreen: Boolean,
+) {
+    entry<NavigationKey.MyApps>(
+        metadata = ListDetailSceneStrategy.listPane("appdetails"),
+    ) {
+        val myAppsViewModel = hiltViewModel<MyAppsViewModel>()
+        val myAppsInfo = object : MyAppsInfo {
+            override val model = myAppsViewModel.myAppsModel.collectAsStateWithLifecycle().value
+
+            override fun updateAll() = myAppsViewModel.updateAll()
+            override fun changeSortOrder(sort: AppListSortOrder) =
+                myAppsViewModel.changeSortOrder(sort)
+
+            override fun search(query: String) = myAppsViewModel.search(query)
+            override fun confirmAppInstall(
+                packageName: String,
+                state: InstallConfirmationState,
+            ) = myAppsViewModel.confirmAppInstall(packageName, state)
+
+            override fun ignoreAppIssue(item: AppWithIssueItem) =
+                myAppsViewModel.ignoreAppIssue(item)
+        }
+        MyApps(
+            myAppsInfo = myAppsInfo,
+            currentPackageName = if (isBigScreen) {
+                (navigator.last as? NavigationKey.AppDetails)?.packageName
+            } else null,
+            onAppItemClick = {
+                val new = NavigationKey.AppDetails(it)
+                if (navigator.last is NavigationKey.AppDetails) {
+                    navigator.replaceLast(new)
+                } else {
+                    navigator.navigate(new)
+                }
+            },
+        )
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt
new file mode 100644
index 000000000..c6fcc93e4
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt
@@ -0,0 +1,33 @@
+package org.fdroid.ui.details
+
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.EntryProviderScope
+import androidx.navigation3.runtime.NavKey
+import org.fdroid.ui.navigation.NavigationKey
+import org.fdroid.ui.navigation.Navigator
+
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+fun EntryProviderScope<NavKey>.appDetailsEntry(
+    navigator: Navigator,
+    isBigScreen: Boolean,
+) {
+    entry<NavigationKey.AppDetails>(
+        metadata = ListDetailSceneStrategy.detailPane("appdetails")
+    ) {
+        val viewModel = hiltViewModel<AppDetailsViewModel, AppDetailsViewModel.Factory>(
+            creationCallback = { factory ->
+                factory.create(it.packageName)
+            }
+        )
+        AppDetails(
+            item = viewModel.appDetails.collectAsStateWithLifecycle().value,
+            onNav = { navKey -> navigator.navigate(navKey) },
+            onBackNav = if (isBigScreen) null else {
+                { navigator.goBack() }
+            },
+        )
+    }
+}
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 56563fff6..0637a7c5f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -52,6 +52,7 @@ import org.fdroid.ui.utils.BigLoadingIndicator
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun Discover(
     discoverModel: DiscoverModel,
+    isBigScreen: Boolean,
     onSearch: suspend (String) -> Unit,
     onSearchCleared: () -> Unit,
     onListTap: (AppListType) -> Unit,
@@ -124,10 +125,9 @@ fun Discover(
                         searchResults = discoverModel.searchResults,
                         onSearch = onSearch,
                         onNav = {
-                            scope.launch {
-                                // workaround for crash when navigating back:
-                                // IllegalStateException: LayoutCoordinate operations are only valid
-                                // when isAttached is true
+                            // workaround for search taking up entire screen
+                            // still a bit buggy though
+                            if (isBigScreen) scope.launch {
                                 searchBarState.animateToCollapsed()
                             }
                             onNav(it)
@@ -201,6 +201,7 @@ fun FirstStartDiscoverPreview() {
                 NetworkState(true, isMetered = false),
                 RepoUpdateProgress(1, true, 0.25f),
             ),
+            isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
             onListTap = {},
@@ -216,6 +217,7 @@ fun LoadingDiscoverPreview() {
     FDroidContent {
         Discover(
             discoverModel = LoadingDiscoverModel,
+            isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
             onListTap = {},
@@ -231,6 +233,7 @@ private fun NoEnabledReposPreview() {
     FDroidContent {
         Discover(
             discoverModel = NoEnabledReposDiscoverModel,
+            isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
             onListTap = {},
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
new file mode 100644
index 000000000..56c01a7a8
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
@@ -0,0 +1,43 @@
+package org.fdroid.ui.discover
+
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.EntryProviderScope
+import androidx.navigation3.runtime.NavKey
+import org.fdroid.ui.details.NoAppSelected
+import org.fdroid.ui.navigation.NavigationKey
+import org.fdroid.ui.navigation.Navigator
+
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+fun EntryProviderScope<NavKey>.discoverEntry(
+    navigator: Navigator,
+    isBigScreen: Boolean,
+) {
+    entry<NavigationKey.Discover>(
+        metadata = ListDetailSceneStrategy.listPane("appdetails") {
+            NoAppSelected()
+        },
+    ) {
+        val viewModel = hiltViewModel<DiscoverViewModel>()
+        Discover(
+            discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
+            isBigScreen = isBigScreen,
+            onListTap = {
+                navigator.navigate(NavigationKey.AppList(it))
+            },
+            onAppTap = {
+                val new = NavigationKey.AppDetails(it.packageName)
+                if (navigator.last is NavigationKey.AppDetails) {
+                    navigator.replaceLast(new)
+                } else {
+                    navigator.navigate(new)
+                }
+            },
+            onNav = { navKey -> navigator.navigate(navKey) },
+            onSearch = viewModel::search,
+            onSearchCleared = viewModel::onSearchCleared,
+        )
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt b/next/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt
new file mode 100644
index 000000000..e85d7937a
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt
@@ -0,0 +1,49 @@
+package org.fdroid.ui.lists
+
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.EntryProviderScope
+import androidx.navigation3.runtime.NavKey
+import org.fdroid.ui.navigation.NavigationKey
+import org.fdroid.ui.navigation.Navigator
+
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+fun EntryProviderScope<NavKey>.appListEntry(
+    navigator: Navigator,
+    isBigScreen: Boolean,
+) {
+    entry<NavigationKey.AppList>(
+        metadata = ListDetailSceneStrategy.listPane("appdetails"),
+    ) {
+        val viewModel = hiltViewModel<AppListViewModel, AppListViewModel.Factory>(
+            creationCallback = { factory ->
+                factory.create(it.type)
+            }
+        )
+        val appListInfo = object : AppListInfo {
+            override val model = viewModel.appListModel.collectAsStateWithLifecycle().value
+            override val list: AppListType = it.type
+            override val actions: AppListActions = viewModel
+            override val showFilters: Boolean =
+                viewModel.showFilters.collectAsStateWithLifecycle().value
+            override val showOnboarding: Boolean =
+                viewModel.showOnboarding.collectAsStateWithLifecycle().value
+        }
+        AppList(
+            appListInfo = appListInfo,
+            currentPackageName = if (isBigScreen) {
+                (navigator.last as? NavigationKey.AppDetails)?.packageName
+            } else null,
+            onBackClicked = { navigator.goBack() },
+        ) { packageName ->
+            val new = NavigationKey.AppDetails(packageName)
+            if (navigator.last is NavigationKey.AppDetails) {
+                navigator.replaceLast(new)
+            } else {
+                navigator.navigate(new)
+            }
+        }
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt
new file mode 100644
index 000000000..fac239863
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt
@@ -0,0 +1,118 @@
+package org.fdroid.ui.repositories
+
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
+import androidx.compose.runtime.LaunchedEffect
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation3.runtime.EntryProviderScope
+import androidx.navigation3.runtime.NavKey
+import org.fdroid.ui.lists.AppListType
+import org.fdroid.ui.navigation.NavigationKey
+import org.fdroid.ui.navigation.Navigator
+import org.fdroid.ui.repositories.add.AddRepo
+import org.fdroid.ui.repositories.add.AddRepoViewModel
+import org.fdroid.ui.repositories.details.RepoDetails
+import org.fdroid.ui.repositories.details.RepoDetailsInfo
+import org.fdroid.ui.repositories.details.RepoDetailsViewModel
+
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+fun EntryProviderScope<NavKey>.repoEntry(
+    navigator: Navigator,
+    isBigScreen: Boolean,
+) {
+    entry<NavigationKey.Repos>(
+        metadata = ListDetailSceneStrategy.listPane("repos") {
+            NoRepoSelected()
+        },
+    ) {
+        val viewModel = hiltViewModel<RepositoriesViewModel>()
+        val info = object : RepositoryInfo {
+            override val model: RepositoryModel =
+                viewModel.model.collectAsStateWithLifecycle().value
+
+            override val currentRepositoryId: Long? = if (isBigScreen) {
+                (navigator.last as? NavigationKey.RepoDetails)?.repoId
+            } else null
+
+            override fun onOnboardingSeen() = viewModel.onOnboardingSeen()
+
+            override fun onRepositorySelected(repositoryItem: RepositoryItem) {
+                val last = navigator.last
+                val new = NavigationKey.RepoDetails(repositoryItem.repoId)
+                if (last is NavigationKey.RepoDetails) {
+                    navigator.replaceLast(new)
+                } else {
+                    navigator.navigate(new)
+                }
+            }
+
+            override fun onRepositoryEnabled(repoId: Long, enabled: Boolean) =
+                viewModel.onRepositoryEnabled(repoId, enabled)
+
+            override fun onAddRepo() {
+                navigator.navigate(NavigationKey.AddRepo())
+            }
+
+            override fun onRepositoryMoved(fromRepoId: Long, toRepoId: Long) =
+                viewModel.onRepositoriesMoved(fromRepoId, toRepoId)
+
+            override fun onRepositoriesFinishedMoving(
+                fromRepoId: Long,
+                toRepoId: Long,
+            ) = viewModel.onRepositoriesFinishedMoving(fromRepoId, toRepoId)
+        }
+        Repositories(info, isBigScreen) {
+            navigator.goBack()
+        }
+    }
+    entry<NavigationKey.RepoDetails>(
+        metadata = ListDetailSceneStrategy.detailPane("repos")
+    ) { navKey ->
+        val viewModel = hiltViewModel<RepoDetailsViewModel, RepoDetailsViewModel.Factory>(
+            creationCallback = { factory ->
+                factory.create(navKey.repoId)
+            }
+        )
+        RepoDetails(
+            info = object : RepoDetailsInfo {
+                override val model = viewModel.model.collectAsStateWithLifecycle().value
+                override val actions = viewModel
+            },
+            onShowAppsClicked = { title, repoId ->
+                val type = AppListType.Repository(title, repoId)
+                navigator.navigate(NavigationKey.AppList(type))
+            },
+            onBackNav = if (isBigScreen) null else {
+                { navigator.goBack() }
+            },
+        )
+    }
+    entry<NavigationKey.AddRepo> { navKey ->
+        val viewModel = hiltViewModel<AddRepoViewModel>()
+        // this is for intents we receive via IntentRouter, usually the user provides URI later
+        LaunchedEffect(navKey) {
+            if (navKey.uri != null) {
+                viewModel.onFetchRepo(navKey.uri)
+            }
+        }
+        AddRepo(
+            state = viewModel.state.collectAsStateWithLifecycle().value,
+            networkStateFlow = viewModel.networkState,
+            proxyConfig = viewModel.proxyConfig,
+            onFetchRepo = viewModel::onFetchRepo,
+            onAddRepo = viewModel::addFetchedRepository,
+            onExistingRepo = { repoId ->
+                navigator.goBack()
+                navigator.navigate(NavigationKey.RepoDetails(repoId))
+            },
+            onRepoAdded = { title, repoId ->
+                navigator.goBack()
+                navigator.navigate(NavigationKey.RepoDetails(repoId))
+                val type = AppListType.Repository(title, repoId)
+                navigator.navigate(NavigationKey.AppList(type))
+            },
+            onBackClicked = { navigator.goBack() },
+        )
+    }
+}

From f9dd39ace0d75fc6b9686ffc4d5c7af646461554 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 23 Dec 2025 11:34:05 -0300
Subject: [PATCH 154/180] Improve presentation of main Discover screen

---
 next/src/main/kotlin/org/fdroid/ui/Main.kt    |   2 +-
 .../org/fdroid/ui/discover/AppsSearch.kt      |  46 ++++--
 .../kotlin/org/fdroid/ui/discover/Discover.kt | 121 +++++-----------
 .../org/fdroid/ui/discover/DiscoverContent.kt |  81 +++++++++++
 .../org/fdroid/ui/discover/DiscoverEntry.kt   |   2 -
 .../org/fdroid/ui/discover/FirstStart.kt      | 136 +++++++++---------
 .../fdroid/ui/utils/BigLoadingIndicator.kt    |   4 +-
 7 files changed, 219 insertions(+), 173 deletions(-)
 create mode 100644 next/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt

diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/next/src/main/kotlin/org/fdroid/ui/Main.kt
index 5ba194b60..4dd73cc14 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Main.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/Main.kt
@@ -71,7 +71,7 @@ fun Main(onListeningForIntent: () -> Unit = {}) {
     val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>(directive = directive)
 
     val entryProvider: (NavKey) -> NavEntry<NavKey> = entryProvider {
-        discoverEntry(navigator, isBigScreen)
+        discoverEntry(navigator)
         myAppsEntry(navigator, isBigScreen)
         appDetailsEntry(navigator, isBigScreen)
         appListEntry(navigator, isBigScreen)
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
index 43f55e938..7a7c26459 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
@@ -14,8 +14,10 @@ import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.ExpandedDockedSearchBar
 import androidx.compose.material3.ExpandedFullScreenSearchBar
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -24,6 +26,7 @@ import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.SearchBarState
 import androidx.compose.material3.SearchBarValue
 import androidx.compose.material3.Text
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.material3.rememberSearchBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -34,6 +37,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import org.fdroid.R
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.categories.CategoryChip
@@ -50,7 +54,7 @@ import org.fdroid.ui.utils.BigLoadingIndicator
 const val SEARCH_THRESHOLD = 2
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun AppsSearch(
     searchBarState: SearchBarState,
     searchResults: SearchResults?,
@@ -90,20 +94,18 @@ fun AppsSearch(
     val listState = rememberSaveable(searchResults, saver = LazyListState.Saver) {
         LazyListState(0, 0)
     }
-    ExpandedFullScreenSearchBar(
-        state = searchBarState,
-        inputField = {
-            AppSearchInputField(
-                searchBarState = searchBarState,
-                textFieldState = textFieldState,
-                onSearch = onSearch,
-                onSearchCleared = {
-                    textFieldState.setTextAndPlaceCursorAtEnd("")
-                    onSearchCleared()
-                },
-            )
-        },
-    ) {
+    val inputField = @Composable {
+        AppSearchInputField(
+            searchBarState = searchBarState,
+            textFieldState = textFieldState,
+            onSearch = onSearch,
+            onSearchCleared = {
+                textFieldState.setTextAndPlaceCursorAtEnd("")
+                onSearchCleared()
+            },
+        )
+    }
+    val results = @Composable {
         if (searchResults == null) {
             if (textFieldState.text.length >= SEARCH_THRESHOLD) BigLoadingIndicator()
         } else if (searchResults.apps.isEmpty() && textFieldState.text.length >= SEARCH_THRESHOLD) {
@@ -168,6 +170,20 @@ fun AppsSearch(
             }
         }
     }
+    val windowAdaptiveInfo = currentWindowAdaptiveInfo()
+    val isBigScreen =
+        windowAdaptiveInfo.windowSizeClass.isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND)
+    if (isBigScreen) {
+        ExpandedDockedSearchBar(
+            state = searchBarState,
+            inputField = inputField,
+        ) { results() }
+    } else {
+        ExpandedFullScreenSearchBar(
+            state = searchBarState,
+            inputField = inputField,
+        ) { results() }
+    }
 }
 
 @Composable
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 0637a7c5f..4fb1f0d11 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
@@ -1,11 +1,7 @@
 package org.fdroid.ui.discover
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -27,7 +23,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -37,12 +32,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation3.runtime.NavKey
-import kotlinx.coroutines.launch
 import org.fdroid.R
 import org.fdroid.download.NetworkState
 import org.fdroid.repo.RepoUpdateProgress
 import org.fdroid.ui.FDroidContent
-import org.fdroid.ui.categories.CategoryList
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.navigation.NavigationKey
 import org.fdroid.ui.navigation.topBarMenuItems
@@ -52,7 +45,6 @@ import org.fdroid.ui.utils.BigLoadingIndicator
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 fun Discover(
     discoverModel: DiscoverModel,
-    isBigScreen: Boolean,
     onSearch: suspend (String) -> Unit,
     onSearchCleared: () -> Unit,
     onListTap: (AppListType) -> Unit,
@@ -104,90 +96,44 @@ fun Discover(
         },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
-        val scope = rememberCoroutineScope()
-        Column(
-            verticalArrangement = Arrangement.Center,
-            modifier = Modifier
-                .focusable() // workaround for https://issuetracker.google.com/issues/445720462
-                .fillMaxSize()
-                .verticalScroll(rememberScrollState())
-                .padding(paddingValues)
-        ) {
-            when (discoverModel) {
-                is FirstStartDiscoverModel -> FirstStart(
-                    networkState = discoverModel.networkState,
-                    repoUpdateState = discoverModel.repoUpdateState,
+        when (discoverModel) {
+            is FirstStartDiscoverModel -> FirstStart(
+                networkState = discoverModel.networkState,
+                repoUpdateState = discoverModel.repoUpdateState,
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(paddingValues),
+            )
+            is LoadingDiscoverModel -> BigLoadingIndicator(Modifier.padding(paddingValues))
+            is LoadedDiscoverModel -> {
+                DiscoverContent(
+                    discoverModel = discoverModel,
+                    searchBarState = searchBarState,
+                    onSearch = onSearch,
+                    onSearchCleared = onSearchCleared,
+                    onListTap = onListTap,
+                    onAppTap = onAppTap,
+                    onNav = onNav,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .verticalScroll(rememberScrollState())
+                        .padding(paddingValues),
                 )
-                is LoadingDiscoverModel -> BigLoadingIndicator()
-                is LoadedDiscoverModel -> {
-                    AppsSearch(
-                        searchBarState = searchBarState,
-                        searchResults = discoverModel.searchResults,
-                        onSearch = onSearch,
-                        onNav = {
-                            // workaround for search taking up entire screen
-                            // still a bit buggy though
-                            if (isBigScreen) scope.launch {
-                                searchBarState.animateToCollapsed()
-                            }
-                            onNav(it)
-                        },
-                        onSearchCleared = onSearchCleared,
-                        modifier = Modifier
-                            .padding(top = 16.dp, bottom = 4.dp)
-                            .padding(horizontal = 16.dp)
-                            .align(Alignment.CenterHorizontally),
-                    )
-                    if (discoverModel.newApps.isNotEmpty()) {
-                        val listNew = AppListType.New(stringResource(R.string.app_list_new))
-                        AppCarousel(
-                            title = listNew.title,
-                            apps = discoverModel.newApps,
-                            onTitleTap = { onListTap(listNew) },
-                            onAppTap = onAppTap,
-                        )
-                    }
-                    val listRecentlyUpdated = AppListType.RecentlyUpdated(
-                        stringResource(R.string.app_list_recently_updated),
-                    )
-                    AppCarousel(
-                        title = listRecentlyUpdated.title,
-                        apps = discoverModel.recentlyUpdatedApps,
-                        onTitleTap = { onListTap(listRecentlyUpdated) },
-                        onAppTap = onAppTap,
-                    )
-                    if (!discoverModel.mostDownloadedApps.isNullOrEmpty()) {
-                        val listMostDownloaded = AppListType.MostDownloaded(
-                            stringResource(R.string.app_list_most_downloaded),
-                        )
-                        AppCarousel(
-                            title = listMostDownloaded.title,
-                            apps = discoverModel.mostDownloadedApps,
-                            onTitleTap = { onListTap(listMostDownloaded) },
-                            onAppTap = onAppTap,
-                        )
-                    }
-                }
-                NoEnabledReposDiscoverModel -> {
+            }
+            NoEnabledReposDiscoverModel -> {
+                Box(
+                    contentAlignment = Alignment.Center,
+                    modifier = modifier
+                        .fillMaxSize()
+                        .padding(paddingValues)
+                ) {
                     Text(
                         text = stringResource(R.string.no_repos_enabled),
                         textAlign = TextAlign.Center,
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(horizontal = 16.dp, vertical = 64.dp)
+                        modifier = Modifier.padding(16.dp)
                     )
                 }
             }
-            AnimatedVisibility(discoverModel is LoadedDiscoverModel) {
-                CategoryList(
-                    categoryMap = (discoverModel as LoadedDiscoverModel).categories,
-                    onNav = onNav,
-                    modifier = Modifier
-                        .padding(horizontal = 16.dp)
-                        .padding(bottom = 16.dp)
-                        .fillMaxWidth()
-                )
-            }
         }
     }
 }
@@ -201,7 +147,6 @@ fun FirstStartDiscoverPreview() {
                 NetworkState(true, isMetered = false),
                 RepoUpdateProgress(1, true, 0.25f),
             ),
-            isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
             onListTap = {},
@@ -217,7 +162,6 @@ fun LoadingDiscoverPreview() {
     FDroidContent {
         Discover(
             discoverModel = LoadingDiscoverModel,
-            isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
             onListTap = {},
@@ -233,7 +177,6 @@ private fun NoEnabledReposPreview() {
     FDroidContent {
         Discover(
             discoverModel = NoEnabledReposDiscoverModel,
-            isBigScreen = false,
             onSearch = {},
             onSearchCleared = {},
             onListTap = {},
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
new file mode 100644
index 000000000..1b5a8fdd1
--- /dev/null
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
@@ -0,0 +1,81 @@
+package org.fdroid.ui.discover
+
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.SearchBarState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation3.runtime.NavKey
+import org.fdroid.R
+import org.fdroid.ui.categories.CategoryList
+import org.fdroid.ui.lists.AppListType
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DiscoverContent(
+    discoverModel: LoadedDiscoverModel,
+    searchBarState: SearchBarState,
+    onSearch: suspend (String) -> Unit,
+    onSearchCleared: () -> Unit,
+    onListTap: (AppListType) -> Unit,
+    onAppTap: (AppDiscoverItem) -> Unit,
+    onNav: (NavKey) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    // workaround for https://issuetracker.google.com/issues/445720462)
+    Column(modifier = modifier.focusable()) {
+        AppsSearch(
+            searchBarState = searchBarState,
+            searchResults = discoverModel.searchResults,
+            onSearch = onSearch,
+            onNav = onNav,
+            onSearchCleared = onSearchCleared,
+            modifier = Modifier
+                .padding(top = 16.dp, bottom = 4.dp)
+                .padding(horizontal = 16.dp)
+                .align(Alignment.CenterHorizontally),
+        )
+        if (discoverModel.newApps.isNotEmpty()) {
+            val listNew = AppListType.New(stringResource(R.string.app_list_new))
+            AppCarousel(
+                title = listNew.title,
+                apps = discoverModel.newApps,
+                onTitleTap = { onListTap(listNew) },
+                onAppTap = onAppTap,
+            )
+        }
+        val listRecentlyUpdated = AppListType.RecentlyUpdated(
+            stringResource(R.string.app_list_recently_updated),
+        )
+        AppCarousel(
+            title = listRecentlyUpdated.title,
+            apps = discoverModel.recentlyUpdatedApps,
+            onTitleTap = { onListTap(listRecentlyUpdated) },
+            onAppTap = onAppTap,
+        )
+        if (!discoverModel.mostDownloadedApps.isNullOrEmpty()) {
+            val listMostDownloaded = AppListType.MostDownloaded(
+                stringResource(R.string.app_list_most_downloaded),
+            )
+            AppCarousel(
+                title = listMostDownloaded.title,
+                apps = discoverModel.mostDownloadedApps,
+                onTitleTap = { onListTap(listMostDownloaded) },
+                onAppTap = onAppTap,
+            )
+        }
+        CategoryList(
+            categoryMap = discoverModel.categories,
+            onNav = onNav,
+            modifier = Modifier
+                .padding(16.dp)
+                .fillMaxWidth()
+        )
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
index 56c01a7a8..4d7de9c3f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
@@ -13,7 +13,6 @@ import org.fdroid.ui.navigation.Navigator
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 fun EntryProviderScope<NavKey>.discoverEntry(
     navigator: Navigator,
-    isBigScreen: Boolean,
 ) {
     entry<NavigationKey.Discover>(
         metadata = ListDetailSceneStrategy.listPane("appdetails") {
@@ -23,7 +22,6 @@ fun EntryProviderScope<NavKey>.discoverEntry(
         val viewModel = hiltViewModel<DiscoverViewModel>()
         Discover(
             discoverModel = viewModel.discoverModel.collectAsStateWithLifecycle().value,
-            isBigScreen = isBigScreen,
             onListTap = {
                 navigator.navigate(NavigationKey.AppList(it))
             },
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt b/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
index da9749a89..81254564d 100644
--- a/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
@@ -1,8 +1,9 @@
 package org.fdroid.ui.discover
 
 import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.layout.Arrangement.Center
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -37,7 +38,11 @@ import org.fdroid.ui.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
-fun ColumnScope.FirstStart(networkState: NetworkState, repoUpdateState: RepoUpdateState?) {
+fun FirstStart(
+    networkState: NetworkState,
+    repoUpdateState: RepoUpdateState?,
+    modifier: Modifier = Modifier,
+) {
     val context = LocalContext.current
     var override by rememberSaveable { mutableStateOf(false) }
     // reset override on error, so user can press button again for re-try
@@ -47,73 +52,75 @@ fun ColumnScope.FirstStart(networkState: NetworkState, repoUpdateState: RepoUpda
         ) override = false
         // TODO it would be nice to surface normal update errors better and also let the user retry
     }
-    if ((!networkState.isOnline || networkState.isMetered) && !override) {
-        // offline or metered, not overridden
-        val res = if (networkState.isMetered) {
-            stringResource(R.string.first_start_metered)
+    Column(verticalArrangement = Center, modifier = modifier) {
+        if ((!networkState.isOnline || networkState.isMetered) && !override) {
+            // offline or metered, not overridden
+            val res = if (networkState.isMetered) {
+                stringResource(R.string.first_start_metered)
+            } else {
+                stringResource(R.string.first_start_offline)
+            }
+            Text(
+                text = stringResource(R.string.first_start_intro),
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .padding(16.dp)
+                    .fillMaxWidth()
+            )
+            Text(
+                text = res,
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .padding(16.dp)
+                    .fillMaxWidth()
+            )
+            Button(
+                onClick = { override = true },
+                modifier = Modifier.align(CenterHorizontally),
+            ) {
+                Text(stringResource(R.string.first_start_button))
+            }
         } else {
-            stringResource(R.string.first_start_offline)
-        }
-        Text(
-            text = stringResource(R.string.first_start_intro),
-            textAlign = TextAlign.Center,
-            modifier = Modifier
+            // happy path or user set override
+            LaunchedEffect(Unit) {
+                RepoUpdateWorker.updateNow(context)
+            }
+            Text(
+                text = stringResource(R.string.first_start_loading),
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .padding(16.dp)
+                    .fillMaxWidth()
+            )
+            // use thicker stroke for larger circle
+            val stroke = Stroke(
+                width = with(LocalDensity.current) {
+                    6.dp.toPx()
+                },
+                cap = StrokeCap.Round,
+            )
+            val progressModifier = Modifier
                 .padding(16.dp)
-                .fillMaxWidth()
-        )
-        Text(
-            text = res,
-            textAlign = TextAlign.Center,
-            modifier = Modifier
-                .padding(16.dp)
-                .fillMaxWidth()
-        )
-        Button(
-            onClick = { override = true },
-            modifier = Modifier.align(CenterHorizontally),
-        ) {
-            Text(stringResource(R.string.first_start_button))
-        }
-    } else {
-        // happy path or user set override
-        LaunchedEffect(Unit) {
-            RepoUpdateWorker.updateNow(context)
-        }
-        Text(
-            text = stringResource(R.string.first_start_loading),
-            textAlign = TextAlign.Center,
-            modifier = Modifier
-                .padding(16.dp)
-                .fillMaxWidth()
-        )
-        // use thicker stroke for larger circle
-        val stroke = Stroke(
-            width = with(LocalDensity.current) {
-                6.dp.toPx()
-            },
-            cap = StrokeCap.Round,
-        )
-        val progressModifier = Modifier
-            .padding(16.dp)
-            .size(128.dp)
-            .align(CenterHorizontally)
-        // show indeterminate circle if we don't have any progress (may take a bit to start)
-        val progress = (repoUpdateState as? RepoUpdateProgress)?.progress ?: 0f
-        if (progress == 0f) CircularWavyProgressIndicator(
-            wavelength = 24.dp,
-            stroke = stroke,
-            trackStroke = stroke,
-            modifier = progressModifier,
-        ) else {
-            // animate real progress (download and DB insertion)
-            val animatedProgress by animateFloatAsState(targetValue = progress)
-            CircularWavyProgressIndicator(
-                progress = { animatedProgress },
+                .size(128.dp)
+                .align(CenterHorizontally)
+            // show indeterminate circle if we don't have any progress (may take a bit to start)
+            val progress = (repoUpdateState as? RepoUpdateProgress)?.progress ?: 0f
+            if (progress == 0f) CircularWavyProgressIndicator(
                 wavelength = 24.dp,
                 stroke = stroke,
                 trackStroke = stroke,
                 modifier = progressModifier,
-            )
+            ) else {
+                // animate real progress (download and DB insertion)
+                val animatedProgress by animateFloatAsState(targetValue = progress)
+                CircularWavyProgressIndicator(
+                    progress = { animatedProgress },
+                    wavelength = 24.dp,
+                    stroke = stroke,
+                    trackStroke = stroke,
+                    modifier = progressModifier,
+                )
+            }
         }
     }
 }
@@ -145,7 +152,8 @@ private fun UpdatePreview() {
         Column {
             FirstStart(
                 networkState = NetworkState(isOnline = true, isMetered = false),
-                repoUpdateState = RepoUpdateProgress(1L, false, 0.5f)
+                repoUpdateState = RepoUpdateProgress(1L, false, 0.5f),
+                modifier = Modifier.fillMaxSize(),
             )
         }
     }
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt b/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
index ab3acc151..b598b9245 100644
--- a/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
@@ -14,10 +14,10 @@ import org.fdroid.ui.FDroidContent
 
 @Composable
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
-fun BigLoadingIndicator() {
+fun BigLoadingIndicator(modifier: Modifier = Modifier) {
     Box(
         contentAlignment = Alignment.Center,
-        modifier = Modifier.fillMaxSize()
+        modifier = modifier.fillMaxSize()
     ) {
         LoadingIndicator(Modifier.size(128.dp))
     }

From 5f9883a1b8ed6250ecd6329c80a0d81cc1076f12 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 23 Dec 2025 16:47:34 -0300
Subject: [PATCH 155/180] Improve About screen

---
 next/src/main/kotlin/org/fdroid/ui/About.kt   | 146 +++++++++++++-----
 .../org/fdroid/ui/details/NoAppSelected.kt    |  27 +---
 .../fdroid/ui/repositories/NoRepoSelected.kt  |   3 +-
 next/src/main/res/values/strings-next.xml     |   3 +-
 4 files changed, 120 insertions(+), 59 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/next/src/main/kotlin/org/fdroid/ui/About.kt
index e35088bef..ff6e46471 100644
--- a/next/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/About.kt
@@ -2,36 +2,51 @@ package org.fdroid.ui
 
 import android.content.res.Configuration
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Code
+import androidx.compose.material.icons.filled.Forum
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.MonetizationOn
+import androidx.compose.material.icons.filled.Translate
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults.enterAlwaysScrollBehavior
+import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.Hyphens
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.BuildConfig.VERSION_NAME
@@ -41,6 +56,7 @@ import org.fdroid.ui.utils.openUriSafe
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun About(onBackClicked: (() -> Unit)?) {
+    val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
     Scaffold(
         topBar = {
             TopAppBar(
@@ -55,33 +71,46 @@ fun About(onBackClicked: (() -> Unit)?) {
                 title = {
                     Text(stringResource(R.string.about_title_full))
                 },
+                scrollBehavior = scrollBehavior,
             )
         },
+        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { paddingValues ->
-        val scrollableState = rememberScrollState()
+        AboutContent(Modifier.fillMaxSize(), paddingValues)
+    }
+}
+
+@Composable
+fun AboutContent(modifier: Modifier = Modifier, paddingValues: PaddingValues = PaddingValues()) {
+    val scrollableState = rememberScrollState()
+    Box(
+        modifier = modifier.verticalScroll(scrollableState)
+    ) {
         Column(
+            verticalArrangement = spacedBy(8.dp),
             modifier = Modifier
-                .padding(horizontal = 16.dp)
-                .padding(top = paddingValues.calculateTopPadding())
-                .verticalScroll(scrollableState)
+                .padding(paddingValues)
+                .padding(16.dp)
         ) {
-            AboutHeader(modifier = Modifier.padding(top = 32.dp))
-            AboutContent()
-            Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+            AboutHeader()
+            AboutText()
         }
     }
 }
 
 @Composable
-fun AboutHeader(modifier: Modifier = Modifier) {
+private fun AboutHeader(modifier: Modifier = Modifier) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = modifier.fillMaxWidth()
     ) {
         Image(
             painter = painterResource(id = R.drawable.ic_launcher),
-            modifier = Modifier.semantics { hideFromAccessibility() },
             contentDescription = null, // decorative element
+            modifier = Modifier
+                .fillMaxWidth(0.25f)
+                .aspectRatio(1f)
+                .semantics { hideFromAccessibility() }
         )
         SelectionContainer {
             Text(
@@ -96,43 +125,80 @@ fun AboutHeader(modifier: Modifier = Modifier) {
 }
 
 @Composable
-fun AboutContent() {
+private fun AboutText() {
     SelectionContainer {
         Text(
             text = stringResource(R.string.about_text),
-            style = MaterialTheme.typography.bodyLarge,
-            modifier = Modifier.padding(top = 24.dp),
+            textAlign = TextAlign.Justify,
+            style = MaterialTheme.typography.bodyLarge.copy(hyphens = Hyphens.Auto),
+            modifier = Modifier.padding(top = 16.dp),
         )
     }
-    Column(modifier = Modifier.padding(top = 24.dp, bottom = 16.dp)) {
-        val uriHandler = LocalUriHandler.current
+    val uriHandler = LocalUriHandler.current
+    Text(
+        text = stringResource(R.string.links),
+        fontWeight = FontWeight.Bold,
+        textAlign = TextAlign.Justify,
+        style = MaterialTheme.typography.bodyLarge,
+        modifier = Modifier.padding(top = 8.dp)
+    )
+    AboutLink(
+        text = stringResource(R.string.menu_website),
+        icon = Icons.Default.Home,
+        onClick = { uriHandler.openUriSafe("https://f-droid.org") },
+    )
+    AboutLink(
+        text = stringResource(R.string.about_forum),
+        icon = Icons.Default.Forum,
+        onClick = { uriHandler.openUriSafe("https://forum.f-droid.org") },
+    )
+    AboutLink(
+        text = stringResource(R.string.menu_translation),
+        icon = Icons.Default.Translate,
+        onClick = {
+            uriHandler.openUriSafe("https://f-droid.org/en/docs/Translation_and_Localization/")
+        },
+    )
+    AboutLink(
+        text = stringResource(R.string.donate_title),
+        icon = Icons.Default.MonetizationOn,
+        onClick = { uriHandler.openUriSafe("https://f-droid.org/donate/") },
+    )
+    AboutLink(
+        text = stringResource(R.string.about_source),
+        icon = Icons.Default.Code,
+        onClick = { uriHandler.openUriSafe("https://gitlab.com/fdroid/fdroidclient") },
+    )
+    Text(
+        text = stringResource(R.string.about_license),
+        fontWeight = FontWeight.Bold,
+        style = MaterialTheme.typography.bodyLarge,
+    )
+    SelectionContainer {
         Text(
-            text = stringResource(R.string.links),
-            fontWeight = FontWeight.Bold,
-            style = MaterialTheme.typography.bodyLarge,
+            text = stringResource(R.string.about_license_text),
+            textAlign = TextAlign.Justify,
+            style = MaterialTheme.typography.bodyLarge.copy(hyphens = Hyphens.Auto),
         )
-        Text(
-            text = stringResource(R.string.menu_website),
-            style = MaterialTheme.typography.bodyLarge,
-            color = MaterialTheme.colorScheme.secondary,
-            modifier = Modifier
-                .padding(top = 4.dp)
-                .clickable { uriHandler.openUriSafe("https://f-droid.org") }
-        )
-        Text(
-            text = stringResource(R.string.about_source),
-            style = MaterialTheme.typography.bodyLarge,
-            color = MaterialTheme.colorScheme.secondary,
-            modifier = Modifier
-                .padding(top = 4.dp)
-                .clickable { uriHandler.openUriSafe("https://gitlab.com/fdroid") }
+    }
+}
+
+@Composable
+private fun AboutLink(text: String, icon: ImageVector, onClick: () -> Unit) {
+    TextButton(onClick = onClick) {
+        Icon(
+            imageVector = icon,
+            contentDescription = null,
+            modifier = Modifier.semantics { hideFromAccessibility() }
         )
+        Spacer(modifier = Modifier.width(ButtonDefaults.IconSpacing))
+        Text(text = text)
     }
 }
 
 @Preview(showBackground = true)
 @Composable
-fun AboutPreview() {
+private fun AboutPreview() {
     FDroidContent {
         About {}
     }
@@ -140,4 +206,8 @@ fun AboutPreview() {
 
 @Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
-fun AboutPreviewDark() = AboutPreview()
+private fun AboutPreviewDark() {
+    FDroidContent {
+        About(null)
+    }
+}
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt b/next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
index 05ccef68b..38aeb7498 100644
--- a/next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
@@ -2,16 +2,10 @@ package org.fdroid.ui.details
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeContentPadding
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.windowInsetsBottomHeight
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment.Companion.Center
@@ -19,7 +13,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.fdroid.ui.AboutContent
-import org.fdroid.ui.AboutHeader
 import org.fdroid.ui.FDroidContent
 
 @Composable
@@ -29,17 +22,13 @@ fun NoAppSelected() {
         modifier = Modifier
             .fillMaxSize()
             .background(MaterialTheme.colorScheme.background)
-            .safeContentPadding()
-            .padding(horizontal = 32.dp)
-            .verticalScroll(rememberScrollState())
     ) {
-        Column(
-            modifier = Modifier.fillMaxSize(fraction = 0.7f)
-        ) {
-            AboutHeader(modifier = Modifier.padding(top = 32.dp))
-            AboutContent()
-            Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
-        }
+        AboutContent(
+            modifier = Modifier
+                .fillMaxHeight()
+                .fillMaxWidth(fraction = 0.7f)
+                .padding(top = 32.dp)
+        )
     }
 }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
index 3440c4b22..d5727a899 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement.spacedBy
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -45,7 +46,7 @@ fun NoRepoSelected() {
             )
             Text(
                 text = stringResource(R.string.repo_list_info_text),
-                modifier = Modifier.fillMaxSize(fraction = 0.7f)
+                modifier = Modifier.fillMaxWidth(fraction = 0.7f)
             )
         }
     }
diff --git a/next/src/main/res/values/strings-next.xml b/next/src/main/res/values/strings-next.xml
index ea030404b..f06cad5ca 100644
--- a/next/src/main/res/values/strings-next.xml
+++ b/next/src/main/res/values/strings-next.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <string name="app_name">F-Droid Next</string>
-    <string name="about_text">F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. This app makes it easy to browse, install, and keep track of updates on your device.</string>
+    <string name="about_text">F-Droid distributes (Free and Open Source Software) apps for Android. All apps in its official app repository are built from their source code to ensure that they are completely transparent and only include Free Software.\n\nThis app makes it easy to browse and install apps from F-Droid or other repositories. It also helps you to keep your apps up to date.\n\nF-Droid is a non-profit volunteer project. Although every effort is made to ensure all apps are safe to install, you use it AT YOUR OWN RISK. The app’s source code is automatically checked for potential security or privacy issues. However, this is far from exhaustive and there are no guarantees.\n\nF-Droid respects your privacy. We don’t track you, or your device. We don’t track what you install. You don’t need an account to use this app, and it sends no additional identifying data when communicating with repositories, other than its version number.</string>
+    <string name="about_license_text">This program is Free Software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
 
     <string name="menu_about">About</string>
     <string name="menu_discover">Discover</string>

From 1738ba96442292d634615a9cefbcfa103a09b116 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 29 Dec 2025 10:48:04 -0300
Subject: [PATCH 156/180] Update our own app last

This is needed, because when we update ourselves we get killed, so then we can't apply the other updates anymore. Updating ourselves last ensures that all other updates have been applied before.
---
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |  2 +-
 .../org/fdroid/updates/AppUpdateWorker.kt     |  3 +--
 .../org/fdroid/updates/UpdatesManager.kt      | 21 +++++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
index a69f1d558..7b453667f 100644
--- a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
@@ -92,7 +92,7 @@ class MyAppsViewModel @Inject constructor(
 
     fun updateAll() {
         scope.launch {
-            updatesManager.updateAll()
+            updatesManager.updateAll(true)
         }
     }
 
diff --git a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
index 7263ee0fe..2e0a4bc93 100644
--- a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
@@ -21,7 +21,6 @@ import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.joinAll
 import mu.KotlinLogging
 import org.fdroid.NotificationManager
 import org.fdroid.NotificationManager.Companion.NOTIFICATION_ID_APP_INSTALLS
@@ -110,7 +109,7 @@ class AppUpdateWorker @AssistedInject constructor(
             // and it will "share" the same notification.
             // This is easier than trying to tell the [AppInstallManager]
             // not to start a foreground service in this specific case.
-            updatesManager.updateAll().joinAll()
+            updatesManager.updateAll(false)
             // show success notification, if at least one app got installed
             val notificationState = appInstallManager.installNotificationState
             if (notificationState.numInstalled > 0) {
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 4acdcf8b0..57673dc65 100644
--- a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -5,13 +5,13 @@ import android.content.pm.PackageInfo
 import androidx.core.os.LocaleListCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
@@ -163,22 +163,31 @@ class UpdatesManager @Inject constructor(
         }
     }
 
-    suspend fun updateAll(): List<Job> {
-        val appsToUpdate = updates.value ?: updates.first() ?: return emptyList()
+    suspend fun updateAll(canAskPreApprovalNow: Boolean) {
+        val appsToUpdate = updates.value ?: updates.first() ?: return
         // we could do more in-depth checks regarding pre-approval, but this also works
-        val canAskPreApprovalNow = appsToUpdate.size == 1
+        val preApprovalNow = canAskPreApprovalNow && appsToUpdate.size == 1
         val concurrencyLimit = min(Runtime.getRuntime().availableProcessors(), 8)
         val semaphore = Semaphore(concurrencyLimit)
-        return appsToUpdate.map { update ->
+        // remember our own app, if it is to be updated as well
+        val updateLast = appsToUpdate.find { it.packageName == context.packageName }
+        appsToUpdate.mapNotNull { update ->
+            // don't update our own app just yet
+            if (update.packageName == context.packageName) return@mapNotNull null
             currentCoroutineContext().ensureActive()
             // launch a new co-routine for each app to update
             coroutineScope.launch {
                 // suspend here until we get a permit from the semaphore (there's free workers)
                 semaphore.withPermit {
                     currentCoroutineContext().ensureActive()
-                    updateApp(update, canAskPreApprovalNow)
+                    updateApp(update, preApprovalNow)
                 }
             }
+        }.joinAll()
+        currentCoroutineContext().ensureActive()
+        // now it is time to update our own app
+        updateLast?.let {
+            updateApp(it, preApprovalNow)
         }
     }
 

From 83f8f80332f447f8c29e1b35d8af4ed9802534e8 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 29 Dec 2025 11:20:50 -0300
Subject: [PATCH 157/180] Init repo update progress as soon as possible

so there can be UI feedback right after we started updating that repo not after the first bytes have been downloaded which may only happen after significant delay.
---
 .../kotlin/org/fdroid/repo/RepoUpdateManager.kt     |  6 ++++++
 .../fdroid/ui/repositories/details/RepoDetails.kt   | 13 ++++++++-----
 .../ui/repositories/details/RepoDetailsInfo.kt      |  3 +++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
index 6fafde103..fa152135c 100644
--- a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
+++ b/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
@@ -120,6 +120,7 @@ class RepoUpdateManager @VisibleForTesting internal constructor(
                 if (!repo.enabled) return@forEach
                 currentCoroutineContext().ensureActive()
 
+                repoUpdateListener.onUpdateStarted(repo.repoId)
                 // show notification
                 val repoName = repo.getName(LocaleListCompat.getDefault())
                 val msg = context.getString(R.string.notification_repo_update_default, repoName)
@@ -159,6 +160,7 @@ class RepoUpdateManager @VisibleForTesting internal constructor(
         val repo = repoManager.getRepository(repoId) ?: return IndexUpdateResult.NotFound
         _isUpdating.value = true
         return try {
+            repoUpdateListener.onUpdateStarted(repo.repoId)
             // show notification
             val repoName = repo.getName(LocaleListCompat.getDefault())
             val msg = context.getString(R.string.notification_repo_update_default, repoName)
@@ -192,6 +194,10 @@ internal class RepoUpdateListener(
     val updateState = _updateState.asStateFlow()
     private var lastUpdateProgress = 0L
 
+    fun onUpdateStarted(repoId: Long) {
+        _updateState.update { RepoUpdateProgress(repoId, true, 0) }
+    }
+
     override fun onDownloadProgress(repo: Repository, bytesRead: Long, totalBytes: Long) {
         log.debug { "Downloading ${repo.address} ($bytesRead/$totalBytes)" }
 
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
index 15859420b..e59925777 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
@@ -125,11 +125,14 @@ fun RepoDetails(
                         contentDescription = stringResource(R.string.show_repository_qr)
                     )
                 }
-                IconButton(enabled = repo.enabled, onClick = {
-                    if (info.model.networkState.isMetered) showMeteredDialog = {
-                        RepoUpdateWorker.updateNow(context, repo.repoId)
-                    } else RepoUpdateWorker.updateNow(context, repo.repoId)
-                }) {
+                IconButton(
+                    enabled = info.model.isUpdateButtonEnabled,
+                    onClick = {
+                        if (info.model.networkState.isMetered) showMeteredDialog = {
+                            RepoUpdateWorker.updateNow(context, repo.repoId)
+                        } else RepoUpdateWorker.updateNow(context, repo.repoId)
+                    },
+                ) {
                     Icon(
                         imageVector = Icons.Default.Update,
                         contentDescription = stringResource(R.string.repo_force_update)
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
index 38e9fec61..ace1b452e 100644
--- a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
+++ b/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
@@ -10,6 +10,7 @@ import org.fdroid.R
 import org.fdroid.database.Repository
 import org.fdroid.download.Mirror
 import org.fdroid.download.NetworkState
+import org.fdroid.repo.RepoUpdateProgress
 import org.fdroid.repo.RepoUpdateState
 import org.fdroid.ui.utils.flagEmoji
 import org.fdroid.ui.utils.generateQrBitmap
@@ -57,6 +58,8 @@ data class RepoDetailsModel(
 
     val showUserMirrors: Boolean = userMirrors.isNotEmpty()
 
+    val isUpdateButtonEnabled: Boolean = repo?.enabled == true && updateState !is RepoUpdateProgress
+
     fun shareRepo(context: Context) {
         require(repo != null) { "repo was null when sharing it" }
         val intent = Intent(ACTION_SEND).apply {

From d3164687cd2408dc52ef1b154b2cad7fa5f79d47 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 29 Dec 2025 15:07:21 -0300
Subject: [PATCH 158/180] Clean up app gradle modules

---
 {next => app}/.gitignore                      |   0
 {next => app}/build.gradle.kts                |  19 +-
 app/proguard-rules.pro                        |  59 +-
 .../org/fdroid/install/ApkFileProviderTest.kt |   0
 app/src/main/AndroidManifest.xml              | 550 +++---------------
 .../src/main/assets/default_repos.json        |   0
 .../src/main/assets/most_downloaded_apps.json |   0
 .../src/main/kotlin/org/fdroid/App.kt         |   0
 .../main/kotlin/org/fdroid/MainActivity.kt    |   0
 .../kotlin/org/fdroid/NotificationManager.kt  |   0
 .../kotlin/org/fdroid/db/DatabaseModule.kt    |   0
 .../main/kotlin/org/fdroid/db/InitialData.kt  |   0
 .../org/fdroid/download/DownloadModule.kt     |   0
 .../fdroid/download/DownloaderFactoryImpl.kt  |   0
 .../kotlin/org/fdroid/download/ImageModel.kt  |   0
 .../fdroid/download/LocalFileDownloader.kt    |   0
 .../org/fdroid/download/LocalIconFetcher.kt   |   0
 .../org/fdroid/download/NetworkMonitor.kt     |   0
 .../org/fdroid/install/ApkFileProvider.kt     |   0
 .../org/fdroid/install/AppInstallListener.kt  |   0
 .../org/fdroid/install/AppInstallManager.kt   |   0
 .../org/fdroid/install/AppInstallService.kt   |   0
 .../kotlin/org/fdroid/install/CacheCleaner.kt |   0
 .../install/InstallBroadcastReceiver.kt       |   0
 .../install/InstallNotificationState.kt       |   0
 .../kotlin/org/fdroid/install/InstallState.kt |   0
 .../org/fdroid/install/InstalledAppsCache.kt  |   0
 .../org/fdroid/install/PreApprovalResult.kt   |   0
 .../fdroid/install/SessionInstallManager.kt   |   0
 .../kotlin/org/fdroid/repo/RepoPreLoader.kt   |   0
 .../org/fdroid/repo/RepoUpdateManager.kt      |   0
 .../org/fdroid/repo/RepoUpdateWorker.kt       |   0
 .../org/fdroid/repo/RepositoryModule.kt       |   0
 .../org/fdroid/settings/OnboardingManager.kt  |   0
 .../org/fdroid/settings/SettingsConstants.kt  |   0
 .../org/fdroid/settings/SettingsManager.kt    |   0
 .../src/main/kotlin/org/fdroid/ui/About.kt    |   0
 app/src/main/kotlin/org/fdroid/ui/Color.kt    |  78 +++
 .../src/main/kotlin/org/fdroid/ui/Main.kt     |   0
 .../kotlin/org/fdroid/ui/MainViewModel.kt     |   0
 .../src/main/kotlin/org/fdroid/ui/Theme.kt    |  73 +--
 .../org/fdroid/ui/apps/IgnoreIssueDialog.kt   |   0
 .../org/fdroid/ui/apps/InstalledAppRow.kt     |   0
 .../org/fdroid/ui/apps/InstallingAppRow.kt    |   0
 .../kotlin/org/fdroid/ui/apps/MyAppItem.kt    |   0
 .../main/kotlin/org/fdroid/ui/apps/MyApps.kt  |   0
 .../kotlin/org/fdroid/ui/apps/MyAppsEntry.kt  |   0
 .../kotlin/org/fdroid/ui/apps/MyAppsInfo.kt   |   0
 .../kotlin/org/fdroid/ui/apps/MyAppsList.kt   |   0
 .../org/fdroid/ui/apps/MyAppsPresenter.kt     |   0
 .../org/fdroid/ui/apps/MyAppsViewModel.kt     |   0
 .../org/fdroid/ui/apps/NotAvailableDialog.kt  |   0
 .../org/fdroid/ui/apps/UpdatableAppRow.kt     |   0
 .../org/fdroid/ui/categories/CategoryChip.kt  |   0
 .../org/fdroid/ui/categories/CategoryGroup.kt |   0
 .../org/fdroid/ui/categories/CategoryItem.kt  |   0
 .../org/fdroid/ui/categories/CategoryList.kt  |   0
 .../main/kotlin/org/fdroid/ui/crash/Crash.kt  |   0
 .../org/fdroid/ui/crash/CrashActivity.kt      |   0
 .../org/fdroid/ui/crash/CrashContent.kt       |   0
 .../org/fdroid/ui/details/AntiFeatures.kt     |   0
 .../org/fdroid/ui/details/AppDetails.kt       |   0
 .../org/fdroid/ui/details/AppDetailsEntry.kt  |   0
 .../org/fdroid/ui/details/AppDetailsHeader.kt |   0
 .../org/fdroid/ui/details/AppDetailsItem.kt   |   0
 .../org/fdroid/ui/details/AppDetailsLink.kt   |   0
 .../org/fdroid/ui/details/AppDetailsMenu.kt   |   0
 .../fdroid/ui/details/AppDetailsTopAppBar.kt  |   0
 .../fdroid/ui/details/AppDetailsViewModel.kt  |   0
 .../fdroid/ui/details/AppDetailsWarnings.kt   |   0
 .../org/fdroid/ui/details/DetailsPresenter.kt |   0
 .../org/fdroid/ui/details/NoAppSelected.kt    |   0
 .../org/fdroid/ui/details/RepoChooser.kt      |   0
 .../org/fdroid/ui/details/Screenshots.kt      |   0
 .../org/fdroid/ui/details/TechnicalInfo.kt    |   0
 .../kotlin/org/fdroid/ui/details/Versions.kt  |   0
 .../org/fdroid/ui/discover/AppCarousel.kt     |   0
 .../org/fdroid/ui/discover/AppDiscoverItem.kt |   0
 .../fdroid/ui/discover/AppSearchInputField.kt |   0
 .../org/fdroid/ui/discover/AppsSearch.kt      |   0
 .../kotlin/org/fdroid/ui/discover/Discover.kt |   0
 .../org/fdroid/ui/discover/DiscoverContent.kt |   0
 .../org/fdroid/ui/discover/DiscoverEntry.kt   |   0
 .../ui/discover/DiscoverOverflowMenu.kt       |   0
 .../fdroid/ui/discover/DiscoverPresenter.kt   |   0
 .../fdroid/ui/discover/DiscoverViewModel.kt   |   0
 .../org/fdroid/ui/discover/FirstStart.kt      |   0
 .../org/fdroid/ui/discover/SearchResults.kt   |   0
 .../kotlin/org/fdroid/ui/icons/License.kt     |   0
 .../org/fdroid/ui/icons/PackageVariant.kt     |   0
 .../kotlin/org/fdroid/ui/lists/AppList.kt     |   0
 .../org/fdroid/ui/lists/AppListEntry.kt       |   0
 .../kotlin/org/fdroid/ui/lists/AppListInfo.kt |   0
 .../kotlin/org/fdroid/ui/lists/AppListItem.kt |   0
 .../org/fdroid/ui/lists/AppListPresenter.kt   |   0
 .../kotlin/org/fdroid/ui/lists/AppListRow.kt  |   0
 .../kotlin/org/fdroid/ui/lists/AppListType.kt |   0
 .../org/fdroid/ui/lists/AppListViewModel.kt   |   0
 .../kotlin/org/fdroid/ui/lists/AppsFilter.kt  |   0
 .../org/fdroid/ui/lists/TopSearchBar.kt       |   0
 .../org/fdroid/ui/navigation/BottomBar.kt     |   0
 .../org/fdroid/ui/navigation/IntentRouter.kt  |   0
 .../org/fdroid/ui/navigation/NavigationKey.kt |   0
 .../fdroid/ui/navigation/NavigationState.kt   |   0
 .../org/fdroid/ui/navigation/Navigator.kt     |   0
 .../fdroid/ui/repositories/NoRepoSelected.kt  |   0
 .../org/fdroid/ui/repositories/RepoEntry.kt   |   0
 .../org/fdroid/ui/repositories/RepoIcon.kt    |   0
 .../fdroid/ui/repositories/Repositories.kt    |   0
 .../ui/repositories/RepositoriesList.kt       |   0
 .../ui/repositories/RepositoriesPresenter.kt  |   0
 .../ui/repositories/RepositoriesViewModel.kt  |   0
 .../fdroid/ui/repositories/RepositoryInfo.kt  |   0
 .../fdroid/ui/repositories/RepositoryItem.kt  |   0
 .../fdroid/ui/repositories/RepositoryRow.kt   |   0
 .../org/fdroid/ui/repositories/add/AddRepo.kt |   0
 .../ui/repositories/add/AddRepoErrorScreen.kt |   0
 .../ui/repositories/add/AddRepoIntro.kt       |   0
 .../repositories/add/AddRepoPreviewScreen.kt  |   0
 .../repositories/add/AddRepoProgressScreen.kt |   0
 .../ui/repositories/add/AddRepoViewModel.kt   |   0
 .../ui/repositories/add/RepoPreviewHeader.kt  |   0
 .../ui/repositories/details/BasicAuth.kt      |   0
 .../ui/repositories/details/DeleteDialog.kt   |   0
 .../repositories/details/OfficialMirrors.kt   |   0
 .../ui/repositories/details/QrCodeDialog.kt   |   0
 .../ui/repositories/details/RepoDetails.kt    |   0
 .../details/RepoDetailsContent.kt             |   0
 .../repositories/details/RepoDetailsHeader.kt |   0
 .../repositories/details/RepoDetailsInfo.kt   |   0
 .../details/RepoDetailsPresenter.kt           |   0
 .../details/RepoDetailsViewModel.kt           |   0
 .../ui/repositories/details/RepoSettings.kt   |   0
 .../ui/repositories/details/UserMirrors.kt    |   0
 .../org/fdroid/ui/settings/PreferenceProxy.kt |   0
 .../kotlin/org/fdroid/ui/settings/Settings.kt |   0
 .../org/fdroid/ui/settings/SettingsModel.kt   |   0
 .../fdroid/ui/settings/SettingsViewModel.kt   |   0
 .../org/fdroid/ui/utils/AsyncShimmerImage.kt  |   0
 .../kotlin/org/fdroid/ui/utils/BadgeIcon.kt   |   0
 .../fdroid/ui/utils/BigLoadingIndicator.kt    |   0
 .../org/fdroid/ui/utils/DragDropState.kt      |   0
 .../kotlin/org/fdroid/ui/utils/ExpandIcon.kt  |   0
 .../org/fdroid/ui/utils/ExpandableSection.kt  |   0
 .../org/fdroid/ui/utils/FDroidButton.kt       |   0
 .../org/fdroid/ui/utils/FDroidSwitchRow.kt    |   0
 .../ui/utils/MeteredConnectionDialog.kt       |   0
 .../kotlin/org/fdroid/ui/utils/OfflineBar.kt  |   0
 .../org/fdroid/ui/utils/OnboardingCard.kt     |   0
 .../org/fdroid/ui/utils/PreviewUtils.kt       |   0
 .../kotlin/org/fdroid/ui/utils/UiUtils.kt     |   0
 .../org/fdroid/updates/AppUpdateWorker.kt     |   0
 .../fdroid/updates/UpdateNotificationState.kt |   0
 .../org/fdroid/updates/UpdatesManager.kt      |   0
 .../org/fdroid/updates/UpdatesModule.kt       |   0
 .../fdroid/utils/CoroutinesScopesModule.kt    |   0
 .../src/main/kotlin/org/fdroid/utils/Utils.kt |   0
 .../src/main/res/drawable/ic_crash.xml        |   0
 .../ic_launcher.png                           | Bin
 app/src/main/res/drawable/ic_notification.xml |   2 +-
 app/src/main/res/drawable/ic_refresh.xml      |   2 +-
 .../main/res/drawable/ic_repo_app_default.xml |   0
 .../res/drawable/screenshots_placeholder.png  | Bin
 .../src/main/res/values/strings-next.xml      |   0
 app/src/main/res/values/themes.xml            | 131 +----
 .../main/res/xml/network_security_config.xml  |  38 +-
 .../fdroid/ui/details/HtmlDescriptionTest.kt  |   0
 .../fdroid/ui/navigation/IntentRouterTest.kt  |   0
 {app => legacy}/build.gradle                  |   0
 {app => legacy}/lint.xml                      |   0
 legacy/proguard-rules.pro                     |  58 ++
 .../src/androidTest/AndroidManifest.xml       |   0
 .../org.fdroid.extendedpermissionstest.apk    | Bin
 .../assets/org.fdroid.permissions.minmax.apk  | Bin
 .../assets/org.fdroid.permissions.minmax.zip  | Bin
 .../assets/org.fdroid.permissions.sdk14.apk   | Bin
 .../assets/org.fdroid.permissions.sdk14.zip   | Bin
 .../src/androidTest/assets/simpleIndex.jar    |   0
 .../fdroid/database/PrimaryConstructorTest.kt |   0
 .../java/org/fdroid/fdroid/AssetUtils.java    |   0
 .../org/fdroid/fdroid/LocalizationTest.java   |   0
 .../fdroid/MainActivityEspressoTest.java      |   0
 .../java/org/fdroid/fdroid/Netstat.java       |   0
 .../org/fdroid/fdroid/SystemAnimations.java   |   0
 .../java/org/fdroid/fdroid/UiWatchers.java    |   0
 .../fdroid/fdroid/compat/FileCompatTest.java  |   0
 .../fdroid/installer/ApkVerifierTest.java     |   0
 .../fdroid/fdroid/net/DnsWithCacheTest.java   |   0
 .../fdroid/fdroid/net/HttpDownloaderTest.java |   0
 .../fdroid/fdroid/work/AppUpdateWorkerTest.kt |   0
 .../fdroid/work/CleanCacheWorkerTest.java     |   0
 .../fdroid/work/FDroidMetricsWorkerTest.java  |   0
 .../fdroid/work/WorkManagerTestRule.java      |   0
 .../repo/RepoManagerAddAllIntegrationTest.kt  |   0
 .../src/androidTest/proguard-rules.pro        |   0
 .../fdroid/MainActivityEspressoTestFull.java  |   0
 .../fdroid/nearby/BonjourManagerTest.java     |   0
 .../fdroid/nearby/LocalHTTPDManagerTest.java  |   0
 .../nearby/PublicSourceDirProviderTest.java   |   0
 .../fdroid/updater/SwapRepoEmulatorTest.java  |   0
 .../fdroid/fdroid/nearby/BluetoothClient.java |   0
 .../fdroid/nearby/LocalRepoManager.java       |   0
 .../fdroid/nearby/SDCardScannerService.java   |   0
 .../org/fdroid/fdroid/nearby/SwapService.java |   0
 .../fdroid/nearby/SwapWorkflowActivity.java   |   0
 .../nearby/TreeUriScannerIntentService.java   |   0
 .../fdroid/nearby/WifiStateChangeService.java |   0
 .../fdroid/fdroid/panic/HidingManager.java    |   0
 .../fdroid/views/main/LatestLayoutPolicy.java |   0
 .../fdroid/views/main/MainViewController.java |   0
 .../fdroid/views/main/NearbyViewBinder.java   |   0
 .../ic_launcher_foreground.xml                |   0
 .../basic/res/drawable-hdpi/ic_launcher.png   | Bin
 .../basic/res/drawable-ldpi/ic_launcher.png   | Bin
 .../basic/res/drawable-mdpi/ic_launcher.png   | Bin
 .../basic/res/drawable-xhdpi/ic_launcher.png  | Bin
 .../basic/res/drawable-xxhdpi/ic_launcher.png | Bin
 .../res/drawable-xxxhdpi/ic_launcher.png      | Bin
 .../res/drawable/ic_launcher_monochrome.xml   |   0
 .../src/basic/res/values/attrs.xml            |   0
 .../src/basic/res/values/strings.xml          |   0
 {app => legacy}/src/debug/AndroidManifest.xml |   0
 {app => legacy}/src/full/AndroidManifest.xml  |   0
 .../cc/mvdan/accesspoint/WifiApControl.java   |   0
 .../javax/jmdns/impl/FDroidServiceInfo.java   |   0
 .../kellinwood/logging/AbstractLogger.java    |   0
 .../logging/ConsoleLoggerFactory.java         |   0
 .../kellinwood/logging/LoggerFactory.java     |   0
 .../kellinwood/logging/LoggerInterface.java   |   0
 .../kellinwood/logging/LoggerManager.java     |   0
 .../kellinwood/logging/NullLoggerFactory.java |   0
 .../java/kellinwood/logging/StreamLogger.java |   0
 .../security/zipsigner/AutoKeyException.java  |   0
 .../zipsigner/DefaultResourceAdapter.java     |   0
 .../security/zipsigner/HexDumpEncoder.java    |   0
 .../kellinwood/security/zipsigner/KeySet.java |   0
 .../security/zipsigner/ProgressEvent.java     |   0
 .../security/zipsigner/ProgressHelper.java    |   0
 .../security/zipsigner/ProgressListener.java  |   0
 .../security/zipsigner/ResourceAdapter.java   |   0
 .../security/zipsigner/ZipSigner.java         |   0
 .../optional/SignatureBlockGenerator.java     |   0
 .../java/kellinwood/zipio/CentralEnd.java     |   0
 .../full/java/kellinwood/zipio/ZioEntry.java  |   0
 .../kellinwood/zipio/ZioEntryInputStream.java |   0
 .../zipio/ZioEntryOutputStream.java           |   0
 .../full/java/kellinwood/zipio/ZipInput.java  |   0
 .../kellinwood/zipio/ZipListingHelper.java    |   0
 .../full/java/kellinwood/zipio/ZipOutput.java |   0
 .../fdroid/fdroid/nearby/BluetoothClient.java |   0
 .../fdroid/nearby/BluetoothManager.java       |   0
 .../fdroid/fdroid/nearby/BluetoothServer.java |   0
 .../fdroid/fdroid/nearby/BonjourManager.java  |   0
 .../org/fdroid/fdroid/nearby/LocalHTTPD.java  |   0
 .../fdroid/nearby/LocalHTTPDManager.java      |   0
 .../fdroid/nearby/LocalRepoKeyStore.java      |   0
 .../fdroid/nearby/LocalRepoManager.java       |   0
 .../fdroid/nearby/LocalRepoService.java       |   0
 .../fdroid/fdroid/nearby/NewRepoConfig.java   |   0
 .../fdroid/nearby/SDCardScannerService.java   |   0
 .../fdroid/fdroid/nearby/SelectAppsView.java  |   0
 .../fdroid/fdroid/nearby/StartSwapView.java   |   8 +-
 .../org/fdroid/fdroid/nearby/SwapService.java |   0
 .../fdroid/fdroid/nearby/SwapSuccessView.java |   0
 .../org/fdroid/fdroid/nearby/SwapView.java    |   0
 .../fdroid/nearby/SwapWorkflowActivity.java   |   0
 .../nearby/TreeUriScannerIntentService.java   |   0
 .../nearby/UsbDeviceAttachedReceiver.java     |   0
 .../nearby/UsbDeviceDetachedReceiver.java     |   0
 .../nearby/UsbDeviceMediaMountedReceiver.java |   0
 .../nearby/WifiStateChangeReceiver.java       |   0
 .../fdroid/nearby/WifiStateChangeService.java |   0
 .../fdroid/nearby/peers/BluetoothPeer.java    |   0
 .../fdroid/nearby/peers/BonjourPeer.java      |   0
 .../org/fdroid/fdroid/nearby/peers/Peer.java  |   0
 .../fdroid/fdroid/nearby/peers/WifiPeer.java  |   0
 .../fdroid/panic/CalculatorActivity.java      |   0
 .../fdroid/panic/DestructivePreference.java   |   0
 .../panic/DestructiveSwitchPreference.java    |   0
 .../org/fdroid/fdroid/panic/ExitActivity.java |   0
 .../fdroid/fdroid/panic/HidingManager.java    |   0
 .../panic/PanicPreferencesActivity.java       |   0
 .../panic/PanicPreferencesFragment.java       |   0
 .../fdroid/panic/PanicResponderActivity.java  |   0
 .../panic/SelectInstalledAppListAdapter.java  |   0
 .../SelectInstalledAppListItemController.java |   0
 .../panic/SelectInstalledAppsActivity.java    |   0
 .../fdroid/views/main/LatestLayoutPolicy.java |   0
 .../fdroid/views/main/MainViewController.java |   0
 .../fdroid/views/main/NearbyViewBinder.java   |   0
 .../src/full/res/drawable-hdpi/circle.png     | Bin
 .../full/res/drawable-hdpi/ic_fdroid_grey.png | Bin
 .../res/drawable-hdpi/swap_start_header.png   | Bin
 .../src/full/res/drawable-ldpi/circle.png     | Bin
 .../full/res/drawable-ldpi/ic_fdroid_grey.png | Bin
 .../res/drawable-ldpi/swap_start_header.png   | Bin
 .../src/full/res/drawable-mdpi/circle.png     | Bin
 .../full/res/drawable-mdpi/ic_fdroid_grey.png | Bin
 .../res/drawable-mdpi/swap_start_header.png   | Bin
 .../src/full/res/drawable-xhdpi/circle.png    | Bin
 .../res/drawable-xhdpi/ic_fdroid_grey.png     | Bin
 .../res/drawable-xhdpi/swap_start_header.png  | Bin
 .../src/full/res/drawable-xxhdpi/circle.png   | Bin
 .../res/drawable-xxhdpi/ic_fdroid_grey.png    | Bin
 .../res/drawable-xxhdpi/swap_start_header.png | Bin
 .../src/full/res/drawable-xxxhdpi/circle.png  | Bin
 .../res/drawable-xxxhdpi/ic_fdroid_grey.png   | Bin
 .../drawable-xxxhdpi/swap_start_header.png    | Bin
 .../src/full/res/drawable/check.xml           |   0
 .../res/drawable/ic_add_circle_outline.xml    |   0
 .../src/full/res/drawable/ic_apps.xml         |   0
 .../src/full/res/drawable/ic_bluetooth.xml    |   0
 .../res/drawable/ic_bluetooth_searching.xml   |   0
 .../src/full/res/drawable/ic_nearby.xml       |   0
 .../src/full/res/drawable/ic_qr_code.xml      |   0
 .../src/full/res/drawable/ic_wifi.xml         |   0
 .../src/full/res/drawable/ic_wifi_off.xml     |   0
 .../full/res/drawable/ic_wifi_tethering.xml   |   0
 .../src/full/res/drawable/nearby_splash.xml   |   0
 .../res/layout-sw480dp/start_swap_header.xml  |   0
 .../full/res/layout/activity_calculator.xml   |   0
 .../res/layout/activity_panic_settings.xml    |   0
 .../src/full/res/layout/dialog_app_hiding.xml |   0
 .../src/full/res/layout/main_tab_nearby.xml   |   0
 .../layout/select_local_apps_list_item.xml    |   0
 .../src/full/res/layout/start_swap_header.xml |   0
 .../src/full/res/layout/swap_activity.xml     |   0
 .../full/res/layout/swap_app_list_item.xml    |   0
 .../full/res/layout/swap_confirm_receive.xml  |   0
 .../src/full/res/layout/swap_connecting.xml   |   0
 .../src/full/res/layout/swap_join_wifi.xml    |   0
 .../full/res/layout/swap_peer_list_item.xml   |   0
 .../src/full/res/layout/swap_select_apps.xml  |   0
 .../src/full/res/layout/swap_send_fdroid.xml  |   0
 .../src/full/res/layout/swap_start_swap.xml   |   0
 .../src/full/res/layout/swap_success.xml      |   0
 .../src/full/res/layout/swap_wifi_qr.xml      |   0
 .../full/res/menu/main_activity_screens.xml   |   0
 .../src/full/res/menu/swap_next.xml           |   0
 .../src/full/res/menu/swap_next_search.xml    |   0
 .../src/full/res/menu/swap_search.xml         |   0
 .../mipmap-hdpi/ic_calculator_launcher.png    | Bin
 .../mipmap-mdpi/ic_calculator_launcher.png    | Bin
 .../mipmap-xhdpi/ic_calculator_launcher.png   | Bin
 .../mipmap-xxhdpi/ic_calculator_launcher.png  | Bin
 .../mipmap-xxxhdpi/ic_calculator_launcher.png | Bin
 .../src/full/res/values-night/colors.xml      |   0
 {app => legacy}/src/full/res/values/attrs.xml |   0
 .../src/full/res/values/colors.xml            |   0
 .../src/full/res/values/strings.xml           |   0
 .../src/full/res/values/styles.xml            |   0
 .../src/full/res/xml/device_filter.xml        |   0
 .../src/full/res/xml/preferences_panic.xml    |   3 +-
 legacy/src/main/AndroidManifest.xml           | 547 +++++++++++++++++
 .../privileged/IPrivilegedCallback.aidl       |   0
 .../fdroid/privileged/IPrivilegedService.aidl |   0
 .../src/main/assets/index.template.html       |   0
 {next => legacy}/src/main/assets/logback.xml  |   0
 {app => legacy}/src/main/assets/swap-icon.png | Bin
 {app => legacy}/src/main/assets/swap-icon.svg |  12 +-
 .../src/main/assets/swap-tick-done.png        | Bin
 .../src/main/assets/swap-tick-not-done.png    | Bin
 .../com/google/zxing/encode/Contents.java     |   0
 .../google/zxing/encode/QRCodeEncoder.java    |   0
 .../org/fdroid/fdroid/AppUpdateManager.kt     |   0
 .../fdroid/fdroid/AppUpdateStatusManager.java |   0
 .../fdroid/fdroid/CompatibilityChecker.java   |   0
 .../org/fdroid/fdroid/DeleteCacheService.java |   0
 .../java/org/fdroid/fdroid/FDroidApp.java     |   0
 .../main/java/org/fdroid/fdroid/Hasher.java   |   0
 .../org/fdroid/fdroid/IPreferencesIpfs.java   |   0
 .../java/org/fdroid/fdroid/Languages.java     |   0
 .../fdroid/NotificationBroadcastReceiver.java |   0
 .../org/fdroid/fdroid/NotificationHelper.java |   0
 .../org/fdroid/fdroid/NotificationManager.kt  |   0
 .../java/org/fdroid/fdroid/Preferences.java   |   0
 .../org/fdroid/fdroid/RepoUpdateManager.kt    |   0
 .../main/java/org/fdroid/fdroid/Utils.java    |   0
 .../src/main/java/org/fdroid/fdroid/Utils.kt  |   0
 .../org/fdroid/fdroid/compat/FileCompat.java  |   0
 .../fdroid/fdroid/compat/LocaleCompat.java    |   0
 .../fdroid/compat/PackageManagerCompat.java   |   0
 .../org/fdroid/fdroid/compose/ComposeUtils.kt |   0
 .../fdroid/compose/FDroidExpandableRow.kt     |   0
 .../fdroid/fdroid/compose/FDroidSwitchRow.kt  |   1 -
 .../main/java/org/fdroid/fdroid/data/Apk.java |   0
 .../main/java/org/fdroid/fdroid/data/App.java |   0
 .../fdroid/data/ContentProviderMigrator.java  |   0
 .../java/org/fdroid/fdroid/data/DBHelper.java |   0
 .../fdroid/fdroid/data/ObbUrlActivity.java    |   0
 .../org/fdroid/fdroid/data/SanitizedFile.java |   0
 .../org/fdroid/fdroid/installer/ApkCache.java |   0
 .../fdroid/installer/ApkFileProvider.java     |   0
 .../fdroid/fdroid/installer/ApkVerifier.java  |   0
 .../fdroid/installer/DefaultInstaller.java    |   0
 .../installer/DefaultInstallerActivity.java   |   0
 .../fdroid/installer/ErrorDialogActivity.java |   0
 .../fdroid/installer/FileInstaller.java       |   0
 .../installer/FileInstallerActivity.java      |   0
 .../installer/InstallHistoryService.java      |   0
 .../installer/InstallManagerService.java      |   0
 .../fdroid/fdroid/installer/Installer.java    |   0
 .../fdroid/installer/InstallerFactory.java    |   0
 .../fdroid/installer/InstallerService.java    |   0
 .../fdroid/installer/ObfInstallerService.java |   0
 .../fdroid/installer/PrivilegedInstaller.java |   0
 .../installer/SessionInstallManager.java      |   0
 .../fdroid/installer/SessionInstaller.java    |   0
 .../fdroid/nearby/BluetoothConnection.java    |   0
 .../fdroid/nearby/BluetoothConstants.java     |   0
 .../nearby/PublicSourceDirProvider.java       |   0
 .../nearby/httpish/ContentLengthHeader.java   |   0
 .../fdroid/nearby/httpish/ETagHeader.java     |   0
 .../fdroid/nearby/httpish/FileDetails.java    |   0
 .../fdroid/fdroid/nearby/httpish/Header.java  |   0
 .../fdroid/fdroid/nearby/httpish/Request.java |   0
 .../fdroid/nearby/httpish/Response.java       |   0
 .../fdroid/net/BluetoothDownloader.java       |   0
 .../net/ConnectivityMonitorService.java       |   0
 .../java/org/fdroid/fdroid/net/DnsCache.java  |   0
 .../org/fdroid/fdroid/net/DnsWithCache.java   |   0
 .../fdroid/fdroid/net/DownloaderFactory.java  |   0
 .../fdroid/fdroid/net/DownloaderService.java  |   0
 .../fdroid/fdroid/net/FDroidGlideModule.java  |   0
 .../net/FDroidMirrorParameterManager.java     |   0
 .../fdroid/net/LocalFileDownloader.java       |   0
 .../fdroid/fdroid/net/TreeUriDownloader.java  |   0
 .../fdroid/privileged/views/AppDiff.java      |   0
 .../views/AppSecurityPermissions.java         |   0
 .../views/CaffeinatedScrollView.java          |   0
 .../views/InstallConfirmActivity.java         |   0
 .../fdroid/privileged/views/TabsAdapter.java  |   0
 .../views/UninstallDialogActivity.java        |   0
 .../qr/CameraCharacteristicsChecker.java      |   0
 .../CameraCharacteristicsMinApiLevel21.java   |   0
 .../receiver/DeviceStorageReceiver.java       |   0
 .../fdroid/receiver/RepoUpdateReceiver.kt     |   0
 .../fdroid/receiver/StartupReceiver.java      |   0
 .../receiver/UnarchivePackageReceiver.kt      |   0
 .../java/org/fdroid/fdroid/ui/theme/Color.kt  |   0
 .../java/org/fdroid/fdroid/ui/theme/Theme.kt  |   0
 .../fdroid/views/AppDetailsActivity.java      |   0
 .../views/AppDetailsRecyclerViewAdapter.java  |   0
 .../fdroid/views/InstallHistoryActivity.java  |   0
 .../fdroid/views/IpfsGatewayAddActivity.kt    |   0
 .../views/IpfsGatewaySettingsActivity.kt      |   0
 .../fdroid/views/LiveSeekBarPreference.java   |   0
 .../fdroid/views/PreferencesFragment.java     |   0
 .../fdroid/views/ScreenShotsActivity.java     |   0
 .../views/ScreenShotsRecyclerViewAdapter.java |   0
 .../fdroid/views/SeekBarForegroundThumb.java  |   0
 .../org/fdroid/fdroid/views/StatusBanner.java |   0
 .../appdetails/AntiFeaturesListingView.java   |   0
 .../views/appdetails/AppDetailsViewModel.kt   |   0
 .../fdroid/views/appdetails/RepoChooser.kt    |   0
 .../fdroid/views/apps/AppListActivity.java    |   0
 .../fdroid/views/apps/AppListAdapter.java     |   0
 .../views/apps/AppListItemController.java     |   0
 .../fdroid/views/apps/AppListItemState.java   |   0
 .../fdroid/views/apps/FeatureImage.java       |   0
 .../fdroid/fdroid/views/apps/FilterSpan.java  |   0
 .../fdroid/views/apps/FilterTextWatcher.java  |   0
 .../apps/StandardAppListItemController.java   |   0
 .../views/categories/AppCardController.java   |   0
 .../views/categories/AppPreviewAdapter.java   |   0
 .../views/categories/CategoryAdapter.java     |   0
 .../views/categories/CategoryController.java  |   0
 .../fdroid/views/categories/CategoryItem.java |   0
 .../installed/InstalledAppListAdapter.java    |   0
 .../InstalledAppListItemController.java       |   0
 .../installed/InstalledAppsActivity.java      |   0
 .../views/main/CategoriesViewBinder.java      |   0
 .../fdroid/views/main/LatestAdapter.java      |   2 +
 .../fdroid/views/main/LatestViewBinder.java   |   0
 .../fdroid/views/main/MainActivity.java       |   0
 .../fdroid/views/main/MainViewAdapter.java    |   0
 .../fdroid/views/main/SettingsView.java       |   0
 .../fdroid/views/repos/AddRepoActivity.kt     |   0
 .../fdroid/views/repos/AddRepoErrorScreen.kt  |   0
 .../fdroid/views/repos/AddRepoIntroScreen.kt  |   0
 .../views/repos/ManageReposActivity.java      |   0
 .../fdroid/views/repos/RepoAdapter.java       |   0
 .../fdroid/views/repos/RepoDetailsActivity.kt |   0
 .../fdroid/views/repos/RepoDetailsScreen.kt   |   0
 .../views/repos/RepoDetailsViewModel.kt       |   0
 .../fdroid/views/repos/RepoIconComposable.kt  |   0
 .../fdroid/views/repos/RepoPreviewScreen.kt   |   0
 .../fdroid/views/repos/RepoProgressScreen.kt  |   0
 .../fdroid/views/updates/UpdatesAdapter.java  |   0
 .../updates/UpdatesItemTouchCallback.java     |   0
 .../views/updates/UpdatesViewBinder.java      |   0
 .../fdroid/views/updates/items/AppStatus.java |   0
 .../items/AppStatusListItemController.java    |   0
 .../views/updates/items/AppUpdateData.java    |   0
 .../views/updates/items/KnownVulnApp.java     |   0
 .../items/KnownVulnAppListItemController.java |   0
 .../views/updates/items/UpdateableApp.java    |   0
 .../UpdateableAppListItemController.java      |   0
 .../updates/items/UpdateableAppsHeader.java   |   0
 .../org/fdroid/fdroid/work/AppUpdateWorker.kt |   0
 .../fdroid/fdroid/work/CleanCacheWorker.java  |   0
 .../fdroid/work/FDroidMetricsWorker.java      |   0
 .../fdroid/fdroid/work/RepoUpdateWorker.kt    |   0
 .../org/fdroid/fdroid/work/UnarchiveWorker.kt |   0
 .../apache/commons/codec/BinaryDecoder.java   |   0
 .../apache/commons/codec/BinaryEncoder.java   |   0
 .../apache/commons/codec/CharEncoding.java    |   0
 .../org/apache/commons/codec/Decoder.java     |   0
 .../commons/codec/DecoderException.java       |   0
 .../org/apache/commons/codec/Encoder.java     |   0
 .../commons/codec/EncoderException.java       |   0
 .../codec/binary/CharSequenceUtils.java       |   0
 .../org/apache/commons/codec/binary/Hex.java  |   0
 .../commons/codec/binary/StringUtils.java     |   0
 .../commons/codec/digest/DigestUtils.java     |   4 +-
 .../codec/digest/MessageDigestAlgorithms.java |   0
 .../res/drawable-anydpi-v26/ic_launcher.xml   |   0
 .../ic_launcher_background.xml                |   0
 .../ic_launcher_foreground.xml                |   0
 .../res/drawable-anydpi/ic_file_install.xml   |   0
 .../src/main/res/drawable-hdpi/ic_coins_s.png | Bin
 .../res/drawable-hdpi/ic_file_install.png     | Bin
 .../main/res/drawable-hdpi/ic_launcher.png    | Bin
 .../res/drawable-hdpi/ic_repo_app_default.png | Bin
 .../drawable-hdpi/tab_unselected_holo.9.png   | Bin
 .../main/res/drawable-ldpi/ic_launcher.png    | Bin
 .../res/drawable-ldpi/ic_repo_app_default.png | Bin
 .../src/main/res/drawable-mdpi/ic_coins_s.png | Bin
 .../res/drawable-mdpi/ic_file_install.png     | Bin
 .../main/res/drawable-mdpi/ic_launcher.png    | Bin
 .../res/drawable-mdpi/ic_repo_app_default.png | Bin
 .../drawable-mdpi/tab_unselected_holo.9.png   | Bin
 .../main/res/drawable-xhdpi/ic_coins_s.png    | Bin
 .../res/drawable-xhdpi/ic_file_install.png    | Bin
 .../main/res/drawable-xhdpi/ic_launcher.png   | Bin
 .../drawable-xhdpi/ic_repo_app_default.png    | Bin
 .../drawable-xhdpi/tab_unselected_holo.9.png  | Bin
 .../res/drawable-xxhdpi/ic_file_install.png   | Bin
 .../main/res/drawable-xxhdpi/ic_launcher.png  | Bin
 .../drawable-xxhdpi/ic_repo_app_default.png   | Bin
 .../drawable-xxhdpi/tab_unselected_holo.9.png | Bin
 .../res/drawable-xxxhdpi/ic_file_install.png  | Bin
 .../res/drawable-xxxhdpi}/ic_launcher.png     | Bin
 .../drawable-xxxhdpi/ic_repo_app_default.png  | Bin
 .../app_version_item_status_incompatible.xml  |   0
 .../app_version_item_status_installed.xml     |   0
 .../drawable/app_version_item_status_new.xml  |   0
 .../app_version_item_status_suggested.xml     |   0
 .../main/res/drawable/background_circle.xml   |   0
 ...egory_preview_app_card_background_dark.xml |   0
 ...gory_preview_app_card_background_light.xml |   0
 .../res/drawable/donation_option_bitcoin.xml  |   0
 .../drawable/donation_option_liberapay.xml    |   0
 .../res/drawable/donation_option_litecoin.xml |   0
 .../donation_option_opencollective.xml        |   0
 .../src/main/res/drawable/ic_add.xml          |   0
 .../main/res/drawable/ic_antifeature_ads.xml  |   0
 .../ic_antifeature_disabledalgorithm.xml      |   0
 .../res/drawable/ic_antifeature_knownvuln.xml |   0
 .../drawable/ic_antifeature_nonfreeadd.xml    |   0
 .../drawable/ic_antifeature_nonfreeassets.xml |   0
 .../drawable/ic_antifeature_nonfreedep.xml    |   0
 .../drawable/ic_antifeature_nonfreenet.xml    |   0
 .../drawable/ic_antifeature_nosourcesince.xml |   0
 .../main/res/drawable/ic_antifeature_nsfw.xml |   0
 .../drawable/ic_antifeature_tetherednet.xml   |   0
 .../res/drawable/ic_antifeature_tracking.xml  |   0
 .../src/main/res/drawable/ic_arrow_back.xml   |   0
 .../ic_arrow_back_with_background.xml         |   0
 .../main/res/drawable/ic_arrow_forward.xml    |   0
 .../src/main/res/drawable/ic_author.xml       |   0
 .../src/main/res/drawable/ic_cancel.xml       |   0
 .../src/main/res/drawable/ic_categories.xml   |   0
 .../src/main/res/drawable/ic_changelog.xml    |   0
 .../src/main/res/drawable/ic_clear.xml        |   0
 .../src/main/res/drawable/ic_close.xml        |   0
 .../src/main/res/drawable/ic_delete.xml       |   0
 .../src/main/res/drawable/ic_donate.xml       |   0
 .../src/main/res/drawable/ic_download.xml     |   0
 .../res/drawable/ic_download_progress.xml     |   0
 .../res/drawable/ic_download_progress_0.xml   |   0
 .../res/drawable/ic_download_progress_105.xml |   0
 .../res/drawable/ic_download_progress_120.xml |   0
 .../res/drawable/ic_download_progress_135.xml |   0
 .../res/drawable/ic_download_progress_15.xml  |   0
 .../res/drawable/ic_download_progress_150.xml |   0
 .../res/drawable/ic_download_progress_165.xml |   0
 .../res/drawable/ic_download_progress_180.xml |   0
 .../res/drawable/ic_download_progress_195.xml |   0
 .../res/drawable/ic_download_progress_210.xml |   0
 .../res/drawable/ic_download_progress_225.xml |   0
 .../res/drawable/ic_download_progress_240.xml |   0
 .../res/drawable/ic_download_progress_255.xml |   0
 .../res/drawable/ic_download_progress_270.xml |   0
 .../res/drawable/ic_download_progress_285.xml |   0
 .../res/drawable/ic_download_progress_30.xml  |   0
 .../res/drawable/ic_download_progress_300.xml |   0
 .../res/drawable/ic_download_progress_315.xml |   0
 .../res/drawable/ic_download_progress_330.xml |   0
 .../res/drawable/ic_download_progress_345.xml |   0
 .../res/drawable/ic_download_progress_360.xml |   0
 .../res/drawable/ic_download_progress_45.xml  |   0
 .../res/drawable/ic_download_progress_60.xml  |   0
 .../res/drawable/ic_download_progress_75.xml  |   0
 .../res/drawable/ic_download_progress_90.xml  |   0
 .../src/main/res/drawable/ic_email.xml        |   0
 .../src/main/res/drawable/ic_error.xml        |   0
 .../src/main/res/drawable/ic_expand_less.xml  |   0
 .../src/main/res/drawable/ic_expand_more.xml  |   0
 .../main/res/drawable/ic_file_download.xml    |   0
 .../src/main/res/drawable/ic_info.xml         |   0
 .../res/drawable/ic_known_vuln_overlay.xml    |   0
 .../src/main/res/drawable/ic_last_updated.xml |   0
 .../src/main/res/drawable/ic_latest.xml       |   0
 .../res/drawable/ic_launcher_monochrome.xml   |   0
 .../src/main/res/drawable/ic_license.xml      |   0
 .../src/main/res/drawable/ic_link.xml         |   0
 .../src/main/res/drawable/ic_lock.xml         |   0
 .../src/main/res/drawable/ic_more.xml         |   0
 .../res/drawable/ic_more_with_background.xml  |   0
 .../src/main/res/drawable/ic_notification.xml |   2 +-
 .../res/drawable/ic_notification_download.xml |   0
 .../main/res/drawable/ic_perm_device_info.xml |   0
 .../src/main/res/drawable/ic_refresh.xml      |   2 +-
 .../src/main/res/drawable/ic_repo.xml         |   0
 .../src/main/res/drawable/ic_search.xml       |   0
 .../src/main/res/drawable/ic_settings.xml     |   0
 .../src/main/res/drawable/ic_share.xml        |   0
 .../res/drawable/ic_share_with_background.xml |   0
 .../src/main/res/drawable/ic_sort.xml         |   0
 .../src/main/res/drawable/ic_source_code.xml  |   0
 .../src/main/res/drawable/ic_translation.xml  |   0
 .../src/main/res/drawable/ic_updates.xml      |   0
 .../src/main/res/drawable/ic_versions.xml     |   0
 .../src/main/res/drawable/ic_video.xml        |   0
 .../src/main/res/drawable/ic_warning.xml      |   0
 .../src/main/res/drawable/ic_website.xml      |   0
 .../src/main/res/drawable/no_updates_bg.xml   |   0
 .../res/drawable/screenshot_placeholder.xml   |   0
 .../main/res/drawable/seekbar_background.xml  |   0
 .../src/main/res/drawable/seekbar_thumb.xml   |   0
 .../main/res/drawable/seekbar_tickmark.xml    |   0
 .../src/main/res/drawable/swap_qr_example.png | Bin
 {app => legacy}/src/main/res/layout/about.xml |   0
 .../src/main/res/layout/activity_app_list.xml |   0
 .../res/layout/activity_install_history.xml   |   0
 .../src/main/res/layout/activity_main.xml     |   0
 .../main/res/layout/activity_screenshots.xml  |   0
 .../res/layout/activity_screenshots_page.xml  |   0
 .../main/res/layout/app_card_horizontal.xml   |   0
 .../src/main/res/layout/app_card_large.xml    |   0
 .../main/res/layout/app_card_list_item.xml    |   0
 .../src/main/res/layout/app_card_normal.xml   |   0
 .../src/main/res/layout/app_details2.xml      |   0
 .../main/res/layout/app_details2_donate.xml   |   0
 .../main/res/layout/app_details2_header.xml   |   0
 .../res/layout/app_details2_link_item.xml     |   0
 .../main/res/layout/app_details2_links.xml    |   0
 .../main/res/layout/app_details2_loading.xml  |   0
 .../res/layout/app_details2_more_apps.xml     |   0
 .../layout/app_details2_screenshot_item.xml   |   0
 .../res/layout/app_details2_screenshots.xml   |   0
 .../res/layout/app_details2_version_item.xml  |   0
 .../src/main/res/layout/app_list_item.xml     |   0
 .../main/res/layout/app_permission_item.xml   |   0
 .../res/layout/app_permission_item_money.xml  |   0
 .../src/main/res/layout/app_perms_summary.xml |   0
 .../src/main/res/layout/app_status_new.xml    |   0
 .../main/res/layout/app_status_suggested.xml  |   0
 .../src/main/res/layout/category_item.xml     |   0
 .../src/main/res/layout/donate_bitcoin.xml    |   0
 .../src/main/res/layout/donate_generic.xml    |   0
 .../src/main/res/layout/donate_liberapay.xml  |   0
 .../src/main/res/layout/donate_litecoin.xml   |   0
 .../main/res/layout/donate_opencollective.xml |   0
 .../src/main/res/layout/fab_search.xml        |   0
 .../main/res/layout/install_app_details.xml   |   0
 .../src/main/res/layout/install_confirm.xml   |   0
 .../src/main/res/layout/install_start.xml     |   0
 .../res/layout/installed_app_list_item.xml    |   0
 .../main/res/layout/installed_apps_layout.xml |   0
 .../res/layout/known_vuln_app_list_item.xml   |   0
 .../layout/listitem_antifeaturelisting.xml    |   0
 {app => legacy}/src/main/res/layout/login.xml |   0
 .../main/res/layout/main_tab_categories.xml   |   0
 .../src/main/res/layout/main_tab_latest.xml   |   0
 .../src/main/res/layout/main_tab_settings.xml |   0
 .../src/main/res/layout/main_tab_updates.xml  |   0
 .../src/main/res/layout/permissions_list.xml  |   0
 .../main/res/layout/preference_edit_text.xml  |   0
 .../main/res/layout/preference_seekbar.xml    |   0
 .../src/main/res/layout/preference_switch.xml |   0
 .../src/main/res/layout/repo_item.xml         |   0
 .../main/res/layout/repo_list_activity.xml    |   0
 .../res/layout/updateable_app_list_item.xml   |   0
 .../res/layout/updateable_app_status_item.xml |   0
 .../src/main/res/layout/updates_header.xml    |   0
 .../src/main/res/menu/details2.xml            |   0
 .../src/main/res/menu/install_history.xml     |   0
 .../src/main/res/menu/installed_apps.xml      |   0
 .../main/res/menu/main_activity_screens.xml   |   0
 .../src/main/res/menu/repo_list.xml           |   0
 .../src/main/res/values-af/strings.xml        |   0
 .../src/main/res/values-ar/strings.xml        |   0
 .../src/main/res/values-ast/strings.xml       |   0
 .../src/main/res/values-az/strings.xml        |   0
 .../src/main/res/values-b+hi+Latn/strings.xml |   0
 .../src/main/res/values-be/strings.xml        |   0
 .../src/main/res/values-ber/strings.xml       |   0
 .../src/main/res/values-bg/strings.xml        |   0
 .../src/main/res/values-bn-rBD/strings.xml    |   0
 .../src/main/res/values-bn/strings.xml        |   0
 .../src/main/res/values-bo/strings.xml        |   0
 .../src/main/res/values-br/strings.xml        |   0
 .../src/main/res/values-ca/strings.xml        |   0
 .../src/main/res/values-ckb/strings.xml       |   0
 .../src/main/res/values-cs/strings.xml        |   0
 .../src/main/res/values-cy/strings.xml        |   0
 .../src/main/res/values-da/strings.xml        |   0
 .../src/main/res/values-de/strings.xml        |   0
 .../src/main/res/values-el/strings.xml        |   0
 .../src/main/res/values-en-rGB/strings.xml    |   0
 .../src/main/res/values-eo/strings.xml        |   0
 .../src/main/res/values-es-rAR/strings.xml    |   0
 .../src/main/res/values-es-rMX/strings.xml    |   0
 .../src/main/res/values-es/strings.xml        |   0
 .../src/main/res/values-et/strings.xml        |   0
 .../src/main/res/values-eu/strings.xml        |   0
 .../src/main/res/values-fa/strings.xml        |   0
 .../src/main/res/values-fi/strings.xml        |   0
 .../src/main/res/values-fil/strings.xml       |   0
 .../src/main/res/values-fr/strings.xml        |   0
 .../src/main/res/values-fy/strings.xml        |   0
 .../src/main/res/values-ga/strings.xml        |   0
 .../src/main/res/values-gd/strings.xml        |   0
 .../src/main/res/values-gl/strings.xml        |   0
 .../src/main/res/values-gu/strings.xml        |   0
 .../src/main/res/values-he/strings.xml        |   0
 .../src/main/res/values-hi/strings.xml        |   0
 .../src/main/res/values-hr/strings.xml        |   0
 .../src/main/res/values-hu/strings.xml        |   0
 .../src/main/res/values-hy/strings.xml        |   0
 .../src/main/res/values-id/strings.xml        |   0
 {app => legacy}/src/main/res/values-in        |   0
 .../src/main/res/values-is/strings.xml        |   0
 .../src/main/res/values-it/strings.xml        |   0
 {app => legacy}/src/main/res/values-iw        |   0
 .../src/main/res/values-ja/strings.xml        |   0
 .../src/main/res/values-ka/strings.xml        |   0
 .../src/main/res/values-kab/strings.xml       |   0
 .../src/main/res/values-kk/strings.xml        |   0
 .../src/main/res/values-kmr/strings.xml       |   0
 .../src/main/res/values-kn/strings.xml        |   0
 .../src/main/res/values-ko/strings.xml        |   0
 .../src/main/res/values-lb/strings.xml        |   0
 .../src/main/res/values-lt/strings.xml        |   0
 .../src/main/res/values-lv/strings.xml        |   0
 .../src/main/res/values-mk/strings.xml        |   0
 .../src/main/res/values-ml/strings.xml        |   0
 .../src/main/res/values-mn/strings.xml        |   0
 .../src/main/res/values-mr/strings.xml        |   0
 .../src/main/res/values-my/strings.xml        |   0
 .../src/main/res/values-nah/strings.xml       |   0
 .../src/main/res/values-nb/strings.xml        |   0
 .../src/main/res/values-ne/strings.xml        |   0
 .../src/main/res/values-night/colors.xml      |   0
 .../src/main/res/values-night/themes.xml      |   0
 .../src/main/res/values-nl-rBE/strings.xml    |   0
 .../src/main/res/values-nl/strings.xml        |   0
 .../src/main/res/values-nn/strings.xml        |   0
 .../src/main/res/values-oc/strings.xml        |   0
 .../src/main/res/values-or/strings.xml        |   0
 .../src/main/res/values-pa-rPK/strings.xml    |   0
 .../src/main/res/values-pa/strings.xml        |   0
 .../src/main/res/values-pl/strings.xml        |   0
 .../src/main/res/values-ps/strings.xml        |   0
 .../src/main/res/values-pt-rBR/strings.xml    |   0
 .../src/main/res/values-pt-rPT/strings.xml    |   0
 .../src/main/res/values-pt/strings.xml        |   0
 .../src/main/res/values-ro/strings.xml        |   0
 .../src/main/res/values-ru/strings.xml        |   0
 .../src/main/res/values-sc/strings.xml        |   0
 .../src/main/res/values-si/strings.xml        |   0
 .../src/main/res/values-sk/strings.xml        |   0
 .../src/main/res/values-sl/strings.xml        |   0
 .../src/main/res/values-sn/strings.xml        |   0
 .../src/main/res/values-so/strings.xml        |   0
 .../src/main/res/values-sq/strings.xml        |   0
 .../src/main/res/values-sr/strings.xml        |   0
 .../src/main/res/values-sv/strings.xml        |   0
 .../src/main/res/values-sw/strings.xml        |   0
 .../res/values-sw360dp/values-preference.xml  |   0
 .../src/main/res/values-sw720dp/dimens.xml    |   0
 .../src/main/res/values-ta/strings.xml        |   0
 .../src/main/res/values-te/strings.xml        |   0
 .../src/main/res/values-th/strings.xml        |   0
 .../src/main/res/values-tok/strings.xml       |   0
 .../src/main/res/values-tr/strings.xml        |   0
 .../src/main/res/values-tt/strings.xml        |   0
 .../src/main/res/values-tzm/strings.xml       |   0
 .../src/main/res/values-ug/strings.xml        |   0
 .../src/main/res/values-uk/strings.xml        |   0
 .../src/main/res/values-ur/strings.xml        |   0
 .../src/main/res/values-uz/strings.xml        |   0
 .../src/main/res/values-vi/strings.xml        |   0
 .../src/main/res/values-yue/strings.xml       |   0
 .../src/main/res/values-zh-rCN/strings.xml    |   0
 .../src/main/res/values-zh-rHK/strings.xml    |   0
 .../src/main/res/values-zh-rTW/strings.xml    |   0
 {app => legacy}/src/main/res/values/array.xml |   0
 {app => legacy}/src/main/res/values/attrs.xml |   0
 .../src/main/res/values/colors.xml            |   0
 .../src/main/res/values/default_repos.xml     |   0
 .../src/main/res/values/dimens.xml            |   0
 .../src/main/res/values/donottranslate.xml    |   0
 {app => legacy}/src/main/res/values/ids.xml   |   0
 {app => legacy}/src/main/res/values/shape.xml |   0
 .../src/main/res/values/strings.xml           |   0
 .../src/main/res/values/styles.xml            |   0
 .../src/main/res/values/styles_detail.xml     |   0
 .../src/main/res/values/theme_overlays.xml    |   0
 legacy/src/main/res/values/themes.xml         | 134 +++++
 .../src/main/res/xml/apk_file_provider.xml    |   0
 .../main/res/xml/backup_extraction_rules.xml  |   0
 .../src/main/res/xml/backup_rules.xml         |   0
 .../main/res/xml/installer_file_provider.xml  |   0
 .../src/main/res/xml/locales_config.xml       |   0
 .../main/res/xml/network_security_config.xml  |  40 ++
 .../src/main/res/xml/preferences.xml          |   0
 .../src/main/res/xml/searchable.xml           |   0
 .../src/main/scripts/update-binary            |   0
 {app => legacy}/src/test/assets/urzip.apk     | Bin
 .../org/fdroid/fdroid/AppUpdateManagerTest.kt |   0
 .../org/fdroid/fdroid/PreferencesTest.java    |   0
 .../fdroid/fdroid/RepoUpdateManagerTest.kt    |   0
 .../java/org/fdroid/fdroid/RepoUrlsTest.java  |   0
 .../java/org/fdroid/fdroid/TestFDroidApp.java |   0
 .../java/org/fdroid/fdroid/TestUtils.java     |   0
 .../java/org/fdroid/fdroid/UtilsTest.java     |   0
 .../java/org/fdroid/fdroid/data/ApkTest.java  |   0
 .../org/fdroid/fdroid/data/DBHelperTest.java  |   0
 .../fdroid/fdroid/data/SanitizedFileTest.java |   0
 .../fdroid/data/SuggestedVersionTest.java     |   0
 .../fdroid/fdroid/installer/ApkCacheTest.java |   0
 .../fdroid/installer/FileInstallerTest.java   |   0
 .../installer/InstallerFactoryTest.java       |   0
 .../fdroid/views/AppDetailsAdapterTest.java   |   0
 .../fdroid/views/main/MainActivityTest.java   |   0
 .../fdroid/work/CleanCacheWorkerTest.java     |   0
 .../fdroid/work/FDroidMetricsWorkerTest.java  |   0
 .../resources/Norway_bouvet_europe_2.obf.zip  | Bin
 .../src/test/resources/additional_repos.xml   |   0
 .../test/resources/all_fields_index-v1.json   |   0
 .../src/test/resources/install_history_all    |   0
 .../org.fdroid.fdroid.privileged.ota_2110.zip | Bin
 .../test/resources/ugly_additional_repos.xml  |   0
 .../security/zipsigner/ZipSignerTest.java     |   0
 .../fdroid/nearby/LocalHTTPDManagerTest.java  |   0
 .../fdroid/fdroid/nearby/LocalHTTPDTest.java  |   0
 .../fdroid/nearby/LocalRepoKeyStoreTest.java  |   0
 .../nearby/WifiStateChangeServiceTest.java    |   0
 .../src/testFull/resources/icon.png           | Bin
 .../src/testFull/resources/index.html         |   0
 .../src/testFull/resources/test.html          |   0
 .../src/testFull/resources/urzip.apk          | Bin
 .../tools/download-material-icon.sh           |   0
 {app => legacy}/tools/svg-to-drawables.sh     |   0
 {app => legacy}/tools/test-search-intents.sh  |   0
 next/proguard-rules.pro                       |  17 -
 next/src/main/AndroidManifest.xml             | 129 ----
 .../main/kotlin/org/fdroid/fdroid/Compat.kt   |  11 -
 .../org/fdroid/fdroid/ui/theme/Color.kt       |   1 -
 next/src/main/res/values/colors.xml           |  10 -
 next/src/main/res/values/themes.xml           |   5 -
 .../main/res/xml/network_security_config.xml  |   6 -
 settings.gradle                               |   2 +-
 876 files changed, 966 insertions(+), 980 deletions(-)
 rename {next => app}/.gitignore (100%)
 rename {next => app}/build.gradle.kts (89%)
 rename {next => app}/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt (100%)
 rename {next => app}/src/main/assets/default_repos.json (100%)
 rename {next => app}/src/main/assets/most_downloaded_apps.json (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/App.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/MainActivity.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/NotificationManager.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/db/DatabaseModule.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/db/InitialData.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/download/DownloadModule.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/download/ImageModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/AppInstallListener.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/AppInstallManager.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/AppInstallService.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/CacheCleaner.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/InstallState.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/settings/SettingsManager.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/About.kt (100%)
 create mode 100644 app/src/main/kotlin/org/fdroid/ui/Color.kt
 rename {next => app}/src/main/kotlin/org/fdroid/ui/Main.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/MainViewModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/Theme.kt (52%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/crash/Crash.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/details/Versions.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/Discover.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/icons/License.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/AppList.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/settings/Settings.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt (100%)
 rename {next => app}/src/main/kotlin/org/fdroid/utils/Utils.kt (100%)
 rename {next => app}/src/main/res/drawable/ic_crash.xml (100%)
 rename app/src/main/res/{drawable-xxxhdpi => drawable}/ic_launcher.png (100%)
 rename {next => app}/src/main/res/drawable/ic_repo_app_default.xml (100%)
 rename {next => app}/src/main/res/drawable/screenshots_placeholder.png (100%)
 rename {next => app}/src/main/res/values/strings-next.xml (100%)
 rename {next => app}/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt (100%)
 rename {next => app}/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt (100%)
 rename {app => legacy}/build.gradle (100%)
 rename {app => legacy}/lint.xml (100%)
 create mode 100644 legacy/proguard-rules.pro
 rename {app => legacy}/src/androidTest/AndroidManifest.xml (100%)
 rename {app => legacy}/src/androidTest/assets/org.fdroid.extendedpermissionstest.apk (100%)
 rename {app => legacy}/src/androidTest/assets/org.fdroid.permissions.minmax.apk (100%)
 rename {app => legacy}/src/androidTest/assets/org.fdroid.permissions.minmax.zip (100%)
 rename {app => legacy}/src/androidTest/assets/org.fdroid.permissions.sdk14.apk (100%)
 rename {app => legacy}/src/androidTest/assets/org.fdroid.permissions.sdk14.zip (100%)
 rename {app => legacy}/src/androidTest/assets/simpleIndex.jar (100%)
 rename {next => legacy}/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/Netstat.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/SystemAnimations.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/work/AppUpdateWorkerTest.kt (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/fdroid/work/WorkManagerTestRule.java (100%)
 rename {app => legacy}/src/androidTest/java/org/fdroid/repo/RepoManagerAddAllIntegrationTest.kt (100%)
 rename {app => legacy}/src/androidTest/proguard-rules.pro (100%)
 rename {app => legacy}/src/androidTestFull/java/org/fdroid/fdroid/MainActivityEspressoTestFull.java (100%)
 rename {app => legacy}/src/androidTestFull/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java (100%)
 rename {app => legacy}/src/androidTestFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java (100%)
 rename {app => legacy}/src/androidTestFull/java/org/fdroid/fdroid/nearby/PublicSourceDirProviderTest.java (100%)
 rename {app => legacy}/src/androidTestFull/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/nearby/LocalRepoManager.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java (100%)
 rename {app => legacy}/src/basic/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java (100%)
 rename {app => legacy}/src/basic/res/drawable-anydpi-v26/ic_launcher_foreground.xml (100%)
 rename {app => legacy}/src/basic/res/drawable-hdpi/ic_launcher.png (100%)
 rename {app => legacy}/src/basic/res/drawable-ldpi/ic_launcher.png (100%)
 rename {app => legacy}/src/basic/res/drawable-mdpi/ic_launcher.png (100%)
 rename {app => legacy}/src/basic/res/drawable-xhdpi/ic_launcher.png (100%)
 rename {app => legacy}/src/basic/res/drawable-xxhdpi/ic_launcher.png (100%)
 rename {app => legacy}/src/basic/res/drawable-xxxhdpi/ic_launcher.png (100%)
 rename {app => legacy}/src/basic/res/drawable/ic_launcher_monochrome.xml (100%)
 rename {app => legacy}/src/basic/res/values/attrs.xml (100%)
 rename {app => legacy}/src/basic/res/values/strings.xml (100%)
 rename {app => legacy}/src/debug/AndroidManifest.xml (100%)
 rename {app => legacy}/src/full/AndroidManifest.xml (100%)
 rename {app => legacy}/src/full/java/cc/mvdan/accesspoint/WifiApControl.java (100%)
 rename {app => legacy}/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/logging/AbstractLogger.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/logging/LoggerFactory.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/logging/LoggerInterface.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/logging/LoggerManager.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/logging/NullLoggerFactory.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/logging/StreamLogger.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/KeySet.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/ProgressListener.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/ZipSigner.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/zipio/CentralEnd.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/zipio/ZioEntry.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/zipio/ZioEntryInputStream.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/zipio/ZipInput.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/zipio/ZipListingHelper.java (100%)
 rename {app => legacy}/src/full/java/kellinwood/zipio/ZipOutput.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/NewRepoConfig.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java (97%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/SwapService.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/SwapView.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/DestructiveSwitchPreference.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/HidingManager.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java (100%)
 rename {app => legacy}/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java (100%)
 rename {app => legacy}/src/full/res/drawable-hdpi/circle.png (100%)
 rename {app => legacy}/src/full/res/drawable-hdpi/ic_fdroid_grey.png (100%)
 rename {app => legacy}/src/full/res/drawable-hdpi/swap_start_header.png (100%)
 rename {app => legacy}/src/full/res/drawable-ldpi/circle.png (100%)
 rename {app => legacy}/src/full/res/drawable-ldpi/ic_fdroid_grey.png (100%)
 rename {app => legacy}/src/full/res/drawable-ldpi/swap_start_header.png (100%)
 rename {app => legacy}/src/full/res/drawable-mdpi/circle.png (100%)
 rename {app => legacy}/src/full/res/drawable-mdpi/ic_fdroid_grey.png (100%)
 rename {app => legacy}/src/full/res/drawable-mdpi/swap_start_header.png (100%)
 rename {app => legacy}/src/full/res/drawable-xhdpi/circle.png (100%)
 rename {app => legacy}/src/full/res/drawable-xhdpi/ic_fdroid_grey.png (100%)
 rename {app => legacy}/src/full/res/drawable-xhdpi/swap_start_header.png (100%)
 rename {app => legacy}/src/full/res/drawable-xxhdpi/circle.png (100%)
 rename {app => legacy}/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png (100%)
 rename {app => legacy}/src/full/res/drawable-xxhdpi/swap_start_header.png (100%)
 rename {app => legacy}/src/full/res/drawable-xxxhdpi/circle.png (100%)
 rename {app => legacy}/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png (100%)
 rename {app => legacy}/src/full/res/drawable-xxxhdpi/swap_start_header.png (100%)
 rename {app => legacy}/src/full/res/drawable/check.xml (100%)
 rename {app => legacy}/src/full/res/drawable/ic_add_circle_outline.xml (100%)
 rename {app => legacy}/src/full/res/drawable/ic_apps.xml (100%)
 rename {app => legacy}/src/full/res/drawable/ic_bluetooth.xml (100%)
 rename {app => legacy}/src/full/res/drawable/ic_bluetooth_searching.xml (100%)
 rename {app => legacy}/src/full/res/drawable/ic_nearby.xml (100%)
 rename {app => legacy}/src/full/res/drawable/ic_qr_code.xml (100%)
 rename {app => legacy}/src/full/res/drawable/ic_wifi.xml (100%)
 rename {app => legacy}/src/full/res/drawable/ic_wifi_off.xml (100%)
 rename {app => legacy}/src/full/res/drawable/ic_wifi_tethering.xml (100%)
 rename {app => legacy}/src/full/res/drawable/nearby_splash.xml (100%)
 rename {app => legacy}/src/full/res/layout-sw480dp/start_swap_header.xml (100%)
 rename {app => legacy}/src/full/res/layout/activity_calculator.xml (100%)
 rename {app => legacy}/src/full/res/layout/activity_panic_settings.xml (100%)
 rename {app => legacy}/src/full/res/layout/dialog_app_hiding.xml (100%)
 rename {app => legacy}/src/full/res/layout/main_tab_nearby.xml (100%)
 rename {app => legacy}/src/full/res/layout/select_local_apps_list_item.xml (100%)
 rename {app => legacy}/src/full/res/layout/start_swap_header.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_activity.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_app_list_item.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_confirm_receive.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_connecting.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_join_wifi.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_peer_list_item.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_select_apps.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_send_fdroid.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_start_swap.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_success.xml (100%)
 rename {app => legacy}/src/full/res/layout/swap_wifi_qr.xml (100%)
 rename {app => legacy}/src/full/res/menu/main_activity_screens.xml (100%)
 rename {app => legacy}/src/full/res/menu/swap_next.xml (100%)
 rename {app => legacy}/src/full/res/menu/swap_next_search.xml (100%)
 rename {app => legacy}/src/full/res/menu/swap_search.xml (100%)
 rename {app => legacy}/src/full/res/mipmap-hdpi/ic_calculator_launcher.png (100%)
 rename {app => legacy}/src/full/res/mipmap-mdpi/ic_calculator_launcher.png (100%)
 rename {app => legacy}/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png (100%)
 rename {app => legacy}/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png (100%)
 rename {app => legacy}/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png (100%)
 rename {app => legacy}/src/full/res/values-night/colors.xml (100%)
 rename {app => legacy}/src/full/res/values/attrs.xml (100%)
 rename {app => legacy}/src/full/res/values/colors.xml (100%)
 rename {app => legacy}/src/full/res/values/strings.xml (100%)
 rename {app => legacy}/src/full/res/values/styles.xml (100%)
 rename {app => legacy}/src/full/res/xml/device_filter.xml (100%)
 rename {app => legacy}/src/full/res/xml/preferences_panic.xml (93%)
 create mode 100644 legacy/src/main/AndroidManifest.xml
 rename {app => legacy}/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl (100%)
 rename {app => legacy}/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl (100%)
 rename {app => legacy}/src/main/assets/index.template.html (100%)
 rename {next => legacy}/src/main/assets/logback.xml (100%)
 rename {app => legacy}/src/main/assets/swap-icon.png (100%)
 rename {app => legacy}/src/main/assets/swap-icon.svg (84%)
 rename {app => legacy}/src/main/assets/swap-tick-done.png (100%)
 rename {app => legacy}/src/main/assets/swap-tick-not-done.png (100%)
 rename {app => legacy}/src/main/java/com/google/zxing/encode/Contents.java (100%)
 rename {app => legacy}/src/main/java/com/google/zxing/encode/QRCodeEncoder.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/AppUpdateManager.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/DeleteCacheService.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/FDroidApp.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/Hasher.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/IPreferencesIpfs.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/Languages.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/NotificationBroadcastReceiver.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/NotificationHelper.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/NotificationManager.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/Preferences.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/RepoUpdateManager.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/Utils.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/Utils.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/compat/FileCompat.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/compat/LocaleCompat.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/compose/FDroidExpandableRow.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt (99%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/data/Apk.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/data/App.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/data/DBHelper.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/ApkCache.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/Installer.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/InstallerService.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/nearby/PublicSourceDirProvider.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/DnsCache.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/DnsWithCache.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/DownloaderService.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/FDroidGlideModule.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/FDroidMirrorParameterManager.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/receiver/DeviceStorageReceiver.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/receiver/RepoUpdateReceiver.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/receiver/UnarchivePackageReceiver.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/StatusBanner.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/appdetails/AppDetailsViewModel.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/apps/FilterSpan.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/apps/FilterTextWatcher.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/categories/CategoryItem.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java (99%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/AddRepoErrorScreen.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/ManageReposActivity.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/RepoAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsScreen.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/RepoIconComposable.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/repos/RepoProgressScreen.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/items/AppUpdateData.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/work/AppUpdateWorker.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt (100%)
 rename {app => legacy}/src/main/java/org/fdroid/fdroid/work/UnarchiveWorker.kt (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/BinaryDecoder.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/BinaryEncoder.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/CharEncoding.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/Decoder.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/DecoderException.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/Encoder.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/EncoderException.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/binary/CharSequenceUtils.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/binary/Hex.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/binary/StringUtils.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java (100%)
 rename {app => legacy}/src/main/java/vendored/org/apache/commons/codec/digest/MessageDigestAlgorithms.java (100%)
 rename {app => legacy}/src/main/res/drawable-anydpi-v26/ic_launcher.xml (100%)
 rename {app => legacy}/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml (100%)
 rename {app => legacy}/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml (100%)
 rename {app => legacy}/src/main/res/drawable-anydpi/ic_file_install.xml (100%)
 rename {app => legacy}/src/main/res/drawable-hdpi/ic_coins_s.png (100%)
 rename {app => legacy}/src/main/res/drawable-hdpi/ic_file_install.png (100%)
 rename {app => legacy}/src/main/res/drawable-hdpi/ic_launcher.png (100%)
 rename {app => legacy}/src/main/res/drawable-hdpi/ic_repo_app_default.png (100%)
 rename {app => legacy}/src/main/res/drawable-hdpi/tab_unselected_holo.9.png (100%)
 rename {app => legacy}/src/main/res/drawable-ldpi/ic_launcher.png (100%)
 rename {app => legacy}/src/main/res/drawable-ldpi/ic_repo_app_default.png (100%)
 rename {app => legacy}/src/main/res/drawable-mdpi/ic_coins_s.png (100%)
 rename {app => legacy}/src/main/res/drawable-mdpi/ic_file_install.png (100%)
 rename {app => legacy}/src/main/res/drawable-mdpi/ic_launcher.png (100%)
 rename {app => legacy}/src/main/res/drawable-mdpi/ic_repo_app_default.png (100%)
 rename {app => legacy}/src/main/res/drawable-mdpi/tab_unselected_holo.9.png (100%)
 rename {app => legacy}/src/main/res/drawable-xhdpi/ic_coins_s.png (100%)
 rename {app => legacy}/src/main/res/drawable-xhdpi/ic_file_install.png (100%)
 rename {app => legacy}/src/main/res/drawable-xhdpi/ic_launcher.png (100%)
 rename {app => legacy}/src/main/res/drawable-xhdpi/ic_repo_app_default.png (100%)
 rename {app => legacy}/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png (100%)
 rename {app => legacy}/src/main/res/drawable-xxhdpi/ic_file_install.png (100%)
 rename {app => legacy}/src/main/res/drawable-xxhdpi/ic_launcher.png (100%)
 rename {app => legacy}/src/main/res/drawable-xxhdpi/ic_repo_app_default.png (100%)
 rename {app => legacy}/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png (100%)
 rename {app => legacy}/src/main/res/drawable-xxxhdpi/ic_file_install.png (100%)
 rename {next/src/main/res/drawable => legacy/src/main/res/drawable-xxxhdpi}/ic_launcher.png (100%)
 rename {app => legacy}/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png (100%)
 rename {app => legacy}/src/main/res/drawable/app_version_item_status_incompatible.xml (100%)
 rename {app => legacy}/src/main/res/drawable/app_version_item_status_installed.xml (100%)
 rename {app => legacy}/src/main/res/drawable/app_version_item_status_new.xml (100%)
 rename {app => legacy}/src/main/res/drawable/app_version_item_status_suggested.xml (100%)
 rename {app => legacy}/src/main/res/drawable/background_circle.xml (100%)
 rename {app => legacy}/src/main/res/drawable/category_preview_app_card_background_dark.xml (100%)
 rename {app => legacy}/src/main/res/drawable/category_preview_app_card_background_light.xml (100%)
 rename {app => legacy}/src/main/res/drawable/donation_option_bitcoin.xml (100%)
 rename {app => legacy}/src/main/res/drawable/donation_option_liberapay.xml (100%)
 rename {app => legacy}/src/main/res/drawable/donation_option_litecoin.xml (100%)
 rename {app => legacy}/src/main/res/drawable/donation_option_opencollective.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_add.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_ads.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_knownvuln.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_nonfreeadd.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_nonfreeassets.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_nonfreedep.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_nonfreenet.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_nosourcesince.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_nsfw.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_tetherednet.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_antifeature_tracking.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_arrow_back.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_arrow_back_with_background.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_arrow_forward.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_author.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_cancel.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_categories.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_changelog.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_clear.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_close.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_delete.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_donate.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_0.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_105.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_120.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_135.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_15.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_150.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_165.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_180.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_195.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_210.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_225.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_240.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_255.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_270.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_285.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_30.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_300.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_315.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_330.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_345.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_360.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_45.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_60.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_75.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_download_progress_90.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_email.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_error.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_expand_less.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_expand_more.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_file_download.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_info.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_known_vuln_overlay.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_last_updated.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_latest.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_launcher_monochrome.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_license.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_link.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_lock.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_more.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_more_with_background.xml (100%)
 rename {next => legacy}/src/main/res/drawable/ic_notification.xml (96%)
 rename {app => legacy}/src/main/res/drawable/ic_notification_download.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_perm_device_info.xml (100%)
 rename {next => legacy}/src/main/res/drawable/ic_refresh.xml (90%)
 rename {app => legacy}/src/main/res/drawable/ic_repo.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_search.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_settings.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_share.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_share_with_background.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_sort.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_source_code.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_translation.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_updates.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_versions.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_video.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_warning.xml (100%)
 rename {app => legacy}/src/main/res/drawable/ic_website.xml (100%)
 rename {app => legacy}/src/main/res/drawable/no_updates_bg.xml (100%)
 rename {app => legacy}/src/main/res/drawable/screenshot_placeholder.xml (100%)
 rename {app => legacy}/src/main/res/drawable/seekbar_background.xml (100%)
 rename {app => legacy}/src/main/res/drawable/seekbar_thumb.xml (100%)
 rename {app => legacy}/src/main/res/drawable/seekbar_tickmark.xml (100%)
 rename {app => legacy}/src/main/res/drawable/swap_qr_example.png (100%)
 rename {app => legacy}/src/main/res/layout/about.xml (100%)
 rename {app => legacy}/src/main/res/layout/activity_app_list.xml (100%)
 rename {app => legacy}/src/main/res/layout/activity_install_history.xml (100%)
 rename {app => legacy}/src/main/res/layout/activity_main.xml (100%)
 rename {app => legacy}/src/main/res/layout/activity_screenshots.xml (100%)
 rename {app => legacy}/src/main/res/layout/activity_screenshots_page.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_card_horizontal.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_card_large.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_card_list_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_card_normal.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2_donate.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2_header.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2_link_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2_links.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2_loading.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2_more_apps.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2_screenshot_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2_screenshots.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_details2_version_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_list_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_permission_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_permission_item_money.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_perms_summary.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_status_new.xml (100%)
 rename {app => legacy}/src/main/res/layout/app_status_suggested.xml (100%)
 rename {app => legacy}/src/main/res/layout/category_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/donate_bitcoin.xml (100%)
 rename {app => legacy}/src/main/res/layout/donate_generic.xml (100%)
 rename {app => legacy}/src/main/res/layout/donate_liberapay.xml (100%)
 rename {app => legacy}/src/main/res/layout/donate_litecoin.xml (100%)
 rename {app => legacy}/src/main/res/layout/donate_opencollective.xml (100%)
 rename {app => legacy}/src/main/res/layout/fab_search.xml (100%)
 rename {app => legacy}/src/main/res/layout/install_app_details.xml (100%)
 rename {app => legacy}/src/main/res/layout/install_confirm.xml (100%)
 rename {app => legacy}/src/main/res/layout/install_start.xml (100%)
 rename {app => legacy}/src/main/res/layout/installed_app_list_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/installed_apps_layout.xml (100%)
 rename {app => legacy}/src/main/res/layout/known_vuln_app_list_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/listitem_antifeaturelisting.xml (100%)
 rename {app => legacy}/src/main/res/layout/login.xml (100%)
 rename {app => legacy}/src/main/res/layout/main_tab_categories.xml (100%)
 rename {app => legacy}/src/main/res/layout/main_tab_latest.xml (100%)
 rename {app => legacy}/src/main/res/layout/main_tab_settings.xml (100%)
 rename {app => legacy}/src/main/res/layout/main_tab_updates.xml (100%)
 rename {app => legacy}/src/main/res/layout/permissions_list.xml (100%)
 rename {app => legacy}/src/main/res/layout/preference_edit_text.xml (100%)
 rename {app => legacy}/src/main/res/layout/preference_seekbar.xml (100%)
 rename {app => legacy}/src/main/res/layout/preference_switch.xml (100%)
 rename {app => legacy}/src/main/res/layout/repo_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/repo_list_activity.xml (100%)
 rename {app => legacy}/src/main/res/layout/updateable_app_list_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/updateable_app_status_item.xml (100%)
 rename {app => legacy}/src/main/res/layout/updates_header.xml (100%)
 rename {app => legacy}/src/main/res/menu/details2.xml (100%)
 rename {app => legacy}/src/main/res/menu/install_history.xml (100%)
 rename {app => legacy}/src/main/res/menu/installed_apps.xml (100%)
 rename {app => legacy}/src/main/res/menu/main_activity_screens.xml (100%)
 rename {app => legacy}/src/main/res/menu/repo_list.xml (100%)
 rename {app => legacy}/src/main/res/values-af/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ar/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ast/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-az/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-b+hi+Latn/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-be/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ber/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-bg/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-bn-rBD/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-bn/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-bo/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-br/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ca/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ckb/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-cs/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-cy/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-da/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-de/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-el/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-en-rGB/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-eo/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-es-rAR/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-es-rMX/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-es/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-et/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-eu/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-fa/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-fi/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-fil/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-fr/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-fy/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ga/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-gd/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-gl/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-gu/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-he/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-hi/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-hr/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-hu/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-hy/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-id/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-in (100%)
 rename {app => legacy}/src/main/res/values-is/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-it/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-iw (100%)
 rename {app => legacy}/src/main/res/values-ja/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ka/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-kab/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-kk/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-kmr/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-kn/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ko/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-lb/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-lt/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-lv/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-mk/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ml/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-mn/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-mr/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-my/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-nah/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-nb/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ne/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-night/colors.xml (100%)
 rename {app => legacy}/src/main/res/values-night/themes.xml (100%)
 rename {app => legacy}/src/main/res/values-nl-rBE/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-nl/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-nn/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-oc/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-or/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-pa-rPK/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-pa/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-pl/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ps/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-pt-rBR/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-pt-rPT/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-pt/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ro/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ru/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-sc/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-si/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-sk/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-sl/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-sn/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-so/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-sq/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-sr/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-sv/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-sw/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-sw360dp/values-preference.xml (100%)
 rename {app => legacy}/src/main/res/values-sw720dp/dimens.xml (100%)
 rename {app => legacy}/src/main/res/values-ta/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-te/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-th/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-tok/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-tr/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-tt/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-tzm/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ug/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-uk/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-ur/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-uz/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-vi/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-yue/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-zh-rCN/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-zh-rHK/strings.xml (100%)
 rename {app => legacy}/src/main/res/values-zh-rTW/strings.xml (100%)
 rename {app => legacy}/src/main/res/values/array.xml (100%)
 rename {app => legacy}/src/main/res/values/attrs.xml (100%)
 rename {app => legacy}/src/main/res/values/colors.xml (100%)
 rename {app => legacy}/src/main/res/values/default_repos.xml (100%)
 rename {app => legacy}/src/main/res/values/dimens.xml (100%)
 rename {app => legacy}/src/main/res/values/donottranslate.xml (100%)
 rename {app => legacy}/src/main/res/values/ids.xml (100%)
 rename {app => legacy}/src/main/res/values/shape.xml (100%)
 rename {next => legacy}/src/main/res/values/strings.xml (100%)
 rename {app => legacy}/src/main/res/values/styles.xml (100%)
 rename {app => legacy}/src/main/res/values/styles_detail.xml (100%)
 rename {app => legacy}/src/main/res/values/theme_overlays.xml (100%)
 create mode 100644 legacy/src/main/res/values/themes.xml
 rename {app => legacy}/src/main/res/xml/apk_file_provider.xml (100%)
 rename {app => legacy}/src/main/res/xml/backup_extraction_rules.xml (100%)
 rename {app => legacy}/src/main/res/xml/backup_rules.xml (100%)
 rename {app => legacy}/src/main/res/xml/installer_file_provider.xml (100%)
 rename {next => legacy}/src/main/res/xml/locales_config.xml (100%)
 create mode 100644 legacy/src/main/res/xml/network_security_config.xml
 rename {app => legacy}/src/main/res/xml/preferences.xml (100%)
 rename {app => legacy}/src/main/res/xml/searchable.xml (100%)
 rename {app => legacy}/src/main/scripts/update-binary (100%)
 rename {app => legacy}/src/test/assets/urzip.apk (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/AppUpdateManagerTest.kt (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/PreferencesTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/RepoUpdateManagerTest.kt (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/TestFDroidApp.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/TestUtils.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/UtilsTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/data/ApkTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java (100%)
 rename {app => legacy}/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java (100%)
 rename {app => legacy}/src/test/resources/Norway_bouvet_europe_2.obf.zip (100%)
 rename {app => legacy}/src/test/resources/additional_repos.xml (100%)
 rename {app => legacy}/src/test/resources/all_fields_index-v1.json (100%)
 rename {app => legacy}/src/test/resources/install_history_all (100%)
 rename {app => legacy}/src/test/resources/org.fdroid.fdroid.privileged.ota_2110.zip (100%)
 rename {app => legacy}/src/test/resources/ugly_additional_repos.xml (100%)
 rename {app => legacy}/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java (100%)
 rename {app => legacy}/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java (100%)
 rename {app => legacy}/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java (100%)
 rename {app => legacy}/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java (100%)
 rename {app => legacy}/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java (100%)
 rename {app => legacy}/src/testFull/resources/icon.png (100%)
 rename {app => legacy}/src/testFull/resources/index.html (100%)
 rename {app => legacy}/src/testFull/resources/test.html (100%)
 rename {app => legacy}/src/testFull/resources/urzip.apk (100%)
 rename {app => legacy}/tools/download-material-icon.sh (100%)
 rename {app => legacy}/tools/svg-to-drawables.sh (100%)
 rename {app => legacy}/tools/test-search-intents.sh (100%)
 delete mode 100644 next/proguard-rules.pro
 delete mode 100644 next/src/main/AndroidManifest.xml
 delete mode 100644 next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
 delete mode 120000 next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Color.kt
 delete mode 100644 next/src/main/res/values/colors.xml
 delete mode 100644 next/src/main/res/values/themes.xml
 delete mode 100644 next/src/main/res/xml/network_security_config.xml

diff --git a/next/.gitignore b/app/.gitignore
similarity index 100%
rename from next/.gitignore
rename to app/.gitignore
diff --git a/next/build.gradle.kts b/app/build.gradle.kts
similarity index 89%
rename from next/build.gradle.kts
rename to app/build.gradle.kts
index 0b824601e..fed84e423 100644
--- a/next/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,7 +14,7 @@ android {
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        applicationId = "org.fdroid.basic"
+        applicationId = "org.fdroid"
         minSdk = 24
         targetSdk = 36
         versionCode = 1
@@ -27,15 +27,28 @@ android {
         all {
             buildConfigField("String", "ACRA_REPORT_EMAIL", "\"t+fdroidnext@grobox.de\"")
         }
-        release {
+        getByName("release") {
             isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
         }
-        debug {
+        getByName("debug") {
             applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+            isDebuggable = true
+        }
+    }
+    flavorDimensions += "base"
+    productFlavors {
+        create("basic") {
+            dimension = "base"
+            applicationIdSuffix = ".basic"
+        }
+        create("full") {
+            dimension = "base"
+            applicationIdSuffix = ".fdroid"
         }
     }
     compileOptions {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 20e22cd98..b37172aee 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,58 +1,17 @@
 -dontobfuscate
--dontoptimize
 -keepattributes SourceFile,LineNumberTable,Exceptions
--keep class org.fdroid.fdroid.** {*;}
--dontwarn android.test.**
 
--dontwarn javax.naming.**
--dontnote org.apache.http.**
--dontnote android.net.http.**
--dontnote **ILicensingService
-
-# Needed for espresso https://stackoverflow.com/a/21706087
--dontwarn org.xmlpull.v1.**
-
-# StrongHttpsClient and its support classes are totally unused, so the
-# ch.boye.httpclientandroidlib.** classes are also unneeded
--dontwarn info.guardianproject.netcipher.client.**
-
-# These libraries are known to break if minification is enabled on them. They
-# use reflection to instantiate classes, for example. If the keep flags are
-# removed, proguard will strip classes which are required, which may result in
-# crashes.
--keep class kellinwood.security.zipsigner.** {*;}
--keep class org.bouncycastle.** {*;}
-
-# This keeps class members used for SystemInstaller IPC.
-#   Reference: https://gitlab.com/fdroid/fdroidclient/issues/79
--keepclassmembers class * implements android.os.IInterface {
-    public *;
-}
-
--keepattributes *Annotation*,EnclosingMethod,Signature
--keepnames class com.fasterxml.jackson.** { *; }
--dontwarn com.fasterxml.jackson.databind.ext.**
--keep class org.codehaus.** { *; }
--keepclassmembers public final enum org.codehaus.jackson.annotate.JsonAutoDetect$Visibility {
-public static final org.codehaus.jackson.annotate.JsonAutoDetect$Visibility *; }
--keep public class org.fdroid.** {
-  *;
-}
-
--dontwarn org.bouncycastle.jsse.**
--dontwarn org.conscrypt.**
--dontwarn org.openjsse.**
-
-# This is necessary so that RemoteWorkManager can be initialized (also marked with @Keep)
--keep class androidx.work.multiprocess.RemoteWorkManagerClient {
-    public <init>(...);
-}
-
--keep class org.acra.config.MailSenderConfiguration {
-    public <init>(...);
-}
+# Anything less causes issues like not finding primary constructor in ReflectionDiffer
+-keep class org.fdroid.** {*;}
 
 # Logging
 -keep class ch.qos.logback.classic.android.LogcatAppender
 -keepclassmembers class ch.qos.logback.** { *; }
 -keepclassmembers class  org.slf4j.impl.** { *; }
+
+# Needed for instrumentation tests (for some werid inexplicable reason)
+-keep class kotlin.LazyKt
+-keep class kotlin.collections.CollectionsKt
+
+# for debugging (comment in when needed)
+#-printconfiguration build/outputs/logs/r8-configuration.txt
diff --git a/next/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt b/app/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt
similarity index 100%
rename from next/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt
rename to app/src/androidTest/java/org/fdroid/install/ApkFileProviderTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1b189c0d..cf22d92b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,350 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (C) 2010-2012 Ciaran Gultnieks
- * Copyright (C) 2013-2017 Peter Serwylo
- * Copyright (C) 2014-2015 Daniel Martí
- * Copyright (C) 2014-2018 Hans-Christoph Steiner
- * Copyright (C) 2016 Dominik Schürmann
- * Copyright (C) 2018 Torsten Grote
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="auto">
-
-    <supports-screens
-        android:anyDensity="true"
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:resizeable="true"
-        android:smallScreens="true"
-        android:xlargeScreens="true" />
-
-    <uses-feature
-        android:name="android.hardware.telephony"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.wifi"
-        android:required="false" />
-
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
+    xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission
-        android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
 
-    <!-- Permission used to externally trigger repository updates -->
-    <permission
-        android:name="${applicationId}.permission.UPDATE_REPOS"
-        android:protectionLevel="signature|privileged" />
-    <uses-permission android:name="${applicationId}.permission.UPDATE_REPOS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE"
+        tools:ignore="ForegroundServicesPolicy" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
+    <uses-permission
+        android:name="android.permission.REQUEST_INSTALL_PACKAGES"
+        tools:ignore="RequestInstallPackagesPolicy" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
 
     <application
-        android:name=".FDroidApp"
+        android:name="org.fdroid.App"
         android:allowBackup="true"
-        android:dataExtractionRules="@xml/backup_extraction_rules"
-        android:description="@string/app_description"
-        android:fullBackupContent="@xml/backup_rules"
-        android:hardwareAccelerated="true"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@drawable/ic_launcher"
-        android:label="${applicationLabel}"
+        android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
-        android:memtagMode="async"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@style/Theme.App">
-
+        android:theme="@style/Theme.Fdroidclient"
+        tools:targetApi="33">
         <activity
-            android:name=".privileged.views.InstallConfirmActivity"
-            android:configChanges="layoutDirection|locale"
-            android:excludeFromRecents="true"
-            android:label="@string/menu_install"
-            android:parentActivityName=".views.main.MainActivity" />
-
-        <activity
-            android:name=".privileged.views.UninstallDialogActivity"
-            android:excludeFromRecents="true" />
-
-        <activity
-            android:name=".views.repos.ManageReposActivity"
-            android:configChanges="layoutDirection|locale"
-            android:label="@string/menu_manage"
-            android:launchMode="singleTask"
-            android:parentActivityName=".views.main.MainActivity"/>
-
-        <activity
-            android:name=".views.repos.AddRepoActivity"
+            android:name="org.fdroid.MainActivity"
             android:exported="true"
-            android:launchMode="singleInstance"
-            android:windowSoftInputMode="adjustResize"
-            android:parentActivityName=".views.main.MainActivity">
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="fdroid.link" />
-            </intent-filter>
-
-            <!-- Repo URLs -->
-
-            <!--
-            This intent serves two purposes: Swapping apps between devices and adding a
-            repo from a website (e.g. https://guardianproject.info/fdroid/repo).
-            We intercept both of these situations in the FDroid activity, and then redirect
-            to the appropriate handler (swap handling, manage repos respectively) from there.
-
-            The reason for this is that the only differentiating factor is the presence
-            of a "swap=1" in the query string, and intent-filter is unable to deal with
-            query parameters. An alternative would be to do something like fdroidswap:// as
-            a scheme, but then we need to copy/paste all of this intent-filter stuff and
-            keep it up to date when it changes or a bug is found.
-
-            This filter supports HTTP and HTTPS schemes. There is an additional filter for
-            fdroidrepo:// and fdroidrepos://
-            -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <!--
-                Android's scheme matcher is case-sensitive, so include
-                ALL CAPS versions to support ALL CAPS URLs in QR Codes.
-                QR Codes have a special ALL CAPS mode that uses a reduced
-                character set, making for more compact QR Codes.
-                -->
-                <data android:scheme="fdroidrepo" />
-                <data android:scheme="fdroidrepos" />
-                <data
-                    android:scheme="FDROIDREPO"
-                    tools:ignore="AppLinkUrlError" />
-                <data android:scheme="fdroidrepos" />
-                <data
-                    android:scheme="FDROIDREPOS"
-                    tools:ignore="AppLinkUrlError" />
-            </intent-filter>
-
-            <!--
-            The below intent filter most likely won't work anymore.
-            Using fdroid.link or fdroidrepos:// scheme is preferred.
-            -->
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <!--
-                Android's scheme matcher is case-sensitive, so include
-                ALL CAPS versions to support ALL CAPS URLs in QR Codes.
-                QR Codes have a special ALL CAPS mode that uses a reduced
-                character set, making for more compact QR Codes.
-                -->
-                <data android:scheme="http" />
-                <data
-                    android:scheme="HTTP"
-                    tools:ignore="AppLinkUrlError" />
-                <data android:scheme="https" />
-                <data
-                    android:scheme="HTTPS"
-                    tools:ignore="AppLinkUrlError" />
-
-                <data android:host="*" />
-
-                <!--
-                The pattern matcher here is poorly implemented, in particular the * is
-                non-greedy, so you have to do stupid tricks to match patterns that have
-                repeat characters in them. http://stackoverflow.com/a/8599921/306864
-                -->
-                <data android:path="/fdroid/repo" />
-                <data android:pathPattern="/fdroid/repo/*" />
-                <data android:pathPattern="/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/.*/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/.*/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/.*/.*/.*/fdroid/repo/*" />
-                <data android:pathPattern="/.*/.*/.*/.*/.*/.*/fdroid/repo" />
-                <data android:pathPattern="/.*/.*/.*/.*/.*/.*/fdroid/repo/*" />
-                <data android:path="/fdroid/archive" />
-                <data android:pathPattern="/fdroid/archive/*" />
-                <data android:pathPattern="/.*/fdroid/archive" />
-                <data android:pathPattern="/.*/fdroid/archive/*" />
-                <data android:pathPattern="/.*/.*/fdroid/archive" />
-                <data android:pathPattern="/.*/.*/fdroid/archive/*" />
-                <data android:pathPattern="/.*/.*/.*/fdroid/archive" />
-                <data android:pathPattern="/.*/.*/.*/fdroid/archive/*" />
-                <data android:pathPattern="/.*/.*/.*/.*/fdroid/archive" />
-                <data android:pathPattern="/.*/.*/.*/.*/fdroid/archive/*" />
-                <!--
-                Some QR Code scanners don't respect custom schemes like fdroidrepo://,
-                so this is a workaround, since the local repo URL is all uppercase in
-                the QR Code for sending the local repo to another device.
-                -->
-                <data android:path="/FDROID/REPO" />
-                <data android:pathPattern="/.*/FDROID/REPO" />
-                <data android:pathPattern="/.*/.*/FDROID/REPO" />
-                <data android:pathPattern="/.*/.*/.*/FDROID/REPO" />
-            </intent-filter>
-
-            <intent-filter android:label="@string/repo_add_new_title">
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".views.IpfsGatewaySettingsActivity"
-            android:configChanges="layoutDirection|locale"
-            android:label="@string/ipfsgw_title"
-            android:launchMode="singleTask"
-            android:parentActivityName=".views.main.MainActivity"></activity>
-
-        <activity
-            android:name=".views.IpfsGatewayAddActivity"
-            android:launchMode="singleTask"
-            android:parentActivityName=".views.main.MainActivity" />
-
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="fullSensor"
-            tools:replace="screenOrientation" />
-
-        <activity
-            android:name=".views.repos.RepoDetailsActivity"
-            android:configChanges="layoutDirection|locale"
-            android:label="@string/repo_details"
-            android:parentActivityName=".views.repos.ManageReposActivity"
-            android:windowSoftInputMode="stateHidden"/>
-
-        <activity
-            android:name=".views.AppDetailsActivity"
-            android:configChanges="layoutDirection|locale"
-            android:exported="true"
-            android:label="@string/app_details"
-            android:parentActivityName=".views.main.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.SHOW_APP_INFO" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".views.ScreenShotsActivity" />
-
-        <activity
-            android:name=".data.ObbUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay" />
-
-        <activity
-            android:name=".installer.DefaultInstallerActivity"
-            android:theme="@style/Theme.App.Transparent" />
-        <activity
-            android:name=".installer.ErrorDialogActivity"
-            android:theme="@style/Theme.App.Transparent" />
-
-        <activity
-            android:name=".views.main.MainActivity"
             android:launchMode="singleTop"
-            android:windowSoftInputMode="adjustResize"
-            android:exported="true">
+            android:theme="@style/Theme.Fdroidclient"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.APP_MARKET" />
                 <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.APP_MARKET" />
             </intent-filter>
-
-
-            <!-- App URLs -->
-
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="fdroid.app" />
+                <action android:name="android.intent.action.SHOW_APP_INFO" />
             </intent-filter>
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="f-droid.org" />
-                <data android:host="www.f-droid.org" />
-                <data android:host="staging.f-droid.org" />
-                <data android:host="cloudflare.f-droid.org" />
-                <data android:pathPrefix="/app/" />
-                <data android:pathPrefix="/packages/" />
-                <data android:pathPrefix="/repository/browse" />
-                <!-- support localized URLs -->
-                <data android:pathPattern="/.*/packages/.*" />
-                <data android:pathPattern="/.*/packages/.*/" />
-            </intent-filter>
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:host="f-droid.org" />
-                <data android:host="www.f-droid.org" />
-                <data android:host="staging.f-droid.org" />
-                <data android:host="cloudflare.f-droid.org" />
-                <data android:pathPrefix="/app/" />
-                <data android:pathPrefix="/packages/" />
-                <data android:pathPrefix="/repository/browse" />
-                <!-- support localized URLs -->
-                <data android:pathPattern="/.*/packages/.*" />
-                <data android:pathPattern="/.*/packages/.*/" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -356,192 +55,75 @@
                     android:scheme="market" />
             </intent-filter>
 
-            <intent-filter android:autoVerify="false">
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
                 <data android:scheme="https" />
-                <data android:host="play.google.com" /> <!-- they don't do www. -->
-                <data android:path="/store/apps/details" />
+                <data android:host="f-droid.org" />
+                <data android:host="staging.f-droid.org" />
+                <data android:host="cloudflare.f-droid.org" />
+                <data android:pathPrefix="/packages/" />
+                <data android:pathPattern="/.*/packages/.*" />
             </intent-filter>
 
+            <!-- Repo URLs -->
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="fdroid.link" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
 
+                <data android:scheme="fdroidrepos" />
                 <data
-                    android:host="apps"
-                    android:path="/android"
-                    android:scheme="amzn" />
+                    android:scheme="FDROIDREPOS"
+                    tools:ignore="AppLinkUrlError" />
             </intent-filter>
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="amazon.com" />
-                <data android:host="www.amazon.com" />
-                <data android:path="/gp/mas/dl/android" />
-            </intent-filter>
-
-
-            <!-- Search URLs -->
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="fdroid.search" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="search"
-                    android:scheme="market" />
-            </intent-filter>
-
-            <intent-filter android:autoVerify="false">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="play.google.com" /> <!-- they don't do www. -->
-                <data android:path="/store/search" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-            <!-- Handle NFC tags detected from outside our application -->
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-
         </activity>
-        <activity android:name=".views.apps.AppListActivity" />
         <activity
-            android:name=".views.installed.InstalledAppsActivity"
-            android:parentActivityName=".views.main.MainActivity"></activity>
+            android:name="org.fdroid.ui.crash.CrashActivity"
+            android:excludeFromRecents="true"
+            android:finishOnTaskLaunch="true"
+            android:launchMode="singleInstance"
+            android:process=":acra"
+            android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".views.InstallHistoryActivity"
-            android:parentActivityName=".views.main.MainActivity"></activity>
-
-        <activity
-            android:name=".installer.FileInstallerActivity"
-            android:theme="@style/Theme.App.Transparent" />
-
-        <provider
-            android:name="org.fdroid.fdroid.installer.ApkFileProvider"
-            android:authorities="${applicationId}.installer.ApkFileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/apk_file_provider" />
-        </provider>
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.installer"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/installer_file_provider" />
-        </provider>
-        <provider
-            android:name="org.fdroid.fdroid.nearby.PublicSourceDirProvider"
-            android:authorities="${applicationId}.nearby.PublicSourceDirProvider"
-            android:exported="false"
-            android:grantUriPermissions="true" />
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="remove"></provider>
-
-        <receiver
-            android:name=".receiver.StartupReceiver"
-            android:exported="false">
-            <intent-filter>
-                <!-- Implicit Broadcast Exception
-                https://developer.android.com/guide/components/broadcast-exceptions -->
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-
-                <category android:name="android.intent.category.HOME" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name=".NotificationBroadcastReceiver"
-            android:exported="false">
-            <!-- Doesn't require an intent-filter because it is explicitly invoked via Intent.setClass() -->
-        </receiver>
-        <receiver android:name=".receiver.RepoUpdateReceiver"
-            android:exported="true"
-            android:permission="${applicationId}.permission.UPDATE_REPOS">
-            <intent-filter>
-                <action android:name="org.fdroid.action.UPDATE_REPOS" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name=".receiver.UnarchivePackageReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.UNARCHIVE_PACKAGE" />
-            </intent-filter>
-        </receiver>
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:ignore="DiscouragedApi"
+            tools:replace="screenOrientation" />
 
         <service
-            android:name=".net.DownloaderService"
+            android:name="org.fdroid.install.AppInstallService"
             android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".installer.InstallerService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
+            android:foregroundServiceType="dataSync" />
         <!-- needed for declaring foregroundServiceType for WorkManager -->
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"
             android:foregroundServiceType="dataSync"
             tools:node="merge" />
-        <service
-            android:name=".DeleteCacheService"
+        <provider
+            android:name="org.fdroid.install.ApkFileProvider"
+            android:authorities="${applicationId}.install.ApkFileProvider"
             android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
-        <service
-            android:name=".net.ConnectivityMonitorService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
-        <service
-            android:name=".installer.InstallHistoryService"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".installer.ObfInstallerService"
-            android:exported="false" />
-
+            android:grantUriPermissions="true" />
+        <!-- disable WorkManager initialization, needed for Hilt -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
     </application>
 
 </manifest>
diff --git a/next/src/main/assets/default_repos.json b/app/src/main/assets/default_repos.json
similarity index 100%
rename from next/src/main/assets/default_repos.json
rename to app/src/main/assets/default_repos.json
diff --git a/next/src/main/assets/most_downloaded_apps.json b/app/src/main/assets/most_downloaded_apps.json
similarity index 100%
rename from next/src/main/assets/most_downloaded_apps.json
rename to app/src/main/assets/most_downloaded_apps.json
diff --git a/next/src/main/kotlin/org/fdroid/App.kt b/app/src/main/kotlin/org/fdroid/App.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/App.kt
rename to app/src/main/kotlin/org/fdroid/App.kt
diff --git a/next/src/main/kotlin/org/fdroid/MainActivity.kt b/app/src/main/kotlin/org/fdroid/MainActivity.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/MainActivity.kt
rename to app/src/main/kotlin/org/fdroid/MainActivity.kt
diff --git a/next/src/main/kotlin/org/fdroid/NotificationManager.kt b/app/src/main/kotlin/org/fdroid/NotificationManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/NotificationManager.kt
rename to app/src/main/kotlin/org/fdroid/NotificationManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt b/app/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
rename to app/src/main/kotlin/org/fdroid/db/DatabaseModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/db/InitialData.kt b/app/src/main/kotlin/org/fdroid/db/InitialData.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/db/InitialData.kt
rename to app/src/main/kotlin/org/fdroid/db/InitialData.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/DownloadModule.kt b/app/src/main/kotlin/org/fdroid/download/DownloadModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/DownloadModule.kt
rename to app/src/main/kotlin/org/fdroid/download/DownloadModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt b/app/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
rename to app/src/main/kotlin/org/fdroid/download/DownloaderFactoryImpl.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/ImageModel.kt b/app/src/main/kotlin/org/fdroid/download/ImageModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/ImageModel.kt
rename to app/src/main/kotlin/org/fdroid/download/ImageModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt b/app/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt
rename to app/src/main/kotlin/org/fdroid/download/LocalFileDownloader.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt b/app/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
rename to app/src/main/kotlin/org/fdroid/download/LocalIconFetcher.kt
diff --git a/next/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt b/app/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt
rename to app/src/main/kotlin/org/fdroid/download/NetworkMonitor.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt b/app/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt
rename to app/src/main/kotlin/org/fdroid/install/ApkFileProvider.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallListener.kt b/app/src/main/kotlin/org/fdroid/install/AppInstallListener.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/AppInstallListener.kt
rename to app/src/main/kotlin/org/fdroid/install/AppInstallListener.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/app/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
rename to app/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/AppInstallService.kt b/app/src/main/kotlin/org/fdroid/install/AppInstallService.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/AppInstallService.kt
rename to app/src/main/kotlin/org/fdroid/install/AppInstallService.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/CacheCleaner.kt b/app/src/main/kotlin/org/fdroid/install/CacheCleaner.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/CacheCleaner.kt
rename to app/src/main/kotlin/org/fdroid/install/CacheCleaner.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt b/app/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
rename to app/src/main/kotlin/org/fdroid/install/InstallBroadcastReceiver.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt b/app/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
rename to app/src/main/kotlin/org/fdroid/install/InstallNotificationState.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/InstallState.kt b/app/src/main/kotlin/org/fdroid/install/InstallState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/InstallState.kt
rename to app/src/main/kotlin/org/fdroid/install/InstallState.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt b/app/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
rename to app/src/main/kotlin/org/fdroid/install/InstalledAppsCache.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt b/app/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
rename to app/src/main/kotlin/org/fdroid/install/PreApprovalResult.kt
diff --git a/next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt b/app/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
rename to app/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt b/app/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt
rename to app/src/main/kotlin/org/fdroid/repo/RepoPreLoader.kt
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt b/app/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
rename to app/src/main/kotlin/org/fdroid/repo/RepoUpdateManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt b/app/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
rename to app/src/main/kotlin/org/fdroid/repo/RepoUpdateWorker.kt
diff --git a/next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt b/app/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
rename to app/src/main/kotlin/org/fdroid/repo/RepositoryModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt b/app/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt
rename to app/src/main/kotlin/org/fdroid/settings/OnboardingManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
rename to app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
diff --git a/next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
rename to app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/About.kt b/app/src/main/kotlin/org/fdroid/ui/About.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/About.kt
rename to app/src/main/kotlin/org/fdroid/ui/About.kt
diff --git a/app/src/main/kotlin/org/fdroid/ui/Color.kt b/app/src/main/kotlin/org/fdroid/ui/Color.kt
new file mode 100644
index 000000000..6a99b02da
--- /dev/null
+++ b/app/src/main/kotlin/org/fdroid/ui/Color.kt
@@ -0,0 +1,78 @@
+package org.fdroid.ui
+
+import androidx.compose.ui.graphics.Color
+
+// Generated by the Material Theme Builder from fdroid_blue and fdroid_green
+// https://www.figma.com/community/plugin/1034969338659738588
+
+val primaryLight = Color(0xFF005197)
+val onPrimaryLight = Color(0xFFFFFFFF)
+val primaryContainerLight = Color(0xFF1976D2)
+val onPrimaryContainerLight = Color(0xFFFFFFFF)
+val secondaryLight = Color(0xFF4F6600)
+val onSecondaryLight = Color(0xFFFFFFFF)
+val secondaryContainerLight = Color(0xFF95BC18)
+val onSecondaryContainerLight = Color(0xFF1C2700)
+val tertiaryLight = Color(0xFF763192)
+val onTertiaryLight = Color(0xFFFFFFFF)
+val tertiaryContainerLight = Color(0xFF9F58BA)
+val onTertiaryContainerLight = Color(0xFFFFFFFF)
+val errorLight = Color(0xFFBA1A1A)
+val onErrorLight = Color(0xFFFFFFFF)
+val errorContainerLight = Color(0xFFFFDAD6)
+val onErrorContainerLight = Color(0xFF410002)
+val backgroundLight = Color(0xFFF9F9FF)
+val onBackgroundLight = Color(0xFF181C21)
+val surfaceLight = Color(0xFFF9F9FF)
+val onSurfaceLight = Color(0xFF181C21)
+val surfaceVariantLight = Color(0xFFDDE2F0)
+val onSurfaceVariantLight = Color(0xFF414752)
+val outlineLight = Color(0xFF717783)
+val outlineVariantLight = Color(0xFFC1C6D4)
+val scrimLight = Color(0xFF000000)
+val inverseSurfaceLight = Color(0xFF2D3037)
+val inverseOnSurfaceLight = Color(0xFFEFF0F9)
+val inversePrimaryLight = Color(0xFFA5C8FF)
+val surfaceDimLight = Color(0xFFD8DAE2)
+val surfaceBrightLight = Color(0xFFF9F9FF)
+val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+val surfaceContainerLowLight = Color(0xFFF2F3FC)
+val surfaceContainerLight = Color(0xFFECEDF6)
+val surfaceContainerHighLight = Color(0xFFE6E8F0)
+val surfaceContainerHighestLight = Color(0xFFE0E2EA)
+
+val primaryDark = Color(0xFFA5C8FF)
+val onPrimaryDark = Color(0xFF00315F)
+val primaryContainerDark = Color(0xFF006DC7)
+val onPrimaryContainerDark = Color(0xFFFFFFFF)
+val secondaryDark = Color(0xFFADD535)
+val onSecondaryDark = Color(0xFF283500)
+val secondaryContainerDark = Color(0xFF83A800)
+val onSecondaryContainerDark = Color(0xFF080D00)
+val tertiaryDark = Color(0xFFEDB1FF)
+val onTertiaryDark = Color(0xFF52046E)
+val tertiaryContainerDark = Color(0xFF954FB0)
+val onTertiaryContainerDark = Color(0xFFFFFFFF)
+val errorDark = Color(0xFFFFB4AB)
+val onErrorDark = Color(0xFF690005)
+val errorContainerDark = Color(0xFF93000A)
+val onErrorContainerDark = Color(0xFFFFDAD6)
+val backgroundDark = Color.Black // changed
+val onBackgroundDark = Color(0xFFE0E2EA)
+val surfaceDark = Color(0xff1e1e1e) // changed
+val onSurfaceDark = Color(0xFFE0E2EA)
+val surfaceVariantDark = Color(0xFF414752)
+val onSurfaceVariantDark = Color(0xFFC1C6D4)
+val outlineDark = Color(0xFF8B919E)
+val outlineVariantDark = Color(0xFF414752)
+val scrimDark = Color(0xFF000000)
+val inverseSurfaceDark = Color(0xFFE0E2EA)
+val inverseOnSurfaceDark = Color(0xFF2D3037)
+val inversePrimaryDark = Color(0xFF005FAF)
+val surfaceDimDark = Color(0xFF101319)
+val surfaceBrightDark = Color(0xFF363940)
+val surfaceContainerLowestDark = Color(0xFF0B0E14)
+val surfaceContainerLowDark = Color(0xFF181C21)
+val surfaceContainerDark = Color(0xFF1C2026)
+val surfaceContainerHighDark = Color(0xFF272A30)
+val surfaceContainerHighestDark = Color(0xFF32353B)
diff --git a/next/src/main/kotlin/org/fdroid/ui/Main.kt b/app/src/main/kotlin/org/fdroid/ui/Main.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/Main.kt
rename to app/src/main/kotlin/org/fdroid/ui/Main.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/MainViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/MainViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/MainViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/MainViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/Theme.kt b/app/src/main/kotlin/org/fdroid/ui/Theme.kt
similarity index 52%
rename from next/src/main/kotlin/org/fdroid/ui/Theme.kt
rename to app/src/main/kotlin/org/fdroid/ui/Theme.kt
index bde49f2b8..815c2f7ef 100644
--- a/next/src/main/kotlin/org/fdroid/ui/Theme.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/Theme.kt
@@ -9,76 +9,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import org.fdroid.fdroid.ui.theme.backgroundLight
-import org.fdroid.fdroid.ui.theme.errorContainerDark
-import org.fdroid.fdroid.ui.theme.errorContainerLight
-import org.fdroid.fdroid.ui.theme.errorDark
-import org.fdroid.fdroid.ui.theme.errorLight
-import org.fdroid.fdroid.ui.theme.inverseOnSurfaceDark
-import org.fdroid.fdroid.ui.theme.inverseOnSurfaceLight
-import org.fdroid.fdroid.ui.theme.inversePrimaryDark
-import org.fdroid.fdroid.ui.theme.inversePrimaryLight
-import org.fdroid.fdroid.ui.theme.inverseSurfaceDark
-import org.fdroid.fdroid.ui.theme.inverseSurfaceLight
-import org.fdroid.fdroid.ui.theme.onBackgroundDark
-import org.fdroid.fdroid.ui.theme.onBackgroundLight
-import org.fdroid.fdroid.ui.theme.onErrorContainerDark
-import org.fdroid.fdroid.ui.theme.onErrorContainerLight
-import org.fdroid.fdroid.ui.theme.onErrorDark
-import org.fdroid.fdroid.ui.theme.onErrorLight
-import org.fdroid.fdroid.ui.theme.onPrimaryContainerDark
-import org.fdroid.fdroid.ui.theme.onPrimaryContainerLight
-import org.fdroid.fdroid.ui.theme.onPrimaryDark
-import org.fdroid.fdroid.ui.theme.onPrimaryLight
-import org.fdroid.fdroid.ui.theme.onSecondaryContainerDark
-import org.fdroid.fdroid.ui.theme.onSecondaryContainerLight
-import org.fdroid.fdroid.ui.theme.onSecondaryDark
-import org.fdroid.fdroid.ui.theme.onSecondaryLight
-import org.fdroid.fdroid.ui.theme.onSurfaceDark
-import org.fdroid.fdroid.ui.theme.onSurfaceLight
-import org.fdroid.fdroid.ui.theme.onSurfaceVariantDark
-import org.fdroid.fdroid.ui.theme.onSurfaceVariantLight
-import org.fdroid.fdroid.ui.theme.onTertiaryContainerDark
-import org.fdroid.fdroid.ui.theme.onTertiaryContainerLight
-import org.fdroid.fdroid.ui.theme.onTertiaryDark
-import org.fdroid.fdroid.ui.theme.onTertiaryLight
-import org.fdroid.fdroid.ui.theme.outlineDark
-import org.fdroid.fdroid.ui.theme.outlineLight
-import org.fdroid.fdroid.ui.theme.outlineVariantDark
-import org.fdroid.fdroid.ui.theme.outlineVariantLight
-import org.fdroid.fdroid.ui.theme.primaryContainerDark
-import org.fdroid.fdroid.ui.theme.primaryContainerLight
-import org.fdroid.fdroid.ui.theme.primaryDark
-import org.fdroid.fdroid.ui.theme.primaryLight
-import org.fdroid.fdroid.ui.theme.scrimDark
-import org.fdroid.fdroid.ui.theme.scrimLight
-import org.fdroid.fdroid.ui.theme.secondaryContainerDark
-import org.fdroid.fdroid.ui.theme.secondaryContainerLight
-import org.fdroid.fdroid.ui.theme.secondaryDark
-import org.fdroid.fdroid.ui.theme.secondaryLight
-import org.fdroid.fdroid.ui.theme.surfaceBrightDark
-import org.fdroid.fdroid.ui.theme.surfaceBrightLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerHighDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerHighLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerHighestDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerHighestLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerLowDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerLowLight
-import org.fdroid.fdroid.ui.theme.surfaceContainerLowestDark
-import org.fdroid.fdroid.ui.theme.surfaceContainerLowestLight
-import org.fdroid.fdroid.ui.theme.surfaceDimDark
-import org.fdroid.fdroid.ui.theme.surfaceDimLight
-import org.fdroid.fdroid.ui.theme.surfaceLight
-import org.fdroid.fdroid.ui.theme.surfaceVariantDark
-import org.fdroid.fdroid.ui.theme.surfaceVariantLight
-import org.fdroid.fdroid.ui.theme.tertiaryContainerDark
-import org.fdroid.fdroid.ui.theme.tertiaryContainerLight
-import org.fdroid.fdroid.ui.theme.tertiaryDark
-import org.fdroid.fdroid.ui.theme.tertiaryLight
 
 // The followings are generated by the Material Theme Builder with modifications
 // https://www.figma.com/community/plugin/1034969338659738588
@@ -139,9 +70,9 @@ private val darkScheme = darkColorScheme(
     onError = onErrorDark,
     errorContainer = errorContainerDark,
     onErrorContainer = onErrorContainerDark,
-    background = Color.Black, // TODO
+    background = backgroundDark,
     onBackground = onBackgroundDark,
-    surface = Color(0xff1e1e1e), // TODO
+    surface = surfaceDark,
     onSurface = onSurfaceDark,
     surfaceVariant = surfaceVariantDark,
     onSurfaceVariant = onSurfaceVariantDark,
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt b/app/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/IgnoreIssueDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt b/app/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/InstalledAppRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt b/app/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/InstallingAppRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsList.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/MyAppsViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt b/app/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/NotAvailableDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt b/app/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/apps/UpdatableAppRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
rename to app/src/main/kotlin/org/fdroid/ui/categories/CategoryChip.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
rename to app/src/main/kotlin/org/fdroid/ui/categories/CategoryGroup.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/categories/CategoryItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt b/app/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
rename to app/src/main/kotlin/org/fdroid/ui/categories/CategoryList.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt b/app/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
rename to app/src/main/kotlin/org/fdroid/ui/crash/Crash.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt b/app/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
rename to app/src/main/kotlin/org/fdroid/ui/crash/CrashActivity.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt b/app/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
rename to app/src/main/kotlin/org/fdroid/ui/crash/CrashContent.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt b/app/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AntiFeatures.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsLink.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsMenu.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsTopAppBar.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/AppDetailsWarnings.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt b/app/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/NoAppSelected.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt b/app/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/RepoChooser.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt b/app/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/Screenshots.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt b/app/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/TechnicalInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/details/Versions.kt b/app/src/main/kotlin/org/fdroid/ui/details/Versions.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/details/Versions.kt
rename to app/src/main/kotlin/org/fdroid/ui/details/Versions.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt b/app/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/AppCarousel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt b/app/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/AppDiscoverItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt b/app/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/AppSearchInputField.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt b/app/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/AppsSearch.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt b/app/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/Discover.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverContent.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverOverflowMenu.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt b/app/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/FirstStart.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt b/app/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt
rename to app/src/main/kotlin/org/fdroid/ui/discover/SearchResults.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/icons/License.kt b/app/src/main/kotlin/org/fdroid/ui/icons/License.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/icons/License.kt
rename to app/src/main/kotlin/org/fdroid/ui/icons/License.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt b/app/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
rename to app/src/main/kotlin/org/fdroid/ui/icons/PackageVariant.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppList.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListType.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/AppsFilter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt b/app/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
rename to app/src/main/kotlin/org/fdroid/ui/lists/TopSearchBar.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/IntentRouter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/NavigationKey.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/NavigationState.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt
rename to app/src/main/kotlin/org/fdroid/ui/navigation/Navigator.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/NoRepoSelected.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepoEntry.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepoIcon.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/Repositories.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesList.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoriesViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoErrorScreen.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoIntro.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoPreviewScreen.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoProgressScreen.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/AddRepoViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/add/RepoPreviewHeader.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/BasicAuth.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/DeleteDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/OfficialMirrors.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/QrCodeDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetails.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsContent.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsInfo.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsPresenter.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoSettings.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
rename to app/src/main/kotlin/org/fdroid/ui/repositories/details/UserMirrors.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt b/app/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
rename to app/src/main/kotlin/org/fdroid/ui/settings/PreferenceProxy.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/app/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
rename to app/src/main/kotlin/org/fdroid/ui/settings/Settings.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt b/app/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/settings/SettingsModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
rename to app/src/main/kotlin/org/fdroid/ui/settings/SettingsViewModel.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt b/app/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/AsyncShimmerImage.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt b/app/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt b/app/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/BigLoadingIndicator.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt b/app/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/DragDropState.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt b/app/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/ExpandIcon.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt b/app/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/ExpandableSection.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt b/app/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/FDroidButton.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt b/app/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/FDroidSwitchRow.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt b/app/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/MeteredConnectionDialog.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt b/app/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/OfflineBar.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt b/app/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/OnboardingCard.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt b/app/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/PreviewUtils.kt
diff --git a/next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt b/app/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
rename to app/src/main/kotlin/org/fdroid/ui/utils/UiUtils.kt
diff --git a/next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt b/app/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
rename to app/src/main/kotlin/org/fdroid/updates/AppUpdateWorker.kt
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt b/app/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
rename to app/src/main/kotlin/org/fdroid/updates/UpdateNotificationState.kt
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
rename to app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
diff --git a/next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt b/app/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
rename to app/src/main/kotlin/org/fdroid/updates/UpdatesModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt b/app/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt
rename to app/src/main/kotlin/org/fdroid/utils/CoroutinesScopesModule.kt
diff --git a/next/src/main/kotlin/org/fdroid/utils/Utils.kt b/app/src/main/kotlin/org/fdroid/utils/Utils.kt
similarity index 100%
rename from next/src/main/kotlin/org/fdroid/utils/Utils.kt
rename to app/src/main/kotlin/org/fdroid/utils/Utils.kt
diff --git a/next/src/main/res/drawable/ic_crash.xml b/app/src/main/res/drawable/ic_crash.xml
similarity index 100%
rename from next/src/main/res/drawable/ic_crash.xml
rename to app/src/main/res/drawable/ic_crash.xml
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_launcher.png
rename to app/src/main/res/drawable/ic_launcher.png
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
index ecba10fa2..53951dfa5 100644
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -1,6 +1,6 @@
 <vector android:height="24dp"
     android:viewportHeight="48.0"
-    android:tint="?attr/colorControlNormal"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48.0"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
index e9b1ec853..15e746762 100644
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/next/src/main/res/drawable/ic_repo_app_default.xml b/app/src/main/res/drawable/ic_repo_app_default.xml
similarity index 100%
rename from next/src/main/res/drawable/ic_repo_app_default.xml
rename to app/src/main/res/drawable/ic_repo_app_default.xml
diff --git a/next/src/main/res/drawable/screenshots_placeholder.png b/app/src/main/res/drawable/screenshots_placeholder.png
similarity index 100%
rename from next/src/main/res/drawable/screenshots_placeholder.png
rename to app/src/main/res/drawable/screenshots_placeholder.png
diff --git a/next/src/main/res/values/strings-next.xml b/app/src/main/res/values/strings-next.xml
similarity index 100%
rename from next/src/main/res/values/strings-next.xml
rename to app/src/main/res/values/strings-next.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 90c68bdeb..6e59254a1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,134 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!--
-~ Copyright (C) 2019 The Android Open Source Project
-~
-~ Licensed under the Apache License, Version 2.0 (the "License");
-~ you may not use this file except in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~      http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License.
--->
-
-<!-- Generated by the Material Theme Builder with modifications-->
-<!-- https://www.figma.com/community/plugin/1034969338659738588&ndash;&gt;-->
 <resources>
 
-    <style name="Base.Theme.App" parent="Theme.Material3.DayNight.NoActionBar">
-        <!--Material shape attributes-->
-        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.App.SmallComponent</item>
-        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent
-        </item>
-        <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.App.LargeComponent</item>
-
-        <item name="borderlessButtonStyle">@style/Widget.App.Button.TextButton</item>
-        <item name="materialButtonOutlinedStyle">@style/Widget.App.Button.OutlinedButton</item>
-        <item name="materialButtonStyle">@style/Widget.App.Button</item>
-        <item name="materialCardViewStyle">@style/Widget.App.CardView</item>
-
-        <!--colorBackground appears behind scrollable content and is used for the default window-->
-        <!--background. colorSurface is mapped to the surface of components such as cards, sheets-->
-        <!--and menus. colorError is used to indicate an error state for components such as-->
-        <!--text fields.-->
-        <item name="appDetailsBackground">#fcfcfc</item>
-        <item name="categoryPreviewAppCardBackground">
-            @drawable/category_preview_app_card_background_light
-        </item>
-        <item name="detailPanel">?attr/colorSurfaceContainerHighest</item>
-        <item name="antiFeaturesWarning">@drawable/ic_warning</item>
-        <item name="backButtonDrawable">@drawable/abc_ic_ab_back_material</item>
-        <item name="clearButtonDrawable">@drawable/ic_close</item>
-
-        <item name="bottomNavigationStyle">@style/Widget.App.BottomNavigationView</item>
-        <item name="floatingActionButtonStyle">@style/Widget.App.FloatingActionButton</item>
-        <item name="mainTabSwapSplashTint">?attr/colorSurfaceDim</item>
-        <item name="warning">?attr/colorTertiaryContainer</item>
-        <item name="categoryName">#4a4a4a</item>
-        <item name="installedApps">#424242</item>
-        <item name="appListItem">#424242</item>
-        <item name="lightGrayTextColor">#4a4a4a</item>
-        <item name="preferenceTheme">@style/ThemeOverlay.App.Preference</item>
-        <item name="appDetailsAntiFeatureIconColor">#000000</item>
-
-        <item name="iconBackgroundColor">#801976D2</item>
-
-        <item name="screenshotPlaceholderIconColor">#e8e8e8</item>
-
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-
-        <!-- Adjust androidx.preference dialogs to follow Material You -->
-        <!-- https://github.com/material-components/material-components-android/issues/2732#issuecomment-1146086018 -->
-        <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
-
-        <item name="colorPrimary">@color/md_theme_primary</item>
-        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_theme_secondary</item>
-        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_theme_tertiary</item>
-        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
-        <item name="colorError">@color/md_theme_error</item>
-        <item name="colorOnError">@color/md_theme_onError</item>
-        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
-        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_theme_background</item>
-        <item name="colorOnBackground">@color/md_theme_onBackground</item>
-        <item name="colorSurface">@color/md_theme_surface</item>
-        <item name="colorOnSurface">@color/md_theme_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_theme_outline</item>
-        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
-        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
-        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
-        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
-        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
-        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
-        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
-        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
-        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
-        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
-        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
-        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
-        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
-        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
-        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
-        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
-        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
-        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
-        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
-        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
-        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
-        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
-        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
-    </style>
-
-    <!-- light app theme with accent colors following roughly android design guidelines -->
-    <style name="Theme.App" parent="Base.Theme.App">
-        <!-- customizations that are not API-level specific go here. -->
-    </style>
-
-    <!-- Same as Theme.App except a black background in Dark mode -->
-    <style name="Theme.App.Black" parent="Theme.App" />
-
-    <style name="Theme.App.Transparent" parent="Base.Theme.App">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
+    <style name="Theme.Fdroidclient" parent="Theme.AppCompat.DayNight.NoActionBar" />
 </resources>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index cfcccb746..f8b53ef87 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,40 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true">
-        <trust-anchors>
-            <!-- Trust preinstalled CAs -->
-            <certificates src="system" />
-            <!-- Additionally trust user added CAs -->
-            <certificates src="user" />
-        </trust-anchors>
-    </base-config>
-
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">amazonaws.com</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">f-droid.org</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">github.com</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">githubusercontent.com</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">github.io</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">gitlab.com</domain>
-        <certificateTransparency enabled="true"/>
-    </domain-config>
-    <domain-config cleartextTrafficPermitted="false">
-        <domain includeSubdomains="true">gitlab.io</domain>
-        <certificateTransparency enabled="true"/>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">onion</domain>
     </domain-config>
 </network-security-config>
diff --git a/next/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt b/app/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt
similarity index 100%
rename from next/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt
rename to app/src/test/java/org/fdroid/ui/details/HtmlDescriptionTest.kt
diff --git a/next/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt b/app/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt
similarity index 100%
rename from next/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt
rename to app/src/test/java/org/fdroid/ui/navigation/IntentRouterTest.kt
diff --git a/app/build.gradle b/legacy/build.gradle
similarity index 100%
rename from app/build.gradle
rename to legacy/build.gradle
diff --git a/app/lint.xml b/legacy/lint.xml
similarity index 100%
rename from app/lint.xml
rename to legacy/lint.xml
diff --git a/legacy/proguard-rules.pro b/legacy/proguard-rules.pro
new file mode 100644
index 000000000..20e22cd98
--- /dev/null
+++ b/legacy/proguard-rules.pro
@@ -0,0 +1,58 @@
+-dontobfuscate
+-dontoptimize
+-keepattributes SourceFile,LineNumberTable,Exceptions
+-keep class org.fdroid.fdroid.** {*;}
+-dontwarn android.test.**
+
+-dontwarn javax.naming.**
+-dontnote org.apache.http.**
+-dontnote android.net.http.**
+-dontnote **ILicensingService
+
+# Needed for espresso https://stackoverflow.com/a/21706087
+-dontwarn org.xmlpull.v1.**
+
+# StrongHttpsClient and its support classes are totally unused, so the
+# ch.boye.httpclientandroidlib.** classes are also unneeded
+-dontwarn info.guardianproject.netcipher.client.**
+
+# These libraries are known to break if minification is enabled on them. They
+# use reflection to instantiate classes, for example. If the keep flags are
+# removed, proguard will strip classes which are required, which may result in
+# crashes.
+-keep class kellinwood.security.zipsigner.** {*;}
+-keep class org.bouncycastle.** {*;}
+
+# This keeps class members used for SystemInstaller IPC.
+#   Reference: https://gitlab.com/fdroid/fdroidclient/issues/79
+-keepclassmembers class * implements android.os.IInterface {
+    public *;
+}
+
+-keepattributes *Annotation*,EnclosingMethod,Signature
+-keepnames class com.fasterxml.jackson.** { *; }
+-dontwarn com.fasterxml.jackson.databind.ext.**
+-keep class org.codehaus.** { *; }
+-keepclassmembers public final enum org.codehaus.jackson.annotate.JsonAutoDetect$Visibility {
+public static final org.codehaus.jackson.annotate.JsonAutoDetect$Visibility *; }
+-keep public class org.fdroid.** {
+  *;
+}
+
+-dontwarn org.bouncycastle.jsse.**
+-dontwarn org.conscrypt.**
+-dontwarn org.openjsse.**
+
+# This is necessary so that RemoteWorkManager can be initialized (also marked with @Keep)
+-keep class androidx.work.multiprocess.RemoteWorkManagerClient {
+    public <init>(...);
+}
+
+-keep class org.acra.config.MailSenderConfiguration {
+    public <init>(...);
+}
+
+# Logging
+-keep class ch.qos.logback.classic.android.LogcatAppender
+-keepclassmembers class ch.qos.logback.** { *; }
+-keepclassmembers class  org.slf4j.impl.** { *; }
diff --git a/app/src/androidTest/AndroidManifest.xml b/legacy/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from app/src/androidTest/AndroidManifest.xml
rename to legacy/src/androidTest/AndroidManifest.xml
diff --git a/app/src/androidTest/assets/org.fdroid.extendedpermissionstest.apk b/legacy/src/androidTest/assets/org.fdroid.extendedpermissionstest.apk
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.extendedpermissionstest.apk
rename to legacy/src/androidTest/assets/org.fdroid.extendedpermissionstest.apk
diff --git a/app/src/androidTest/assets/org.fdroid.permissions.minmax.apk b/legacy/src/androidTest/assets/org.fdroid.permissions.minmax.apk
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.permissions.minmax.apk
rename to legacy/src/androidTest/assets/org.fdroid.permissions.minmax.apk
diff --git a/app/src/androidTest/assets/org.fdroid.permissions.minmax.zip b/legacy/src/androidTest/assets/org.fdroid.permissions.minmax.zip
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.permissions.minmax.zip
rename to legacy/src/androidTest/assets/org.fdroid.permissions.minmax.zip
diff --git a/app/src/androidTest/assets/org.fdroid.permissions.sdk14.apk b/legacy/src/androidTest/assets/org.fdroid.permissions.sdk14.apk
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.permissions.sdk14.apk
rename to legacy/src/androidTest/assets/org.fdroid.permissions.sdk14.apk
diff --git a/app/src/androidTest/assets/org.fdroid.permissions.sdk14.zip b/legacy/src/androidTest/assets/org.fdroid.permissions.sdk14.zip
similarity index 100%
rename from app/src/androidTest/assets/org.fdroid.permissions.sdk14.zip
rename to legacy/src/androidTest/assets/org.fdroid.permissions.sdk14.zip
diff --git a/app/src/androidTest/assets/simpleIndex.jar b/legacy/src/androidTest/assets/simpleIndex.jar
similarity index 100%
rename from app/src/androidTest/assets/simpleIndex.jar
rename to legacy/src/androidTest/assets/simpleIndex.jar
diff --git a/next/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt b/legacy/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt
similarity index 100%
rename from next/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt
rename to legacy/src/androidTest/java/org/fdroid/database/PrimaryConstructorTest.kt
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java b/legacy/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/AssetUtils.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java b/legacy/src/androidTest/java/org/fdroid/fdroid/Netstat.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/Netstat.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/Netstat.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/SystemAnimations.java b/legacy/src/androidTest/java/org/fdroid/fdroid/SystemAnimations.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/SystemAnimations.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/SystemAnimations.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java b/legacy/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/installer/ApkVerifierTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/net/DnsWithCacheTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/work/AppUpdateWorkerTest.kt b/legacy/src/androidTest/java/org/fdroid/fdroid/work/AppUpdateWorkerTest.kt
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/work/AppUpdateWorkerTest.kt
rename to legacy/src/androidTest/java/org/fdroid/fdroid/work/AppUpdateWorkerTest.kt
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java b/legacy/src/androidTest/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/work/WorkManagerTestRule.java b/legacy/src/androidTest/java/org/fdroid/fdroid/work/WorkManagerTestRule.java
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/fdroid/work/WorkManagerTestRule.java
rename to legacy/src/androidTest/java/org/fdroid/fdroid/work/WorkManagerTestRule.java
diff --git a/app/src/androidTest/java/org/fdroid/repo/RepoManagerAddAllIntegrationTest.kt b/legacy/src/androidTest/java/org/fdroid/repo/RepoManagerAddAllIntegrationTest.kt
similarity index 100%
rename from app/src/androidTest/java/org/fdroid/repo/RepoManagerAddAllIntegrationTest.kt
rename to legacy/src/androidTest/java/org/fdroid/repo/RepoManagerAddAllIntegrationTest.kt
diff --git a/app/src/androidTest/proguard-rules.pro b/legacy/src/androidTest/proguard-rules.pro
similarity index 100%
rename from app/src/androidTest/proguard-rules.pro
rename to legacy/src/androidTest/proguard-rules.pro
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/MainActivityEspressoTestFull.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/MainActivityEspressoTestFull.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/MainActivityEspressoTestFull.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/MainActivityEspressoTestFull.java
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/BonjourManagerTest.java
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/nearby/PublicSourceDirProviderTest.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/PublicSourceDirProviderTest.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/nearby/PublicSourceDirProviderTest.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/nearby/PublicSourceDirProviderTest.java
diff --git a/app/src/androidTestFull/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java b/legacy/src/androidTestFull/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
similarity index 100%
rename from app/src/androidTestFull/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
rename to legacy/src/androidTestFull/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/BluetoothClient.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/LocalRepoManager.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/SwapService.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java b/legacy/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
rename to legacy/src/basic/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java b/legacy/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java
rename to legacy/src/basic/java/org/fdroid/fdroid/panic/HidingManager.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java b/legacy/src/basic/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
rename to legacy/src/basic/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java b/legacy/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java
rename to legacy/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java
diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java b/legacy/src/basic/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
similarity index 100%
rename from app/src/basic/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
rename to legacy/src/basic/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
diff --git a/app/src/basic/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/legacy/src/basic/res/drawable-anydpi-v26/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/basic/res/drawable-anydpi-v26/ic_launcher_foreground.xml
rename to legacy/src/basic/res/drawable-anydpi-v26/ic_launcher_foreground.xml
diff --git a/app/src/basic/res/drawable-hdpi/ic_launcher.png b/legacy/src/basic/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-hdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-hdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-ldpi/ic_launcher.png b/legacy/src/basic/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-ldpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-ldpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-mdpi/ic_launcher.png b/legacy/src/basic/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-mdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-mdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-xhdpi/ic_launcher.png b/legacy/src/basic/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-xhdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-xhdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-xxhdpi/ic_launcher.png b/legacy/src/basic/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-xxhdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable-xxxhdpi/ic_launcher.png b/legacy/src/basic/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/basic/res/drawable-xxxhdpi/ic_launcher.png
rename to legacy/src/basic/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/app/src/basic/res/drawable/ic_launcher_monochrome.xml b/legacy/src/basic/res/drawable/ic_launcher_monochrome.xml
similarity index 100%
rename from app/src/basic/res/drawable/ic_launcher_monochrome.xml
rename to legacy/src/basic/res/drawable/ic_launcher_monochrome.xml
diff --git a/app/src/basic/res/values/attrs.xml b/legacy/src/basic/res/values/attrs.xml
similarity index 100%
rename from app/src/basic/res/values/attrs.xml
rename to legacy/src/basic/res/values/attrs.xml
diff --git a/app/src/basic/res/values/strings.xml b/legacy/src/basic/res/values/strings.xml
similarity index 100%
rename from app/src/basic/res/values/strings.xml
rename to legacy/src/basic/res/values/strings.xml
diff --git a/app/src/debug/AndroidManifest.xml b/legacy/src/debug/AndroidManifest.xml
similarity index 100%
rename from app/src/debug/AndroidManifest.xml
rename to legacy/src/debug/AndroidManifest.xml
diff --git a/app/src/full/AndroidManifest.xml b/legacy/src/full/AndroidManifest.xml
similarity index 100%
rename from app/src/full/AndroidManifest.xml
rename to legacy/src/full/AndroidManifest.xml
diff --git a/app/src/full/java/cc/mvdan/accesspoint/WifiApControl.java b/legacy/src/full/java/cc/mvdan/accesspoint/WifiApControl.java
similarity index 100%
rename from app/src/full/java/cc/mvdan/accesspoint/WifiApControl.java
rename to legacy/src/full/java/cc/mvdan/accesspoint/WifiApControl.java
diff --git a/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java b/legacy/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java
similarity index 100%
rename from app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java
rename to legacy/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java
diff --git a/app/src/full/java/kellinwood/logging/AbstractLogger.java b/legacy/src/full/java/kellinwood/logging/AbstractLogger.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/AbstractLogger.java
rename to legacy/src/full/java/kellinwood/logging/AbstractLogger.java
diff --git a/app/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java b/legacy/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java
rename to legacy/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java
diff --git a/app/src/full/java/kellinwood/logging/LoggerFactory.java b/legacy/src/full/java/kellinwood/logging/LoggerFactory.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/LoggerFactory.java
rename to legacy/src/full/java/kellinwood/logging/LoggerFactory.java
diff --git a/app/src/full/java/kellinwood/logging/LoggerInterface.java b/legacy/src/full/java/kellinwood/logging/LoggerInterface.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/LoggerInterface.java
rename to legacy/src/full/java/kellinwood/logging/LoggerInterface.java
diff --git a/app/src/full/java/kellinwood/logging/LoggerManager.java b/legacy/src/full/java/kellinwood/logging/LoggerManager.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/LoggerManager.java
rename to legacy/src/full/java/kellinwood/logging/LoggerManager.java
diff --git a/app/src/full/java/kellinwood/logging/NullLoggerFactory.java b/legacy/src/full/java/kellinwood/logging/NullLoggerFactory.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/NullLoggerFactory.java
rename to legacy/src/full/java/kellinwood/logging/NullLoggerFactory.java
diff --git a/app/src/full/java/kellinwood/logging/StreamLogger.java b/legacy/src/full/java/kellinwood/logging/StreamLogger.java
similarity index 100%
rename from app/src/full/java/kellinwood/logging/StreamLogger.java
rename to legacy/src/full/java/kellinwood/logging/StreamLogger.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java b/legacy/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java b/legacy/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java b/legacy/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/KeySet.java b/legacy/src/full/java/kellinwood/security/zipsigner/KeySet.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/KeySet.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/KeySet.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java b/legacy/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java b/legacy/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ProgressListener.java b/legacy/src/full/java/kellinwood/security/zipsigner/ProgressListener.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ProgressListener.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ProgressListener.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java b/legacy/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java b/legacy/src/full/java/kellinwood/security/zipsigner/ZipSigner.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/ZipSigner.java
diff --git a/app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java b/legacy/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java
similarity index 100%
rename from app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java
rename to legacy/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java
diff --git a/app/src/full/java/kellinwood/zipio/CentralEnd.java b/legacy/src/full/java/kellinwood/zipio/CentralEnd.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/CentralEnd.java
rename to legacy/src/full/java/kellinwood/zipio/CentralEnd.java
diff --git a/app/src/full/java/kellinwood/zipio/ZioEntry.java b/legacy/src/full/java/kellinwood/zipio/ZioEntry.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZioEntry.java
rename to legacy/src/full/java/kellinwood/zipio/ZioEntry.java
diff --git a/app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java b/legacy/src/full/java/kellinwood/zipio/ZioEntryInputStream.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java
rename to legacy/src/full/java/kellinwood/zipio/ZioEntryInputStream.java
diff --git a/app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java b/legacy/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java
rename to legacy/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java
diff --git a/app/src/full/java/kellinwood/zipio/ZipInput.java b/legacy/src/full/java/kellinwood/zipio/ZipInput.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZipInput.java
rename to legacy/src/full/java/kellinwood/zipio/ZipInput.java
diff --git a/app/src/full/java/kellinwood/zipio/ZipListingHelper.java b/legacy/src/full/java/kellinwood/zipio/ZipListingHelper.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZipListingHelper.java
rename to legacy/src/full/java/kellinwood/zipio/ZipListingHelper.java
diff --git a/app/src/full/java/kellinwood/zipio/ZipOutput.java b/legacy/src/full/java/kellinwood/zipio/ZipOutput.java
similarity index 100%
rename from app/src/full/java/kellinwood/zipio/ZipOutput.java
rename to legacy/src/full/java/kellinwood/zipio/ZipOutput.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothClient.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/BluetoothServer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/BonjourManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPD.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalHTTPDManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoKeyStore.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/NewRepoConfig.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/NewRepoConfig.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/NewRepoConfig.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/NewRepoConfig.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
similarity index 97%
rename from app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
index 2d6be417a..221cbadb8 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
+++ b/legacy/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
@@ -25,8 +25,8 @@ import androidx.core.content.ContextCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.progressindicator.CircularProgressIndicator;
 import com.google.android.material.materialswitch.MaterialSwitch;
+import com.google.android.material.progressindicator.CircularProgressIndicator;
 
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
@@ -35,12 +35,6 @@ import org.fdroid.fdroid.nearby.peers.Peer;
 
 import java.util.ArrayList;
 
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import com.google.android.material.progressindicator.CircularProgressIndicator;
-
 import cc.mvdan.accesspoint.WifiApControl;
 
 @SuppressWarnings("LineLength")
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/TreeUriScannerIntentService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceAttachedReceiver.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceDetachedReceiver.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/UsbDeviceMediaMountedReceiver.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeReceiver.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/WifiStateChangeService.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/peers/BonjourPeer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/peers/Peer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java b/legacy/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
rename to legacy/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java b/legacy/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/DestructivePreference.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/DestructiveSwitchPreference.java b/legacy/src/full/java/org/fdroid/fdroid/panic/DestructiveSwitchPreference.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/DestructiveSwitchPreference.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/DestructiveSwitchPreference.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/ExitActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java b/legacy/src/full/java/org/fdroid/fdroid/panic/HidingManager.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/HidingManager.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/HidingManager.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java b/legacy/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/PanicResponderActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java b/legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListAdapter.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java b/legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppListItemController.java
diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java b/legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
rename to legacy/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java b/legacy/src/full/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
rename to legacy/src/full/java/org/fdroid/fdroid/views/main/LatestLayoutPolicy.java
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java b/legacy/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
rename to legacy/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java b/legacy/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
rename to legacy/src/full/java/org/fdroid/fdroid/views/main/NearbyViewBinder.java
diff --git a/app/src/full/res/drawable-hdpi/circle.png b/legacy/src/full/res/drawable-hdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-hdpi/circle.png
rename to legacy/src/full/res/drawable-hdpi/circle.png
diff --git a/app/src/full/res/drawable-hdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-hdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-hdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-hdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-hdpi/swap_start_header.png b/legacy/src/full/res/drawable-hdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-hdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-hdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-ldpi/circle.png b/legacy/src/full/res/drawable-ldpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-ldpi/circle.png
rename to legacy/src/full/res/drawable-ldpi/circle.png
diff --git a/app/src/full/res/drawable-ldpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-ldpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-ldpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-ldpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-ldpi/swap_start_header.png b/legacy/src/full/res/drawable-ldpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-ldpi/swap_start_header.png
rename to legacy/src/full/res/drawable-ldpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-mdpi/circle.png b/legacy/src/full/res/drawable-mdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-mdpi/circle.png
rename to legacy/src/full/res/drawable-mdpi/circle.png
diff --git a/app/src/full/res/drawable-mdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-mdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-mdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-mdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-mdpi/swap_start_header.png b/legacy/src/full/res/drawable-mdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-mdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-mdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-xhdpi/circle.png b/legacy/src/full/res/drawable-xhdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-xhdpi/circle.png
rename to legacy/src/full/res/drawable-xhdpi/circle.png
diff --git a/app/src/full/res/drawable-xhdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-xhdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-xhdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-xhdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-xhdpi/swap_start_header.png b/legacy/src/full/res/drawable-xhdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-xhdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-xhdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-xxhdpi/circle.png b/legacy/src/full/res/drawable-xxhdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-xxhdpi/circle.png
rename to legacy/src/full/res/drawable-xxhdpi/circle.png
diff --git a/app/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-xxhdpi/swap_start_header.png b/legacy/src/full/res/drawable-xxhdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-xxhdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-xxhdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable-xxxhdpi/circle.png b/legacy/src/full/res/drawable-xxxhdpi/circle.png
similarity index 100%
rename from app/src/full/res/drawable-xxxhdpi/circle.png
rename to legacy/src/full/res/drawable-xxxhdpi/circle.png
diff --git a/app/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png b/legacy/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png
similarity index 100%
rename from app/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png
rename to legacy/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png
diff --git a/app/src/full/res/drawable-xxxhdpi/swap_start_header.png b/legacy/src/full/res/drawable-xxxhdpi/swap_start_header.png
similarity index 100%
rename from app/src/full/res/drawable-xxxhdpi/swap_start_header.png
rename to legacy/src/full/res/drawable-xxxhdpi/swap_start_header.png
diff --git a/app/src/full/res/drawable/check.xml b/legacy/src/full/res/drawable/check.xml
similarity index 100%
rename from app/src/full/res/drawable/check.xml
rename to legacy/src/full/res/drawable/check.xml
diff --git a/app/src/full/res/drawable/ic_add_circle_outline.xml b/legacy/src/full/res/drawable/ic_add_circle_outline.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_add_circle_outline.xml
rename to legacy/src/full/res/drawable/ic_add_circle_outline.xml
diff --git a/app/src/full/res/drawable/ic_apps.xml b/legacy/src/full/res/drawable/ic_apps.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_apps.xml
rename to legacy/src/full/res/drawable/ic_apps.xml
diff --git a/app/src/full/res/drawable/ic_bluetooth.xml b/legacy/src/full/res/drawable/ic_bluetooth.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_bluetooth.xml
rename to legacy/src/full/res/drawable/ic_bluetooth.xml
diff --git a/app/src/full/res/drawable/ic_bluetooth_searching.xml b/legacy/src/full/res/drawable/ic_bluetooth_searching.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_bluetooth_searching.xml
rename to legacy/src/full/res/drawable/ic_bluetooth_searching.xml
diff --git a/app/src/full/res/drawable/ic_nearby.xml b/legacy/src/full/res/drawable/ic_nearby.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_nearby.xml
rename to legacy/src/full/res/drawable/ic_nearby.xml
diff --git a/app/src/full/res/drawable/ic_qr_code.xml b/legacy/src/full/res/drawable/ic_qr_code.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_qr_code.xml
rename to legacy/src/full/res/drawable/ic_qr_code.xml
diff --git a/app/src/full/res/drawable/ic_wifi.xml b/legacy/src/full/res/drawable/ic_wifi.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_wifi.xml
rename to legacy/src/full/res/drawable/ic_wifi.xml
diff --git a/app/src/full/res/drawable/ic_wifi_off.xml b/legacy/src/full/res/drawable/ic_wifi_off.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_wifi_off.xml
rename to legacy/src/full/res/drawable/ic_wifi_off.xml
diff --git a/app/src/full/res/drawable/ic_wifi_tethering.xml b/legacy/src/full/res/drawable/ic_wifi_tethering.xml
similarity index 100%
rename from app/src/full/res/drawable/ic_wifi_tethering.xml
rename to legacy/src/full/res/drawable/ic_wifi_tethering.xml
diff --git a/app/src/full/res/drawable/nearby_splash.xml b/legacy/src/full/res/drawable/nearby_splash.xml
similarity index 100%
rename from app/src/full/res/drawable/nearby_splash.xml
rename to legacy/src/full/res/drawable/nearby_splash.xml
diff --git a/app/src/full/res/layout-sw480dp/start_swap_header.xml b/legacy/src/full/res/layout-sw480dp/start_swap_header.xml
similarity index 100%
rename from app/src/full/res/layout-sw480dp/start_swap_header.xml
rename to legacy/src/full/res/layout-sw480dp/start_swap_header.xml
diff --git a/app/src/full/res/layout/activity_calculator.xml b/legacy/src/full/res/layout/activity_calculator.xml
similarity index 100%
rename from app/src/full/res/layout/activity_calculator.xml
rename to legacy/src/full/res/layout/activity_calculator.xml
diff --git a/app/src/full/res/layout/activity_panic_settings.xml b/legacy/src/full/res/layout/activity_panic_settings.xml
similarity index 100%
rename from app/src/full/res/layout/activity_panic_settings.xml
rename to legacy/src/full/res/layout/activity_panic_settings.xml
diff --git a/app/src/full/res/layout/dialog_app_hiding.xml b/legacy/src/full/res/layout/dialog_app_hiding.xml
similarity index 100%
rename from app/src/full/res/layout/dialog_app_hiding.xml
rename to legacy/src/full/res/layout/dialog_app_hiding.xml
diff --git a/app/src/full/res/layout/main_tab_nearby.xml b/legacy/src/full/res/layout/main_tab_nearby.xml
similarity index 100%
rename from app/src/full/res/layout/main_tab_nearby.xml
rename to legacy/src/full/res/layout/main_tab_nearby.xml
diff --git a/app/src/full/res/layout/select_local_apps_list_item.xml b/legacy/src/full/res/layout/select_local_apps_list_item.xml
similarity index 100%
rename from app/src/full/res/layout/select_local_apps_list_item.xml
rename to legacy/src/full/res/layout/select_local_apps_list_item.xml
diff --git a/app/src/full/res/layout/start_swap_header.xml b/legacy/src/full/res/layout/start_swap_header.xml
similarity index 100%
rename from app/src/full/res/layout/start_swap_header.xml
rename to legacy/src/full/res/layout/start_swap_header.xml
diff --git a/app/src/full/res/layout/swap_activity.xml b/legacy/src/full/res/layout/swap_activity.xml
similarity index 100%
rename from app/src/full/res/layout/swap_activity.xml
rename to legacy/src/full/res/layout/swap_activity.xml
diff --git a/app/src/full/res/layout/swap_app_list_item.xml b/legacy/src/full/res/layout/swap_app_list_item.xml
similarity index 100%
rename from app/src/full/res/layout/swap_app_list_item.xml
rename to legacy/src/full/res/layout/swap_app_list_item.xml
diff --git a/app/src/full/res/layout/swap_confirm_receive.xml b/legacy/src/full/res/layout/swap_confirm_receive.xml
similarity index 100%
rename from app/src/full/res/layout/swap_confirm_receive.xml
rename to legacy/src/full/res/layout/swap_confirm_receive.xml
diff --git a/app/src/full/res/layout/swap_connecting.xml b/legacy/src/full/res/layout/swap_connecting.xml
similarity index 100%
rename from app/src/full/res/layout/swap_connecting.xml
rename to legacy/src/full/res/layout/swap_connecting.xml
diff --git a/app/src/full/res/layout/swap_join_wifi.xml b/legacy/src/full/res/layout/swap_join_wifi.xml
similarity index 100%
rename from app/src/full/res/layout/swap_join_wifi.xml
rename to legacy/src/full/res/layout/swap_join_wifi.xml
diff --git a/app/src/full/res/layout/swap_peer_list_item.xml b/legacy/src/full/res/layout/swap_peer_list_item.xml
similarity index 100%
rename from app/src/full/res/layout/swap_peer_list_item.xml
rename to legacy/src/full/res/layout/swap_peer_list_item.xml
diff --git a/app/src/full/res/layout/swap_select_apps.xml b/legacy/src/full/res/layout/swap_select_apps.xml
similarity index 100%
rename from app/src/full/res/layout/swap_select_apps.xml
rename to legacy/src/full/res/layout/swap_select_apps.xml
diff --git a/app/src/full/res/layout/swap_send_fdroid.xml b/legacy/src/full/res/layout/swap_send_fdroid.xml
similarity index 100%
rename from app/src/full/res/layout/swap_send_fdroid.xml
rename to legacy/src/full/res/layout/swap_send_fdroid.xml
diff --git a/app/src/full/res/layout/swap_start_swap.xml b/legacy/src/full/res/layout/swap_start_swap.xml
similarity index 100%
rename from app/src/full/res/layout/swap_start_swap.xml
rename to legacy/src/full/res/layout/swap_start_swap.xml
diff --git a/app/src/full/res/layout/swap_success.xml b/legacy/src/full/res/layout/swap_success.xml
similarity index 100%
rename from app/src/full/res/layout/swap_success.xml
rename to legacy/src/full/res/layout/swap_success.xml
diff --git a/app/src/full/res/layout/swap_wifi_qr.xml b/legacy/src/full/res/layout/swap_wifi_qr.xml
similarity index 100%
rename from app/src/full/res/layout/swap_wifi_qr.xml
rename to legacy/src/full/res/layout/swap_wifi_qr.xml
diff --git a/app/src/full/res/menu/main_activity_screens.xml b/legacy/src/full/res/menu/main_activity_screens.xml
similarity index 100%
rename from app/src/full/res/menu/main_activity_screens.xml
rename to legacy/src/full/res/menu/main_activity_screens.xml
diff --git a/app/src/full/res/menu/swap_next.xml b/legacy/src/full/res/menu/swap_next.xml
similarity index 100%
rename from app/src/full/res/menu/swap_next.xml
rename to legacy/src/full/res/menu/swap_next.xml
diff --git a/app/src/full/res/menu/swap_next_search.xml b/legacy/src/full/res/menu/swap_next_search.xml
similarity index 100%
rename from app/src/full/res/menu/swap_next_search.xml
rename to legacy/src/full/res/menu/swap_next_search.xml
diff --git a/app/src/full/res/menu/swap_search.xml b/legacy/src/full/res/menu/swap_search.xml
similarity index 100%
rename from app/src/full/res/menu/swap_search.xml
rename to legacy/src/full/res/menu/swap_search.xml
diff --git a/app/src/full/res/mipmap-hdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-hdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-hdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-hdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/mipmap-mdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-mdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-mdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-mdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png b/legacy/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png
similarity index 100%
rename from app/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png
rename to legacy/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png
diff --git a/app/src/full/res/values-night/colors.xml b/legacy/src/full/res/values-night/colors.xml
similarity index 100%
rename from app/src/full/res/values-night/colors.xml
rename to legacy/src/full/res/values-night/colors.xml
diff --git a/app/src/full/res/values/attrs.xml b/legacy/src/full/res/values/attrs.xml
similarity index 100%
rename from app/src/full/res/values/attrs.xml
rename to legacy/src/full/res/values/attrs.xml
diff --git a/app/src/full/res/values/colors.xml b/legacy/src/full/res/values/colors.xml
similarity index 100%
rename from app/src/full/res/values/colors.xml
rename to legacy/src/full/res/values/colors.xml
diff --git a/app/src/full/res/values/strings.xml b/legacy/src/full/res/values/strings.xml
similarity index 100%
rename from app/src/full/res/values/strings.xml
rename to legacy/src/full/res/values/strings.xml
diff --git a/app/src/full/res/values/styles.xml b/legacy/src/full/res/values/styles.xml
similarity index 100%
rename from app/src/full/res/values/styles.xml
rename to legacy/src/full/res/values/styles.xml
diff --git a/app/src/full/res/xml/device_filter.xml b/legacy/src/full/res/xml/device_filter.xml
similarity index 100%
rename from app/src/full/res/xml/device_filter.xml
rename to legacy/src/full/res/xml/device_filter.xml
diff --git a/app/src/full/res/xml/preferences_panic.xml b/legacy/src/full/res/xml/preferences_panic.xml
similarity index 93%
rename from app/src/full/res/xml/preferences_panic.xml
rename to legacy/src/full/res/xml/preferences_panic.xml
index 433d6b489..02b781ed6 100644
--- a/app/src/full/res/xml/preferences_panic.xml
+++ b/legacy/src/full/res/xml/preferences_panic.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
diff --git a/legacy/src/main/AndroidManifest.xml b/legacy/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..d1b189c0d
--- /dev/null
+++ b/legacy/src/main/AndroidManifest.xml
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Copyright (C) 2010-2012 Ciaran Gultnieks
+ * Copyright (C) 2013-2017 Peter Serwylo
+ * Copyright (C) 2014-2015 Daniel Martí
+ * Copyright (C) 2014-2018 Hans-Christoph Steiner
+ * Copyright (C) 2016 Dominik Schürmann
+ * Copyright (C) 2018 Torsten Grote
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:installLocation="auto">
+
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:resizeable="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true" />
+
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false" />
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
+
+    <!-- Permission used to externally trigger repository updates -->
+    <permission
+        android:name="${applicationId}.permission.UPDATE_REPOS"
+        android:protectionLevel="signature|privileged" />
+    <uses-permission android:name="${applicationId}.permission.UPDATE_REPOS" />
+
+    <application
+        android:name=".FDroidApp"
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/backup_extraction_rules"
+        android:description="@string/app_description"
+        android:fullBackupContent="@xml/backup_rules"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="${applicationLabel}"
+        android:localeConfig="@xml/locales_config"
+        android:memtagMode="async"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.App">
+
+        <activity
+            android:name=".privileged.views.InstallConfirmActivity"
+            android:configChanges="layoutDirection|locale"
+            android:excludeFromRecents="true"
+            android:label="@string/menu_install"
+            android:parentActivityName=".views.main.MainActivity" />
+
+        <activity
+            android:name=".privileged.views.UninstallDialogActivity"
+            android:excludeFromRecents="true" />
+
+        <activity
+            android:name=".views.repos.ManageReposActivity"
+            android:configChanges="layoutDirection|locale"
+            android:label="@string/menu_manage"
+            android:launchMode="singleTask"
+            android:parentActivityName=".views.main.MainActivity"/>
+
+        <activity
+            android:name=".views.repos.AddRepoActivity"
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:windowSoftInputMode="adjustResize"
+            android:parentActivityName=".views.main.MainActivity">
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="fdroid.link" />
+            </intent-filter>
+
+            <!-- Repo URLs -->
+
+            <!--
+            This intent serves two purposes: Swapping apps between devices and adding a
+            repo from a website (e.g. https://guardianproject.info/fdroid/repo).
+            We intercept both of these situations in the FDroid activity, and then redirect
+            to the appropriate handler (swap handling, manage repos respectively) from there.
+
+            The reason for this is that the only differentiating factor is the presence
+            of a "swap=1" in the query string, and intent-filter is unable to deal with
+            query parameters. An alternative would be to do something like fdroidswap:// as
+            a scheme, but then we need to copy/paste all of this intent-filter stuff and
+            keep it up to date when it changes or a bug is found.
+
+            This filter supports HTTP and HTTPS schemes. There is an additional filter for
+            fdroidrepo:// and fdroidrepos://
+            -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <!--
+                Android's scheme matcher is case-sensitive, so include
+                ALL CAPS versions to support ALL CAPS URLs in QR Codes.
+                QR Codes have a special ALL CAPS mode that uses a reduced
+                character set, making for more compact QR Codes.
+                -->
+                <data android:scheme="fdroidrepo" />
+                <data android:scheme="fdroidrepos" />
+                <data
+                    android:scheme="FDROIDREPO"
+                    tools:ignore="AppLinkUrlError" />
+                <data android:scheme="fdroidrepos" />
+                <data
+                    android:scheme="FDROIDREPOS"
+                    tools:ignore="AppLinkUrlError" />
+            </intent-filter>
+
+            <!--
+            The below intent filter most likely won't work anymore.
+            Using fdroid.link or fdroidrepos:// scheme is preferred.
+            -->
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <!--
+                Android's scheme matcher is case-sensitive, so include
+                ALL CAPS versions to support ALL CAPS URLs in QR Codes.
+                QR Codes have a special ALL CAPS mode that uses a reduced
+                character set, making for more compact QR Codes.
+                -->
+                <data android:scheme="http" />
+                <data
+                    android:scheme="HTTP"
+                    tools:ignore="AppLinkUrlError" />
+                <data android:scheme="https" />
+                <data
+                    android:scheme="HTTPS"
+                    tools:ignore="AppLinkUrlError" />
+
+                <data android:host="*" />
+
+                <!--
+                The pattern matcher here is poorly implemented, in particular the * is
+                non-greedy, so you have to do stupid tricks to match patterns that have
+                repeat characters in them. http://stackoverflow.com/a/8599921/306864
+                -->
+                <data android:path="/fdroid/repo" />
+                <data android:pathPattern="/fdroid/repo/*" />
+                <data android:pathPattern="/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/.*/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/.*/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/.*/.*/.*/fdroid/repo/*" />
+                <data android:pathPattern="/.*/.*/.*/.*/.*/.*/fdroid/repo" />
+                <data android:pathPattern="/.*/.*/.*/.*/.*/.*/fdroid/repo/*" />
+                <data android:path="/fdroid/archive" />
+                <data android:pathPattern="/fdroid/archive/*" />
+                <data android:pathPattern="/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/fdroid/archive/*" />
+                <data android:pathPattern="/.*/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/.*/fdroid/archive/*" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/.*/.*/fdroid/archive/*" />
+                <data android:pathPattern="/.*/.*/.*/.*/fdroid/archive" />
+                <data android:pathPattern="/.*/.*/.*/.*/fdroid/archive/*" />
+                <!--
+                Some QR Code scanners don't respect custom schemes like fdroidrepo://,
+                so this is a workaround, since the local repo URL is all uppercase in
+                the QR Code for sending the local repo to another device.
+                -->
+                <data android:path="/FDROID/REPO" />
+                <data android:pathPattern="/.*/FDROID/REPO" />
+                <data android:pathPattern="/.*/.*/FDROID/REPO" />
+                <data android:pathPattern="/.*/.*/.*/FDROID/REPO" />
+            </intent-filter>
+
+            <intent-filter android:label="@string/repo_add_new_title">
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".views.IpfsGatewaySettingsActivity"
+            android:configChanges="layoutDirection|locale"
+            android:label="@string/ipfsgw_title"
+            android:launchMode="singleTask"
+            android:parentActivityName=".views.main.MainActivity"></activity>
+
+        <activity
+            android:name=".views.IpfsGatewayAddActivity"
+            android:launchMode="singleTask"
+            android:parentActivityName=".views.main.MainActivity" />
+
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:replace="screenOrientation" />
+
+        <activity
+            android:name=".views.repos.RepoDetailsActivity"
+            android:configChanges="layoutDirection|locale"
+            android:label="@string/repo_details"
+            android:parentActivityName=".views.repos.ManageReposActivity"
+            android:windowSoftInputMode="stateHidden"/>
+
+        <activity
+            android:name=".views.AppDetailsActivity"
+            android:configChanges="layoutDirection|locale"
+            android:exported="true"
+            android:label="@string/app_details"
+            android:parentActivityName=".views.main.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.SHOW_APP_INFO" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".views.ScreenShotsActivity" />
+
+        <activity
+            android:name=".data.ObbUrlActivity"
+            android:theme="@android:style/Theme.NoDisplay" />
+
+        <activity
+            android:name=".installer.DefaultInstallerActivity"
+            android:theme="@style/Theme.App.Transparent" />
+        <activity
+            android:name=".installer.ErrorDialogActivity"
+            android:theme="@style/Theme.App.Transparent" />
+
+        <activity
+            android:name=".views.main.MainActivity"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.APP_MARKET" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+
+            <!-- App URLs -->
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="fdroid.app" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="f-droid.org" />
+                <data android:host="www.f-droid.org" />
+                <data android:host="staging.f-droid.org" />
+                <data android:host="cloudflare.f-droid.org" />
+                <data android:pathPrefix="/app/" />
+                <data android:pathPrefix="/packages/" />
+                <data android:pathPrefix="/repository/browse" />
+                <!-- support localized URLs -->
+                <data android:pathPattern="/.*/packages/.*" />
+                <data android:pathPattern="/.*/packages/.*/" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:host="f-droid.org" />
+                <data android:host="www.f-droid.org" />
+                <data android:host="staging.f-droid.org" />
+                <data android:host="cloudflare.f-droid.org" />
+                <data android:pathPrefix="/app/" />
+                <data android:pathPrefix="/packages/" />
+                <data android:pathPrefix="/repository/browse" />
+                <!-- support localized URLs -->
+                <data android:pathPattern="/.*/packages/.*" />
+                <data android:pathPattern="/.*/packages/.*/" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="details"
+                    android:scheme="market" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="play.google.com" /> <!-- they don't do www. -->
+                <data android:path="/store/apps/details" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="apps"
+                    android:path="/android"
+                    android:scheme="amzn" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="amazon.com" />
+                <data android:host="www.amazon.com" />
+                <data android:path="/gp/mas/dl/android" />
+            </intent-filter>
+
+
+            <!-- Search URLs -->
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="fdroid.search" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="search"
+                    android:scheme="market" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="play.google.com" /> <!-- they don't do www. -->
+                <data android:path="/store/search" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+
+            <!-- Handle NFC tags detected from outside our application -->
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+
+        </activity>
+        <activity android:name=".views.apps.AppListActivity" />
+        <activity
+            android:name=".views.installed.InstalledAppsActivity"
+            android:parentActivityName=".views.main.MainActivity"></activity>
+        <activity
+            android:name=".views.InstallHistoryActivity"
+            android:parentActivityName=".views.main.MainActivity"></activity>
+
+        <activity
+            android:name=".installer.FileInstallerActivity"
+            android:theme="@style/Theme.App.Transparent" />
+
+        <provider
+            android:name="org.fdroid.fdroid.installer.ApkFileProvider"
+            android:authorities="${applicationId}.installer.ApkFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/apk_file_provider" />
+        </provider>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.installer"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/installer_file_provider" />
+        </provider>
+        <provider
+            android:name="org.fdroid.fdroid.nearby.PublicSourceDirProvider"
+            android:authorities="${applicationId}.nearby.PublicSourceDirProvider"
+            android:exported="false"
+            android:grantUriPermissions="true" />
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="remove"></provider>
+
+        <receiver
+            android:name=".receiver.StartupReceiver"
+            android:exported="false">
+            <intent-filter>
+                <!-- Implicit Broadcast Exception
+                https://developer.android.com/guide/components/broadcast-exceptions -->
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name=".NotificationBroadcastReceiver"
+            android:exported="false">
+            <!-- Doesn't require an intent-filter because it is explicitly invoked via Intent.setClass() -->
+        </receiver>
+        <receiver android:name=".receiver.RepoUpdateReceiver"
+            android:exported="true"
+            android:permission="${applicationId}.permission.UPDATE_REPOS">
+            <intent-filter>
+                <action android:name="org.fdroid.action.UPDATE_REPOS" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name=".receiver.UnarchivePackageReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.UNARCHIVE_PACKAGE" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name=".net.DownloaderService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <service
+            android:name=".installer.InstallerService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <!-- needed for declaring foregroundServiceType for WorkManager -->
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
+        <service
+            android:name=".DeleteCacheService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <service
+            android:name=".net.ConnectivityMonitorService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <service
+            android:name=".installer.InstallHistoryService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <service
+            android:name=".installer.ObfInstallerService"
+            android:exported="false" />
+
+    </application>
+
+</manifest>
diff --git a/app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl b/legacy/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl
similarity index 100%
rename from app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl
rename to legacy/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedCallback.aidl
diff --git a/app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl b/legacy/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl
similarity index 100%
rename from app/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl
rename to legacy/src/main/aidl/org/fdroid/fdroid/privileged/IPrivilegedService.aidl
diff --git a/app/src/main/assets/index.template.html b/legacy/src/main/assets/index.template.html
similarity index 100%
rename from app/src/main/assets/index.template.html
rename to legacy/src/main/assets/index.template.html
diff --git a/next/src/main/assets/logback.xml b/legacy/src/main/assets/logback.xml
similarity index 100%
rename from next/src/main/assets/logback.xml
rename to legacy/src/main/assets/logback.xml
diff --git a/app/src/main/assets/swap-icon.png b/legacy/src/main/assets/swap-icon.png
similarity index 100%
rename from app/src/main/assets/swap-icon.png
rename to legacy/src/main/assets/swap-icon.png
diff --git a/app/src/main/assets/swap-icon.svg b/legacy/src/main/assets/swap-icon.svg
similarity index 84%
rename from app/src/main/assets/swap-icon.svg
rename to legacy/src/main/assets/swap-icon.svg
index adcd0b51c..43db30a87 100644
--- a/app/src/main/assets/swap-icon.svg
+++ b/legacy/src/main/assets/swap-icon.svg
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="210.73421"
-   height="146.02573"
-   id="svg4443">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" version="1.1" width="210.73421" height="146.02573" id="svg4443">
   <defs
      id="defs4445" />
   <metadata
diff --git a/app/src/main/assets/swap-tick-done.png b/legacy/src/main/assets/swap-tick-done.png
similarity index 100%
rename from app/src/main/assets/swap-tick-done.png
rename to legacy/src/main/assets/swap-tick-done.png
diff --git a/app/src/main/assets/swap-tick-not-done.png b/legacy/src/main/assets/swap-tick-not-done.png
similarity index 100%
rename from app/src/main/assets/swap-tick-not-done.png
rename to legacy/src/main/assets/swap-tick-not-done.png
diff --git a/app/src/main/java/com/google/zxing/encode/Contents.java b/legacy/src/main/java/com/google/zxing/encode/Contents.java
similarity index 100%
rename from app/src/main/java/com/google/zxing/encode/Contents.java
rename to legacy/src/main/java/com/google/zxing/encode/Contents.java
diff --git a/app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java b/legacy/src/main/java/com/google/zxing/encode/QRCodeEncoder.java
similarity index 100%
rename from app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java
rename to legacy/src/main/java/com/google/zxing/encode/QRCodeEncoder.java
diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateManager.kt b/legacy/src/main/java/org/fdroid/fdroid/AppUpdateManager.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/AppUpdateManager.kt
rename to legacy/src/main/java/org/fdroid/fdroid/AppUpdateManager.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java b/legacy/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
rename to legacy/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
diff --git a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java b/legacy/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
rename to legacy/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
diff --git a/app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java b/legacy/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
rename to legacy/src/main/java/org/fdroid/fdroid/DeleteCacheService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/legacy/src/main/java/org/fdroid/fdroid/FDroidApp.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/FDroidApp.java
rename to legacy/src/main/java/org/fdroid/fdroid/FDroidApp.java
diff --git a/app/src/main/java/org/fdroid/fdroid/Hasher.java b/legacy/src/main/java/org/fdroid/fdroid/Hasher.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Hasher.java
rename to legacy/src/main/java/org/fdroid/fdroid/Hasher.java
diff --git a/app/src/main/java/org/fdroid/fdroid/IPreferencesIpfs.java b/legacy/src/main/java/org/fdroid/fdroid/IPreferencesIpfs.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/IPreferencesIpfs.java
rename to legacy/src/main/java/org/fdroid/fdroid/IPreferencesIpfs.java
diff --git a/app/src/main/java/org/fdroid/fdroid/Languages.java b/legacy/src/main/java/org/fdroid/fdroid/Languages.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Languages.java
rename to legacy/src/main/java/org/fdroid/fdroid/Languages.java
diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationBroadcastReceiver.java b/legacy/src/main/java/org/fdroid/fdroid/NotificationBroadcastReceiver.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/NotificationBroadcastReceiver.java
rename to legacy/src/main/java/org/fdroid/fdroid/NotificationBroadcastReceiver.java
diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/legacy/src/main/java/org/fdroid/fdroid/NotificationHelper.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
rename to legacy/src/main/java/org/fdroid/fdroid/NotificationHelper.java
diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationManager.kt b/legacy/src/main/java/org/fdroid/fdroid/NotificationManager.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/NotificationManager.kt
rename to legacy/src/main/java/org/fdroid/fdroid/NotificationManager.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/legacy/src/main/java/org/fdroid/fdroid/Preferences.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Preferences.java
rename to legacy/src/main/java/org/fdroid/fdroid/Preferences.java
diff --git a/app/src/main/java/org/fdroid/fdroid/RepoUpdateManager.kt b/legacy/src/main/java/org/fdroid/fdroid/RepoUpdateManager.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/RepoUpdateManager.kt
rename to legacy/src/main/java/org/fdroid/fdroid/RepoUpdateManager.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/legacy/src/main/java/org/fdroid/fdroid/Utils.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Utils.java
rename to legacy/src/main/java/org/fdroid/fdroid/Utils.java
diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.kt b/legacy/src/main/java/org/fdroid/fdroid/Utils.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/Utils.kt
rename to legacy/src/main/java/org/fdroid/fdroid/Utils.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java b/legacy/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
rename to legacy/src/main/java/org/fdroid/fdroid/compat/FileCompat.java
diff --git a/app/src/main/java/org/fdroid/fdroid/compat/LocaleCompat.java b/legacy/src/main/java/org/fdroid/fdroid/compat/LocaleCompat.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compat/LocaleCompat.java
rename to legacy/src/main/java/org/fdroid/fdroid/compat/LocaleCompat.java
diff --git a/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java b/legacy/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
rename to legacy/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java
diff --git a/app/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt b/legacy/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt
rename to legacy/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/compose/FDroidExpandableRow.kt b/legacy/src/main/java/org/fdroid/fdroid/compose/FDroidExpandableRow.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/compose/FDroidExpandableRow.kt
rename to legacy/src/main/java/org/fdroid/fdroid/compose/FDroidExpandableRow.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt b/legacy/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
similarity index 99%
rename from app/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
rename to legacy/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
index 0b3186752..d7444ae76 100644
--- a/app/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
+++ b/legacy/src/main/java/org/fdroid/fdroid/compose/FDroidSwitchRow.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.fdroid.fdroid.ui.theme.FDroidContent
-import kotlin.Unit
 
 @Composable
 fun FDroidSwitchRow(
diff --git a/app/src/main/java/org/fdroid/fdroid/data/Apk.java b/legacy/src/main/java/org/fdroid/fdroid/data/Apk.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/Apk.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/Apk.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/legacy/src/main/java/org/fdroid/fdroid/data/App.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/App.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/App.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java b/legacy/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/ContentProviderMigrator.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/legacy/src/main/java/org/fdroid/fdroid/data/DBHelper.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/DBHelper.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java b/legacy/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/ObbUrlActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java b/legacy/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java
rename to legacy/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ApkCache.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ApkCache.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ApkCache.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ApkFileProvider.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ApkVerifier.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java b/legacy/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java b/legacy/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ErrorDialogActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java b/legacy/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java b/legacy/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java b/legacy/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/InstallHistoryService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java b/legacy/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/legacy/src/main/java/org/fdroid/fdroid/installer/Installer.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/Installer.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/Installer.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java b/legacy/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java b/legacy/src/main/java/org/fdroid/fdroid/installer/InstallerService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/InstallerService.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/InstallerService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java b/legacy/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/ObfInstallerService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/legacy/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java b/legacy/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/SessionInstallManager.java
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java b/legacy/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java
rename to legacy/src/main/java/org/fdroid/fdroid/installer/SessionInstaller.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/BluetoothConnection.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/BluetoothConstants.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/PublicSourceDirProvider.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/PublicSourceDirProvider.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/PublicSourceDirProvider.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/PublicSourceDirProvider.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/ContentLengthHeader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/ETagHeader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/FileDetails.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Header.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Request.java
diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java b/legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
rename to legacy/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java b/legacy/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java b/legacy/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DnsCache.java b/legacy/src/main/java/org/fdroid/fdroid/net/DnsCache.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/DnsCache.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/DnsCache.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DnsWithCache.java b/legacy/src/main/java/org/fdroid/fdroid/net/DnsWithCache.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/DnsWithCache.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/DnsWithCache.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java b/legacy/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java b/legacy/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/FDroidGlideModule.java b/legacy/src/main/java/org/fdroid/fdroid/net/FDroidGlideModule.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/FDroidGlideModule.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/FDroidGlideModule.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/FDroidMirrorParameterManager.java b/legacy/src/main/java/org/fdroid/fdroid/net/FDroidMirrorParameterManager.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/FDroidMirrorParameterManager.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/FDroidMirrorParameterManager.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java b/legacy/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java b/legacy/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java
rename to legacy/src/main/java/org/fdroid/fdroid/net/TreeUriDownloader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java b/legacy/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/privileged/views/UninstallDialogActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java b/legacy/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java
rename to legacy/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsChecker.java
diff --git a/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java b/legacy/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java
rename to legacy/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/DeviceStorageReceiver.java b/legacy/src/main/java/org/fdroid/fdroid/receiver/DeviceStorageReceiver.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/receiver/DeviceStorageReceiver.java
rename to legacy/src/main/java/org/fdroid/fdroid/receiver/DeviceStorageReceiver.java
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/RepoUpdateReceiver.kt b/legacy/src/main/java/org/fdroid/fdroid/receiver/RepoUpdateReceiver.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/receiver/RepoUpdateReceiver.kt
rename to legacy/src/main/java/org/fdroid/fdroid/receiver/RepoUpdateReceiver.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java b/legacy/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
rename to legacy/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/UnarchivePackageReceiver.kt b/legacy/src/main/java/org/fdroid/fdroid/receiver/UnarchivePackageReceiver.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/receiver/UnarchivePackageReceiver.kt
rename to legacy/src/main/java/org/fdroid/fdroid/receiver/UnarchivePackageReceiver.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt b/legacy/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt
rename to legacy/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt b/legacy/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt
rename to legacy/src/main/java/org/fdroid/fdroid/ui/theme/Theme.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/InstallHistoryActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt b/legacy/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/IpfsGatewayAddActivity.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt b/legacy/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java b/legacy/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java b/legacy/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/ScreenShotsRecyclerViewAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java b/legacy/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/StatusBanner.java b/legacy/src/main/java/org/fdroid/fdroid/views/StatusBanner.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/StatusBanner.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/StatusBanner.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java b/legacy/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/appdetails/AntiFeaturesListingView.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/appdetails/AppDetailsViewModel.kt b/legacy/src/main/java/org/fdroid/fdroid/views/appdetails/AppDetailsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/appdetails/AppDetailsViewModel.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/appdetails/AppDetailsViewModel.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt b/legacy/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/appdetails/RepoChooser.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/AppListItemState.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/FeatureImage.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/FilterSpan.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/FilterSpan.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/FilterSpan.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/FilterSpan.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/FilterTextWatcher.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/FilterTextWatcher.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/FilterTextWatcher.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/FilterTextWatcher.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/apps/StandardAppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/AppPreviewAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryItem.java b/legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryItem.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/categories/CategoryItem.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/categories/CategoryItem.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/installed/InstalledAppsActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
similarity index 99%
rename from app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
index d6cdd0a90..9adc696f6 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
+++ b/legacy/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java
@@ -1,11 +1,13 @@
 package org.fdroid.fdroid.views.main;
 
 import android.view.ViewGroup;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import org.fdroid.database.AppOverviewItem;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.views.categories.AppCardController;
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java b/legacy/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/main/SettingsView.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoActivity.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoErrorScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoErrorScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoErrorScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoErrorScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/AddRepoIntroScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/ManageReposActivity.java b/legacy/src/main/java/org/fdroid/fdroid/views/repos/ManageReposActivity.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/ManageReposActivity.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/ManageReposActivity.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoIconComposable.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoIconComposable.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoIconComposable.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoIconComposable.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoPreviewScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoProgressScreen.kt b/legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoProgressScreen.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/repos/RepoProgressScreen.kt
rename to legacy/src/main/java/org/fdroid/fdroid/views/repos/RepoProgressScreen.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatus.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppStatusListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/AppUpdateData.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppUpdateData.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/AppUpdateData.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/AppUpdateData.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnApp.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableApp.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppListItemController.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java b/legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
rename to legacy/src/main/java/org/fdroid/fdroid/views/updates/items/UpdateableAppsHeader.java
diff --git a/app/src/main/java/org/fdroid/fdroid/work/AppUpdateWorker.kt b/legacy/src/main/java/org/fdroid/fdroid/work/AppUpdateWorker.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/AppUpdateWorker.kt
rename to legacy/src/main/java/org/fdroid/fdroid/work/AppUpdateWorker.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java b/legacy/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java
rename to legacy/src/main/java/org/fdroid/fdroid/work/CleanCacheWorker.java
diff --git a/app/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java b/legacy/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java
rename to legacy/src/main/java/org/fdroid/fdroid/work/FDroidMetricsWorker.java
diff --git a/app/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt b/legacy/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt
rename to legacy/src/main/java/org/fdroid/fdroid/work/RepoUpdateWorker.kt
diff --git a/app/src/main/java/org/fdroid/fdroid/work/UnarchiveWorker.kt b/legacy/src/main/java/org/fdroid/fdroid/work/UnarchiveWorker.kt
similarity index 100%
rename from app/src/main/java/org/fdroid/fdroid/work/UnarchiveWorker.kt
rename to legacy/src/main/java/org/fdroid/fdroid/work/UnarchiveWorker.kt
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/BinaryDecoder.java b/legacy/src/main/java/vendored/org/apache/commons/codec/BinaryDecoder.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/BinaryDecoder.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/BinaryDecoder.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/BinaryEncoder.java b/legacy/src/main/java/vendored/org/apache/commons/codec/BinaryEncoder.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/BinaryEncoder.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/BinaryEncoder.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/CharEncoding.java b/legacy/src/main/java/vendored/org/apache/commons/codec/CharEncoding.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/CharEncoding.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/CharEncoding.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/Decoder.java b/legacy/src/main/java/vendored/org/apache/commons/codec/Decoder.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/Decoder.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/Decoder.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/DecoderException.java b/legacy/src/main/java/vendored/org/apache/commons/codec/DecoderException.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/DecoderException.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/DecoderException.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/Encoder.java b/legacy/src/main/java/vendored/org/apache/commons/codec/Encoder.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/Encoder.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/Encoder.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/EncoderException.java b/legacy/src/main/java/vendored/org/apache/commons/codec/EncoderException.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/EncoderException.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/EncoderException.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/binary/CharSequenceUtils.java b/legacy/src/main/java/vendored/org/apache/commons/codec/binary/CharSequenceUtils.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/binary/CharSequenceUtils.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/binary/CharSequenceUtils.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/binary/Hex.java b/legacy/src/main/java/vendored/org/apache/commons/codec/binary/Hex.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/binary/Hex.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/binary/Hex.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/binary/StringUtils.java b/legacy/src/main/java/vendored/org/apache/commons/codec/binary/StringUtils.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/binary/StringUtils.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/binary/StringUtils.java
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java b/legacy/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
index 0db245497..7af956e04 100644
--- a/app/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
+++ b/legacy/src/main/java/vendored/org/apache/commons/codec/digest/DigestUtils.java
@@ -17,6 +17,8 @@
 
 package vendored.org.apache.commons.codec.digest;
 
+import androidx.annotation.RequiresApi;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,8 +36,6 @@ import java.security.NoSuchAlgorithmException;
 import vendored.org.apache.commons.codec.binary.Hex;
 import vendored.org.apache.commons.codec.binary.StringUtils;
 
-import androidx.annotation.RequiresApi;
-
 /**
  * Operations to simplify common {@link java.security.MessageDigest} tasks.
  * This class is immutable and thread-safe.
diff --git a/app/src/main/java/vendored/org/apache/commons/codec/digest/MessageDigestAlgorithms.java b/legacy/src/main/java/vendored/org/apache/commons/codec/digest/MessageDigestAlgorithms.java
similarity index 100%
rename from app/src/main/java/vendored/org/apache/commons/codec/digest/MessageDigestAlgorithms.java
rename to legacy/src/main/java/vendored/org/apache/commons/codec/digest/MessageDigestAlgorithms.java
diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher.xml b/legacy/src/main/res/drawable-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v26/ic_launcher.xml
rename to legacy/src/main/res/drawable-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml b/legacy/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
rename to legacy/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml
diff --git a/app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/legacy/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
rename to legacy/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_file_install.xml b/legacy/src/main/res/drawable-anydpi/ic_file_install.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_file_install.xml
rename to legacy/src/main/res/drawable-anydpi/ic_file_install.xml
diff --git a/app/src/main/res/drawable-hdpi/ic_coins_s.png b/legacy/src/main/res/drawable-hdpi/ic_coins_s.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_coins_s.png
rename to legacy/src/main/res/drawable-hdpi/ic_coins_s.png
diff --git a/app/src/main/res/drawable-hdpi/ic_file_install.png b/legacy/src/main/res/drawable-hdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-hdpi/ic_file_install.png
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/legacy/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_launcher.png
rename to legacy/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-hdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-hdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-hdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-hdpi/tab_unselected_holo.9.png b/legacy/src/main/res/drawable-hdpi/tab_unselected_holo.9.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/tab_unselected_holo.9.png
rename to legacy/src/main/res/drawable-hdpi/tab_unselected_holo.9.png
diff --git a/app/src/main/res/drawable-ldpi/ic_launcher.png b/legacy/src/main/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/ic_launcher.png
rename to legacy/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-ldpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-ldpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-ldpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-mdpi/ic_coins_s.png b/legacy/src/main/res/drawable-mdpi/ic_coins_s.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_coins_s.png
rename to legacy/src/main/res/drawable-mdpi/ic_coins_s.png
diff --git a/app/src/main/res/drawable-mdpi/ic_file_install.png b/legacy/src/main/res/drawable-mdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-mdpi/ic_file_install.png
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/legacy/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_launcher.png
rename to legacy/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-mdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-mdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-mdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-mdpi/tab_unselected_holo.9.png b/legacy/src/main/res/drawable-mdpi/tab_unselected_holo.9.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/tab_unselected_holo.9.png
rename to legacy/src/main/res/drawable-mdpi/tab_unselected_holo.9.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_coins_s.png b/legacy/src/main/res/drawable-xhdpi/ic_coins_s.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_coins_s.png
rename to legacy/src/main/res/drawable-xhdpi/ic_coins_s.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_install.png b/legacy/src/main/res/drawable-xhdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-xhdpi/ic_file_install.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/legacy/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_launcher.png
rename to legacy/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-xhdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-xhdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png b/legacy/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png
rename to legacy/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_install.png b/legacy/src/main/res/drawable-xxhdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-xxhdpi/ic_file_install.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/legacy/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to legacy/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-xxhdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-xxhdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png b/legacy/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png
rename to legacy/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_install.png b/legacy/src/main/res/drawable-xxxhdpi/ic_file_install.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_file_install.png
rename to legacy/src/main/res/drawable-xxxhdpi/ic_file_install.png
diff --git a/next/src/main/res/drawable/ic_launcher.png b/legacy/src/main/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from next/src/main/res/drawable/ic_launcher.png
rename to legacy/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png b/legacy/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png
rename to legacy/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png
diff --git a/app/src/main/res/drawable/app_version_item_status_incompatible.xml b/legacy/src/main/res/drawable/app_version_item_status_incompatible.xml
similarity index 100%
rename from app/src/main/res/drawable/app_version_item_status_incompatible.xml
rename to legacy/src/main/res/drawable/app_version_item_status_incompatible.xml
diff --git a/app/src/main/res/drawable/app_version_item_status_installed.xml b/legacy/src/main/res/drawable/app_version_item_status_installed.xml
similarity index 100%
rename from app/src/main/res/drawable/app_version_item_status_installed.xml
rename to legacy/src/main/res/drawable/app_version_item_status_installed.xml
diff --git a/app/src/main/res/drawable/app_version_item_status_new.xml b/legacy/src/main/res/drawable/app_version_item_status_new.xml
similarity index 100%
rename from app/src/main/res/drawable/app_version_item_status_new.xml
rename to legacy/src/main/res/drawable/app_version_item_status_new.xml
diff --git a/app/src/main/res/drawable/app_version_item_status_suggested.xml b/legacy/src/main/res/drawable/app_version_item_status_suggested.xml
similarity index 100%
rename from app/src/main/res/drawable/app_version_item_status_suggested.xml
rename to legacy/src/main/res/drawable/app_version_item_status_suggested.xml
diff --git a/app/src/main/res/drawable/background_circle.xml b/legacy/src/main/res/drawable/background_circle.xml
similarity index 100%
rename from app/src/main/res/drawable/background_circle.xml
rename to legacy/src/main/res/drawable/background_circle.xml
diff --git a/app/src/main/res/drawable/category_preview_app_card_background_dark.xml b/legacy/src/main/res/drawable/category_preview_app_card_background_dark.xml
similarity index 100%
rename from app/src/main/res/drawable/category_preview_app_card_background_dark.xml
rename to legacy/src/main/res/drawable/category_preview_app_card_background_dark.xml
diff --git a/app/src/main/res/drawable/category_preview_app_card_background_light.xml b/legacy/src/main/res/drawable/category_preview_app_card_background_light.xml
similarity index 100%
rename from app/src/main/res/drawable/category_preview_app_card_background_light.xml
rename to legacy/src/main/res/drawable/category_preview_app_card_background_light.xml
diff --git a/app/src/main/res/drawable/donation_option_bitcoin.xml b/legacy/src/main/res/drawable/donation_option_bitcoin.xml
similarity index 100%
rename from app/src/main/res/drawable/donation_option_bitcoin.xml
rename to legacy/src/main/res/drawable/donation_option_bitcoin.xml
diff --git a/app/src/main/res/drawable/donation_option_liberapay.xml b/legacy/src/main/res/drawable/donation_option_liberapay.xml
similarity index 100%
rename from app/src/main/res/drawable/donation_option_liberapay.xml
rename to legacy/src/main/res/drawable/donation_option_liberapay.xml
diff --git a/app/src/main/res/drawable/donation_option_litecoin.xml b/legacy/src/main/res/drawable/donation_option_litecoin.xml
similarity index 100%
rename from app/src/main/res/drawable/donation_option_litecoin.xml
rename to legacy/src/main/res/drawable/donation_option_litecoin.xml
diff --git a/app/src/main/res/drawable/donation_option_opencollective.xml b/legacy/src/main/res/drawable/donation_option_opencollective.xml
similarity index 100%
rename from app/src/main/res/drawable/donation_option_opencollective.xml
rename to legacy/src/main/res/drawable/donation_option_opencollective.xml
diff --git a/app/src/main/res/drawable/ic_add.xml b/legacy/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add.xml
rename to legacy/src/main/res/drawable/ic_add.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_ads.xml b/legacy/src/main/res/drawable/ic_antifeature_ads.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_ads.xml
rename to legacy/src/main/res/drawable/ic_antifeature_ads.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml b/legacy/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
rename to legacy/src/main/res/drawable/ic_antifeature_disabledalgorithm.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_knownvuln.xml b/legacy/src/main/res/drawable/ic_antifeature_knownvuln.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_knownvuln.xml
rename to legacy/src/main/res/drawable/ic_antifeature_knownvuln.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml b/legacy/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nonfreeadd.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml b/legacy/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nonfreeassets.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreedep.xml b/legacy/src/main/res/drawable/ic_antifeature_nonfreedep.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nonfreedep.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nonfreedep.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nonfreenet.xml b/legacy/src/main/res/drawable/ic_antifeature_nonfreenet.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nonfreenet.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nonfreenet.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nosourcesince.xml b/legacy/src/main/res/drawable/ic_antifeature_nosourcesince.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nosourcesince.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nosourcesince.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_nsfw.xml b/legacy/src/main/res/drawable/ic_antifeature_nsfw.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_nsfw.xml
rename to legacy/src/main/res/drawable/ic_antifeature_nsfw.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_tetherednet.xml b/legacy/src/main/res/drawable/ic_antifeature_tetherednet.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_tetherednet.xml
rename to legacy/src/main/res/drawable/ic_antifeature_tetherednet.xml
diff --git a/app/src/main/res/drawable/ic_antifeature_tracking.xml b/legacy/src/main/res/drawable/ic_antifeature_tracking.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_antifeature_tracking.xml
rename to legacy/src/main/res/drawable/ic_antifeature_tracking.xml
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/legacy/src/main/res/drawable/ic_arrow_back.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_back.xml
rename to legacy/src/main/res/drawable/ic_arrow_back.xml
diff --git a/app/src/main/res/drawable/ic_arrow_back_with_background.xml b/legacy/src/main/res/drawable/ic_arrow_back_with_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_back_with_background.xml
rename to legacy/src/main/res/drawable/ic_arrow_back_with_background.xml
diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/legacy/src/main/res/drawable/ic_arrow_forward.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_forward.xml
rename to legacy/src/main/res/drawable/ic_arrow_forward.xml
diff --git a/app/src/main/res/drawable/ic_author.xml b/legacy/src/main/res/drawable/ic_author.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_author.xml
rename to legacy/src/main/res/drawable/ic_author.xml
diff --git a/app/src/main/res/drawable/ic_cancel.xml b/legacy/src/main/res/drawable/ic_cancel.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cancel.xml
rename to legacy/src/main/res/drawable/ic_cancel.xml
diff --git a/app/src/main/res/drawable/ic_categories.xml b/legacy/src/main/res/drawable/ic_categories.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_categories.xml
rename to legacy/src/main/res/drawable/ic_categories.xml
diff --git a/app/src/main/res/drawable/ic_changelog.xml b/legacy/src/main/res/drawable/ic_changelog.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_changelog.xml
rename to legacy/src/main/res/drawable/ic_changelog.xml
diff --git a/app/src/main/res/drawable/ic_clear.xml b/legacy/src/main/res/drawable/ic_clear.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_clear.xml
rename to legacy/src/main/res/drawable/ic_clear.xml
diff --git a/app/src/main/res/drawable/ic_close.xml b/legacy/src/main/res/drawable/ic_close.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_close.xml
rename to legacy/src/main/res/drawable/ic_close.xml
diff --git a/app/src/main/res/drawable/ic_delete.xml b/legacy/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete.xml
rename to legacy/src/main/res/drawable/ic_delete.xml
diff --git a/app/src/main/res/drawable/ic_donate.xml b/legacy/src/main/res/drawable/ic_donate.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_donate.xml
rename to legacy/src/main/res/drawable/ic_donate.xml
diff --git a/app/src/main/res/drawable/ic_download.xml b/legacy/src/main/res/drawable/ic_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download.xml
rename to legacy/src/main/res/drawable/ic_download.xml
diff --git a/app/src/main/res/drawable/ic_download_progress.xml b/legacy/src/main/res/drawable/ic_download_progress.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress.xml
rename to legacy/src/main/res/drawable/ic_download_progress.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_0.xml b/legacy/src/main/res/drawable/ic_download_progress_0.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_0.xml
rename to legacy/src/main/res/drawable/ic_download_progress_0.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_105.xml b/legacy/src/main/res/drawable/ic_download_progress_105.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_105.xml
rename to legacy/src/main/res/drawable/ic_download_progress_105.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_120.xml b/legacy/src/main/res/drawable/ic_download_progress_120.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_120.xml
rename to legacy/src/main/res/drawable/ic_download_progress_120.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_135.xml b/legacy/src/main/res/drawable/ic_download_progress_135.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_135.xml
rename to legacy/src/main/res/drawable/ic_download_progress_135.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_15.xml b/legacy/src/main/res/drawable/ic_download_progress_15.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_15.xml
rename to legacy/src/main/res/drawable/ic_download_progress_15.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_150.xml b/legacy/src/main/res/drawable/ic_download_progress_150.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_150.xml
rename to legacy/src/main/res/drawable/ic_download_progress_150.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_165.xml b/legacy/src/main/res/drawable/ic_download_progress_165.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_165.xml
rename to legacy/src/main/res/drawable/ic_download_progress_165.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_180.xml b/legacy/src/main/res/drawable/ic_download_progress_180.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_180.xml
rename to legacy/src/main/res/drawable/ic_download_progress_180.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_195.xml b/legacy/src/main/res/drawable/ic_download_progress_195.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_195.xml
rename to legacy/src/main/res/drawable/ic_download_progress_195.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_210.xml b/legacy/src/main/res/drawable/ic_download_progress_210.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_210.xml
rename to legacy/src/main/res/drawable/ic_download_progress_210.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_225.xml b/legacy/src/main/res/drawable/ic_download_progress_225.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_225.xml
rename to legacy/src/main/res/drawable/ic_download_progress_225.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_240.xml b/legacy/src/main/res/drawable/ic_download_progress_240.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_240.xml
rename to legacy/src/main/res/drawable/ic_download_progress_240.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_255.xml b/legacy/src/main/res/drawable/ic_download_progress_255.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_255.xml
rename to legacy/src/main/res/drawable/ic_download_progress_255.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_270.xml b/legacy/src/main/res/drawable/ic_download_progress_270.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_270.xml
rename to legacy/src/main/res/drawable/ic_download_progress_270.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_285.xml b/legacy/src/main/res/drawable/ic_download_progress_285.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_285.xml
rename to legacy/src/main/res/drawable/ic_download_progress_285.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_30.xml b/legacy/src/main/res/drawable/ic_download_progress_30.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_30.xml
rename to legacy/src/main/res/drawable/ic_download_progress_30.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_300.xml b/legacy/src/main/res/drawable/ic_download_progress_300.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_300.xml
rename to legacy/src/main/res/drawable/ic_download_progress_300.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_315.xml b/legacy/src/main/res/drawable/ic_download_progress_315.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_315.xml
rename to legacy/src/main/res/drawable/ic_download_progress_315.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_330.xml b/legacy/src/main/res/drawable/ic_download_progress_330.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_330.xml
rename to legacy/src/main/res/drawable/ic_download_progress_330.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_345.xml b/legacy/src/main/res/drawable/ic_download_progress_345.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_345.xml
rename to legacy/src/main/res/drawable/ic_download_progress_345.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_360.xml b/legacy/src/main/res/drawable/ic_download_progress_360.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_360.xml
rename to legacy/src/main/res/drawable/ic_download_progress_360.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_45.xml b/legacy/src/main/res/drawable/ic_download_progress_45.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_45.xml
rename to legacy/src/main/res/drawable/ic_download_progress_45.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_60.xml b/legacy/src/main/res/drawable/ic_download_progress_60.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_60.xml
rename to legacy/src/main/res/drawable/ic_download_progress_60.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_75.xml b/legacy/src/main/res/drawable/ic_download_progress_75.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_75.xml
rename to legacy/src/main/res/drawable/ic_download_progress_75.xml
diff --git a/app/src/main/res/drawable/ic_download_progress_90.xml b/legacy/src/main/res/drawable/ic_download_progress_90.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_download_progress_90.xml
rename to legacy/src/main/res/drawable/ic_download_progress_90.xml
diff --git a/app/src/main/res/drawable/ic_email.xml b/legacy/src/main/res/drawable/ic_email.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_email.xml
rename to legacy/src/main/res/drawable/ic_email.xml
diff --git a/app/src/main/res/drawable/ic_error.xml b/legacy/src/main/res/drawable/ic_error.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_error.xml
rename to legacy/src/main/res/drawable/ic_error.xml
diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/legacy/src/main/res/drawable/ic_expand_less.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_less.xml
rename to legacy/src/main/res/drawable/ic_expand_less.xml
diff --git a/app/src/main/res/drawable/ic_expand_more.xml b/legacy/src/main/res/drawable/ic_expand_more.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_more.xml
rename to legacy/src/main/res/drawable/ic_expand_more.xml
diff --git a/app/src/main/res/drawable/ic_file_download.xml b/legacy/src/main/res/drawable/ic_file_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_download.xml
rename to legacy/src/main/res/drawable/ic_file_download.xml
diff --git a/app/src/main/res/drawable/ic_info.xml b/legacy/src/main/res/drawable/ic_info.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_info.xml
rename to legacy/src/main/res/drawable/ic_info.xml
diff --git a/app/src/main/res/drawable/ic_known_vuln_overlay.xml b/legacy/src/main/res/drawable/ic_known_vuln_overlay.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_known_vuln_overlay.xml
rename to legacy/src/main/res/drawable/ic_known_vuln_overlay.xml
diff --git a/app/src/main/res/drawable/ic_last_updated.xml b/legacy/src/main/res/drawable/ic_last_updated.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_last_updated.xml
rename to legacy/src/main/res/drawable/ic_last_updated.xml
diff --git a/app/src/main/res/drawable/ic_latest.xml b/legacy/src/main/res/drawable/ic_latest.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_latest.xml
rename to legacy/src/main/res/drawable/ic_latest.xml
diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/legacy/src/main/res/drawable/ic_launcher_monochrome.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_monochrome.xml
rename to legacy/src/main/res/drawable/ic_launcher_monochrome.xml
diff --git a/app/src/main/res/drawable/ic_license.xml b/legacy/src/main/res/drawable/ic_license.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_license.xml
rename to legacy/src/main/res/drawable/ic_license.xml
diff --git a/app/src/main/res/drawable/ic_link.xml b/legacy/src/main/res/drawable/ic_link.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_link.xml
rename to legacy/src/main/res/drawable/ic_link.xml
diff --git a/app/src/main/res/drawable/ic_lock.xml b/legacy/src/main/res/drawable/ic_lock.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_lock.xml
rename to legacy/src/main/res/drawable/ic_lock.xml
diff --git a/app/src/main/res/drawable/ic_more.xml b/legacy/src/main/res/drawable/ic_more.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_more.xml
rename to legacy/src/main/res/drawable/ic_more.xml
diff --git a/app/src/main/res/drawable/ic_more_with_background.xml b/legacy/src/main/res/drawable/ic_more_with_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_more_with_background.xml
rename to legacy/src/main/res/drawable/ic_more_with_background.xml
diff --git a/next/src/main/res/drawable/ic_notification.xml b/legacy/src/main/res/drawable/ic_notification.xml
similarity index 96%
rename from next/src/main/res/drawable/ic_notification.xml
rename to legacy/src/main/res/drawable/ic_notification.xml
index 53951dfa5..ecba10fa2 100644
--- a/next/src/main/res/drawable/ic_notification.xml
+++ b/legacy/src/main/res/drawable/ic_notification.xml
@@ -1,6 +1,6 @@
 <vector android:height="24dp"
     android:viewportHeight="48.0"
-    android:tint="?android:attr/colorControlNormal"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="48.0"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/ic_notification_download.xml b/legacy/src/main/res/drawable/ic_notification_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_notification_download.xml
rename to legacy/src/main/res/drawable/ic_notification_download.xml
diff --git a/app/src/main/res/drawable/ic_perm_device_info.xml b/legacy/src/main/res/drawable/ic_perm_device_info.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_perm_device_info.xml
rename to legacy/src/main/res/drawable/ic_perm_device_info.xml
diff --git a/next/src/main/res/drawable/ic_refresh.xml b/legacy/src/main/res/drawable/ic_refresh.xml
similarity index 90%
rename from next/src/main/res/drawable/ic_refresh.xml
rename to legacy/src/main/res/drawable/ic_refresh.xml
index 15e746762..e9b1ec853 100644
--- a/next/src/main/res/drawable/ic_refresh.xml
+++ b/legacy/src/main/res/drawable/ic_refresh.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?android:attr/colorControlNormal"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_repo.xml b/legacy/src/main/res/drawable/ic_repo.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_repo.xml
rename to legacy/src/main/res/drawable/ic_repo.xml
diff --git a/app/src/main/res/drawable/ic_search.xml b/legacy/src/main/res/drawable/ic_search.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search.xml
rename to legacy/src/main/res/drawable/ic_search.xml
diff --git a/app/src/main/res/drawable/ic_settings.xml b/legacy/src/main/res/drawable/ic_settings.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings.xml
rename to legacy/src/main/res/drawable/ic_settings.xml
diff --git a/app/src/main/res/drawable/ic_share.xml b/legacy/src/main/res/drawable/ic_share.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_share.xml
rename to legacy/src/main/res/drawable/ic_share.xml
diff --git a/app/src/main/res/drawable/ic_share_with_background.xml b/legacy/src/main/res/drawable/ic_share_with_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_share_with_background.xml
rename to legacy/src/main/res/drawable/ic_share_with_background.xml
diff --git a/app/src/main/res/drawable/ic_sort.xml b/legacy/src/main/res/drawable/ic_sort.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_sort.xml
rename to legacy/src/main/res/drawable/ic_sort.xml
diff --git a/app/src/main/res/drawable/ic_source_code.xml b/legacy/src/main/res/drawable/ic_source_code.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_source_code.xml
rename to legacy/src/main/res/drawable/ic_source_code.xml
diff --git a/app/src/main/res/drawable/ic_translation.xml b/legacy/src/main/res/drawable/ic_translation.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_translation.xml
rename to legacy/src/main/res/drawable/ic_translation.xml
diff --git a/app/src/main/res/drawable/ic_updates.xml b/legacy/src/main/res/drawable/ic_updates.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_updates.xml
rename to legacy/src/main/res/drawable/ic_updates.xml
diff --git a/app/src/main/res/drawable/ic_versions.xml b/legacy/src/main/res/drawable/ic_versions.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_versions.xml
rename to legacy/src/main/res/drawable/ic_versions.xml
diff --git a/app/src/main/res/drawable/ic_video.xml b/legacy/src/main/res/drawable/ic_video.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_video.xml
rename to legacy/src/main/res/drawable/ic_video.xml
diff --git a/app/src/main/res/drawable/ic_warning.xml b/legacy/src/main/res/drawable/ic_warning.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_warning.xml
rename to legacy/src/main/res/drawable/ic_warning.xml
diff --git a/app/src/main/res/drawable/ic_website.xml b/legacy/src/main/res/drawable/ic_website.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_website.xml
rename to legacy/src/main/res/drawable/ic_website.xml
diff --git a/app/src/main/res/drawable/no_updates_bg.xml b/legacy/src/main/res/drawable/no_updates_bg.xml
similarity index 100%
rename from app/src/main/res/drawable/no_updates_bg.xml
rename to legacy/src/main/res/drawable/no_updates_bg.xml
diff --git a/app/src/main/res/drawable/screenshot_placeholder.xml b/legacy/src/main/res/drawable/screenshot_placeholder.xml
similarity index 100%
rename from app/src/main/res/drawable/screenshot_placeholder.xml
rename to legacy/src/main/res/drawable/screenshot_placeholder.xml
diff --git a/app/src/main/res/drawable/seekbar_background.xml b/legacy/src/main/res/drawable/seekbar_background.xml
similarity index 100%
rename from app/src/main/res/drawable/seekbar_background.xml
rename to legacy/src/main/res/drawable/seekbar_background.xml
diff --git a/app/src/main/res/drawable/seekbar_thumb.xml b/legacy/src/main/res/drawable/seekbar_thumb.xml
similarity index 100%
rename from app/src/main/res/drawable/seekbar_thumb.xml
rename to legacy/src/main/res/drawable/seekbar_thumb.xml
diff --git a/app/src/main/res/drawable/seekbar_tickmark.xml b/legacy/src/main/res/drawable/seekbar_tickmark.xml
similarity index 100%
rename from app/src/main/res/drawable/seekbar_tickmark.xml
rename to legacy/src/main/res/drawable/seekbar_tickmark.xml
diff --git a/app/src/main/res/drawable/swap_qr_example.png b/legacy/src/main/res/drawable/swap_qr_example.png
similarity index 100%
rename from app/src/main/res/drawable/swap_qr_example.png
rename to legacy/src/main/res/drawable/swap_qr_example.png
diff --git a/app/src/main/res/layout/about.xml b/legacy/src/main/res/layout/about.xml
similarity index 100%
rename from app/src/main/res/layout/about.xml
rename to legacy/src/main/res/layout/about.xml
diff --git a/app/src/main/res/layout/activity_app_list.xml b/legacy/src/main/res/layout/activity_app_list.xml
similarity index 100%
rename from app/src/main/res/layout/activity_app_list.xml
rename to legacy/src/main/res/layout/activity_app_list.xml
diff --git a/app/src/main/res/layout/activity_install_history.xml b/legacy/src/main/res/layout/activity_install_history.xml
similarity index 100%
rename from app/src/main/res/layout/activity_install_history.xml
rename to legacy/src/main/res/layout/activity_install_history.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/legacy/src/main/res/layout/activity_main.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to legacy/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_screenshots.xml b/legacy/src/main/res/layout/activity_screenshots.xml
similarity index 100%
rename from app/src/main/res/layout/activity_screenshots.xml
rename to legacy/src/main/res/layout/activity_screenshots.xml
diff --git a/app/src/main/res/layout/activity_screenshots_page.xml b/legacy/src/main/res/layout/activity_screenshots_page.xml
similarity index 100%
rename from app/src/main/res/layout/activity_screenshots_page.xml
rename to legacy/src/main/res/layout/activity_screenshots_page.xml
diff --git a/app/src/main/res/layout/app_card_horizontal.xml b/legacy/src/main/res/layout/app_card_horizontal.xml
similarity index 100%
rename from app/src/main/res/layout/app_card_horizontal.xml
rename to legacy/src/main/res/layout/app_card_horizontal.xml
diff --git a/app/src/main/res/layout/app_card_large.xml b/legacy/src/main/res/layout/app_card_large.xml
similarity index 100%
rename from app/src/main/res/layout/app_card_large.xml
rename to legacy/src/main/res/layout/app_card_large.xml
diff --git a/app/src/main/res/layout/app_card_list_item.xml b/legacy/src/main/res/layout/app_card_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_card_list_item.xml
rename to legacy/src/main/res/layout/app_card_list_item.xml
diff --git a/app/src/main/res/layout/app_card_normal.xml b/legacy/src/main/res/layout/app_card_normal.xml
similarity index 100%
rename from app/src/main/res/layout/app_card_normal.xml
rename to legacy/src/main/res/layout/app_card_normal.xml
diff --git a/app/src/main/res/layout/app_details2.xml b/legacy/src/main/res/layout/app_details2.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2.xml
rename to legacy/src/main/res/layout/app_details2.xml
diff --git a/app/src/main/res/layout/app_details2_donate.xml b/legacy/src/main/res/layout/app_details2_donate.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_donate.xml
rename to legacy/src/main/res/layout/app_details2_donate.xml
diff --git a/app/src/main/res/layout/app_details2_header.xml b/legacy/src/main/res/layout/app_details2_header.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_header.xml
rename to legacy/src/main/res/layout/app_details2_header.xml
diff --git a/app/src/main/res/layout/app_details2_link_item.xml b/legacy/src/main/res/layout/app_details2_link_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_link_item.xml
rename to legacy/src/main/res/layout/app_details2_link_item.xml
diff --git a/app/src/main/res/layout/app_details2_links.xml b/legacy/src/main/res/layout/app_details2_links.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_links.xml
rename to legacy/src/main/res/layout/app_details2_links.xml
diff --git a/app/src/main/res/layout/app_details2_loading.xml b/legacy/src/main/res/layout/app_details2_loading.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_loading.xml
rename to legacy/src/main/res/layout/app_details2_loading.xml
diff --git a/app/src/main/res/layout/app_details2_more_apps.xml b/legacy/src/main/res/layout/app_details2_more_apps.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_more_apps.xml
rename to legacy/src/main/res/layout/app_details2_more_apps.xml
diff --git a/app/src/main/res/layout/app_details2_screenshot_item.xml b/legacy/src/main/res/layout/app_details2_screenshot_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_screenshot_item.xml
rename to legacy/src/main/res/layout/app_details2_screenshot_item.xml
diff --git a/app/src/main/res/layout/app_details2_screenshots.xml b/legacy/src/main/res/layout/app_details2_screenshots.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_screenshots.xml
rename to legacy/src/main/res/layout/app_details2_screenshots.xml
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/legacy/src/main/res/layout/app_details2_version_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_details2_version_item.xml
rename to legacy/src/main/res/layout/app_details2_version_item.xml
diff --git a/app/src/main/res/layout/app_list_item.xml b/legacy/src/main/res/layout/app_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_list_item.xml
rename to legacy/src/main/res/layout/app_list_item.xml
diff --git a/app/src/main/res/layout/app_permission_item.xml b/legacy/src/main/res/layout/app_permission_item.xml
similarity index 100%
rename from app/src/main/res/layout/app_permission_item.xml
rename to legacy/src/main/res/layout/app_permission_item.xml
diff --git a/app/src/main/res/layout/app_permission_item_money.xml b/legacy/src/main/res/layout/app_permission_item_money.xml
similarity index 100%
rename from app/src/main/res/layout/app_permission_item_money.xml
rename to legacy/src/main/res/layout/app_permission_item_money.xml
diff --git a/app/src/main/res/layout/app_perms_summary.xml b/legacy/src/main/res/layout/app_perms_summary.xml
similarity index 100%
rename from app/src/main/res/layout/app_perms_summary.xml
rename to legacy/src/main/res/layout/app_perms_summary.xml
diff --git a/app/src/main/res/layout/app_status_new.xml b/legacy/src/main/res/layout/app_status_new.xml
similarity index 100%
rename from app/src/main/res/layout/app_status_new.xml
rename to legacy/src/main/res/layout/app_status_new.xml
diff --git a/app/src/main/res/layout/app_status_suggested.xml b/legacy/src/main/res/layout/app_status_suggested.xml
similarity index 100%
rename from app/src/main/res/layout/app_status_suggested.xml
rename to legacy/src/main/res/layout/app_status_suggested.xml
diff --git a/app/src/main/res/layout/category_item.xml b/legacy/src/main/res/layout/category_item.xml
similarity index 100%
rename from app/src/main/res/layout/category_item.xml
rename to legacy/src/main/res/layout/category_item.xml
diff --git a/app/src/main/res/layout/donate_bitcoin.xml b/legacy/src/main/res/layout/donate_bitcoin.xml
similarity index 100%
rename from app/src/main/res/layout/donate_bitcoin.xml
rename to legacy/src/main/res/layout/donate_bitcoin.xml
diff --git a/app/src/main/res/layout/donate_generic.xml b/legacy/src/main/res/layout/donate_generic.xml
similarity index 100%
rename from app/src/main/res/layout/donate_generic.xml
rename to legacy/src/main/res/layout/donate_generic.xml
diff --git a/app/src/main/res/layout/donate_liberapay.xml b/legacy/src/main/res/layout/donate_liberapay.xml
similarity index 100%
rename from app/src/main/res/layout/donate_liberapay.xml
rename to legacy/src/main/res/layout/donate_liberapay.xml
diff --git a/app/src/main/res/layout/donate_litecoin.xml b/legacy/src/main/res/layout/donate_litecoin.xml
similarity index 100%
rename from app/src/main/res/layout/donate_litecoin.xml
rename to legacy/src/main/res/layout/donate_litecoin.xml
diff --git a/app/src/main/res/layout/donate_opencollective.xml b/legacy/src/main/res/layout/donate_opencollective.xml
similarity index 100%
rename from app/src/main/res/layout/donate_opencollective.xml
rename to legacy/src/main/res/layout/donate_opencollective.xml
diff --git a/app/src/main/res/layout/fab_search.xml b/legacy/src/main/res/layout/fab_search.xml
similarity index 100%
rename from app/src/main/res/layout/fab_search.xml
rename to legacy/src/main/res/layout/fab_search.xml
diff --git a/app/src/main/res/layout/install_app_details.xml b/legacy/src/main/res/layout/install_app_details.xml
similarity index 100%
rename from app/src/main/res/layout/install_app_details.xml
rename to legacy/src/main/res/layout/install_app_details.xml
diff --git a/app/src/main/res/layout/install_confirm.xml b/legacy/src/main/res/layout/install_confirm.xml
similarity index 100%
rename from app/src/main/res/layout/install_confirm.xml
rename to legacy/src/main/res/layout/install_confirm.xml
diff --git a/app/src/main/res/layout/install_start.xml b/legacy/src/main/res/layout/install_start.xml
similarity index 100%
rename from app/src/main/res/layout/install_start.xml
rename to legacy/src/main/res/layout/install_start.xml
diff --git a/app/src/main/res/layout/installed_app_list_item.xml b/legacy/src/main/res/layout/installed_app_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/installed_app_list_item.xml
rename to legacy/src/main/res/layout/installed_app_list_item.xml
diff --git a/app/src/main/res/layout/installed_apps_layout.xml b/legacy/src/main/res/layout/installed_apps_layout.xml
similarity index 100%
rename from app/src/main/res/layout/installed_apps_layout.xml
rename to legacy/src/main/res/layout/installed_apps_layout.xml
diff --git a/app/src/main/res/layout/known_vuln_app_list_item.xml b/legacy/src/main/res/layout/known_vuln_app_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/known_vuln_app_list_item.xml
rename to legacy/src/main/res/layout/known_vuln_app_list_item.xml
diff --git a/app/src/main/res/layout/listitem_antifeaturelisting.xml b/legacy/src/main/res/layout/listitem_antifeaturelisting.xml
similarity index 100%
rename from app/src/main/res/layout/listitem_antifeaturelisting.xml
rename to legacy/src/main/res/layout/listitem_antifeaturelisting.xml
diff --git a/app/src/main/res/layout/login.xml b/legacy/src/main/res/layout/login.xml
similarity index 100%
rename from app/src/main/res/layout/login.xml
rename to legacy/src/main/res/layout/login.xml
diff --git a/app/src/main/res/layout/main_tab_categories.xml b/legacy/src/main/res/layout/main_tab_categories.xml
similarity index 100%
rename from app/src/main/res/layout/main_tab_categories.xml
rename to legacy/src/main/res/layout/main_tab_categories.xml
diff --git a/app/src/main/res/layout/main_tab_latest.xml b/legacy/src/main/res/layout/main_tab_latest.xml
similarity index 100%
rename from app/src/main/res/layout/main_tab_latest.xml
rename to legacy/src/main/res/layout/main_tab_latest.xml
diff --git a/app/src/main/res/layout/main_tab_settings.xml b/legacy/src/main/res/layout/main_tab_settings.xml
similarity index 100%
rename from app/src/main/res/layout/main_tab_settings.xml
rename to legacy/src/main/res/layout/main_tab_settings.xml
diff --git a/app/src/main/res/layout/main_tab_updates.xml b/legacy/src/main/res/layout/main_tab_updates.xml
similarity index 100%
rename from app/src/main/res/layout/main_tab_updates.xml
rename to legacy/src/main/res/layout/main_tab_updates.xml
diff --git a/app/src/main/res/layout/permissions_list.xml b/legacy/src/main/res/layout/permissions_list.xml
similarity index 100%
rename from app/src/main/res/layout/permissions_list.xml
rename to legacy/src/main/res/layout/permissions_list.xml
diff --git a/app/src/main/res/layout/preference_edit_text.xml b/legacy/src/main/res/layout/preference_edit_text.xml
similarity index 100%
rename from app/src/main/res/layout/preference_edit_text.xml
rename to legacy/src/main/res/layout/preference_edit_text.xml
diff --git a/app/src/main/res/layout/preference_seekbar.xml b/legacy/src/main/res/layout/preference_seekbar.xml
similarity index 100%
rename from app/src/main/res/layout/preference_seekbar.xml
rename to legacy/src/main/res/layout/preference_seekbar.xml
diff --git a/app/src/main/res/layout/preference_switch.xml b/legacy/src/main/res/layout/preference_switch.xml
similarity index 100%
rename from app/src/main/res/layout/preference_switch.xml
rename to legacy/src/main/res/layout/preference_switch.xml
diff --git a/app/src/main/res/layout/repo_item.xml b/legacy/src/main/res/layout/repo_item.xml
similarity index 100%
rename from app/src/main/res/layout/repo_item.xml
rename to legacy/src/main/res/layout/repo_item.xml
diff --git a/app/src/main/res/layout/repo_list_activity.xml b/legacy/src/main/res/layout/repo_list_activity.xml
similarity index 100%
rename from app/src/main/res/layout/repo_list_activity.xml
rename to legacy/src/main/res/layout/repo_list_activity.xml
diff --git a/app/src/main/res/layout/updateable_app_list_item.xml b/legacy/src/main/res/layout/updateable_app_list_item.xml
similarity index 100%
rename from app/src/main/res/layout/updateable_app_list_item.xml
rename to legacy/src/main/res/layout/updateable_app_list_item.xml
diff --git a/app/src/main/res/layout/updateable_app_status_item.xml b/legacy/src/main/res/layout/updateable_app_status_item.xml
similarity index 100%
rename from app/src/main/res/layout/updateable_app_status_item.xml
rename to legacy/src/main/res/layout/updateable_app_status_item.xml
diff --git a/app/src/main/res/layout/updates_header.xml b/legacy/src/main/res/layout/updates_header.xml
similarity index 100%
rename from app/src/main/res/layout/updates_header.xml
rename to legacy/src/main/res/layout/updates_header.xml
diff --git a/app/src/main/res/menu/details2.xml b/legacy/src/main/res/menu/details2.xml
similarity index 100%
rename from app/src/main/res/menu/details2.xml
rename to legacy/src/main/res/menu/details2.xml
diff --git a/app/src/main/res/menu/install_history.xml b/legacy/src/main/res/menu/install_history.xml
similarity index 100%
rename from app/src/main/res/menu/install_history.xml
rename to legacy/src/main/res/menu/install_history.xml
diff --git a/app/src/main/res/menu/installed_apps.xml b/legacy/src/main/res/menu/installed_apps.xml
similarity index 100%
rename from app/src/main/res/menu/installed_apps.xml
rename to legacy/src/main/res/menu/installed_apps.xml
diff --git a/app/src/main/res/menu/main_activity_screens.xml b/legacy/src/main/res/menu/main_activity_screens.xml
similarity index 100%
rename from app/src/main/res/menu/main_activity_screens.xml
rename to legacy/src/main/res/menu/main_activity_screens.xml
diff --git a/app/src/main/res/menu/repo_list.xml b/legacy/src/main/res/menu/repo_list.xml
similarity index 100%
rename from app/src/main/res/menu/repo_list.xml
rename to legacy/src/main/res/menu/repo_list.xml
diff --git a/app/src/main/res/values-af/strings.xml b/legacy/src/main/res/values-af/strings.xml
similarity index 100%
rename from app/src/main/res/values-af/strings.xml
rename to legacy/src/main/res/values-af/strings.xml
diff --git a/app/src/main/res/values-ar/strings.xml b/legacy/src/main/res/values-ar/strings.xml
similarity index 100%
rename from app/src/main/res/values-ar/strings.xml
rename to legacy/src/main/res/values-ar/strings.xml
diff --git a/app/src/main/res/values-ast/strings.xml b/legacy/src/main/res/values-ast/strings.xml
similarity index 100%
rename from app/src/main/res/values-ast/strings.xml
rename to legacy/src/main/res/values-ast/strings.xml
diff --git a/app/src/main/res/values-az/strings.xml b/legacy/src/main/res/values-az/strings.xml
similarity index 100%
rename from app/src/main/res/values-az/strings.xml
rename to legacy/src/main/res/values-az/strings.xml
diff --git a/app/src/main/res/values-b+hi+Latn/strings.xml b/legacy/src/main/res/values-b+hi+Latn/strings.xml
similarity index 100%
rename from app/src/main/res/values-b+hi+Latn/strings.xml
rename to legacy/src/main/res/values-b+hi+Latn/strings.xml
diff --git a/app/src/main/res/values-be/strings.xml b/legacy/src/main/res/values-be/strings.xml
similarity index 100%
rename from app/src/main/res/values-be/strings.xml
rename to legacy/src/main/res/values-be/strings.xml
diff --git a/app/src/main/res/values-ber/strings.xml b/legacy/src/main/res/values-ber/strings.xml
similarity index 100%
rename from app/src/main/res/values-ber/strings.xml
rename to legacy/src/main/res/values-ber/strings.xml
diff --git a/app/src/main/res/values-bg/strings.xml b/legacy/src/main/res/values-bg/strings.xml
similarity index 100%
rename from app/src/main/res/values-bg/strings.xml
rename to legacy/src/main/res/values-bg/strings.xml
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/legacy/src/main/res/values-bn-rBD/strings.xml
similarity index 100%
rename from app/src/main/res/values-bn-rBD/strings.xml
rename to legacy/src/main/res/values-bn-rBD/strings.xml
diff --git a/app/src/main/res/values-bn/strings.xml b/legacy/src/main/res/values-bn/strings.xml
similarity index 100%
rename from app/src/main/res/values-bn/strings.xml
rename to legacy/src/main/res/values-bn/strings.xml
diff --git a/app/src/main/res/values-bo/strings.xml b/legacy/src/main/res/values-bo/strings.xml
similarity index 100%
rename from app/src/main/res/values-bo/strings.xml
rename to legacy/src/main/res/values-bo/strings.xml
diff --git a/app/src/main/res/values-br/strings.xml b/legacy/src/main/res/values-br/strings.xml
similarity index 100%
rename from app/src/main/res/values-br/strings.xml
rename to legacy/src/main/res/values-br/strings.xml
diff --git a/app/src/main/res/values-ca/strings.xml b/legacy/src/main/res/values-ca/strings.xml
similarity index 100%
rename from app/src/main/res/values-ca/strings.xml
rename to legacy/src/main/res/values-ca/strings.xml
diff --git a/app/src/main/res/values-ckb/strings.xml b/legacy/src/main/res/values-ckb/strings.xml
similarity index 100%
rename from app/src/main/res/values-ckb/strings.xml
rename to legacy/src/main/res/values-ckb/strings.xml
diff --git a/app/src/main/res/values-cs/strings.xml b/legacy/src/main/res/values-cs/strings.xml
similarity index 100%
rename from app/src/main/res/values-cs/strings.xml
rename to legacy/src/main/res/values-cs/strings.xml
diff --git a/app/src/main/res/values-cy/strings.xml b/legacy/src/main/res/values-cy/strings.xml
similarity index 100%
rename from app/src/main/res/values-cy/strings.xml
rename to legacy/src/main/res/values-cy/strings.xml
diff --git a/app/src/main/res/values-da/strings.xml b/legacy/src/main/res/values-da/strings.xml
similarity index 100%
rename from app/src/main/res/values-da/strings.xml
rename to legacy/src/main/res/values-da/strings.xml
diff --git a/app/src/main/res/values-de/strings.xml b/legacy/src/main/res/values-de/strings.xml
similarity index 100%
rename from app/src/main/res/values-de/strings.xml
rename to legacy/src/main/res/values-de/strings.xml
diff --git a/app/src/main/res/values-el/strings.xml b/legacy/src/main/res/values-el/strings.xml
similarity index 100%
rename from app/src/main/res/values-el/strings.xml
rename to legacy/src/main/res/values-el/strings.xml
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/legacy/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from app/src/main/res/values-en-rGB/strings.xml
rename to legacy/src/main/res/values-en-rGB/strings.xml
diff --git a/app/src/main/res/values-eo/strings.xml b/legacy/src/main/res/values-eo/strings.xml
similarity index 100%
rename from app/src/main/res/values-eo/strings.xml
rename to legacy/src/main/res/values-eo/strings.xml
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/legacy/src/main/res/values-es-rAR/strings.xml
similarity index 100%
rename from app/src/main/res/values-es-rAR/strings.xml
rename to legacy/src/main/res/values-es-rAR/strings.xml
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/legacy/src/main/res/values-es-rMX/strings.xml
similarity index 100%
rename from app/src/main/res/values-es-rMX/strings.xml
rename to legacy/src/main/res/values-es-rMX/strings.xml
diff --git a/app/src/main/res/values-es/strings.xml b/legacy/src/main/res/values-es/strings.xml
similarity index 100%
rename from app/src/main/res/values-es/strings.xml
rename to legacy/src/main/res/values-es/strings.xml
diff --git a/app/src/main/res/values-et/strings.xml b/legacy/src/main/res/values-et/strings.xml
similarity index 100%
rename from app/src/main/res/values-et/strings.xml
rename to legacy/src/main/res/values-et/strings.xml
diff --git a/app/src/main/res/values-eu/strings.xml b/legacy/src/main/res/values-eu/strings.xml
similarity index 100%
rename from app/src/main/res/values-eu/strings.xml
rename to legacy/src/main/res/values-eu/strings.xml
diff --git a/app/src/main/res/values-fa/strings.xml b/legacy/src/main/res/values-fa/strings.xml
similarity index 100%
rename from app/src/main/res/values-fa/strings.xml
rename to legacy/src/main/res/values-fa/strings.xml
diff --git a/app/src/main/res/values-fi/strings.xml b/legacy/src/main/res/values-fi/strings.xml
similarity index 100%
rename from app/src/main/res/values-fi/strings.xml
rename to legacy/src/main/res/values-fi/strings.xml
diff --git a/app/src/main/res/values-fil/strings.xml b/legacy/src/main/res/values-fil/strings.xml
similarity index 100%
rename from app/src/main/res/values-fil/strings.xml
rename to legacy/src/main/res/values-fil/strings.xml
diff --git a/app/src/main/res/values-fr/strings.xml b/legacy/src/main/res/values-fr/strings.xml
similarity index 100%
rename from app/src/main/res/values-fr/strings.xml
rename to legacy/src/main/res/values-fr/strings.xml
diff --git a/app/src/main/res/values-fy/strings.xml b/legacy/src/main/res/values-fy/strings.xml
similarity index 100%
rename from app/src/main/res/values-fy/strings.xml
rename to legacy/src/main/res/values-fy/strings.xml
diff --git a/app/src/main/res/values-ga/strings.xml b/legacy/src/main/res/values-ga/strings.xml
similarity index 100%
rename from app/src/main/res/values-ga/strings.xml
rename to legacy/src/main/res/values-ga/strings.xml
diff --git a/app/src/main/res/values-gd/strings.xml b/legacy/src/main/res/values-gd/strings.xml
similarity index 100%
rename from app/src/main/res/values-gd/strings.xml
rename to legacy/src/main/res/values-gd/strings.xml
diff --git a/app/src/main/res/values-gl/strings.xml b/legacy/src/main/res/values-gl/strings.xml
similarity index 100%
rename from app/src/main/res/values-gl/strings.xml
rename to legacy/src/main/res/values-gl/strings.xml
diff --git a/app/src/main/res/values-gu/strings.xml b/legacy/src/main/res/values-gu/strings.xml
similarity index 100%
rename from app/src/main/res/values-gu/strings.xml
rename to legacy/src/main/res/values-gu/strings.xml
diff --git a/app/src/main/res/values-he/strings.xml b/legacy/src/main/res/values-he/strings.xml
similarity index 100%
rename from app/src/main/res/values-he/strings.xml
rename to legacy/src/main/res/values-he/strings.xml
diff --git a/app/src/main/res/values-hi/strings.xml b/legacy/src/main/res/values-hi/strings.xml
similarity index 100%
rename from app/src/main/res/values-hi/strings.xml
rename to legacy/src/main/res/values-hi/strings.xml
diff --git a/app/src/main/res/values-hr/strings.xml b/legacy/src/main/res/values-hr/strings.xml
similarity index 100%
rename from app/src/main/res/values-hr/strings.xml
rename to legacy/src/main/res/values-hr/strings.xml
diff --git a/app/src/main/res/values-hu/strings.xml b/legacy/src/main/res/values-hu/strings.xml
similarity index 100%
rename from app/src/main/res/values-hu/strings.xml
rename to legacy/src/main/res/values-hu/strings.xml
diff --git a/app/src/main/res/values-hy/strings.xml b/legacy/src/main/res/values-hy/strings.xml
similarity index 100%
rename from app/src/main/res/values-hy/strings.xml
rename to legacy/src/main/res/values-hy/strings.xml
diff --git a/app/src/main/res/values-id/strings.xml b/legacy/src/main/res/values-id/strings.xml
similarity index 100%
rename from app/src/main/res/values-id/strings.xml
rename to legacy/src/main/res/values-id/strings.xml
diff --git a/app/src/main/res/values-in b/legacy/src/main/res/values-in
similarity index 100%
rename from app/src/main/res/values-in
rename to legacy/src/main/res/values-in
diff --git a/app/src/main/res/values-is/strings.xml b/legacy/src/main/res/values-is/strings.xml
similarity index 100%
rename from app/src/main/res/values-is/strings.xml
rename to legacy/src/main/res/values-is/strings.xml
diff --git a/app/src/main/res/values-it/strings.xml b/legacy/src/main/res/values-it/strings.xml
similarity index 100%
rename from app/src/main/res/values-it/strings.xml
rename to legacy/src/main/res/values-it/strings.xml
diff --git a/app/src/main/res/values-iw b/legacy/src/main/res/values-iw
similarity index 100%
rename from app/src/main/res/values-iw
rename to legacy/src/main/res/values-iw
diff --git a/app/src/main/res/values-ja/strings.xml b/legacy/src/main/res/values-ja/strings.xml
similarity index 100%
rename from app/src/main/res/values-ja/strings.xml
rename to legacy/src/main/res/values-ja/strings.xml
diff --git a/app/src/main/res/values-ka/strings.xml b/legacy/src/main/res/values-ka/strings.xml
similarity index 100%
rename from app/src/main/res/values-ka/strings.xml
rename to legacy/src/main/res/values-ka/strings.xml
diff --git a/app/src/main/res/values-kab/strings.xml b/legacy/src/main/res/values-kab/strings.xml
similarity index 100%
rename from app/src/main/res/values-kab/strings.xml
rename to legacy/src/main/res/values-kab/strings.xml
diff --git a/app/src/main/res/values-kk/strings.xml b/legacy/src/main/res/values-kk/strings.xml
similarity index 100%
rename from app/src/main/res/values-kk/strings.xml
rename to legacy/src/main/res/values-kk/strings.xml
diff --git a/app/src/main/res/values-kmr/strings.xml b/legacy/src/main/res/values-kmr/strings.xml
similarity index 100%
rename from app/src/main/res/values-kmr/strings.xml
rename to legacy/src/main/res/values-kmr/strings.xml
diff --git a/app/src/main/res/values-kn/strings.xml b/legacy/src/main/res/values-kn/strings.xml
similarity index 100%
rename from app/src/main/res/values-kn/strings.xml
rename to legacy/src/main/res/values-kn/strings.xml
diff --git a/app/src/main/res/values-ko/strings.xml b/legacy/src/main/res/values-ko/strings.xml
similarity index 100%
rename from app/src/main/res/values-ko/strings.xml
rename to legacy/src/main/res/values-ko/strings.xml
diff --git a/app/src/main/res/values-lb/strings.xml b/legacy/src/main/res/values-lb/strings.xml
similarity index 100%
rename from app/src/main/res/values-lb/strings.xml
rename to legacy/src/main/res/values-lb/strings.xml
diff --git a/app/src/main/res/values-lt/strings.xml b/legacy/src/main/res/values-lt/strings.xml
similarity index 100%
rename from app/src/main/res/values-lt/strings.xml
rename to legacy/src/main/res/values-lt/strings.xml
diff --git a/app/src/main/res/values-lv/strings.xml b/legacy/src/main/res/values-lv/strings.xml
similarity index 100%
rename from app/src/main/res/values-lv/strings.xml
rename to legacy/src/main/res/values-lv/strings.xml
diff --git a/app/src/main/res/values-mk/strings.xml b/legacy/src/main/res/values-mk/strings.xml
similarity index 100%
rename from app/src/main/res/values-mk/strings.xml
rename to legacy/src/main/res/values-mk/strings.xml
diff --git a/app/src/main/res/values-ml/strings.xml b/legacy/src/main/res/values-ml/strings.xml
similarity index 100%
rename from app/src/main/res/values-ml/strings.xml
rename to legacy/src/main/res/values-ml/strings.xml
diff --git a/app/src/main/res/values-mn/strings.xml b/legacy/src/main/res/values-mn/strings.xml
similarity index 100%
rename from app/src/main/res/values-mn/strings.xml
rename to legacy/src/main/res/values-mn/strings.xml
diff --git a/app/src/main/res/values-mr/strings.xml b/legacy/src/main/res/values-mr/strings.xml
similarity index 100%
rename from app/src/main/res/values-mr/strings.xml
rename to legacy/src/main/res/values-mr/strings.xml
diff --git a/app/src/main/res/values-my/strings.xml b/legacy/src/main/res/values-my/strings.xml
similarity index 100%
rename from app/src/main/res/values-my/strings.xml
rename to legacy/src/main/res/values-my/strings.xml
diff --git a/app/src/main/res/values-nah/strings.xml b/legacy/src/main/res/values-nah/strings.xml
similarity index 100%
rename from app/src/main/res/values-nah/strings.xml
rename to legacy/src/main/res/values-nah/strings.xml
diff --git a/app/src/main/res/values-nb/strings.xml b/legacy/src/main/res/values-nb/strings.xml
similarity index 100%
rename from app/src/main/res/values-nb/strings.xml
rename to legacy/src/main/res/values-nb/strings.xml
diff --git a/app/src/main/res/values-ne/strings.xml b/legacy/src/main/res/values-ne/strings.xml
similarity index 100%
rename from app/src/main/res/values-ne/strings.xml
rename to legacy/src/main/res/values-ne/strings.xml
diff --git a/app/src/main/res/values-night/colors.xml b/legacy/src/main/res/values-night/colors.xml
similarity index 100%
rename from app/src/main/res/values-night/colors.xml
rename to legacy/src/main/res/values-night/colors.xml
diff --git a/app/src/main/res/values-night/themes.xml b/legacy/src/main/res/values-night/themes.xml
similarity index 100%
rename from app/src/main/res/values-night/themes.xml
rename to legacy/src/main/res/values-night/themes.xml
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/legacy/src/main/res/values-nl-rBE/strings.xml
similarity index 100%
rename from app/src/main/res/values-nl-rBE/strings.xml
rename to legacy/src/main/res/values-nl-rBE/strings.xml
diff --git a/app/src/main/res/values-nl/strings.xml b/legacy/src/main/res/values-nl/strings.xml
similarity index 100%
rename from app/src/main/res/values-nl/strings.xml
rename to legacy/src/main/res/values-nl/strings.xml
diff --git a/app/src/main/res/values-nn/strings.xml b/legacy/src/main/res/values-nn/strings.xml
similarity index 100%
rename from app/src/main/res/values-nn/strings.xml
rename to legacy/src/main/res/values-nn/strings.xml
diff --git a/app/src/main/res/values-oc/strings.xml b/legacy/src/main/res/values-oc/strings.xml
similarity index 100%
rename from app/src/main/res/values-oc/strings.xml
rename to legacy/src/main/res/values-oc/strings.xml
diff --git a/app/src/main/res/values-or/strings.xml b/legacy/src/main/res/values-or/strings.xml
similarity index 100%
rename from app/src/main/res/values-or/strings.xml
rename to legacy/src/main/res/values-or/strings.xml
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/legacy/src/main/res/values-pa-rPK/strings.xml
similarity index 100%
rename from app/src/main/res/values-pa-rPK/strings.xml
rename to legacy/src/main/res/values-pa-rPK/strings.xml
diff --git a/app/src/main/res/values-pa/strings.xml b/legacy/src/main/res/values-pa/strings.xml
similarity index 100%
rename from app/src/main/res/values-pa/strings.xml
rename to legacy/src/main/res/values-pa/strings.xml
diff --git a/app/src/main/res/values-pl/strings.xml b/legacy/src/main/res/values-pl/strings.xml
similarity index 100%
rename from app/src/main/res/values-pl/strings.xml
rename to legacy/src/main/res/values-pl/strings.xml
diff --git a/app/src/main/res/values-ps/strings.xml b/legacy/src/main/res/values-ps/strings.xml
similarity index 100%
rename from app/src/main/res/values-ps/strings.xml
rename to legacy/src/main/res/values-ps/strings.xml
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/legacy/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from app/src/main/res/values-pt-rBR/strings.xml
rename to legacy/src/main/res/values-pt-rBR/strings.xml
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/legacy/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from app/src/main/res/values-pt-rPT/strings.xml
rename to legacy/src/main/res/values-pt-rPT/strings.xml
diff --git a/app/src/main/res/values-pt/strings.xml b/legacy/src/main/res/values-pt/strings.xml
similarity index 100%
rename from app/src/main/res/values-pt/strings.xml
rename to legacy/src/main/res/values-pt/strings.xml
diff --git a/app/src/main/res/values-ro/strings.xml b/legacy/src/main/res/values-ro/strings.xml
similarity index 100%
rename from app/src/main/res/values-ro/strings.xml
rename to legacy/src/main/res/values-ro/strings.xml
diff --git a/app/src/main/res/values-ru/strings.xml b/legacy/src/main/res/values-ru/strings.xml
similarity index 100%
rename from app/src/main/res/values-ru/strings.xml
rename to legacy/src/main/res/values-ru/strings.xml
diff --git a/app/src/main/res/values-sc/strings.xml b/legacy/src/main/res/values-sc/strings.xml
similarity index 100%
rename from app/src/main/res/values-sc/strings.xml
rename to legacy/src/main/res/values-sc/strings.xml
diff --git a/app/src/main/res/values-si/strings.xml b/legacy/src/main/res/values-si/strings.xml
similarity index 100%
rename from app/src/main/res/values-si/strings.xml
rename to legacy/src/main/res/values-si/strings.xml
diff --git a/app/src/main/res/values-sk/strings.xml b/legacy/src/main/res/values-sk/strings.xml
similarity index 100%
rename from app/src/main/res/values-sk/strings.xml
rename to legacy/src/main/res/values-sk/strings.xml
diff --git a/app/src/main/res/values-sl/strings.xml b/legacy/src/main/res/values-sl/strings.xml
similarity index 100%
rename from app/src/main/res/values-sl/strings.xml
rename to legacy/src/main/res/values-sl/strings.xml
diff --git a/app/src/main/res/values-sn/strings.xml b/legacy/src/main/res/values-sn/strings.xml
similarity index 100%
rename from app/src/main/res/values-sn/strings.xml
rename to legacy/src/main/res/values-sn/strings.xml
diff --git a/app/src/main/res/values-so/strings.xml b/legacy/src/main/res/values-so/strings.xml
similarity index 100%
rename from app/src/main/res/values-so/strings.xml
rename to legacy/src/main/res/values-so/strings.xml
diff --git a/app/src/main/res/values-sq/strings.xml b/legacy/src/main/res/values-sq/strings.xml
similarity index 100%
rename from app/src/main/res/values-sq/strings.xml
rename to legacy/src/main/res/values-sq/strings.xml
diff --git a/app/src/main/res/values-sr/strings.xml b/legacy/src/main/res/values-sr/strings.xml
similarity index 100%
rename from app/src/main/res/values-sr/strings.xml
rename to legacy/src/main/res/values-sr/strings.xml
diff --git a/app/src/main/res/values-sv/strings.xml b/legacy/src/main/res/values-sv/strings.xml
similarity index 100%
rename from app/src/main/res/values-sv/strings.xml
rename to legacy/src/main/res/values-sv/strings.xml
diff --git a/app/src/main/res/values-sw/strings.xml b/legacy/src/main/res/values-sw/strings.xml
similarity index 100%
rename from app/src/main/res/values-sw/strings.xml
rename to legacy/src/main/res/values-sw/strings.xml
diff --git a/app/src/main/res/values-sw360dp/values-preference.xml b/legacy/src/main/res/values-sw360dp/values-preference.xml
similarity index 100%
rename from app/src/main/res/values-sw360dp/values-preference.xml
rename to legacy/src/main/res/values-sw360dp/values-preference.xml
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/legacy/src/main/res/values-sw720dp/dimens.xml
similarity index 100%
rename from app/src/main/res/values-sw720dp/dimens.xml
rename to legacy/src/main/res/values-sw720dp/dimens.xml
diff --git a/app/src/main/res/values-ta/strings.xml b/legacy/src/main/res/values-ta/strings.xml
similarity index 100%
rename from app/src/main/res/values-ta/strings.xml
rename to legacy/src/main/res/values-ta/strings.xml
diff --git a/app/src/main/res/values-te/strings.xml b/legacy/src/main/res/values-te/strings.xml
similarity index 100%
rename from app/src/main/res/values-te/strings.xml
rename to legacy/src/main/res/values-te/strings.xml
diff --git a/app/src/main/res/values-th/strings.xml b/legacy/src/main/res/values-th/strings.xml
similarity index 100%
rename from app/src/main/res/values-th/strings.xml
rename to legacy/src/main/res/values-th/strings.xml
diff --git a/app/src/main/res/values-tok/strings.xml b/legacy/src/main/res/values-tok/strings.xml
similarity index 100%
rename from app/src/main/res/values-tok/strings.xml
rename to legacy/src/main/res/values-tok/strings.xml
diff --git a/app/src/main/res/values-tr/strings.xml b/legacy/src/main/res/values-tr/strings.xml
similarity index 100%
rename from app/src/main/res/values-tr/strings.xml
rename to legacy/src/main/res/values-tr/strings.xml
diff --git a/app/src/main/res/values-tt/strings.xml b/legacy/src/main/res/values-tt/strings.xml
similarity index 100%
rename from app/src/main/res/values-tt/strings.xml
rename to legacy/src/main/res/values-tt/strings.xml
diff --git a/app/src/main/res/values-tzm/strings.xml b/legacy/src/main/res/values-tzm/strings.xml
similarity index 100%
rename from app/src/main/res/values-tzm/strings.xml
rename to legacy/src/main/res/values-tzm/strings.xml
diff --git a/app/src/main/res/values-ug/strings.xml b/legacy/src/main/res/values-ug/strings.xml
similarity index 100%
rename from app/src/main/res/values-ug/strings.xml
rename to legacy/src/main/res/values-ug/strings.xml
diff --git a/app/src/main/res/values-uk/strings.xml b/legacy/src/main/res/values-uk/strings.xml
similarity index 100%
rename from app/src/main/res/values-uk/strings.xml
rename to legacy/src/main/res/values-uk/strings.xml
diff --git a/app/src/main/res/values-ur/strings.xml b/legacy/src/main/res/values-ur/strings.xml
similarity index 100%
rename from app/src/main/res/values-ur/strings.xml
rename to legacy/src/main/res/values-ur/strings.xml
diff --git a/app/src/main/res/values-uz/strings.xml b/legacy/src/main/res/values-uz/strings.xml
similarity index 100%
rename from app/src/main/res/values-uz/strings.xml
rename to legacy/src/main/res/values-uz/strings.xml
diff --git a/app/src/main/res/values-vi/strings.xml b/legacy/src/main/res/values-vi/strings.xml
similarity index 100%
rename from app/src/main/res/values-vi/strings.xml
rename to legacy/src/main/res/values-vi/strings.xml
diff --git a/app/src/main/res/values-yue/strings.xml b/legacy/src/main/res/values-yue/strings.xml
similarity index 100%
rename from app/src/main/res/values-yue/strings.xml
rename to legacy/src/main/res/values-yue/strings.xml
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/legacy/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rCN/strings.xml
rename to legacy/src/main/res/values-zh-rCN/strings.xml
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/legacy/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rHK/strings.xml
rename to legacy/src/main/res/values-zh-rHK/strings.xml
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/legacy/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh-rTW/strings.xml
rename to legacy/src/main/res/values-zh-rTW/strings.xml
diff --git a/app/src/main/res/values/array.xml b/legacy/src/main/res/values/array.xml
similarity index 100%
rename from app/src/main/res/values/array.xml
rename to legacy/src/main/res/values/array.xml
diff --git a/app/src/main/res/values/attrs.xml b/legacy/src/main/res/values/attrs.xml
similarity index 100%
rename from app/src/main/res/values/attrs.xml
rename to legacy/src/main/res/values/attrs.xml
diff --git a/app/src/main/res/values/colors.xml b/legacy/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to legacy/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/default_repos.xml b/legacy/src/main/res/values/default_repos.xml
similarity index 100%
rename from app/src/main/res/values/default_repos.xml
rename to legacy/src/main/res/values/default_repos.xml
diff --git a/app/src/main/res/values/dimens.xml b/legacy/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to legacy/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/donottranslate.xml b/legacy/src/main/res/values/donottranslate.xml
similarity index 100%
rename from app/src/main/res/values/donottranslate.xml
rename to legacy/src/main/res/values/donottranslate.xml
diff --git a/app/src/main/res/values/ids.xml b/legacy/src/main/res/values/ids.xml
similarity index 100%
rename from app/src/main/res/values/ids.xml
rename to legacy/src/main/res/values/ids.xml
diff --git a/app/src/main/res/values/shape.xml b/legacy/src/main/res/values/shape.xml
similarity index 100%
rename from app/src/main/res/values/shape.xml
rename to legacy/src/main/res/values/shape.xml
diff --git a/next/src/main/res/values/strings.xml b/legacy/src/main/res/values/strings.xml
similarity index 100%
rename from next/src/main/res/values/strings.xml
rename to legacy/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/legacy/src/main/res/values/styles.xml
similarity index 100%
rename from app/src/main/res/values/styles.xml
rename to legacy/src/main/res/values/styles.xml
diff --git a/app/src/main/res/values/styles_detail.xml b/legacy/src/main/res/values/styles_detail.xml
similarity index 100%
rename from app/src/main/res/values/styles_detail.xml
rename to legacy/src/main/res/values/styles_detail.xml
diff --git a/app/src/main/res/values/theme_overlays.xml b/legacy/src/main/res/values/theme_overlays.xml
similarity index 100%
rename from app/src/main/res/values/theme_overlays.xml
rename to legacy/src/main/res/values/theme_overlays.xml
diff --git a/legacy/src/main/res/values/themes.xml b/legacy/src/main/res/values/themes.xml
new file mode 100644
index 000000000..90c68bdeb
--- /dev/null
+++ b/legacy/src/main/res/values/themes.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+~ Copyright (C) 2019 The Android Open Source Project
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~      http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<!-- Generated by the Material Theme Builder with modifications-->
+<!-- https://www.figma.com/community/plugin/1034969338659738588&ndash;&gt;-->
+<resources>
+
+    <style name="Base.Theme.App" parent="Theme.Material3.DayNight.NoActionBar">
+        <!--Material shape attributes-->
+        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.App.SmallComponent</item>
+        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent
+        </item>
+        <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.App.LargeComponent</item>
+
+        <item name="borderlessButtonStyle">@style/Widget.App.Button.TextButton</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.App.Button.OutlinedButton</item>
+        <item name="materialButtonStyle">@style/Widget.App.Button</item>
+        <item name="materialCardViewStyle">@style/Widget.App.CardView</item>
+
+        <!--colorBackground appears behind scrollable content and is used for the default window-->
+        <!--background. colorSurface is mapped to the surface of components such as cards, sheets-->
+        <!--and menus. colorError is used to indicate an error state for components such as-->
+        <!--text fields.-->
+        <item name="appDetailsBackground">#fcfcfc</item>
+        <item name="categoryPreviewAppCardBackground">
+            @drawable/category_preview_app_card_background_light
+        </item>
+        <item name="detailPanel">?attr/colorSurfaceContainerHighest</item>
+        <item name="antiFeaturesWarning">@drawable/ic_warning</item>
+        <item name="backButtonDrawable">@drawable/abc_ic_ab_back_material</item>
+        <item name="clearButtonDrawable">@drawable/ic_close</item>
+
+        <item name="bottomNavigationStyle">@style/Widget.App.BottomNavigationView</item>
+        <item name="floatingActionButtonStyle">@style/Widget.App.FloatingActionButton</item>
+        <item name="mainTabSwapSplashTint">?attr/colorSurfaceDim</item>
+        <item name="warning">?attr/colorTertiaryContainer</item>
+        <item name="categoryName">#4a4a4a</item>
+        <item name="installedApps">#424242</item>
+        <item name="appListItem">#424242</item>
+        <item name="lightGrayTextColor">#4a4a4a</item>
+        <item name="preferenceTheme">@style/ThemeOverlay.App.Preference</item>
+        <item name="appDetailsAntiFeatureIconColor">#000000</item>
+
+        <item name="iconBackgroundColor">#801976D2</item>
+
+        <item name="screenshotPlaceholderIconColor">#e8e8e8</item>
+
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+
+        <!-- Adjust androidx.preference dialogs to follow Material You -->
+        <!-- https://github.com/material-components/material-components-android/issues/2732#issuecomment-1146086018 -->
+        <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
+
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+        <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+        <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+        <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+        <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+        <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+        <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+        <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+        <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+        <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+        <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+        <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+        <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+        <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+        <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+        <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+        <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+        <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+        <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+        <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
+    </style>
+
+    <!-- light app theme with accent colors following roughly android design guidelines -->
+    <style name="Theme.App" parent="Base.Theme.App">
+        <!-- customizations that are not API-level specific go here. -->
+    </style>
+
+    <!-- Same as Theme.App except a black background in Dark mode -->
+    <style name="Theme.App.Black" parent="Theme.App" />
+
+    <style name="Theme.App.Transparent" parent="Base.Theme.App">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/xml/apk_file_provider.xml b/legacy/src/main/res/xml/apk_file_provider.xml
similarity index 100%
rename from app/src/main/res/xml/apk_file_provider.xml
rename to legacy/src/main/res/xml/apk_file_provider.xml
diff --git a/app/src/main/res/xml/backup_extraction_rules.xml b/legacy/src/main/res/xml/backup_extraction_rules.xml
similarity index 100%
rename from app/src/main/res/xml/backup_extraction_rules.xml
rename to legacy/src/main/res/xml/backup_extraction_rules.xml
diff --git a/app/src/main/res/xml/backup_rules.xml b/legacy/src/main/res/xml/backup_rules.xml
similarity index 100%
rename from app/src/main/res/xml/backup_rules.xml
rename to legacy/src/main/res/xml/backup_rules.xml
diff --git a/app/src/main/res/xml/installer_file_provider.xml b/legacy/src/main/res/xml/installer_file_provider.xml
similarity index 100%
rename from app/src/main/res/xml/installer_file_provider.xml
rename to legacy/src/main/res/xml/installer_file_provider.xml
diff --git a/next/src/main/res/xml/locales_config.xml b/legacy/src/main/res/xml/locales_config.xml
similarity index 100%
rename from next/src/main/res/xml/locales_config.xml
rename to legacy/src/main/res/xml/locales_config.xml
diff --git a/legacy/src/main/res/xml/network_security_config.xml b/legacy/src/main/res/xml/network_security_config.xml
new file mode 100644
index 000000000..cfcccb746
--- /dev/null
+++ b/legacy/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <!-- Trust preinstalled CAs -->
+            <certificates src="system" />
+            <!-- Additionally trust user added CAs -->
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">amazonaws.com</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">f-droid.org</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">github.com</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">githubusercontent.com</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">github.io</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">gitlab.com</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="true">gitlab.io</domain>
+        <certificateTransparency enabled="true"/>
+    </domain-config>
+</network-security-config>
diff --git a/app/src/main/res/xml/preferences.xml b/legacy/src/main/res/xml/preferences.xml
similarity index 100%
rename from app/src/main/res/xml/preferences.xml
rename to legacy/src/main/res/xml/preferences.xml
diff --git a/app/src/main/res/xml/searchable.xml b/legacy/src/main/res/xml/searchable.xml
similarity index 100%
rename from app/src/main/res/xml/searchable.xml
rename to legacy/src/main/res/xml/searchable.xml
diff --git a/app/src/main/scripts/update-binary b/legacy/src/main/scripts/update-binary
similarity index 100%
rename from app/src/main/scripts/update-binary
rename to legacy/src/main/scripts/update-binary
diff --git a/app/src/test/assets/urzip.apk b/legacy/src/test/assets/urzip.apk
similarity index 100%
rename from app/src/test/assets/urzip.apk
rename to legacy/src/test/assets/urzip.apk
diff --git a/app/src/test/java/org/fdroid/fdroid/AppUpdateManagerTest.kt b/legacy/src/test/java/org/fdroid/fdroid/AppUpdateManagerTest.kt
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/AppUpdateManagerTest.kt
rename to legacy/src/test/java/org/fdroid/fdroid/AppUpdateManagerTest.kt
diff --git a/app/src/test/java/org/fdroid/fdroid/PreferencesTest.java b/legacy/src/test/java/org/fdroid/fdroid/PreferencesTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/PreferencesTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/PreferencesTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/RepoUpdateManagerTest.kt b/legacy/src/test/java/org/fdroid/fdroid/RepoUpdateManagerTest.kt
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/RepoUpdateManagerTest.kt
rename to legacy/src/test/java/org/fdroid/fdroid/RepoUpdateManagerTest.kt
diff --git a/app/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java b/legacy/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/TestFDroidApp.java b/legacy/src/test/java/org/fdroid/fdroid/TestFDroidApp.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/TestFDroidApp.java
rename to legacy/src/test/java/org/fdroid/fdroid/TestFDroidApp.java
diff --git a/app/src/test/java/org/fdroid/fdroid/TestUtils.java b/legacy/src/test/java/org/fdroid/fdroid/TestUtils.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/TestUtils.java
rename to legacy/src/test/java/org/fdroid/fdroid/TestUtils.java
diff --git a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java b/legacy/src/test/java/org/fdroid/fdroid/UtilsTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/UtilsTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/UtilsTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/data/ApkTest.java b/legacy/src/test/java/org/fdroid/fdroid/data/ApkTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/data/ApkTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/data/ApkTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java b/legacy/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/data/DBHelperTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java b/legacy/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/data/SanitizedFileTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java b/legacy/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java b/legacy/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/installer/ApkCacheTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java b/legacy/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/installer/FileInstallerTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java b/legacy/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/installer/InstallerFactoryTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java b/legacy/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java b/legacy/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/views/main/MainActivityTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java b/legacy/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/work/CleanCacheWorkerTest.java
diff --git a/app/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java b/legacy/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
similarity index 100%
rename from app/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
rename to legacy/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
diff --git a/app/src/test/resources/Norway_bouvet_europe_2.obf.zip b/legacy/src/test/resources/Norway_bouvet_europe_2.obf.zip
similarity index 100%
rename from app/src/test/resources/Norway_bouvet_europe_2.obf.zip
rename to legacy/src/test/resources/Norway_bouvet_europe_2.obf.zip
diff --git a/app/src/test/resources/additional_repos.xml b/legacy/src/test/resources/additional_repos.xml
similarity index 100%
rename from app/src/test/resources/additional_repos.xml
rename to legacy/src/test/resources/additional_repos.xml
diff --git a/app/src/test/resources/all_fields_index-v1.json b/legacy/src/test/resources/all_fields_index-v1.json
similarity index 100%
rename from app/src/test/resources/all_fields_index-v1.json
rename to legacy/src/test/resources/all_fields_index-v1.json
diff --git a/app/src/test/resources/install_history_all b/legacy/src/test/resources/install_history_all
similarity index 100%
rename from app/src/test/resources/install_history_all
rename to legacy/src/test/resources/install_history_all
diff --git a/app/src/test/resources/org.fdroid.fdroid.privileged.ota_2110.zip b/legacy/src/test/resources/org.fdroid.fdroid.privileged.ota_2110.zip
similarity index 100%
rename from app/src/test/resources/org.fdroid.fdroid.privileged.ota_2110.zip
rename to legacy/src/test/resources/org.fdroid.fdroid.privileged.ota_2110.zip
diff --git a/app/src/test/resources/ugly_additional_repos.xml b/legacy/src/test/resources/ugly_additional_repos.xml
similarity index 100%
rename from app/src/test/resources/ugly_additional_repos.xml
rename to legacy/src/test/resources/ugly_additional_repos.xml
diff --git a/app/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java b/legacy/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java
similarity index 100%
rename from app/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java
rename to legacy/src/testFull/java/kellinwood/security/zipsigner/ZipSignerTest.java
diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java b/legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
similarity index 100%
rename from app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
rename to legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDManagerTest.java
diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java b/legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
similarity index 100%
rename from app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
rename to legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java b/legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java
similarity index 100%
rename from app/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java
rename to legacy/src/testFull/java/org/fdroid/fdroid/nearby/LocalRepoKeyStoreTest.java
diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java b/legacy/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
similarity index 100%
rename from app/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
rename to legacy/src/testFull/java/org/fdroid/fdroid/nearby/WifiStateChangeServiceTest.java
diff --git a/app/src/testFull/resources/icon.png b/legacy/src/testFull/resources/icon.png
similarity index 100%
rename from app/src/testFull/resources/icon.png
rename to legacy/src/testFull/resources/icon.png
diff --git a/app/src/testFull/resources/index.html b/legacy/src/testFull/resources/index.html
similarity index 100%
rename from app/src/testFull/resources/index.html
rename to legacy/src/testFull/resources/index.html
diff --git a/app/src/testFull/resources/test.html b/legacy/src/testFull/resources/test.html
similarity index 100%
rename from app/src/testFull/resources/test.html
rename to legacy/src/testFull/resources/test.html
diff --git a/app/src/testFull/resources/urzip.apk b/legacy/src/testFull/resources/urzip.apk
similarity index 100%
rename from app/src/testFull/resources/urzip.apk
rename to legacy/src/testFull/resources/urzip.apk
diff --git a/app/tools/download-material-icon.sh b/legacy/tools/download-material-icon.sh
similarity index 100%
rename from app/tools/download-material-icon.sh
rename to legacy/tools/download-material-icon.sh
diff --git a/app/tools/svg-to-drawables.sh b/legacy/tools/svg-to-drawables.sh
similarity index 100%
rename from app/tools/svg-to-drawables.sh
rename to legacy/tools/svg-to-drawables.sh
diff --git a/app/tools/test-search-intents.sh b/legacy/tools/test-search-intents.sh
similarity index 100%
rename from app/tools/test-search-intents.sh
rename to legacy/tools/test-search-intents.sh
diff --git a/next/proguard-rules.pro b/next/proguard-rules.pro
deleted file mode 100644
index b37172aee..000000000
--- a/next/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
--dontobfuscate
--keepattributes SourceFile,LineNumberTable,Exceptions
-
-# Anything less causes issues like not finding primary constructor in ReflectionDiffer
--keep class org.fdroid.** {*;}
-
-# Logging
--keep class ch.qos.logback.classic.android.LogcatAppender
--keepclassmembers class ch.qos.logback.** { *; }
--keepclassmembers class  org.slf4j.impl.** { *; }
-
-# Needed for instrumentation tests (for some werid inexplicable reason)
--keep class kotlin.LazyKt
--keep class kotlin.collections.CollectionsKt
-
-# for debugging (comment in when needed)
-#-printconfiguration build/outputs/logs/r8-configuration.txt
diff --git a/next/src/main/AndroidManifest.xml b/next/src/main/AndroidManifest.xml
deleted file mode 100644
index cf22d92b6..000000000
--- a/next/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission
-        android:name="android.permission.FOREGROUND_SERVICE"
-        tools:ignore="ForegroundServicesPolicy" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-
-    <uses-permission
-        android:name="android.permission.REQUEST_INSTALL_PACKAGES"
-        tools:ignore="RequestInstallPackagesPolicy" />
-    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
-    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
-
-    <application
-        android:name="org.fdroid.App"
-        android:allowBackup="true"
-        android:enableOnBackInvokedCallback="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:localeConfig="@xml/locales_config"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Fdroidclient"
-        tools:targetApi="33">
-        <activity
-            android:name="org.fdroid.MainActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/Theme.Fdroidclient"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.APP_MARKET" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SHOW_APP_INFO" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="details"
-                    android:scheme="market" />
-            </intent-filter>
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="f-droid.org" />
-                <data android:host="staging.f-droid.org" />
-                <data android:host="cloudflare.f-droid.org" />
-                <data android:pathPrefix="/packages/" />
-                <data android:pathPattern="/.*/packages/.*" />
-            </intent-filter>
-
-            <!-- Repo URLs -->
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="fdroid.link" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="fdroidrepos" />
-                <data
-                    android:scheme="FDROIDREPOS"
-                    tools:ignore="AppLinkUrlError" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="org.fdroid.ui.crash.CrashActivity"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true"
-            android:launchMode="singleInstance"
-            android:process=":acra"
-            android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="fullSensor"
-            tools:ignore="DiscouragedApi"
-            tools:replace="screenOrientation" />
-
-        <service
-            android:name="org.fdroid.install.AppInstallService"
-            android:exported="false"
-            android:foregroundServiceType="dataSync" />
-        <!-- needed for declaring foregroundServiceType for WorkManager -->
-        <service
-            android:name="androidx.work.impl.foreground.SystemForegroundService"
-            android:foregroundServiceType="dataSync"
-            tools:node="merge" />
-        <provider
-            android:name="org.fdroid.install.ApkFileProvider"
-            android:authorities="${applicationId}.install.ApkFileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true" />
-        <!-- disable WorkManager initialization, needed for Hilt -->
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
-    </application>
-
-</manifest>
diff --git a/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt b/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
deleted file mode 100644
index 1275413f1..000000000
--- a/next/src/main/kotlin/org/fdroid/fdroid/Compat.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-@file:Suppress("ktlint:standard:filename")
-
-package org.fdroid.fdroid
-
-object Preferences {
-
-    fun get(): Preferences = Preferences
-
-    val isPureBlack: Boolean = true
-
-}
diff --git a/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Color.kt b/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Color.kt
deleted file mode 120000
index 9d0fa521d..000000000
--- a/next/src/main/kotlin/org/fdroid/fdroid/ui/theme/Color.kt
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../app/src/main/java/org/fdroid/fdroid/ui/theme/Color.kt
\ No newline at end of file
diff --git a/next/src/main/res/values/colors.xml b/next/src/main/res/values/colors.xml
deleted file mode 100644
index ca1931bca..000000000
--- a/next/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
diff --git a/next/src/main/res/values/themes.xml b/next/src/main/res/values/themes.xml
deleted file mode 100644
index 6e59254a1..000000000
--- a/next/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.Fdroidclient" parent="Theme.AppCompat.DayNight.NoActionBar" />
-</resources>
diff --git a/next/src/main/res/xml/network_security_config.xml b/next/src/main/res/xml/network_security_config.xml
deleted file mode 100644
index f8b53ef87..000000000
--- a/next/src/main/res/xml/network_security_config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">onion</domain>
-    </domain-config>
-</network-security-config>
diff --git a/settings.gradle b/settings.gradle
index c7a2ed7ce..76413edd0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,4 +13,4 @@ include ':libs:download'
 include ':libs:index'
 include ':libs:database'
 
-include ':next'
+include ':legacy'

From 8bdf1ae644338f77d99198d434c89c09e12f1e59 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 29 Dec 2025 17:08:32 -0300
Subject: [PATCH 159/180] Clean up resources across old and new code

---
 .../res/drawable/ic_launcher_foreground.xml   |  30 +++
 app/src/basic/res/values/strings.xml          |   4 +
 app/src/main/AndroidManifest.xml              |   6 +-
 app/src/main/kotlin/org/fdroid/ui/About.kt    |   2 +-
 .../kotlin/org/fdroid/ui/utils/BadgeIcon.kt   |   4 +-
 app/src/main/res/drawable/ic_launcher.png     | Bin 10858 -> 0 bytes
 .../res/drawable/ic_launcher_foreground.xml   |  69 +++++++
 .../res/drawable/ic_launcher_monochrome.xml   |  15 ++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   6 +
 app/src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 2133 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 1427 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 2888 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 4422 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 6254 bytes
 .../src/main/res/values-af/strings.xml        |   0
 .../src/main/res/values-ar/strings.xml        |   0
 .../src/main/res/values-ast/strings.xml       |   0
 .../src/main/res/values-az/strings.xml        |   0
 .../src/main/res/values-b+hi+Latn/strings.xml |   0
 .../src/main/res/values-be/strings.xml        |   0
 .../src/main/res/values-ber/strings.xml       |   0
 .../src/main/res/values-bg/strings.xml        |   0
 .../src/main/res/values-bn-rBD/strings.xml    |   0
 .../src/main/res/values-bn/strings.xml        |   0
 .../src/main/res/values-bo/strings.xml        |   0
 .../src/main/res/values-br/strings.xml        |   0
 .../src/main/res/values-ca/strings.xml        |   0
 .../src/main/res/values-ckb/strings.xml       |   0
 .../src/main/res/values-cs/strings.xml        |   0
 .../src/main/res/values-cy/strings.xml        |   0
 .../src/main/res/values-da/strings.xml        |   0
 .../src/main/res/values-de/strings.xml        |   0
 .../src/main/res/values-el/strings.xml        |   0
 .../src/main/res/values-en-rGB/strings.xml    |   0
 .../src/main/res/values-eo/strings.xml        |   0
 .../src/main/res/values-es-rAR/strings.xml    |   0
 .../src/main/res/values-es-rMX/strings.xml    |   0
 .../src/main/res/values-es/strings.xml        |   0
 .../src/main/res/values-et/strings.xml        |   0
 .../src/main/res/values-eu/strings.xml        |   0
 .../src/main/res/values-fa/strings.xml        |   0
 .../src/main/res/values-fi/strings.xml        |   0
 .../src/main/res/values-fil/strings.xml       |   0
 .../src/main/res/values-fr/strings.xml        |   0
 .../src/main/res/values-fy/strings.xml        |   0
 .../src/main/res/values-ga/strings.xml        |   0
 .../src/main/res/values-gd/strings.xml        |   0
 .../src/main/res/values-gl/strings.xml        |   0
 .../src/main/res/values-gu/strings.xml        |   0
 .../src/main/res/values-he/strings.xml        |   0
 .../src/main/res/values-hi/strings.xml        |   0
 .../src/main/res/values-hr/strings.xml        |   0
 .../src/main/res/values-hu/strings.xml        |   0
 .../src/main/res/values-hy/strings.xml        |   0
 .../src/main/res/values-id/strings.xml        |   0
 app/src/main/res/values-in                    |   1 +
 .../src/main/res/values-is/strings.xml        |   0
 .../src/main/res/values-it/strings.xml        |   0
 app/src/main/res/values-iw                    |   1 +
 .../src/main/res/values-ja/strings.xml        |   0
 .../src/main/res/values-ka/strings.xml        |   0
 .../src/main/res/values-kab/strings.xml       |   0
 .../src/main/res/values-kk/strings.xml        |   0
 .../src/main/res/values-kmr/strings.xml       |   0
 .../src/main/res/values-kn/strings.xml        |   0
 .../src/main/res/values-ko/strings.xml        |   0
 .../src/main/res/values-lb/strings.xml        |   0
 .../src/main/res/values-lt/strings.xml        |   0
 .../src/main/res/values-lv/strings.xml        |   0
 .../src/main/res/values-mk/strings.xml        |   0
 .../src/main/res/values-ml/strings.xml        |   0
 .../src/main/res/values-mn/strings.xml        |   0
 .../src/main/res/values-mr/strings.xml        |   0
 .../src/main/res/values-my/strings.xml        |   0
 .../src/main/res/values-nah/strings.xml       |   0
 .../src/main/res/values-nb/strings.xml        |   0
 .../src/main/res/values-ne/strings.xml        |   0
 .../values-night/ic_launcher_background.xml   |   4 +
 .../src/main/res/values-nl-rBE/strings.xml    |   0
 .../src/main/res/values-nl/strings.xml        |   0
 .../src/main/res/values-nn/strings.xml        |   0
 .../src/main/res/values-oc/strings.xml        |   0
 .../src/main/res/values-or/strings.xml        |   0
 .../src/main/res/values-pa-rPK/strings.xml    |   0
 .../src/main/res/values-pa/strings.xml        |   0
 .../src/main/res/values-pl/strings.xml        |   0
 .../src/main/res/values-ps/strings.xml        |   0
 .../src/main/res/values-pt-rBR/strings.xml    |   0
 .../src/main/res/values-pt-rPT/strings.xml    |   0
 .../src/main/res/values-pt/strings.xml        |   0
 .../src/main/res/values-ro/strings.xml        |   0
 .../src/main/res/values-ru/strings.xml        |   0
 .../src/main/res/values-sc/strings.xml        |   0
 .../src/main/res/values-si/strings.xml        |   0
 .../src/main/res/values-sk/strings.xml        |   0
 .../src/main/res/values-sl/strings.xml        |   0
 .../src/main/res/values-sn/strings.xml        |   0
 .../src/main/res/values-so/strings.xml        |   0
 .../src/main/res/values-sq/strings.xml        |   0
 .../src/main/res/values-sr/strings.xml        |   0
 .../src/main/res/values-sv/strings.xml        |   0
 .../src/main/res/values-sw/strings.xml        |   1 -
 .../src/main/res/values-ta/strings.xml        |   0
 .../src/main/res/values-te/strings.xml        |   0
 .../src/main/res/values-th/strings.xml        |   0
 .../src/main/res/values-tok/strings.xml       |   0
 .../src/main/res/values-tr/strings.xml        |   0
 .../src/main/res/values-tt/strings.xml        |   0
 .../src/main/res/values-tzm/strings.xml       |   0
 .../src/main/res/values-ug/strings.xml        |   0
 .../src/main/res/values-uk/strings.xml        |   0
 .../src/main/res/values-ur/strings.xml        |   0
 .../src/main/res/values-uz/strings.xml        |   0
 .../src/main/res/values-vi/strings.xml        |   0
 .../src/main/res/values-yue/strings.xml       |   0
 .../src/main/res/values-zh-rCN/strings.xml    |   0
 .../src/main/res/values-zh-rHK/strings.xml    |   0
 .../src/main/res/values-zh-rTW/strings.xml    |   0
 .../res/values/ic_launcher_background.xml     |   4 +
 app/src/main/res/values/strings-next.xml      | 178 -----------------
 app/src/main/res/values/strings.xml           | 181 ++++++++++++++++++
 app/src/main/res/values/themes.xml            |   3 +-
 .../main/res/xml/network_security_config.xml  |   8 +
 legacy/src/main/res/values-af                 |   1 +
 legacy/src/main/res/values-ar                 |   1 +
 legacy/src/main/res/values-ast                |   1 +
 legacy/src/main/res/values-az                 |   1 +
 legacy/src/main/res/values-b+hi+Latn          |   1 +
 legacy/src/main/res/values-be                 |   1 +
 legacy/src/main/res/values-ber                |   1 +
 legacy/src/main/res/values-bg                 |   1 +
 legacy/src/main/res/values-bn                 |   1 +
 legacy/src/main/res/values-bn-rBD             |   1 +
 legacy/src/main/res/values-bo                 |   1 +
 legacy/src/main/res/values-br                 |   1 +
 legacy/src/main/res/values-ca                 |   1 +
 legacy/src/main/res/values-ckb                |   1 +
 legacy/src/main/res/values-cs                 |   1 +
 legacy/src/main/res/values-cy                 |   1 +
 legacy/src/main/res/values-da                 |   1 +
 legacy/src/main/res/values-de                 |   1 +
 legacy/src/main/res/values-el                 |   1 +
 legacy/src/main/res/values-en-rGB             |   1 +
 legacy/src/main/res/values-eo                 |   1 +
 legacy/src/main/res/values-es                 |   1 +
 legacy/src/main/res/values-es-rAR             |   1 +
 legacy/src/main/res/values-es-rMX             |   1 +
 legacy/src/main/res/values-et                 |   1 +
 legacy/src/main/res/values-eu                 |   1 +
 legacy/src/main/res/values-fa                 |   1 +
 legacy/src/main/res/values-fi                 |   1 +
 legacy/src/main/res/values-fil                |   1 +
 legacy/src/main/res/values-fr                 |   1 +
 legacy/src/main/res/values-fy                 |   1 +
 legacy/src/main/res/values-ga                 |   1 +
 legacy/src/main/res/values-gd                 |   1 +
 legacy/src/main/res/values-gl                 |   1 +
 legacy/src/main/res/values-gu                 |   1 +
 legacy/src/main/res/values-he                 |   1 +
 legacy/src/main/res/values-hi                 |   1 +
 legacy/src/main/res/values-hr                 |   1 +
 legacy/src/main/res/values-hu                 |   1 +
 legacy/src/main/res/values-hy                 |   1 +
 legacy/src/main/res/values-id                 |   1 +
 legacy/src/main/res/values-in                 |   2 +-
 legacy/src/main/res/values-is                 |   1 +
 legacy/src/main/res/values-it                 |   1 +
 legacy/src/main/res/values-iw                 |   2 +-
 legacy/src/main/res/values-ja                 |   1 +
 legacy/src/main/res/values-ka                 |   1 +
 legacy/src/main/res/values-kab                |   1 +
 legacy/src/main/res/values-kk                 |   1 +
 legacy/src/main/res/values-kmr                |   1 +
 legacy/src/main/res/values-kn                 |   1 +
 legacy/src/main/res/values-ko                 |   1 +
 legacy/src/main/res/values-lb                 |   1 +
 legacy/src/main/res/values-lt                 |   1 +
 legacy/src/main/res/values-lv                 |   1 +
 legacy/src/main/res/values-mk                 |   1 +
 legacy/src/main/res/values-ml                 |   1 +
 legacy/src/main/res/values-mn                 |   1 +
 legacy/src/main/res/values-mr                 |   1 +
 legacy/src/main/res/values-my                 |   1 +
 legacy/src/main/res/values-nah                |   1 +
 legacy/src/main/res/values-nb                 |   1 +
 legacy/src/main/res/values-ne                 |   1 +
 legacy/src/main/res/values-nl                 |   1 +
 legacy/src/main/res/values-nl-rBE             |   1 +
 legacy/src/main/res/values-nn                 |   1 +
 legacy/src/main/res/values-oc                 |   1 +
 legacy/src/main/res/values-or                 |   1 +
 legacy/src/main/res/values-pa                 |   1 +
 legacy/src/main/res/values-pa-rPK             |   1 +
 legacy/src/main/res/values-pl                 |   1 +
 legacy/src/main/res/values-ps                 |   1 +
 legacy/src/main/res/values-pt                 |   1 +
 legacy/src/main/res/values-pt-rBR             |   1 +
 legacy/src/main/res/values-pt-rPT             |   1 +
 legacy/src/main/res/values-ro                 |   1 +
 legacy/src/main/res/values-ru                 |   1 +
 legacy/src/main/res/values-sc                 |   1 +
 legacy/src/main/res/values-si                 |   1 +
 legacy/src/main/res/values-sk                 |   1 +
 legacy/src/main/res/values-sl                 |   1 +
 legacy/src/main/res/values-sn                 |   1 +
 legacy/src/main/res/values-so                 |   1 +
 legacy/src/main/res/values-sq                 |   1 +
 legacy/src/main/res/values-sr                 |   1 +
 legacy/src/main/res/values-sv                 |   1 +
 legacy/src/main/res/values-sw                 |   1 +
 legacy/src/main/res/values-ta                 |   1 +
 legacy/src/main/res/values-te                 |   1 +
 legacy/src/main/res/values-th                 |   1 +
 legacy/src/main/res/values-tok                |   1 +
 legacy/src/main/res/values-tr                 |   1 +
 legacy/src/main/res/values-tt                 |   1 +
 legacy/src/main/res/values-tzm                |   1 +
 legacy/src/main/res/values-ug                 |   1 +
 legacy/src/main/res/values-uk                 |   1 +
 legacy/src/main/res/values-ur                 |   1 +
 legacy/src/main/res/values-uz                 |   1 +
 legacy/src/main/res/values-vi                 |   1 +
 legacy/src/main/res/values-yue                |   1 +
 legacy/src/main/res/values-zh-rCN             |   1 +
 legacy/src/main/res/values-zh-rHK             |   1 +
 legacy/src/main/res/values-zh-rTW             |   1 +
 226 files changed, 433 insertions(+), 189 deletions(-)
 create mode 100644 app/src/basic/res/drawable/ic_launcher_foreground.xml
 create mode 100644 app/src/basic/res/values/strings.xml
 delete mode 100644 app/src/main/res/drawable/ic_launcher.png
 create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml
 create mode 100644 app/src/main/res/drawable/ic_launcher_monochrome.xml
 create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 rename {legacy => app}/src/main/res/values-af/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ar/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ast/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-az/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-b+hi+Latn/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-be/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ber/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-bg/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-bn-rBD/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-bn/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-bo/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-br/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ca/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ckb/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-cs/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-cy/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-da/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-de/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-el/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-en-rGB/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-eo/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-es-rAR/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-es-rMX/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-es/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-et/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-eu/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-fa/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-fi/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-fil/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-fr/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-fy/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ga/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-gd/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-gl/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-gu/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-he/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-hi/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-hr/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-hu/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-hy/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-id/strings.xml (100%)
 create mode 120000 app/src/main/res/values-in
 rename {legacy => app}/src/main/res/values-is/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-it/strings.xml (100%)
 create mode 120000 app/src/main/res/values-iw
 rename {legacy => app}/src/main/res/values-ja/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ka/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-kab/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-kk/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-kmr/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-kn/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ko/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-lb/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-lt/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-lv/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-mk/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ml/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-mn/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-mr/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-my/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-nah/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-nb/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ne/strings.xml (100%)
 create mode 100644 app/src/main/res/values-night/ic_launcher_background.xml
 rename {legacy => app}/src/main/res/values-nl-rBE/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-nl/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-nn/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-oc/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-or/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-pa-rPK/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-pa/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-pl/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ps/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-pt-rBR/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-pt-rPT/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-pt/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ro/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ru/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-sc/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-si/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-sk/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-sl/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-sn/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-so/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-sq/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-sr/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-sv/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-sw/strings.xml (99%)
 rename {legacy => app}/src/main/res/values-ta/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-te/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-th/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-tok/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-tr/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-tt/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-tzm/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ug/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-uk/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-ur/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-uz/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-vi/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-yue/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-zh-rCN/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-zh-rHK/strings.xml (100%)
 rename {legacy => app}/src/main/res/values-zh-rTW/strings.xml (100%)
 create mode 100644 app/src/main/res/values/ic_launcher_background.xml
 delete mode 100644 app/src/main/res/values/strings-next.xml
 create mode 120000 legacy/src/main/res/values-af
 create mode 120000 legacy/src/main/res/values-ar
 create mode 120000 legacy/src/main/res/values-ast
 create mode 120000 legacy/src/main/res/values-az
 create mode 120000 legacy/src/main/res/values-b+hi+Latn
 create mode 120000 legacy/src/main/res/values-be
 create mode 120000 legacy/src/main/res/values-ber
 create mode 120000 legacy/src/main/res/values-bg
 create mode 120000 legacy/src/main/res/values-bn
 create mode 120000 legacy/src/main/res/values-bn-rBD
 create mode 120000 legacy/src/main/res/values-bo
 create mode 120000 legacy/src/main/res/values-br
 create mode 120000 legacy/src/main/res/values-ca
 create mode 120000 legacy/src/main/res/values-ckb
 create mode 120000 legacy/src/main/res/values-cs
 create mode 120000 legacy/src/main/res/values-cy
 create mode 120000 legacy/src/main/res/values-da
 create mode 120000 legacy/src/main/res/values-de
 create mode 120000 legacy/src/main/res/values-el
 create mode 120000 legacy/src/main/res/values-en-rGB
 create mode 120000 legacy/src/main/res/values-eo
 create mode 120000 legacy/src/main/res/values-es
 create mode 120000 legacy/src/main/res/values-es-rAR
 create mode 120000 legacy/src/main/res/values-es-rMX
 create mode 120000 legacy/src/main/res/values-et
 create mode 120000 legacy/src/main/res/values-eu
 create mode 120000 legacy/src/main/res/values-fa
 create mode 120000 legacy/src/main/res/values-fi
 create mode 120000 legacy/src/main/res/values-fil
 create mode 120000 legacy/src/main/res/values-fr
 create mode 120000 legacy/src/main/res/values-fy
 create mode 120000 legacy/src/main/res/values-ga
 create mode 120000 legacy/src/main/res/values-gd
 create mode 120000 legacy/src/main/res/values-gl
 create mode 120000 legacy/src/main/res/values-gu
 create mode 120000 legacy/src/main/res/values-he
 create mode 120000 legacy/src/main/res/values-hi
 create mode 120000 legacy/src/main/res/values-hr
 create mode 120000 legacy/src/main/res/values-hu
 create mode 120000 legacy/src/main/res/values-hy
 create mode 120000 legacy/src/main/res/values-id
 create mode 120000 legacy/src/main/res/values-is
 create mode 120000 legacy/src/main/res/values-it
 create mode 120000 legacy/src/main/res/values-ja
 create mode 120000 legacy/src/main/res/values-ka
 create mode 120000 legacy/src/main/res/values-kab
 create mode 120000 legacy/src/main/res/values-kk
 create mode 120000 legacy/src/main/res/values-kmr
 create mode 120000 legacy/src/main/res/values-kn
 create mode 120000 legacy/src/main/res/values-ko
 create mode 120000 legacy/src/main/res/values-lb
 create mode 120000 legacy/src/main/res/values-lt
 create mode 120000 legacy/src/main/res/values-lv
 create mode 120000 legacy/src/main/res/values-mk
 create mode 120000 legacy/src/main/res/values-ml
 create mode 120000 legacy/src/main/res/values-mn
 create mode 120000 legacy/src/main/res/values-mr
 create mode 120000 legacy/src/main/res/values-my
 create mode 120000 legacy/src/main/res/values-nah
 create mode 120000 legacy/src/main/res/values-nb
 create mode 120000 legacy/src/main/res/values-ne
 create mode 120000 legacy/src/main/res/values-nl
 create mode 120000 legacy/src/main/res/values-nl-rBE
 create mode 120000 legacy/src/main/res/values-nn
 create mode 120000 legacy/src/main/res/values-oc
 create mode 120000 legacy/src/main/res/values-or
 create mode 120000 legacy/src/main/res/values-pa
 create mode 120000 legacy/src/main/res/values-pa-rPK
 create mode 120000 legacy/src/main/res/values-pl
 create mode 120000 legacy/src/main/res/values-ps
 create mode 120000 legacy/src/main/res/values-pt
 create mode 120000 legacy/src/main/res/values-pt-rBR
 create mode 120000 legacy/src/main/res/values-pt-rPT
 create mode 120000 legacy/src/main/res/values-ro
 create mode 120000 legacy/src/main/res/values-ru
 create mode 120000 legacy/src/main/res/values-sc
 create mode 120000 legacy/src/main/res/values-si
 create mode 120000 legacy/src/main/res/values-sk
 create mode 120000 legacy/src/main/res/values-sl
 create mode 120000 legacy/src/main/res/values-sn
 create mode 120000 legacy/src/main/res/values-so
 create mode 120000 legacy/src/main/res/values-sq
 create mode 120000 legacy/src/main/res/values-sr
 create mode 120000 legacy/src/main/res/values-sv
 create mode 120000 legacy/src/main/res/values-sw
 create mode 120000 legacy/src/main/res/values-ta
 create mode 120000 legacy/src/main/res/values-te
 create mode 120000 legacy/src/main/res/values-th
 create mode 120000 legacy/src/main/res/values-tok
 create mode 120000 legacy/src/main/res/values-tr
 create mode 120000 legacy/src/main/res/values-tt
 create mode 120000 legacy/src/main/res/values-tzm
 create mode 120000 legacy/src/main/res/values-ug
 create mode 120000 legacy/src/main/res/values-uk
 create mode 120000 legacy/src/main/res/values-ur
 create mode 120000 legacy/src/main/res/values-uz
 create mode 120000 legacy/src/main/res/values-vi
 create mode 120000 legacy/src/main/res/values-yue
 create mode 120000 legacy/src/main/res/values-zh-rCN
 create mode 120000 legacy/src/main/res/values-zh-rHK
 create mode 120000 legacy/src/main/res/values-zh-rTW

diff --git a/app/src/basic/res/drawable/ic_launcher_foreground.xml b/app/src/basic/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..ddae19fea
--- /dev/null
+++ b/app/src/basic/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <group
+        android:scaleX="0.52"
+        android:scaleY="0.52"
+        android:translateX="11.52"
+        android:translateY="11.52">
+        <path
+            android:pathData="M45.411,3.75 L41.161,9.25"
+            android:strokeWidth="2.5"
+            android:strokeColor="#aeea00"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="miter" />
+        <path
+            android:pathData="M2.589,3.75 L6.839,9.25"
+            android:strokeWidth="2.5"
+            android:strokeColor="#aeea00"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="miter" />
+        <path
+            android:fillColor="#aeea00"
+            android:pathData="M8,7.25L40,7.25A3,3 0,0 1,43 10.25L43,17.25A3,3 0,0 1,40 20.25L8,20.25A3,3 0,0 1,5 17.25L5,10.25A3,3 0,0 1,8 7.25z" />
+        <path
+            android:fillColor="#1976d2"
+            android:pathData="M8,21.25L40,21.25A3,3 0,0 1,43 24.25L43,44.25A3,3 0,0 1,40 47.25L8,47.25A3,3 0,0 1,5 44.25L5,24.25A3,3 0,0 1,8 21.25z" />
+    </group>
+</vector>
diff --git a/app/src/basic/res/values/strings.xml b/app/src/basic/res/values/strings.xml
new file mode 100644
index 000000000..2f6657fd9
--- /dev/null
+++ b/app/src/basic/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">@string/app_name_basic</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf22d92b6..f5f7afa12 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,18 +22,18 @@
         android:name="org.fdroid.App"
         android:allowBackup="true"
         android:enableOnBackInvokedCallback="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Fdroidclient"
+        android:theme="@style/Theme.FDroid"
         tools:targetApi="33">
         <activity
             android:name="org.fdroid.MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.Fdroidclient"
+            android:theme="@style/Theme.FDroid"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/kotlin/org/fdroid/ui/About.kt b/app/src/main/kotlin/org/fdroid/ui/About.kt
index ff6e46471..811c534fc 100644
--- a/app/src/main/kotlin/org/fdroid/ui/About.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/About.kt
@@ -105,7 +105,7 @@ private fun AboutHeader(modifier: Modifier = Modifier) {
         modifier = modifier.fillMaxWidth()
     ) {
         Image(
-            painter = painterResource(id = R.drawable.ic_launcher),
+            painter = painterResource(id = R.drawable.ic_launcher_foreground),
             contentDescription = null, // decorative element
             modifier = Modifier
                 .fillMaxWidth(0.25f)
diff --git a/app/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt b/app/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
index 67a74fac5..4ec975f15 100644
--- a/app/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/utils/BadgeIcon.kt
@@ -60,7 +60,7 @@ private fun Preview() {
                 )
             }, modifier = Modifier.padding(16.dp)) {
                 Image(
-                    painter = painterResource(R.drawable.ic_launcher),
+                    painter = painterResource(R.drawable.ic_launcher_foreground),
                     contentDescription = null,
                     modifier = Modifier
                         .size(48.dp),
@@ -71,7 +71,7 @@ private fun Preview() {
                 modifier = Modifier.padding(16.dp)
             ) {
                 Image(
-                    painter = painterResource(R.drawable.ic_launcher),
+                    painter = painterResource(R.drawable.ic_launcher_foreground),
                     contentDescription = null,
                     modifier = Modifier
                         .size(48.dp),
diff --git a/app/src/main/res/drawable/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png
deleted file mode 100644
index 6107595cf86aff526de92931a9aebe5172d6b419..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10858
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
agGoHuHCwxL%pd+C1(aW_%U8;ph5kRWr7s!)

diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..5a9726517
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,69 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <group android:scaleX="0.52"
+      android:scaleY="0.52"
+      android:translateX="11.52"
+      android:translateY="11.52">
+    <path
+        android:pathData="M45.411,3.75 L41.161,9.25"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="2.5"
+        android:strokeColor="#aeea00"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M2.589,3.75 L6.839,9.25"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="2.5"
+        android:strokeColor="#aeea00"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M8,7.25L40,7.25A3,3 0,0 1,43 10.25L43,17.25A3,3 0,0 1,40 20.25L8,20.25A3,3 0,0 1,5 17.25L5,10.25A3,3 0,0 1,8 7.25z"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="3"
+        android:fillColor="#aeea00"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M8,21.25L40,21.25A3,3 0,0 1,43 24.25L43,44.25A3,3 0,0 1,40 47.25L8,47.25A3,3 0,0 1,5 44.25L5,24.25A3,3 0,0 1,8 21.25z"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="3"
+        android:fillColor="#1976d2"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="m24,28c-2.881,0 -5.32,1.985 -6.033,4.65h3.213C21.734,31.665 22.775,31 24,31c1.813,0 3.25,1.437 3.25,3.25 0,1.813 -1.437,3.25 -3.25,3.25 -1.307,0 -2.411,-0.753 -2.93,-1.85h-3.154c0.642,2.766 3.132,4.85 6.084,4.85 3.434,0 6.25,-2.816 6.25,-6.25 0,-3.434 -2.816,-6.25 -6.25,-6.25z"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="3"
+        android:fillColor="#0d47a1"
+        android:strokeColor="#00000000"
+        android:fillType="nonZero"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M14.45,34.25a9.55,9.55 0,1 0,19.1 0a9.55,9.55 0,1 0,-19.1 0z"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="1.9"
+        android:fillColor="#00000000"
+        android:strokeColor="#0d47a1"
+        android:fillAlpha="0.403922"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M11,14.375a3.375,3.375 0,1 0,6.75 0a3.375,3.375 0,1 0,-6.75 0z"
+        android:strokeAlpha="0.697211"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="1.9"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M30.5,14.375a3.375,3.375 0,1 0,6.75 0a3.375,3.375 0,1 0,-6.75 0z"
+        android:strokeAlpha="0.697211"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="1.9"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml
new file mode 100644
index 000000000..a30297672
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M70.24,49.95H37.76a3.04,3.04 0,0 0,-3.04 3.04V73.29a3.04,3.04 0,0 0,3.04 3.04H70.24A3.04,3.04 0,0 0,73.28 73.29V52.99A3.04,3.04 0,0 0,70.24 49.95ZM54,73.8A10.66,10.66 0,1 1,64.66 63.14,10.67 10.67,0 0,1 54,73.8Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M54,54.41A8.73,8.73 0,1 0,62.73 63.14,8.74 8.74,0 0,0 54,54.41ZM54,69.48a6.37,6.37 0,0 1,-6.17 -4.92h3.2a3.3,3.3 0,1 0,0.11 -3.04L47.88,61.52A6.34,6.34 0,1 1,54 69.48Z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M76.51,31.18a1.27,1.27 0,0 0,-1.78 0.23l-3.49,4.51a3.02,3.02 0,0 0,-1 -0.18L37.76,35.74a3.02,3.02 0,0 0,-1 0.18l-3.49,-4.51A1.27,1.27 0,1 0,31.26 32.96l3.66,4.74a3.02,3.02 0,0 0,-0.21 1.09L34.72,45.89a3.04,3.04 0,0 0,3.04 3.04L70.24,48.93a3.04,3.04 0,0 0,3.04 -3.04L73.28,38.78a3.02,3.02 0,0 0,-0.21 -1.09l3.66,-4.74A1.27,1.27 0,0 0,76.51 31.18ZM44.23,46.39a3.43,3.43 0,1 1,3.43 -3.43A3.43,3.43 0,0 1,44.23 46.39ZM64.02,46.39a3.43,3.43 0,1 1,3.43 -3.43A3.43,3.43 0,0 1,64.02 46.39Z" />
+</vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..c78bee3b5
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fbe681d0c0600364b4bc6785ceadf249887eac7
GIT binary patch
literal 2133
zcmV-b2&(sqP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000OaNkl<ZcwX(B
zX>3$g6vrt`T(D(Yri(@cMonB07yKY5D*8b!ivqGJC<uaziVCQ4i`E6AiDFGmT%rg{
z5n5=0LaRU*&?3?n=ujjsY-Pzzr?t~*JDtwL@%-<bSEuhz>C9+n`X+OeU*79|=bbs{
zKlh${Z<FcQFW%xU-r_CZ^xcRkff*QMBxv&ttFfd0+P+w6|2a2*2Yf%4d6!wve8_yH
zGY~UkM-F2H<rq>^U*xNiDLZ@iECH|At9yL8l-cceqkpbJH}adG?5G?LJsyucmOxG{
z&@N6<9SFhKBsLz1tJCQmuZpAn7W5A1<#sq6R9jm+#Xskun$I|)wYBwwSQUtIyId|h
zeE9Gu$Tb{+`rB-_&)_T;1wu~TAkYfr8je5%tyb&jsx$2e!~jAdlgacAat&9YFW@Z3
z1zL$*!xG41v3v<<-3iq0X&{H&EcN#l5L>&)D)svi0@c*itU|8;yFl%3D^)a2q|(M)
z$?p1H`{7Z??)r;kyNxRTp1`qMr03q=7Rc`UlZvgE(*|=tDsQ}l+}?I=08zv3b#hF1
zir9*+!#LJIBpYvU3k3dZ`;79<{Y4;qZL_)0BiTeA4^`RbaZCw<KU+TyU?b>#fjr(0
zI%t1g2!vqj9P1>TNORJ$-X~5!j_p+uqt?bp?+XN+T&T+$Zx;b=v<#+0E$>iG^NVz#
zc}YaUXC7*KTf~4^P=64cHr|K}1X|ojd9Dxljil&<y3^u5BE=asfiUk6G%u0@jTZZx
z7mAqVIHM>~jeUs}s7k(h0By5gOWPYpb{6&UNT46ASI~}zo2bBYUV!Hc`<kEOnA`#4
z?1KUo)n7(O+rAR}rVdXt9e1n_YdUVSTttUkmQkzg1i3v9I^AB#Lfs(Q0o@3Mk#nT&
z3(5YJV<Q*S3nlyRNnrmkOMYyw-^3T7wbzY6+Z#skO420RdpP)Q)~hA^?$~5WB8#(B
z@&nWjp+CA22vfl2X$fHOWr41d?7L&LC7G<w3dsl9*?5;^uN#5#%>(H~+ZxH<+`fZH
zMWSTiJqcWY-k1C+$DLu4y>0{oIIo>)FYdIhckZO(`r(pYPZZW0x!8X#rYHQ^I%;`(
zjgjntB2b@N=Dk#Fe?tmX1)~L13T(C*r02m>U>+oD7yN9gPnVvnnC!3gJ%L(WM|h8N
zr4($W!9FR7U3BCH0{9<HontNi(VERHk1!w83I1%<C2d^Y5P5;>8lCjk=2P_4>f=%2
zP5$f?4MG23DzX9{=fG}RdWbH5=|EJu`MpDQ)EbmXkrilJ@fj)DP{>$ZO=(Y82ym}`
z9t!VmJ<Y3~9HWNF34~y>3QtLa_C(q<6_ot&7D~MDTS~lVWmmW_`JqA~nD)J%c(vdp
z$1KOG8-X&GR8z{#t)0Roja@CoNMW%Ae4jKnr&B1{hBB&jEl|dyDl$wdpu~Gu(U1q$
zQR@71%6OqNfL*0{1{>HKrsRuvwRVBfuRt&E=aI5mjEv-IoBkDs`_mWhp|q!d65t+v
zcm|u~>6?^y_+7RCT<BIH<J=OFsA2L3F+$Ln{_HP8tfX-{Vx$1vLliuNjTm(gZV>Mp
z=j@RDYSE=Y8B6vlB5+Mfe|ER%OIz@>(x)xZK9a_*=`7L^3-7`nzO?>zFHq_eJAKon
zP)rky3Q=EFF}NtF%q$Xg7H9@GVzi0rSt$BapD367>s}zSYH@NHHTc^&w^Uih7{jEz
zE`=I`7$&Xn6bVxk{TNO7J7vaJ$-h7P6A0h_w2dM;b-BhgQ3+IdA*8wuK+O{UY%50L
z)Qth(QPH75`?$#FD+2XUKU6S^lE#0pOtbsfD*Zlzgkb0JqeFrAi*H>KNEt!t&;2TP
z(jd_O2K`By-zkDj%v1VRfu<J3*a%`!H$)BctzgDEB|-oo_C$Uo0@DzEY7H7Xdz<JN
zD_Km|AjUYav`cd7&;Qyvg~U#o3-!>)whJ+aOw3jGMEndk7;Sh*71{WBspMbx0*QSP
zpSggVaO(UrO7u;mKwxyi2DU;_yq~$c$2z7<fxysNKZ?Y$OIB-9>XW;8#N>57(epj}
zaO{8$1WBH*98usy>sO0z1wvuP3M53D;desk{<H-@iM<gJdnNTO#y0BI606rainEG-
z1!B@)*sIhSB+Q#Zb>kQaJTpvIHjG0a$mMCaSF#C&t_1>E*8Nwhr15Jg<&k1hpaJgD
zr#=^}obPZO47wLcz*8ml$(_pn$hTs3f&1_bXSiUdl|Ow>Ah5LPv=nGi;NZ&VFzk;o
zr38F0&SoJBqk=CBUz#>X4UrYdbh3@Ef4f!+Hqwm9s-^vPtx|jeh^#=M_H-L9&a0zG
zR~(57i*xHl4BEK5;eQb*=6|cf0<A=@VF_flT0<H^dIC8?po0ewhChPLW^;C||DbNq
zo;_b8*RTZIy?gg8)ftPV{Q%v9T=0`jyWLJXIXMfEYgJX%AgvDFHd21zI)J(O*s){#
zFcjgCoyP>o1vyn$SJ!Zkmm*hR&cV0b+*}A`m@r|&ohFm1rm3lkIyyQCj`a+tmCa_O
z%F0SpW@hHy$T2G`EBNW<-^Pp?b3R`#VQ$RM&VH?^s3@nrynI7RNl9K=S=oAjN=r+-
z+-v_1)}}Xn`mTA19XTKu<b>Qtj~;zN*Q`Tp38O}hx{$9K%vH>F%m|%>9FR-;$dMxl
z^EI@o6{xXDgLpI<_-bUQX?g}Z_;LxpD2LFXb}SHY@fL6Kri=CuWm%Q4!Ueqn00000
LNkvXXu0mjfm?#Nq

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7bf26889b69b2b5f18840b69934e4628996a23a
GIT binary patch
literal 1427
zcmV;E1#J3>P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000GANkl<ZcwX&U
zZ%kWN6o;{?jL-rt6cU}$L}Q$O@Po++(GNQOvjNc=n1iuR*-YHrAO9s96TkA^2-9ey
zB4cx|4A^vW%UUdh0>#d`Nn)ACZPB&z`dT_@>3gpn&$+zf>w8qDdGz(ePV&or_ug~Q
z`Tg#@_cZCt$+=}&YygmlSZOfw)V!87T(p9q9yiMV6Cb4`K3foL5O)~_%57PU+oG0q
zz;-pFeQs{fpGYKvMndM$PMnk+7q#T1BuO9PLcoPtgK#+f2~x{VD*)un5{X2tDBv$z
zgl!z#1h$4i&K;-CL|&6Fm#ad_HN|jnCAH(@<M)Z87?K5049#w262w6k5bo*ec~HqU
z#gc;q0|WP?06w``9Wc{S3h3(UTC3!mVk!Yy`35>VIv!GTO|hi}1ZMle6MhMzqF<9l
zPsGFk%R~97ubY5tQ9JYmR>MeW3y4xolUNUki5QH8n=ns4T#bIs#&i=PB?Pz>c^{4k
zZik8K510r+n$Zmu@A7mTi+?fl9?Pez0K%-qgEROzbo*C<i(e0Cxkq$^i?4>`7`H$8
z7|XM;ae4|MObO#)_vb7d!osDLe7XzZ<6cct2e%HqQ?IgJwEJ^4^J+M_N16XQext@e
z824mWfP<@q8SxJ`CrA;Ql$P{A{_C)k{kh=p4mGF*jAm8<?WA&k0xzPPv=YOi%_;tu
zrw<w{;QQbc5SOOd9F@UgEVF9TO3)jNiJa^|i#2~oW(9<WpH-xCVUVxGoovV7h(_oQ
z6lzE-(d}OWu3$CW`H|38R`ZqfVd3KP3J|0lxXTUD7cgV;0^QITFyVcuXYrR+0O3X~
z3f}7u7`%EyH+cOH7FV51cL9-@2+g1U1{H7rs5=@z{S~I7;_?dc`J<Y|8ocQRYl{O)
zww_u5^~-Tw<Ez3i*Hhnu?gD<gHls<ZMCq=6Fx4Ce)5b0+Y5WFCn!aT))pRkG?s96@
zC~^MEv~dDTcRIkdp%X0IzJu~N#-QS@^HBb}++yFd?KGPwKlNI}1=#iugSqxFSYJMi
zWPbq5_S0ZyZ{iSZE!)qqaXL!mXWQ%6#4uC<o%5m>x*172I)zVv!FIdo`D3i5K8@2o
zAU`@*>KKL!FxPzrRy-QE{iBRv(Iz{T?HR)3<At)<hS-}hJ^Llt_6;*X@>j<&OaSdF
z9gDI(gPOS{N}5hV;ZvVO+3rE+NB)adB|`+zB{kO`VdRKZ+3s^1F~ytv<^|w5`H?@Z
zQ^zt!0K)v-QFd|54|o_kI`dSGZ2LyoIJ*;gnadB1f@Q}U=C6)nr~p=7>W(l0R;=}f
z&vdXIUjX*4JDu|a(T}Q?I)<SFsQMIbItIlJz3iDTGgYSI7f-O3-UN-)Q8Hs?qGxps
zLj@41!kBP(sdSdU(l3wCpL6PyKocG>@>8$P3IR+6?L5|dRyLK`a0p7aoMiLrH5nCf
zg^R)6?_SU(P61XI+x`(&|LM1YTIw%Wb(C21&IS0LOa0UA{|ZR^=Wbk(;N$)P)U{1O
z&4)hSP}k;zgBW)f<EImFQ-AIb4Glf;Z*O2hh$ulUt{-S))H&1wIy*ZbR&q@-kUtvO
z?e;qbLEvbSlqDZHkQ?wkA8c)Hy_YyToldO)GMN8-bBE98JBlJ`9gq;CESWnVkHgs5
zST}OZhjgEq$mGeqs;a8B9*?JYa&nRng+f!PK1^*Uk<7_)9Pf6!`zk9d>G;rh>+}N1
zWQTmjJ=N9KPqwtQ)HXLa8v@F`9*wvVrzOcJjU4Oi>u<xy0))w66cCr2Ca*NQEO_=-
h8HuzP_LgOd{S9vT$%`N<Nz(uT002ovPDHLkV1jk9uD<{P

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..8068afb7282349e7e1c0366b3866b7a00fc71a7c
GIT binary patch
literal 2888
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d2bcf9d7a9862492d18b39ac234aefccb870ce6
GIT binary patch
literal 4422
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
Pe}q6=T_0AhY8&-G@n%`9

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9b447816070c49f849e33be2411a8f7f40d3110
GIT binary patch
literal 6254
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

literal 0
HcmV?d00001

diff --git a/legacy/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-af/strings.xml
rename to app/src/main/res/values-af/strings.xml
diff --git a/legacy/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ar/strings.xml
rename to app/src/main/res/values-ar/strings.xml
diff --git a/legacy/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ast/strings.xml
rename to app/src/main/res/values-ast/strings.xml
diff --git a/legacy/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-az/strings.xml
rename to app/src/main/res/values-az/strings.xml
diff --git a/legacy/src/main/res/values-b+hi+Latn/strings.xml b/app/src/main/res/values-b+hi+Latn/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-b+hi+Latn/strings.xml
rename to app/src/main/res/values-b+hi+Latn/strings.xml
diff --git a/legacy/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-be/strings.xml
rename to app/src/main/res/values-be/strings.xml
diff --git a/legacy/src/main/res/values-ber/strings.xml b/app/src/main/res/values-ber/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ber/strings.xml
rename to app/src/main/res/values-ber/strings.xml
diff --git a/legacy/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-bg/strings.xml
rename to app/src/main/res/values-bg/strings.xml
diff --git a/legacy/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-bn-rBD/strings.xml
rename to app/src/main/res/values-bn-rBD/strings.xml
diff --git a/legacy/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-bn/strings.xml
rename to app/src/main/res/values-bn/strings.xml
diff --git a/legacy/src/main/res/values-bo/strings.xml b/app/src/main/res/values-bo/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-bo/strings.xml
rename to app/src/main/res/values-bo/strings.xml
diff --git a/legacy/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-br/strings.xml
rename to app/src/main/res/values-br/strings.xml
diff --git a/legacy/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ca/strings.xml
rename to app/src/main/res/values-ca/strings.xml
diff --git a/legacy/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ckb/strings.xml
rename to app/src/main/res/values-ckb/strings.xml
diff --git a/legacy/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-cs/strings.xml
rename to app/src/main/res/values-cs/strings.xml
diff --git a/legacy/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-cy/strings.xml
rename to app/src/main/res/values-cy/strings.xml
diff --git a/legacy/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-da/strings.xml
rename to app/src/main/res/values-da/strings.xml
diff --git a/legacy/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-de/strings.xml
rename to app/src/main/res/values-de/strings.xml
diff --git a/legacy/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-el/strings.xml
rename to app/src/main/res/values-el/strings.xml
diff --git a/legacy/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-en-rGB/strings.xml
rename to app/src/main/res/values-en-rGB/strings.xml
diff --git a/legacy/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-eo/strings.xml
rename to app/src/main/res/values-eo/strings.xml
diff --git a/legacy/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-es-rAR/strings.xml
rename to app/src/main/res/values-es-rAR/strings.xml
diff --git a/legacy/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-es-rMX/strings.xml
rename to app/src/main/res/values-es-rMX/strings.xml
diff --git a/legacy/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-es/strings.xml
rename to app/src/main/res/values-es/strings.xml
diff --git a/legacy/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-et/strings.xml
rename to app/src/main/res/values-et/strings.xml
diff --git a/legacy/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-eu/strings.xml
rename to app/src/main/res/values-eu/strings.xml
diff --git a/legacy/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-fa/strings.xml
rename to app/src/main/res/values-fa/strings.xml
diff --git a/legacy/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-fi/strings.xml
rename to app/src/main/res/values-fi/strings.xml
diff --git a/legacy/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-fil/strings.xml
rename to app/src/main/res/values-fil/strings.xml
diff --git a/legacy/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-fr/strings.xml
rename to app/src/main/res/values-fr/strings.xml
diff --git a/legacy/src/main/res/values-fy/strings.xml b/app/src/main/res/values-fy/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-fy/strings.xml
rename to app/src/main/res/values-fy/strings.xml
diff --git a/legacy/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ga/strings.xml
rename to app/src/main/res/values-ga/strings.xml
diff --git a/legacy/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-gd/strings.xml
rename to app/src/main/res/values-gd/strings.xml
diff --git a/legacy/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-gl/strings.xml
rename to app/src/main/res/values-gl/strings.xml
diff --git a/legacy/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-gu/strings.xml
rename to app/src/main/res/values-gu/strings.xml
diff --git a/legacy/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-he/strings.xml
rename to app/src/main/res/values-he/strings.xml
diff --git a/legacy/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-hi/strings.xml
rename to app/src/main/res/values-hi/strings.xml
diff --git a/legacy/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-hr/strings.xml
rename to app/src/main/res/values-hr/strings.xml
diff --git a/legacy/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-hu/strings.xml
rename to app/src/main/res/values-hu/strings.xml
diff --git a/legacy/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-hy/strings.xml
rename to app/src/main/res/values-hy/strings.xml
diff --git a/legacy/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-id/strings.xml
rename to app/src/main/res/values-id/strings.xml
diff --git a/app/src/main/res/values-in b/app/src/main/res/values-in
new file mode 120000
index 000000000..f7118b95e
--- /dev/null
+++ b/app/src/main/res/values-in
@@ -0,0 +1 @@
+values-id
\ No newline at end of file
diff --git a/legacy/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-is/strings.xml
rename to app/src/main/res/values-is/strings.xml
diff --git a/legacy/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-it/strings.xml
rename to app/src/main/res/values-it/strings.xml
diff --git a/app/src/main/res/values-iw b/app/src/main/res/values-iw
new file mode 120000
index 000000000..57bf91954
--- /dev/null
+++ b/app/src/main/res/values-iw
@@ -0,0 +1 @@
+values-he
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ja/strings.xml
rename to app/src/main/res/values-ja/strings.xml
diff --git a/legacy/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ka/strings.xml
rename to app/src/main/res/values-ka/strings.xml
diff --git a/legacy/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-kab/strings.xml
rename to app/src/main/res/values-kab/strings.xml
diff --git a/legacy/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-kk/strings.xml
rename to app/src/main/res/values-kk/strings.xml
diff --git a/legacy/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-kmr/strings.xml
rename to app/src/main/res/values-kmr/strings.xml
diff --git a/legacy/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-kn/strings.xml
rename to app/src/main/res/values-kn/strings.xml
diff --git a/legacy/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ko/strings.xml
rename to app/src/main/res/values-ko/strings.xml
diff --git a/legacy/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-lb/strings.xml
rename to app/src/main/res/values-lb/strings.xml
diff --git a/legacy/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-lt/strings.xml
rename to app/src/main/res/values-lt/strings.xml
diff --git a/legacy/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-lv/strings.xml
rename to app/src/main/res/values-lv/strings.xml
diff --git a/legacy/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-mk/strings.xml
rename to app/src/main/res/values-mk/strings.xml
diff --git a/legacy/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ml/strings.xml
rename to app/src/main/res/values-ml/strings.xml
diff --git a/legacy/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-mn/strings.xml
rename to app/src/main/res/values-mn/strings.xml
diff --git a/legacy/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-mr/strings.xml
rename to app/src/main/res/values-mr/strings.xml
diff --git a/legacy/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-my/strings.xml
rename to app/src/main/res/values-my/strings.xml
diff --git a/legacy/src/main/res/values-nah/strings.xml b/app/src/main/res/values-nah/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-nah/strings.xml
rename to app/src/main/res/values-nah/strings.xml
diff --git a/legacy/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-nb/strings.xml
rename to app/src/main/res/values-nb/strings.xml
diff --git a/legacy/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ne/strings.xml
rename to app/src/main/res/values-ne/strings.xml
diff --git a/app/src/main/res/values-night/ic_launcher_background.xml b/app/src/main/res/values-night/ic_launcher_background.xml
new file mode 100644
index 000000000..cdde88fb8
--- /dev/null
+++ b/app/src/main/res/values-night/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#000000</color>
+</resources>
diff --git a/legacy/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-nl-rBE/strings.xml
rename to app/src/main/res/values-nl-rBE/strings.xml
diff --git a/legacy/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-nl/strings.xml
rename to app/src/main/res/values-nl/strings.xml
diff --git a/legacy/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-nn/strings.xml
rename to app/src/main/res/values-nn/strings.xml
diff --git a/legacy/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-oc/strings.xml
rename to app/src/main/res/values-oc/strings.xml
diff --git a/legacy/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-or/strings.xml
rename to app/src/main/res/values-or/strings.xml
diff --git a/legacy/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-pa-rPK/strings.xml
rename to app/src/main/res/values-pa-rPK/strings.xml
diff --git a/legacy/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-pa/strings.xml
rename to app/src/main/res/values-pa/strings.xml
diff --git a/legacy/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-pl/strings.xml
rename to app/src/main/res/values-pl/strings.xml
diff --git a/legacy/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ps/strings.xml
rename to app/src/main/res/values-ps/strings.xml
diff --git a/legacy/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-pt-rBR/strings.xml
rename to app/src/main/res/values-pt-rBR/strings.xml
diff --git a/legacy/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-pt-rPT/strings.xml
rename to app/src/main/res/values-pt-rPT/strings.xml
diff --git a/legacy/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-pt/strings.xml
rename to app/src/main/res/values-pt/strings.xml
diff --git a/legacy/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ro/strings.xml
rename to app/src/main/res/values-ro/strings.xml
diff --git a/legacy/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ru/strings.xml
rename to app/src/main/res/values-ru/strings.xml
diff --git a/legacy/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-sc/strings.xml
rename to app/src/main/res/values-sc/strings.xml
diff --git a/legacy/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-si/strings.xml
rename to app/src/main/res/values-si/strings.xml
diff --git a/legacy/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-sk/strings.xml
rename to app/src/main/res/values-sk/strings.xml
diff --git a/legacy/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-sl/strings.xml
rename to app/src/main/res/values-sl/strings.xml
diff --git a/legacy/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-sn/strings.xml
rename to app/src/main/res/values-sn/strings.xml
diff --git a/legacy/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-so/strings.xml
rename to app/src/main/res/values-so/strings.xml
diff --git a/legacy/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-sq/strings.xml
rename to app/src/main/res/values-sq/strings.xml
diff --git a/legacy/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-sr/strings.xml
rename to app/src/main/res/values-sr/strings.xml
diff --git a/legacy/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-sv/strings.xml
rename to app/src/main/res/values-sv/strings.xml
diff --git a/legacy/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
similarity index 99%
rename from legacy/src/main/res/values-sw/strings.xml
rename to app/src/main/res/values-sw/strings.xml
index 62535eb6a..8018e2af1 100644
--- a/legacy/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -336,7 +336,6 @@
     <string name="repo_url">Anwani</string>
     <string name="repo_num_apps">Idadi ya apu</string>
     <string name="repo_description">Maelezo</string>
-    <string name="repo_last_update_downloaded">Sasisho la mwisho kupakuliwa</string>
     <string name="repo_official_mirrors">Vioo rasmi</string>
     <string name="repo_user_mirrors">Vioo vya watumiaji</string>
     <string name="repo_name">Jina</string>
diff --git a/legacy/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ta/strings.xml
rename to app/src/main/res/values-ta/strings.xml
diff --git a/legacy/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-te/strings.xml
rename to app/src/main/res/values-te/strings.xml
diff --git a/legacy/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-th/strings.xml
rename to app/src/main/res/values-th/strings.xml
diff --git a/legacy/src/main/res/values-tok/strings.xml b/app/src/main/res/values-tok/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-tok/strings.xml
rename to app/src/main/res/values-tok/strings.xml
diff --git a/legacy/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-tr/strings.xml
rename to app/src/main/res/values-tr/strings.xml
diff --git a/legacy/src/main/res/values-tt/strings.xml b/app/src/main/res/values-tt/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-tt/strings.xml
rename to app/src/main/res/values-tt/strings.xml
diff --git a/legacy/src/main/res/values-tzm/strings.xml b/app/src/main/res/values-tzm/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-tzm/strings.xml
rename to app/src/main/res/values-tzm/strings.xml
diff --git a/legacy/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ug/strings.xml
rename to app/src/main/res/values-ug/strings.xml
diff --git a/legacy/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-uk/strings.xml
rename to app/src/main/res/values-uk/strings.xml
diff --git a/legacy/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-ur/strings.xml
rename to app/src/main/res/values-ur/strings.xml
diff --git a/legacy/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-uz/strings.xml
rename to app/src/main/res/values-uz/strings.xml
diff --git a/legacy/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-vi/strings.xml
rename to app/src/main/res/values-vi/strings.xml
diff --git a/legacy/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-yue/strings.xml
rename to app/src/main/res/values-yue/strings.xml
diff --git a/legacy/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-zh-rCN/strings.xml
rename to app/src/main/res/values-zh-rCN/strings.xml
diff --git a/legacy/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-zh-rHK/strings.xml
rename to app/src/main/res/values-zh-rHK/strings.xml
diff --git a/legacy/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from legacy/src/main/res/values-zh-rTW/strings.xml
rename to app/src/main/res/values-zh-rTW/strings.xml
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 000000000..c5d5899fd
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-next.xml b/app/src/main/res/values/strings-next.xml
deleted file mode 100644
index f06cad5ca..000000000
--- a/app/src/main/res/values/strings-next.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">F-Droid Next</string>
-    <string name="about_text">F-Droid distributes (Free and Open Source Software) apps for Android. All apps in its official app repository are built from their source code to ensure that they are completely transparent and only include Free Software.\n\nThis app makes it easy to browse and install apps from F-Droid or other repositories. It also helps you to keep your apps up to date.\n\nF-Droid is a non-profit volunteer project. Although every effort is made to ensure all apps are safe to install, you use it AT YOUR OWN RISK. The app’s source code is automatically checked for potential security or privacy issues. However, this is far from exhaustive and there are no guarantees.\n\nF-Droid respects your privacy. We don’t track you, or your device. We don’t track what you install. You don’t need an account to use this app, and it sends no additional identifying data when communicating with repositories, other than its version number.</string>
-    <string name="about_license_text">This program is Free Software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
-
-    <string name="menu_about">About</string>
-    <string name="menu_discover">Discover</string>
-    <string name="menu_apps_my">My apps</string>
-
-    <string name="first_start_loading">Retrieving apps…\n\nThis may take some time.</string>
-    <string name="first_start_intro">We need to download the latest app repository to get you started.</string>
-    <string name="first_start_offline">However, you seem to be offline. Connect to the internet and tap the button below when ready.</string>
-    <string name="first_start_metered">However, you are on mobile data and we\'ll need to download more than 10 MB. Tap the button below when ready to download.</string>
-    <string name="first_start_button">Download app repository</string>
-    <string name="no_repos_enabled">No repositories enabled.\nEnable or add at least one repository to see apps.</string>
-
-    <string name="my_apps_empty">No apps installed.\n\nInstall apps and they will appear here.</string>
-    <string name="my_apps_header_apps_with_issue">Apps with issues</string>
-    <string name="my_apps_ignore_dialog_title">Hide app issue</string>
-    <string name="my_apps_ignore_dialog_text">Do you want to hide the issue with the app \"%1$s\"?</string>
-    <string name="my_apps_ignore_dialog_button">Hide</string>
-
-    <string name="app_list_new">New apps</string>
-    <string name="app_list_recently_updated">Recently updated</string>
-    <string name="app_list_most_downloaded">Most downloaded</string>
-    <string name="app_list_all">All apps</string>
-    <string name="app_list_author">Apps by %s</string>
-
-    <string name="search_placeholder">Search…</string>
-    <string name="search_no_results">No apps found.\n\nTry to use less search terms or add/enable more repositories.</string>
-    <string name="search_filter_no_results">No matching apps.\n\nTry to use less search terms or remove filters.</string>
-    <string name="search_my_apps_no_results">No matching apps.\n\nTry to use less search terms.</string>
-    <string name="sort_title">Sorting and compatibility</string>
-    <string name="sort_by_name">Sort by name</string>
-    <string name="sort_by_latest">Sort by latest</string>
-    <string name="filter_only_compatible">Apps compatible with this device</string>
-    <string name="filter_button_save">Save above as default</string>
-    <string name="filter_button_clear_all">Clear all filters</string>
-    <!-- Used for filtering lists of apps by certain criteria -->
-    <string name="filter">Filter</string>
-    <!-- Used for filter chips (e.g. categories) when they are currently selected -->
-    <string name="filter_selected">selected</string>
-    <string name="category">Category</string>
-
-    <string name="dialog_metered_title">Continue with mobile data?</string>
-    <!-- The placeholder will be replaced with a size string such as "13 MB" -->
-    <string name="dialog_metered_text">You are currently on a metered internet connection. Do you want to continue downloading %1$s?</string>
-    <string name="dialog_metered_text_no_size">You are currently on a metered internet connection. Do you want to continue downloading?</string>
-    <string name="dialog_metered_button">Download</string>
-    <string name="screenshots_metered">Tap to load screenshots via mobile data</string>
-
-    <string name="category_group_productivity">Productivity</string>
-    <string name="category_group_tools">Tools</string>
-    <string name="category_group_wallets">Finances &amp; Wallets</string>
-    <string name="category_group_media">Entertainment &amp; Media</string>
-    <string name="category_group_communication">Communication</string>
-    <string name="category_group_device">Device</string>
-    <string name="category_group_network">Network</string>
-    <string name="category_group_storage">Files &amp; Storage</string>
-    <string name="category_group_interests">Interests</string>
-    <string name="category_group_misc">Miscellaneous</string>
-
-    <string name="author_by">By %1$s</string>
-    <string name="last_updated">Last updated: %1$s</string>
-    <!-- The placeholder in round brackets will be replaced with the size of the app -->
-    <string name="last_updated_with_size">Last updated: %1$s (%2$s)</string>
-    <string name="status_install_preparing">Preparing installation…</string>
-    <string name="whats_new_title">What\'s new</string>
-    <string name="donate_title">Donate</string>
-    <string name="anti_features_title">This app has anti-features</string>
-    <string name="developer_contact">Developer contact</string>
-    <string name="technical_info">Technical information</string>
-    <string name="package_name">Package Name:</string>
-    <string name="installed_version">Installed Version:</string>
-    <string name="copy_link">Copy link</string>
-    <string name="app_no_compatible_versions">This app is not compatible with your device.</string>
-    <string name="app_no_compatible_signer">Can not update this app, because all versions have an incompatible signature.\n\nIf you don\'t receive updates through other means, you may need to uninstall and then reinstall this app. The app\'s data will be lost.</string>
-    <string name="app_no_compatible_signer_in_this_repo">Can not update this app, because there are no compatible versions in the preferred repository.\n\nTry changing the preferred repository.</string>
-    <string name="app_no_auto_update">Auto-update not available, because app targets old version of Android.</string>
-    <string name="app_issue_update_other_repo">An update is available in another repository, but will not get installed, because that repository is not preferred.</string>
-    <string name="app_issue_not_available_title">No longer available</string>
-    <string name="app_issue_not_available_text">This app is not receiving updates, because it is no longer in any enabled repository.\n\nIt may have been in a repository you removed or disabled. Or it was simply removed.</string>
-    <string name="app_issue_not_available_button">Show app info</string>
-    <string name="added_x_ago">Added %1$s</string>
-    <string name="size_colon">Size: %1$s</string>
-    <string name="sdk_versions_colon">SDK versions: %1$s</string>
-    <!-- The minimum SDK version the app can be installed on, e.g. only Android 10 or higher -->
-    <string name="sdk_min_version">%1$s (Min)</string>
-    <!-- The target SDK version of the app -->
-    <string name="sdk_target_version">%1$s (Target)</string>
-    <!-- The maximum SDK version the app can be installed on, e.g. only Android 10 or lower -->
-    <string name="sdk_max_version">%1$s (Max)</string>
-    <string name="signer_colon">Signer: %1$s</string>
-    <string name="architectures_colon">Architectures: %1$s</string>
-    <string name="app_details_incompatible_version">Incompatible • Installation likely to fail</string>
-    <string name="app_details_incompatible_signer">Signature mismatch, can\'t install</string>
-    <string name="app_details_install_error_text">Sorry! There was an unexpected error installing this app.</string>
-
-    <string name="notification_title">Notifications</string>
-    <string name="notification_summary">Opens system notification settings</string>
-    <string name="notification_channel_install_success_title">Automatically installed apps</string>
-    <string name="notification_channel_install_success_description">Displays a notification after apps were installed automatically.</string>
-    <string name="notification_channel_updates_available_title">Available app updates</string>
-    <string name="notification_channel_updates_available_description">Displays a notification after repositories were updated and app updates were found.</string>
-
-    <string name="notification_repo_update_default">Connecting to %1$s…</string>
-    <string name="notification_repo_update_downloading">Downloaded %1$s from %2$s</string>
-    <plurals name="notification_repo_update_saving">
-        <item quantity="one">Saved %1$d app from %2$s</item>
-        <item quantity="other">Saved %1$d apps from %2$s</item>
-    </plurals>
-    <plurals name="notification_installing_title">
-        <item quantity="one">Installing %1$d app…</item>
-        <item quantity="other">Installing %1$d apps…</item>
-    </plurals>
-    <plurals name="notification_updating_title">
-        <item quantity="one">Updating %1$d app…</item>
-        <item quantity="other">Updating %1$d apps…</item>
-    </plurals>
-    <plurals name="notification_update_success_title">
-        <item quantity="one">%1$d app updated</item>
-        <item quantity="other">%1$d apps updated</item>
-    </plurals>
-    <string name="notification_installing_section_installing">Installing:</string>
-    <string name="notification_installing_section_confirmation">Needs user confirmation:</string>
-    <string name="notification_installing_section_installed">Installed:</string>
-    <string name="notification_installing_confirmation">Tap to confirm.</string>
-
-    <string name="onboarding_app_list_filter_title">Filter</string>
-    <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
-    <string name="got_it">Got it</string>
-    <string name="clear">Clear</string>
-    <string name="error">Error</string>
-    <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
-    <string name="repo_has_update_error">Had errors updating</string>
-    <string name="repo_has_update_error_intro">An error occurred while trying to update this repository:</string>
-    <string name="repo_last_update_upstream">Published %s</string>
-    <string name="repo_last_update_downloaded">Downloaded %s</string>
-    <string name="repo_basicauth_username">Username</string>
-    <string name="repo_basicauth_password">Password</string>
-    <string name="repo_basicauth_edit">Save Changes</string>
-    <string name="repo_force_update">Check for updates</string>
-
-
-    <string name="pref_dyn_colors_title">Use system colors</string>
-    <string name="pref_dyn_colors_summary">Apply dynamic colors from your system settings</string>
-    <string name="pref_language_summary">Opens system language settings</string>
-    <string name="pref_auto_updates_only_wifi">Only on WiFi</string>
-    <string name="pref_auto_updates_only_always">Always (even on mobile data)</string>
-    <string name="pref_auto_updates_only_never">Never</string>
-    <string name="pref_auto_updates_summary_only_wifi">Download and update apps daily when on WiFi and the device isn\'t being used.</string>
-    <string name="pref_auto_updates_summary_always">Download and update apps daily even on mobile data when the device isn\'t being used.</string>
-    <string name="pref_auto_updates_summary_never">Auto-updates disabled • Apps will need to be updated manually</string>
-    <string name="pref_repo_updates_title">Check for updates</string>
-    <string name="pref_repo_updates_summary_only_wifi">Periodically ask all repositories for app updates, but only when on WiFi.</string>
-    <string name="pref_repo_updates_summary_always">Periodically ask all repositories for app updates even when on mobile data.</string>
-    <string name="pref_repo_updates_summary_never">Do NOT check for updates • Apps will become outdated</string>
-    <string name="pref_category_network">Network</string>
-    <string name="pref_proxy_title">Connect via SOCKS proxy</string>
-    <string name="pref_proxy_disabled">Connect to the internet without proxy</string>
-    <string name="pref_proxy_enabled">Uses proxy %s to connect</string>
-    <string name="pref_proxy_hint">Proxy is expected in host:port format.</string>
-    <string name="pref_proxy_error">Proxy format invalid</string>
-
-    <string name="crash_report_text">An unexpected error occurred.
-        This is not your fault.
-        Would you like to e-mail the details to help us fix the issue?
-    </string>
-    <string name="crash_report_comment_hint">Tell us what happened right before the crash</string>
-    <string name="crash_report_button_send">Send report</string>
-    <string name="crash_report_error">Could not send report. No email program found :(</string>
-    <string name="crash_report_save">Save crash report as file</string>
-    <string name="crash_report_saved">Saved report to file</string>
-    <string name="crash_report_error_saving">Error saving crash report to file</string>
-
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d03c6bf7..fead1c220 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -815,4 +815,185 @@ This often occurs with apps installed via Google Play or other sources, if they
 
     <string name="expand">Expand</string>
     <string name="collapse">Collapse</string>
+
+
+    <!--
+
+    New strings to be merged into the above ones as soon as old code and usages were removed
+
+     -->
+
+
+    <string name="about_text">F-Droid distributes (Free and Open Source Software) apps for Android. All apps in its official app repository are built from their source code to ensure that they are completely transparent and only include Free Software.\n\nThis app makes it easy to browse and install apps from F-Droid or other repositories. It also helps you to keep your apps up to date.\n\nF-Droid is a non-profit volunteer project. Although every effort is made to ensure all apps are safe to install, you use it AT YOUR OWN RISK. The app’s source code is automatically checked for potential security or privacy issues. However, this is far from exhaustive and there are no guarantees.\n\nF-Droid respects your privacy. We don’t track you, or your device. We don’t track what you install. You don’t need an account to use this app, and it sends no additional identifying data when communicating with repositories, other than its version number.</string>
+    <string name="about_license_text">This program is Free Software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
+
+    <string name="menu_about">About</string>
+    <string name="menu_discover">Discover</string>
+    <string name="menu_apps_my">My apps</string>
+
+    <string name="first_start_loading">Retrieving apps…\n\nThis may take some time.</string>
+    <string name="first_start_intro">We need to download the latest app repository to get you started.</string>
+    <string name="first_start_offline">However, you seem to be offline. Connect to the internet and tap the button below when ready.</string>
+    <string name="first_start_metered">However, you are on mobile data and we\'ll need to download more than 10 MB. Tap the button below when ready to download.</string>
+    <string name="first_start_button">Download app repository</string>
+    <string name="no_repos_enabled">No repositories enabled.\nEnable or add at least one repository to see apps.</string>
+
+    <string name="my_apps_empty">No apps installed.\n\nInstall apps and they will appear here.</string>
+    <string name="my_apps_header_apps_with_issue">Apps with issues</string>
+    <string name="my_apps_ignore_dialog_title">Hide app issue</string>
+    <string name="my_apps_ignore_dialog_text">Do you want to hide the issue with the app \"%1$s\"?</string>
+    <string name="my_apps_ignore_dialog_button">Hide</string>
+
+    <string name="app_list_new">New apps</string>
+    <string name="app_list_recently_updated">Recently updated</string>
+    <string name="app_list_most_downloaded">Most downloaded</string>
+    <string name="app_list_all">All apps</string>
+    <string name="app_list_author">Apps by %s</string>
+
+    <string name="search_placeholder">Search…</string>
+    <string name="search_no_results">No apps found.\n\nTry to use less search terms or add/enable more repositories.</string>
+    <string name="search_filter_no_results">No matching apps.\n\nTry to use less search terms or remove filters.</string>
+    <string name="search_my_apps_no_results">No matching apps.\n\nTry to use less search terms.</string>
+    <string name="sort_title">Sorting and compatibility</string>
+    <string name="sort_by_name">Sort by name</string>
+    <string name="sort_by_latest">Sort by latest</string>
+    <string name="filter_only_compatible">Apps compatible with this device</string>
+    <string name="filter_button_save">Save above as default</string>
+    <string name="filter_button_clear_all">Clear all filters</string>
+    <!-- Used for filtering lists of apps by certain criteria -->
+    <string name="filter">Filter</string>
+    <!-- Used for filter chips (e.g. categories) when they are currently selected -->
+    <string name="filter_selected">selected</string>
+    <string name="category">Category</string>
+
+    <string name="dialog_metered_title">Continue with mobile data?</string>
+    <!-- The placeholder will be replaced with a size string such as "13 MB" -->
+    <string name="dialog_metered_text">You are currently on a metered internet connection. Do you want to continue downloading %1$s?</string>
+    <string name="dialog_metered_text_no_size">You are currently on a metered internet connection. Do you want to continue downloading?</string>
+    <string name="dialog_metered_button">Download</string>
+    <string name="screenshots_metered">Tap to load screenshots via mobile data</string>
+
+    <string name="category_group_productivity">Productivity</string>
+    <string name="category_group_tools">Tools</string>
+    <string name="category_group_wallets">Finances &amp; Wallets</string>
+    <string name="category_group_media">Entertainment &amp; Media</string>
+    <string name="category_group_communication">Communication</string>
+    <string name="category_group_device">Device</string>
+    <string name="category_group_network">Network</string>
+    <string name="category_group_storage">Files &amp; Storage</string>
+    <string name="category_group_interests">Interests</string>
+    <string name="category_group_misc">Miscellaneous</string>
+
+    <string name="author_by">By %1$s</string>
+    <string name="last_updated">Last updated: %1$s</string>
+    <!-- The placeholder in round brackets will be replaced with the size of the app -->
+    <string name="last_updated_with_size">Last updated: %1$s (%2$s)</string>
+    <string name="status_install_preparing">Preparing installation…</string>
+    <string name="whats_new_title">What\'s new</string>
+    <string name="donate_title">Donate</string>
+    <string name="anti_features_title">This app has anti-features</string>
+    <string name="developer_contact">Developer contact</string>
+    <string name="technical_info">Technical information</string>
+    <string name="package_name">Package Name:</string>
+    <string name="installed_version">Installed Version:</string>
+    <string name="copy_link">Copy link</string>
+    <string name="app_no_compatible_versions">This app is not compatible with your device.</string>
+    <string name="app_no_compatible_signer">Can not update this app, because all versions have an incompatible signature.\n\nIf you don\'t receive updates through other means, you may need to uninstall and then reinstall this app. The app\'s data will be lost.</string>
+    <string name="app_no_compatible_signer_in_this_repo">Can not update this app, because there are no compatible versions in the preferred repository.\n\nTry changing the preferred repository.</string>
+    <string name="app_no_auto_update">Auto-update not available, because app targets old version of Android.</string>
+    <string name="app_issue_update_other_repo">An update is available in another repository, but will not get installed, because that repository is not preferred.</string>
+    <string name="app_issue_not_available_title">No longer available</string>
+    <string name="app_issue_not_available_text">This app is not receiving updates, because it is no longer in any enabled repository.\n\nIt may have been in a repository you removed or disabled. Or it was simply removed.</string>
+    <string name="app_issue_not_available_button">Show app info</string>
+    <string name="added_x_ago">Added %1$s</string>
+    <string name="size_colon">Size: %1$s</string>
+    <string name="sdk_versions_colon">SDK versions: %1$s</string>
+    <!-- The minimum SDK version the app can be installed on, e.g. only Android 10 or higher -->
+    <string name="sdk_min_version">%1$s (Min)</string>
+    <!-- The target SDK version of the app -->
+    <string name="sdk_target_version">%1$s (Target)</string>
+    <!-- The maximum SDK version the app can be installed on, e.g. only Android 10 or lower -->
+    <string name="sdk_max_version">%1$s (Max)</string>
+    <string name="signer_colon">Signer: %1$s</string>
+    <string name="architectures_colon">Architectures: %1$s</string>
+    <string name="app_details_incompatible_version">Incompatible • Installation likely to fail</string>
+    <string name="app_details_incompatible_signer">Signature mismatch, can\'t install</string>
+    <string name="app_details_install_error_text">Sorry! There was an unexpected error installing this app.</string>
+
+    <string name="notification_title">Notifications</string>
+    <string name="notification_summary">Opens system notification settings</string>
+    <string name="notification_channel_install_success_title">Automatically installed apps</string>
+    <string name="notification_channel_install_success_description">Displays a notification after apps were installed automatically.</string>
+    <string name="notification_channel_updates_available_title">Available app updates</string>
+    <string name="notification_channel_updates_available_description">Displays a notification after repositories were updated and app updates were found.</string>
+
+    <string name="notification_repo_update_default">Connecting to %1$s…</string>
+    <string name="notification_repo_update_downloading">Downloaded %1$s from %2$s</string>
+    <plurals name="notification_repo_update_saving">
+        <item quantity="one">Saved %1$d app from %2$s</item>
+        <item quantity="other">Saved %1$d apps from %2$s</item>
+    </plurals>
+    <plurals name="notification_installing_title">
+        <item quantity="one">Installing %1$d app…</item>
+        <item quantity="other">Installing %1$d apps…</item>
+    </plurals>
+    <plurals name="notification_updating_title">
+        <item quantity="one">Updating %1$d app…</item>
+        <item quantity="other">Updating %1$d apps…</item>
+    </plurals>
+    <plurals name="notification_update_success_title">
+        <item quantity="one">%1$d app updated</item>
+        <item quantity="other">%1$d apps updated</item>
+    </plurals>
+    <string name="notification_installing_section_installing">Installing:</string>
+    <string name="notification_installing_section_confirmation">Needs user confirmation:</string>
+    <string name="notification_installing_section_installed">Installed:</string>
+    <string name="notification_installing_confirmation">Tap to confirm.</string>
+
+    <string name="onboarding_app_list_filter_title">Filter</string>
+    <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
+    <string name="got_it">Got it</string>
+    <string name="clear">Clear</string>
+    <string name="error">Error</string>
+    <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
+    <string name="repo_has_update_error">Had errors updating</string>
+    <string name="repo_has_update_error_intro">An error occurred while trying to update this repository:</string>
+    <string name="repo_last_update_upstream">Published %s</string>
+    <string name="repo_last_update_downloaded">Downloaded %s</string>
+    <string name="repo_basicauth_username">Username</string>
+    <string name="repo_basicauth_password">Password</string>
+    <string name="repo_basicauth_edit">Save Changes</string>
+    <string name="repo_force_update">Check for updates</string>
+
+    <string name="pref_dyn_colors_title">Use system colors</string>
+    <string name="pref_dyn_colors_summary">Apply dynamic colors from your system settings</string>
+    <string name="pref_language_summary">Opens system language settings</string>
+    <string name="pref_auto_updates_only_wifi">Only on WiFi</string>
+    <string name="pref_auto_updates_only_always">Always (even on mobile data)</string>
+    <string name="pref_auto_updates_only_never">Never</string>
+    <string name="pref_auto_updates_summary_only_wifi">Download and update apps daily when on WiFi and the device isn\'t being used.</string>
+    <string name="pref_auto_updates_summary_always">Download and update apps daily even on mobile data when the device isn\'t being used.</string>
+    <string name="pref_auto_updates_summary_never">Auto-updates disabled • Apps will need to be updated manually</string>
+    <string name="pref_repo_updates_title">Check for updates</string>
+    <string name="pref_repo_updates_summary_only_wifi">Periodically ask all repositories for app updates, but only when on WiFi.</string>
+    <string name="pref_repo_updates_summary_always">Periodically ask all repositories for app updates even when on mobile data.</string>
+    <string name="pref_repo_updates_summary_never">Do NOT check for updates • Apps will become outdated</string>
+    <string name="pref_category_network">Network</string>
+    <string name="pref_proxy_title">Connect via SOCKS proxy</string>
+    <string name="pref_proxy_disabled">Connect to the internet without proxy</string>
+    <string name="pref_proxy_enabled">Uses proxy %s to connect</string>
+    <string name="pref_proxy_hint">Proxy is expected in host:port format.</string>
+    <string name="pref_proxy_error">Proxy format invalid</string>
+
+    <string name="crash_report_text">An unexpected error occurred.
+        This is not your fault.
+        Would you like to e-mail the details to help us fix the issue?
+    </string>
+    <string name="crash_report_comment_hint">Tell us what happened right before the crash</string>
+    <string name="crash_report_button_send">Send report</string>
+    <string name="crash_report_error">Could not send report. No email program found :(</string>
+    <string name="crash_report_save">Save crash report as file</string>
+    <string name="crash_report_saved">Saved report to file</string>
+    <string name="crash_report_error_saving">Error saving crash report to file</string>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6e59254a1..33872af90 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="Theme.Fdroidclient" parent="Theme.AppCompat.DayNight.NoActionBar" />
+    <style name="Theme.FDroid" parent="Theme.AppCompat.DayNight.NoActionBar" />
 </resources>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index f8b53ef87..ffa0c1641 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
+    <base-config cleartextTrafficPermitted="false">
+        <trust-anchors>
+            <!-- Trust preinstalled CAs -->
+            <certificates src="system" />
+            <!-- Additionally trust user added CAs -->
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">onion</domain>
     </domain-config>
diff --git a/legacy/src/main/res/values-af b/legacy/src/main/res/values-af
new file mode 120000
index 000000000..00b01d25d
--- /dev/null
+++ b/legacy/src/main/res/values-af
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-af
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ar b/legacy/src/main/res/values-ar
new file mode 120000
index 000000000..14ebbd758
--- /dev/null
+++ b/legacy/src/main/res/values-ar
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ar
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ast b/legacy/src/main/res/values-ast
new file mode 120000
index 000000000..556e6de6a
--- /dev/null
+++ b/legacy/src/main/res/values-ast
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ast
\ No newline at end of file
diff --git a/legacy/src/main/res/values-az b/legacy/src/main/res/values-az
new file mode 120000
index 000000000..cc107adf7
--- /dev/null
+++ b/legacy/src/main/res/values-az
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-az
\ No newline at end of file
diff --git a/legacy/src/main/res/values-b+hi+Latn b/legacy/src/main/res/values-b+hi+Latn
new file mode 120000
index 000000000..dc4e08fdf
--- /dev/null
+++ b/legacy/src/main/res/values-b+hi+Latn
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-b+hi+Latn
\ No newline at end of file
diff --git a/legacy/src/main/res/values-be b/legacy/src/main/res/values-be
new file mode 120000
index 000000000..8e35fe689
--- /dev/null
+++ b/legacy/src/main/res/values-be
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-be
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ber b/legacy/src/main/res/values-ber
new file mode 120000
index 000000000..e8d93a196
--- /dev/null
+++ b/legacy/src/main/res/values-ber
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ber
\ No newline at end of file
diff --git a/legacy/src/main/res/values-bg b/legacy/src/main/res/values-bg
new file mode 120000
index 000000000..cb8ffecea
--- /dev/null
+++ b/legacy/src/main/res/values-bg
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-bg
\ No newline at end of file
diff --git a/legacy/src/main/res/values-bn b/legacy/src/main/res/values-bn
new file mode 120000
index 000000000..d609451db
--- /dev/null
+++ b/legacy/src/main/res/values-bn
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-bn
\ No newline at end of file
diff --git a/legacy/src/main/res/values-bn-rBD b/legacy/src/main/res/values-bn-rBD
new file mode 120000
index 000000000..cc8804162
--- /dev/null
+++ b/legacy/src/main/res/values-bn-rBD
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-bn-rBD
\ No newline at end of file
diff --git a/legacy/src/main/res/values-bo b/legacy/src/main/res/values-bo
new file mode 120000
index 000000000..8eaafd9f4
--- /dev/null
+++ b/legacy/src/main/res/values-bo
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-bo
\ No newline at end of file
diff --git a/legacy/src/main/res/values-br b/legacy/src/main/res/values-br
new file mode 120000
index 000000000..1110a25a1
--- /dev/null
+++ b/legacy/src/main/res/values-br
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-br
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ca b/legacy/src/main/res/values-ca
new file mode 120000
index 000000000..556783525
--- /dev/null
+++ b/legacy/src/main/res/values-ca
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ca
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ckb b/legacy/src/main/res/values-ckb
new file mode 120000
index 000000000..a740045ca
--- /dev/null
+++ b/legacy/src/main/res/values-ckb
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ckb
\ No newline at end of file
diff --git a/legacy/src/main/res/values-cs b/legacy/src/main/res/values-cs
new file mode 120000
index 000000000..9fbdacf5f
--- /dev/null
+++ b/legacy/src/main/res/values-cs
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-cs
\ No newline at end of file
diff --git a/legacy/src/main/res/values-cy b/legacy/src/main/res/values-cy
new file mode 120000
index 000000000..6f34a72bc
--- /dev/null
+++ b/legacy/src/main/res/values-cy
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-cy
\ No newline at end of file
diff --git a/legacy/src/main/res/values-da b/legacy/src/main/res/values-da
new file mode 120000
index 000000000..277abb7b6
--- /dev/null
+++ b/legacy/src/main/res/values-da
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-da
\ No newline at end of file
diff --git a/legacy/src/main/res/values-de b/legacy/src/main/res/values-de
new file mode 120000
index 000000000..a493d4062
--- /dev/null
+++ b/legacy/src/main/res/values-de
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-de
\ No newline at end of file
diff --git a/legacy/src/main/res/values-el b/legacy/src/main/res/values-el
new file mode 120000
index 000000000..31bdb8f56
--- /dev/null
+++ b/legacy/src/main/res/values-el
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-el
\ No newline at end of file
diff --git a/legacy/src/main/res/values-en-rGB b/legacy/src/main/res/values-en-rGB
new file mode 120000
index 000000000..c395ce4ef
--- /dev/null
+++ b/legacy/src/main/res/values-en-rGB
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-en-rGB
\ No newline at end of file
diff --git a/legacy/src/main/res/values-eo b/legacy/src/main/res/values-eo
new file mode 120000
index 000000000..fe8ba3571
--- /dev/null
+++ b/legacy/src/main/res/values-eo
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-eo
\ No newline at end of file
diff --git a/legacy/src/main/res/values-es b/legacy/src/main/res/values-es
new file mode 120000
index 000000000..ce99ed365
--- /dev/null
+++ b/legacy/src/main/res/values-es
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-es
\ No newline at end of file
diff --git a/legacy/src/main/res/values-es-rAR b/legacy/src/main/res/values-es-rAR
new file mode 120000
index 000000000..65d001a17
--- /dev/null
+++ b/legacy/src/main/res/values-es-rAR
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-es-rAR
\ No newline at end of file
diff --git a/legacy/src/main/res/values-es-rMX b/legacy/src/main/res/values-es-rMX
new file mode 120000
index 000000000..823d6db09
--- /dev/null
+++ b/legacy/src/main/res/values-es-rMX
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-es-rMX
\ No newline at end of file
diff --git a/legacy/src/main/res/values-et b/legacy/src/main/res/values-et
new file mode 120000
index 000000000..566851553
--- /dev/null
+++ b/legacy/src/main/res/values-et
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-et
\ No newline at end of file
diff --git a/legacy/src/main/res/values-eu b/legacy/src/main/res/values-eu
new file mode 120000
index 000000000..e3f531818
--- /dev/null
+++ b/legacy/src/main/res/values-eu
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-eu
\ No newline at end of file
diff --git a/legacy/src/main/res/values-fa b/legacy/src/main/res/values-fa
new file mode 120000
index 000000000..876e9fb92
--- /dev/null
+++ b/legacy/src/main/res/values-fa
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-fa
\ No newline at end of file
diff --git a/legacy/src/main/res/values-fi b/legacy/src/main/res/values-fi
new file mode 120000
index 000000000..81a539bcb
--- /dev/null
+++ b/legacy/src/main/res/values-fi
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-fi
\ No newline at end of file
diff --git a/legacy/src/main/res/values-fil b/legacy/src/main/res/values-fil
new file mode 120000
index 000000000..336720e0e
--- /dev/null
+++ b/legacy/src/main/res/values-fil
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-fil
\ No newline at end of file
diff --git a/legacy/src/main/res/values-fr b/legacy/src/main/res/values-fr
new file mode 120000
index 000000000..4d65ffd9b
--- /dev/null
+++ b/legacy/src/main/res/values-fr
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-fr
\ No newline at end of file
diff --git a/legacy/src/main/res/values-fy b/legacy/src/main/res/values-fy
new file mode 120000
index 000000000..3958979b3
--- /dev/null
+++ b/legacy/src/main/res/values-fy
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-fy
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ga b/legacy/src/main/res/values-ga
new file mode 120000
index 000000000..4dd6f6ceb
--- /dev/null
+++ b/legacy/src/main/res/values-ga
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ga
\ No newline at end of file
diff --git a/legacy/src/main/res/values-gd b/legacy/src/main/res/values-gd
new file mode 120000
index 000000000..5744b2401
--- /dev/null
+++ b/legacy/src/main/res/values-gd
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-gd
\ No newline at end of file
diff --git a/legacy/src/main/res/values-gl b/legacy/src/main/res/values-gl
new file mode 120000
index 000000000..a1ebc254c
--- /dev/null
+++ b/legacy/src/main/res/values-gl
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-gl
\ No newline at end of file
diff --git a/legacy/src/main/res/values-gu b/legacy/src/main/res/values-gu
new file mode 120000
index 000000000..a7c61b4df
--- /dev/null
+++ b/legacy/src/main/res/values-gu
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-gu
\ No newline at end of file
diff --git a/legacy/src/main/res/values-he b/legacy/src/main/res/values-he
new file mode 120000
index 000000000..65c2d232d
--- /dev/null
+++ b/legacy/src/main/res/values-he
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-he
\ No newline at end of file
diff --git a/legacy/src/main/res/values-hi b/legacy/src/main/res/values-hi
new file mode 120000
index 000000000..130daf430
--- /dev/null
+++ b/legacy/src/main/res/values-hi
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-hi
\ No newline at end of file
diff --git a/legacy/src/main/res/values-hr b/legacy/src/main/res/values-hr
new file mode 120000
index 000000000..a3b4d9d8c
--- /dev/null
+++ b/legacy/src/main/res/values-hr
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-hr
\ No newline at end of file
diff --git a/legacy/src/main/res/values-hu b/legacy/src/main/res/values-hu
new file mode 120000
index 000000000..84df9bdb3
--- /dev/null
+++ b/legacy/src/main/res/values-hu
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-hu
\ No newline at end of file
diff --git a/legacy/src/main/res/values-hy b/legacy/src/main/res/values-hy
new file mode 120000
index 000000000..b97d6e592
--- /dev/null
+++ b/legacy/src/main/res/values-hy
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-hy
\ No newline at end of file
diff --git a/legacy/src/main/res/values-id b/legacy/src/main/res/values-id
new file mode 120000
index 000000000..c6f663aa9
--- /dev/null
+++ b/legacy/src/main/res/values-id
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-id
\ No newline at end of file
diff --git a/legacy/src/main/res/values-in b/legacy/src/main/res/values-in
index f7118b95e..c6f663aa9 120000
--- a/legacy/src/main/res/values-in
+++ b/legacy/src/main/res/values-in
@@ -1 +1 @@
-values-id
\ No newline at end of file
+../../../../app/src/main/res/values-id
\ No newline at end of file
diff --git a/legacy/src/main/res/values-is b/legacy/src/main/res/values-is
new file mode 120000
index 000000000..d437a47db
--- /dev/null
+++ b/legacy/src/main/res/values-is
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-is
\ No newline at end of file
diff --git a/legacy/src/main/res/values-it b/legacy/src/main/res/values-it
new file mode 120000
index 000000000..fc0464024
--- /dev/null
+++ b/legacy/src/main/res/values-it
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-it
\ No newline at end of file
diff --git a/legacy/src/main/res/values-iw b/legacy/src/main/res/values-iw
index 57bf91954..65c2d232d 120000
--- a/legacy/src/main/res/values-iw
+++ b/legacy/src/main/res/values-iw
@@ -1 +1 @@
-values-he
\ No newline at end of file
+../../../../app/src/main/res/values-he
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ja b/legacy/src/main/res/values-ja
new file mode 120000
index 000000000..c2afa624f
--- /dev/null
+++ b/legacy/src/main/res/values-ja
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ja
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ka b/legacy/src/main/res/values-ka
new file mode 120000
index 000000000..82768126f
--- /dev/null
+++ b/legacy/src/main/res/values-ka
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ka
\ No newline at end of file
diff --git a/legacy/src/main/res/values-kab b/legacy/src/main/res/values-kab
new file mode 120000
index 000000000..27fc060ed
--- /dev/null
+++ b/legacy/src/main/res/values-kab
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-kab
\ No newline at end of file
diff --git a/legacy/src/main/res/values-kk b/legacy/src/main/res/values-kk
new file mode 120000
index 000000000..11719ee73
--- /dev/null
+++ b/legacy/src/main/res/values-kk
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-kk
\ No newline at end of file
diff --git a/legacy/src/main/res/values-kmr b/legacy/src/main/res/values-kmr
new file mode 120000
index 000000000..05577dd34
--- /dev/null
+++ b/legacy/src/main/res/values-kmr
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-kmr
\ No newline at end of file
diff --git a/legacy/src/main/res/values-kn b/legacy/src/main/res/values-kn
new file mode 120000
index 000000000..284d22f97
--- /dev/null
+++ b/legacy/src/main/res/values-kn
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-kn
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ko b/legacy/src/main/res/values-ko
new file mode 120000
index 000000000..5f33f6d9a
--- /dev/null
+++ b/legacy/src/main/res/values-ko
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ko
\ No newline at end of file
diff --git a/legacy/src/main/res/values-lb b/legacy/src/main/res/values-lb
new file mode 120000
index 000000000..1294140da
--- /dev/null
+++ b/legacy/src/main/res/values-lb
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-lb
\ No newline at end of file
diff --git a/legacy/src/main/res/values-lt b/legacy/src/main/res/values-lt
new file mode 120000
index 000000000..94de78466
--- /dev/null
+++ b/legacy/src/main/res/values-lt
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-lt
\ No newline at end of file
diff --git a/legacy/src/main/res/values-lv b/legacy/src/main/res/values-lv
new file mode 120000
index 000000000..5b439b8ab
--- /dev/null
+++ b/legacy/src/main/res/values-lv
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-lv
\ No newline at end of file
diff --git a/legacy/src/main/res/values-mk b/legacy/src/main/res/values-mk
new file mode 120000
index 000000000..5e81c1632
--- /dev/null
+++ b/legacy/src/main/res/values-mk
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-mk
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ml b/legacy/src/main/res/values-ml
new file mode 120000
index 000000000..ea61cb5d4
--- /dev/null
+++ b/legacy/src/main/res/values-ml
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ml
\ No newline at end of file
diff --git a/legacy/src/main/res/values-mn b/legacy/src/main/res/values-mn
new file mode 120000
index 000000000..27aab3a27
--- /dev/null
+++ b/legacy/src/main/res/values-mn
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-mn
\ No newline at end of file
diff --git a/legacy/src/main/res/values-mr b/legacy/src/main/res/values-mr
new file mode 120000
index 000000000..08b5c7e6f
--- /dev/null
+++ b/legacy/src/main/res/values-mr
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-mr
\ No newline at end of file
diff --git a/legacy/src/main/res/values-my b/legacy/src/main/res/values-my
new file mode 120000
index 000000000..461393a7d
--- /dev/null
+++ b/legacy/src/main/res/values-my
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-my
\ No newline at end of file
diff --git a/legacy/src/main/res/values-nah b/legacy/src/main/res/values-nah
new file mode 120000
index 000000000..f8631caad
--- /dev/null
+++ b/legacy/src/main/res/values-nah
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-nah
\ No newline at end of file
diff --git a/legacy/src/main/res/values-nb b/legacy/src/main/res/values-nb
new file mode 120000
index 000000000..0a0360a81
--- /dev/null
+++ b/legacy/src/main/res/values-nb
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-nb
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ne b/legacy/src/main/res/values-ne
new file mode 120000
index 000000000..854c94ec6
--- /dev/null
+++ b/legacy/src/main/res/values-ne
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ne
\ No newline at end of file
diff --git a/legacy/src/main/res/values-nl b/legacy/src/main/res/values-nl
new file mode 120000
index 000000000..c938d20e3
--- /dev/null
+++ b/legacy/src/main/res/values-nl
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-nl
\ No newline at end of file
diff --git a/legacy/src/main/res/values-nl-rBE b/legacy/src/main/res/values-nl-rBE
new file mode 120000
index 000000000..4aa380b67
--- /dev/null
+++ b/legacy/src/main/res/values-nl-rBE
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-nl-rBE
\ No newline at end of file
diff --git a/legacy/src/main/res/values-nn b/legacy/src/main/res/values-nn
new file mode 120000
index 000000000..ff9962aae
--- /dev/null
+++ b/legacy/src/main/res/values-nn
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-nn
\ No newline at end of file
diff --git a/legacy/src/main/res/values-oc b/legacy/src/main/res/values-oc
new file mode 120000
index 000000000..f3479908b
--- /dev/null
+++ b/legacy/src/main/res/values-oc
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-oc
\ No newline at end of file
diff --git a/legacy/src/main/res/values-or b/legacy/src/main/res/values-or
new file mode 120000
index 000000000..7cb767593
--- /dev/null
+++ b/legacy/src/main/res/values-or
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-or
\ No newline at end of file
diff --git a/legacy/src/main/res/values-pa b/legacy/src/main/res/values-pa
new file mode 120000
index 000000000..041d401cd
--- /dev/null
+++ b/legacy/src/main/res/values-pa
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-pa
\ No newline at end of file
diff --git a/legacy/src/main/res/values-pa-rPK b/legacy/src/main/res/values-pa-rPK
new file mode 120000
index 000000000..97c07a6cf
--- /dev/null
+++ b/legacy/src/main/res/values-pa-rPK
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-pa-rPK
\ No newline at end of file
diff --git a/legacy/src/main/res/values-pl b/legacy/src/main/res/values-pl
new file mode 120000
index 000000000..98d0aef76
--- /dev/null
+++ b/legacy/src/main/res/values-pl
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-pl
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ps b/legacy/src/main/res/values-ps
new file mode 120000
index 000000000..96f7cc3b2
--- /dev/null
+++ b/legacy/src/main/res/values-ps
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ps
\ No newline at end of file
diff --git a/legacy/src/main/res/values-pt b/legacy/src/main/res/values-pt
new file mode 120000
index 000000000..7d43830a1
--- /dev/null
+++ b/legacy/src/main/res/values-pt
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-pt
\ No newline at end of file
diff --git a/legacy/src/main/res/values-pt-rBR b/legacy/src/main/res/values-pt-rBR
new file mode 120000
index 000000000..44a862b85
--- /dev/null
+++ b/legacy/src/main/res/values-pt-rBR
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-pt-rBR
\ No newline at end of file
diff --git a/legacy/src/main/res/values-pt-rPT b/legacy/src/main/res/values-pt-rPT
new file mode 120000
index 000000000..c157b8502
--- /dev/null
+++ b/legacy/src/main/res/values-pt-rPT
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-pt-rPT
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ro b/legacy/src/main/res/values-ro
new file mode 120000
index 000000000..577f597f3
--- /dev/null
+++ b/legacy/src/main/res/values-ro
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ro
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ru b/legacy/src/main/res/values-ru
new file mode 120000
index 000000000..c6eadc5f1
--- /dev/null
+++ b/legacy/src/main/res/values-ru
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ru
\ No newline at end of file
diff --git a/legacy/src/main/res/values-sc b/legacy/src/main/res/values-sc
new file mode 120000
index 000000000..8d99e9f08
--- /dev/null
+++ b/legacy/src/main/res/values-sc
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-sc
\ No newline at end of file
diff --git a/legacy/src/main/res/values-si b/legacy/src/main/res/values-si
new file mode 120000
index 000000000..0af0b622b
--- /dev/null
+++ b/legacy/src/main/res/values-si
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-si
\ No newline at end of file
diff --git a/legacy/src/main/res/values-sk b/legacy/src/main/res/values-sk
new file mode 120000
index 000000000..4290f7439
--- /dev/null
+++ b/legacy/src/main/res/values-sk
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-sk
\ No newline at end of file
diff --git a/legacy/src/main/res/values-sl b/legacy/src/main/res/values-sl
new file mode 120000
index 000000000..dd1f927b3
--- /dev/null
+++ b/legacy/src/main/res/values-sl
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-sl
\ No newline at end of file
diff --git a/legacy/src/main/res/values-sn b/legacy/src/main/res/values-sn
new file mode 120000
index 000000000..4b0cfe7a5
--- /dev/null
+++ b/legacy/src/main/res/values-sn
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-sn
\ No newline at end of file
diff --git a/legacy/src/main/res/values-so b/legacy/src/main/res/values-so
new file mode 120000
index 000000000..01a2d8566
--- /dev/null
+++ b/legacy/src/main/res/values-so
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-so
\ No newline at end of file
diff --git a/legacy/src/main/res/values-sq b/legacy/src/main/res/values-sq
new file mode 120000
index 000000000..cb846336f
--- /dev/null
+++ b/legacy/src/main/res/values-sq
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-sq
\ No newline at end of file
diff --git a/legacy/src/main/res/values-sr b/legacy/src/main/res/values-sr
new file mode 120000
index 000000000..bd70c5949
--- /dev/null
+++ b/legacy/src/main/res/values-sr
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-sr
\ No newline at end of file
diff --git a/legacy/src/main/res/values-sv b/legacy/src/main/res/values-sv
new file mode 120000
index 000000000..6a363e94e
--- /dev/null
+++ b/legacy/src/main/res/values-sv
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-sv
\ No newline at end of file
diff --git a/legacy/src/main/res/values-sw b/legacy/src/main/res/values-sw
new file mode 120000
index 000000000..e1f37964d
--- /dev/null
+++ b/legacy/src/main/res/values-sw
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-sw
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ta b/legacy/src/main/res/values-ta
new file mode 120000
index 000000000..5b67fda81
--- /dev/null
+++ b/legacy/src/main/res/values-ta
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ta
\ No newline at end of file
diff --git a/legacy/src/main/res/values-te b/legacy/src/main/res/values-te
new file mode 120000
index 000000000..a9f9f08cd
--- /dev/null
+++ b/legacy/src/main/res/values-te
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-te
\ No newline at end of file
diff --git a/legacy/src/main/res/values-th b/legacy/src/main/res/values-th
new file mode 120000
index 000000000..af663395b
--- /dev/null
+++ b/legacy/src/main/res/values-th
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-th
\ No newline at end of file
diff --git a/legacy/src/main/res/values-tok b/legacy/src/main/res/values-tok
new file mode 120000
index 000000000..2b8af15c6
--- /dev/null
+++ b/legacy/src/main/res/values-tok
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-tok
\ No newline at end of file
diff --git a/legacy/src/main/res/values-tr b/legacy/src/main/res/values-tr
new file mode 120000
index 000000000..7beb6944c
--- /dev/null
+++ b/legacy/src/main/res/values-tr
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-tr
\ No newline at end of file
diff --git a/legacy/src/main/res/values-tt b/legacy/src/main/res/values-tt
new file mode 120000
index 000000000..9214178cd
--- /dev/null
+++ b/legacy/src/main/res/values-tt
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-tt
\ No newline at end of file
diff --git a/legacy/src/main/res/values-tzm b/legacy/src/main/res/values-tzm
new file mode 120000
index 000000000..18f3d8000
--- /dev/null
+++ b/legacy/src/main/res/values-tzm
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-tzm
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ug b/legacy/src/main/res/values-ug
new file mode 120000
index 000000000..bafc22afb
--- /dev/null
+++ b/legacy/src/main/res/values-ug
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ug
\ No newline at end of file
diff --git a/legacy/src/main/res/values-uk b/legacy/src/main/res/values-uk
new file mode 120000
index 000000000..34ae8792d
--- /dev/null
+++ b/legacy/src/main/res/values-uk
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-uk
\ No newline at end of file
diff --git a/legacy/src/main/res/values-ur b/legacy/src/main/res/values-ur
new file mode 120000
index 000000000..f7653f103
--- /dev/null
+++ b/legacy/src/main/res/values-ur
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-ur
\ No newline at end of file
diff --git a/legacy/src/main/res/values-uz b/legacy/src/main/res/values-uz
new file mode 120000
index 000000000..72a0f8fb0
--- /dev/null
+++ b/legacy/src/main/res/values-uz
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-uz
\ No newline at end of file
diff --git a/legacy/src/main/res/values-vi b/legacy/src/main/res/values-vi
new file mode 120000
index 000000000..1e09193ed
--- /dev/null
+++ b/legacy/src/main/res/values-vi
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-vi
\ No newline at end of file
diff --git a/legacy/src/main/res/values-yue b/legacy/src/main/res/values-yue
new file mode 120000
index 000000000..5f0bbe839
--- /dev/null
+++ b/legacy/src/main/res/values-yue
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-yue
\ No newline at end of file
diff --git a/legacy/src/main/res/values-zh-rCN b/legacy/src/main/res/values-zh-rCN
new file mode 120000
index 000000000..9639e405c
--- /dev/null
+++ b/legacy/src/main/res/values-zh-rCN
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-zh-rCN
\ No newline at end of file
diff --git a/legacy/src/main/res/values-zh-rHK b/legacy/src/main/res/values-zh-rHK
new file mode 120000
index 000000000..7f5ea1fa6
--- /dev/null
+++ b/legacy/src/main/res/values-zh-rHK
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-zh-rHK
\ No newline at end of file
diff --git a/legacy/src/main/res/values-zh-rTW b/legacy/src/main/res/values-zh-rTW
new file mode 120000
index 000000000..7d64cc734
--- /dev/null
+++ b/legacy/src/main/res/values-zh-rTW
@@ -0,0 +1 @@
+../../../../app/src/main/res/values-zh-rTW
\ No newline at end of file

From e811b876bedb5680d5de57bde13cba278fa17942 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 30 Dec 2025 09:49:02 -0300
Subject: [PATCH 160/180] Change last update check key

because the Int/Long issue in the preference lib doesn't seem to get resolved in time
---
 app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
index 808a9ab71..a2a8e90f6 100644
--- a/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
+++ b/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -5,7 +5,7 @@ import org.fdroid.settings.SettingsConstants.AutoUpdateValues
 
 object SettingsConstants {
 
-    const val PREF_KEY_LAST_UPDATE_CHECK = "lastUpdateCheck"
+    const val PREF_KEY_LAST_UPDATE_CHECK = "lastRepoUpdateCheck"
     const val PREF_DEFAULT_LAST_UPDATE_CHECK = -1
 
     const val PREF_KEY_THEME = "theme"

From 9b3fbe00981619a8d89a963ca20c288ed4265ef7 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 29 Dec 2025 17:48:57 -0300
Subject: [PATCH 161/180] Adapt CI to new module structure

---
 .gitlab-ci.yml                                | 61 +++++++++++--------
 app/build.gradle.kts                          |  3 +
 app/lint.xml                                  | 13 ++++
 app/src/full/res/values/strings.xml           |  4 ++
 .../repositories/details/RepoDetailsHeader.kt |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 6 files changed, 57 insertions(+), 28 deletions(-)
 create mode 100644 app/lint.xml
 create mode 100644 app/src/full/res/values/strings.xml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04a8972ab..605c0ba42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,11 +61,17 @@ workflow:
       - app/build/reports
       - app/build/outputs/*ml
       - app/build/outputs/apk
+      - legacy/core*
+      - legacy/*.log
+      - legacy/build/reports
+      - legacy/build/outputs/*ml
+      - legacy/build/outputs/apk
       - libs/*/build/reports
       - build/reports
     reports:
       junit:
         - app/build/**/TEST-*.xml
+        - legacy/build/**/TEST-*.xml
         - libs/*/build/**/TEST-*.xml
     expire_in: 1 week
     when: on_failure
@@ -89,17 +95,21 @@ app assembleRelease test:
     - changes:
         - app/**/*
         - libs/**/*
+        - legacy/**/*
   script:
-    - ./gradlew :app:assembleRelease :app:assembleDebug :app:testFullDebugUnitTest
+    - ./gradlew :app:assemble :app:testFullDebugUnitTest :legacy:assemble :legacy:testFullDebugUnitTest
   artifacts:
     name: "${CI_PROJECT_PATH}_${CI_JOB_STAGE}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHA}"
     paths:
       - app/build/reports
       - app/build/outputs/apk
       - libs/*/build/reports
+      - legacy/build/reports
+      - legacy/build/outputs/apk
     reports:
       junit:
         - app/build/test-results/*/TEST-*.xml
+        - legacy/build/test-results/*/TEST-*.xml
     expire_in: 1 week
     when: always
 
@@ -137,22 +147,23 @@ app lint:
     - <<: *always-on-these-changes
     - changes:
         - app/**/*
+        - legacy/**/*
   script:
     # always report on lint errors to the build log
-    - sed -i -e 's,textReport .*,textReport true,' app/build.gradle
+    - sed -i -e 's,textReport .*,textReport true,' legacy/build.gradle
     # the tasks "lint", "test", etc don't always include everything
-    - ./gradlew :app:lint :app:ktlintCheck
+    - ./gradlew :app:lint :app:ktlintCheck :legacy:lint :legacy:ktlintCheck
 
-app checkstyle:
+legacy checkstyle:
   <<: *test-template
   stage: lint
   rules:
     - <<: *always-on-these-changes
     - changes:
-        - app/**/*
+        - legacy/**/*
   script:
-    - ./gradlew :app:checkstyle
-    - python3 tools/checkstyle-to-codeclimate.py --input app/build/reports/checkstyle/checkstyle.xml --output gl-checkstyle.json
+    - ./gradlew :legacy:checkstyle
+    - python3 tools/checkstyle-to-codeclimate.py --input legacy/build/reports/checkstyle/checkstyle.xml --output gl-checkstyle.json
   artifacts:
     reports:
       codequality: gl-checkstyle.json
@@ -165,12 +176,10 @@ libs lint ktlintCheck:
     - changes:
         - libs/**/*
   script:
-    # always report on lint errors to the build log
-    - sed -i -e 's,textReport .*,textReport true,' app/build.gradle
-    - ./gradlew :libs:database:lint :libs:download:lint :libs:index:lint ktlintCheck checkLegacyAbi
+    - ./gradlew :libs:database:lint :libs:download:lint :libs:index:lint :libs:ktlintCheck checkLegacyAbi
 
 # Reference: https://gitlab.com/components/code-quality-oss/codequality-os-scanners-integration/-/blob/4121970daed111dda84cab4547e1f2951684653c/templates/pmd.yml#L52-92
-app lint pmd:
+legacy lint pmd:
   stage: lint
   image:
     name: registry.gitlab.com/gitlab-ci-utils/gitlab-pmd-cpd:latest
@@ -178,18 +187,18 @@ app lint pmd:
   rules:
     - <<: *always-on-these-changes
     - changes:
-        - app/**/*
+        - legacy/**/*
   parallel:
     matrix:
       - PMD_VARIANT: main
         PMD_RULESETS: "config/pmd/rules.xml,config/pmd/rules-main.xml"
         PMD_FILE_PATHS:
-          - "app/src/main/java"
+          - "legacy/src/main/java"
       - PMD_VARIANT: test
         PMD_RULESETS: "config/pmd/rules.xml,config/pmd/rules-test.xml"
         PMD_FILE_PATHS:
-          - "app/src/test/java"
-          - "app/src/androidTest/java"
+          - "legacy/src/test/java"
+          - "legacy/src/androidTest/java"
   before_script:
     - apt-get update
     - apt-get -qy install --no-install-recommends jq
@@ -259,17 +268,17 @@ app weblate merge conflict:
     - git diff --exit-code
     - exit $EXITVALUE
 
-app errorprone:
+legacy errorprone:
   extends: .base
   stage: lint
   rules:
     - <<: *always-on-these-changes
     - changes:
-        - app/**/*
+        - legacy/**/*
   script:
-    - sed -i "s@plugins {@plugins{\nid 'net.ltgt.errorprone' version '3.1.0'@" app/build.gradle
-    - cat config/errorprone.gradle >> app/build.gradle
-    - ./gradlew -Dorg.gradle.dependency.verification=lenient assembleDebug
+    - sed -i "s@plugins {@plugins{\nid 'net.ltgt.errorprone' version '3.1.0'@" legacy/build.gradle
+    - cat config/errorprone.gradle >> legacy/build.gradle
+    - ./gradlew -Dorg.gradle.dependency.verification=lenient :legacy:assembleDebug
 
 libs database schema:
   stage: lint
@@ -321,9 +330,9 @@ libs database schema:
     - ./gradlew installFullDebug
     - adb shell am start -n org.fdroid.fdroid.debug/org.fdroid.fdroid.views.main.MainActivity
     - export FLAG="-Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.LargeTest,androidx.test.filters.FlakyTest"
-    - ./gradlew $FLAG :app:connectedFullDebugAndroidTest :libs:database:connectedCheck :libs:download:connectedCheck :libs:index:connectedCheck
+    - ./gradlew $FLAG :app:connectedBasicDebugAndroidTest :legacy:connectedFullDebugAndroidTest :libs:database:connectedCheck :libs:download:connectedCheck :libs:index:connectedCheck
     - export FLAG="-Pandroid.testInstrumentationRunnerArguments.annotation=androidx.test.filters.FlakyTest"
-    - for i in {1..5}; do echo "$i" && ./gradlew $FLAG :app:connectedFullDebugAndroidTest :libs:database:connectedCheck :libs:download:connectedCheck :libs:index:connectedCheck && break; done || exit 137
+    - for i in {1..5}; do echo "$i" && ./gradlew $FLAG :app:connectedBasicDebugAndroidTest :legacy:connectedFullDebugAndroidTest :libs:database:connectedCheck :libs:download:connectedCheck :libs:index:connectedCheck && break; done || exit 137
   allow_failure:
     exit_codes: 137
 
@@ -361,10 +370,10 @@ deploy_nightly:
         's,<string name="app_name">.*</string>,<string name="app_name">F-Nightly</string>,'
         app/src/main/res/values*/strings.xml
     # add this nightly repo as a enabled repo
-    - sed -i -e '/<\/string-array>/d' -e '/<\/resources>/d' app/src/main/res/values/default_repos.xml
-    - echo "<item>${CI_PROJECT_PATH}-nightly</item>" >> app/src/main/res/values/default_repos.xml
-    - echo "<item>${CI_PROJECT_URL}-nightly/-/raw/master/fdroid/repo</item>" >> app/src/main/res/values/default_repos.xml
-    - cat config/nightly-repo/repo.xml >> app/src/main/res/values/default_repos.xml
+    - sed -i -e '/<\/string-array>/d' -e '/<\/resources>/d' legacy/src/main/res/values/default_repos.xml
+    - echo "<item>${CI_PROJECT_PATH}-nightly</item>" >> legacy/src/main/res/values/default_repos.xml
+    - echo "<item>${CI_PROJECT_URL}-nightly/-/raw/master/fdroid/repo</item>" >> legacy/src/main/res/values/default_repos.xml
+    - cat config/nightly-repo/repo.xml >> legacy/src/main/res/values/default_repos.xml
     - export DB=`sed -n 's,.*version *= *\([0-9][0-9]*\).*,\1,p' libs/database/src/main/java/org/fdroid/database/FDroidDatabase.kt`
     - export versionCode=`printf '%d%05d' $DB $(date '+%s'| cut -b1-8)`
     - sed -i "s,^\(\s*versionCode\)  *[0-9].*,\1 $versionCode," app/build.gradle
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fed84e423..66e3733d6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -64,6 +64,9 @@ android {
             excludes += listOf("META-INF/LICENSE.md", "META-INF/LICENSE-notice.md")
         }
     }
+    lint {
+        lintConfig = file("lint.xml")
+    }
 }
 
 dependencies {
diff --git a/app/lint.xml b/app/lint.xml
new file mode 100644
index 000000000..1732ebe7a
--- /dev/null
+++ b/app/lint.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- Our translations are crowd-sourced -->
+    <issue id="MissingTranslation" severity="ignore" />
+    <issue id="ExtraTranslation" severity="warning" />
+
+    <!-- Weblate doesn't handle these yet: https://github.com/WeblateOrg/weblate/issues/7520 -->
+    <issue id="MissingQuantity" severity="error">
+        <ignore path="src/main/res/values-cs" />
+        <ignore path="src/main/res/values-lt" />
+        <ignore path="src/main/res/values-sk" />
+    </issue>
+</lint>
diff --git a/app/src/full/res/values/strings.xml b/app/src/full/res/values/strings.xml
new file mode 100644
index 000000000..946be2654
--- /dev/null
+++ b/app/src/full/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">@string/app_name_full</string>
+</resources>
diff --git a/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
index 01149b989..8f5eb6434 100644
--- a/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
@@ -57,7 +57,7 @@ fun RepoDetailsHeader(
 
     val lastDownloadedTime = repo.lastUpdated?.asRelativeTimeString()
         ?: stringResource(R.string.repositories_last_update_never)
-    val lastUpdated = stringResource(R.string.repo_last_update_downloaded, lastDownloadedTime)
+    val lastUpdated = stringResource(R.string.repo_last_downloaded, lastDownloadedTime)
 
     Column(
         verticalArrangement = spacedBy(8.dp),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fead1c220..95228df75 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -959,7 +959,7 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="repo_has_update_error">Had errors updating</string>
     <string name="repo_has_update_error_intro">An error occurred while trying to update this repository:</string>
     <string name="repo_last_update_upstream">Published %s</string>
-    <string name="repo_last_update_downloaded">Downloaded %s</string>
+    <string name="repo_last_downloaded">Downloaded %s</string>
     <string name="repo_basicauth_username">Username</string>
     <string name="repo_basicauth_password">Password</string>
     <string name="repo_basicauth_edit">Save Changes</string>

From ddafdd6e8b540c1d29d004cb809d08bfe19065b9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 30 Dec 2025 10:49:03 -0300
Subject: [PATCH 162/180] Only show one app confirmation dialog at a time

---
 .../main/kotlin/org/fdroid/install/InstallState.kt   | 12 ++++++++++++
 app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt     | 12 ++----------
 app/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt |  3 ++-
 .../kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt     |  6 ++++++
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/org/fdroid/install/InstallState.kt b/app/src/main/kotlin/org/fdroid/install/InstallState.kt
index 1fd743dda..fda917fad 100644
--- a/app/src/main/kotlin/org/fdroid/install/InstallState.kt
+++ b/app/src/main/kotlin/org/fdroid/install/InstallState.kt
@@ -20,6 +20,7 @@ sealed class InstallState(val showProgress: Boolean) {
         val version: AppVersion,
         val repo: Repository,
         override val sessionId: Int,
+        override val creationTimeMillis: Long = System.currentTimeMillis(),
         override val intent: PendingIntent,
     ) : InstallConfirmationState() {
         override val name: String = state.name
@@ -67,6 +68,7 @@ sealed class InstallState(val showProgress: Boolean) {
         override val iconDownloadRequest: DownloadRequest?,
         override val sessionId: Int,
         override val intent: PendingIntent,
+        override val creationTimeMillis: Long,
         val progress: Float,
     ) : InstallConfirmationState() {
         constructor(
@@ -82,6 +84,7 @@ sealed class InstallState(val showProgress: Boolean) {
             iconDownloadRequest = state.iconDownloadRequest,
             sessionId = sessionId,
             intent = intent,
+            creationTimeMillis = System.currentTimeMillis(),
             progress = progress
         )
     }
@@ -127,5 +130,14 @@ sealed class InstallStateWithInfo(showProgress: Boolean) : InstallState(showProg
 
 sealed class InstallConfirmationState() : InstallStateWithInfo(true) {
     abstract val sessionId: Int
+
+    /**
+     * The epoch time in milliseconds when this state was created.
+     * This is used to get a stable ordering on apps that require user confirmation.
+     * The reason this is needed is that we can only show a single confirmation dialog at a time.
+     * If we show more than one, the second one gets silently swallowed by the system
+     * and we don't receive any feedback, so installation process of several apps gets stuck.
+     */
+    abstract val creationTimeMillis: Long
     abstract val intent: PendingIntent
 }
diff --git a/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 1383f0973..08585a76b 100644
--- a/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -25,7 +25,6 @@ import androidx.compose.material3.TopAppBarDefaults.enterAlwaysScrollBehavior
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -59,18 +58,11 @@ fun MyApps(
     modifier: Modifier = Modifier,
 ) {
     val myAppsModel = myAppsInfo.model
-    val appToConfirm by remember(myAppsInfo.model.installingApps) {
-        derivedStateOf {
-            myAppsInfo.model.installingApps.find { app ->
-                app.installState is InstallConfirmationState
-            }
-        }
-    }
     // Ask user to confirm appToConfirm whenever it changes and we are in STARTED state.
     // In tests, waiting for RESUME didn't work, because the LaunchedEffect ran before.
     val lifecycleOwner = LocalLifecycleOwner.current
-    LaunchedEffect(appToConfirm) {
-        val app = appToConfirm
+    LaunchedEffect(myAppsModel.appToConfirm) {
+        val app = myAppsModel.appToConfirm
         if (app != null && lifecycleOwner.lifecycle.currentState.isAtLeast(STARTED)) {
             val state = app.installState as InstallConfirmationState
             myAppsInfo.confirmAppInstall(app.packageName, state)
diff --git a/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
index 84a75b0a0..f3b1d54fe 100644
--- a/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsInfo.kt
@@ -14,8 +14,9 @@ interface MyAppsInfo {
 }
 
 data class MyAppsModel(
-    val installingApps: List<InstallingAppItem>,
+    val appToConfirm: InstallingAppItem? = null,
     val appUpdates: List<AppUpdateItem>? = null,
+    val installingApps: List<InstallingAppItem>,
     val appsWithIssue: List<AppWithIssueItem>? = null,
     val installedApps: List<InstalledAppItem>? = null,
     val sortOrder: AppListSortOrder = AppListSortOrder.NAME,
diff --git a/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
index f729ba0f7..b7e9f9d05 100644
--- a/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/apps/MyAppsPresenter.kt
@@ -8,6 +8,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.download.NetworkState
+import org.fdroid.install.InstallConfirmationState
 import org.fdroid.install.InstallState
 import org.fdroid.install.InstallStateWithInfo
 import org.fdroid.ui.utils.normalize
@@ -87,6 +88,11 @@ fun MyAppsPresenter(
         }
     } ?: run { updateBytes = null }
     return MyAppsModel(
+        appToConfirm = installingApps.filter {
+            it.installState is InstallConfirmationState
+        }.minByOrNull {
+            (it.installState as InstallConfirmationState).creationTimeMillis
+        },
         installingApps = installingApps.sort(sortOrder),
         appUpdates = updates?.sort(sortOrder),
         appsWithIssue = withIssues?.sort(sortOrder),

From 312937eda6078e4081892cc6544930845f80070b Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 30 Dec 2025 11:39:24 -0300
Subject: [PATCH 163/180] Update update-mirrors-in-default_repos.xml.py

---
 app/src/main/assets/default_repos.json       | 10 +++---
 legacy/src/main/res/values/default_repos.xml |  4 +--
 tools/update-mirrors-in-default_repos.xml.py | 35 ++++++++++++++++----
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/app/src/main/assets/default_repos.json b/app/src/main/assets/default_repos.json
index 372371c2d..0fddb0f01 100644
--- a/app/src/main/assets/default_repos.json
+++ b/app/src/main/assets/default_repos.json
@@ -14,6 +14,7 @@
       "https://ftp.gwdg.de/pub/android/fdroid/repo",
       "https://ftp.lysator.liu.se/pub/fdroid/repo",
       "https://mirror.cyberbits.eu/fdroid/repo",
+      "https://mirror.eu.ossplanet.net/fdroid/repo",
       "https://mirror.fcix.net/fdroid/repo",
       "https://mirror.kumi.systems/fdroid/repo",
       "https://mirror.level66.network/fdroid/repo",
@@ -22,8 +23,7 @@
       "https://opencolo.mm.fcix.net/fdroid/repo",
       "https://plug-mirror.rcac.purdue.edu/fdroid/repo",
       "https://mirror.init7.net/fdroid/repo",
-      "https://mirror.freedif.org/fdroid/repo",
-      "https://de.freedif.org/fdroid/repo"
+      "https://mirror.freedif.org/fdroid/repo"
     ],
     "description": "The official F-Droid Free Software repository. Everything in this repository is always built from the source code.",
     "certificate": "3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef",
@@ -44,6 +44,7 @@
       "https://ftp.gwdg.de/pub/android/fdroid/archive",
       "https://ftp.lysator.liu.se/pub/fdroid/archive",
       "https://mirror.cyberbits.eu/fdroid/archive",
+      "https://mirror.eu.ossplanet.net/fdroid/archive",
       "https://mirror.fcix.net/fdroid/archive",
       "https://mirror.kumi.systems/fdroid/archive",
       "https://mirror.level66.network/fdroid/archive",
@@ -52,11 +53,10 @@
       "https://opencolo.mm.fcix.net/fdroid/archive",
       "https://plug-mirror.rcac.purdue.edu/fdroid/archive",
       "https://mirror.init7.net/fdroid/archive",
-      "https://mirror.freedif.org/fdroid/archive",
-      "https://de.freedif.org/fdroid/archive"
+      "https://mirror.freedif.org/fdroid/archive"
     ],
     "description": "The archive repository of the F-Droid client. This contains older versions of applications from the main repository.",
     "certificate": "3082035e30820246a00302010202044c49cd00300d06092a864886f70d01010505003071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b73301e170d3130303732333137313032345a170d3337313230383137313032345a3071310b300906035504061302554b3110300e06035504081307556e6b6e6f776e3111300f0603550407130857657468657262793110300e060355040a1307556e6b6e6f776e3110300e060355040b1307556e6b6e6f776e311930170603550403131043696172616e2047756c746e69656b7330820122300d06092a864886f70d01010105000382010f003082010a028201010096d075e47c014e7822c89fd67f795d23203e2a8843f53ba4e6b1bf5f2fd0e225938267cfcae7fbf4fe596346afbaf4070fdb91f66fbcdf2348a3d92430502824f80517b156fab00809bdc8e631bfa9afd42d9045ab5fd6d28d9e140afc1300917b19b7c6c4df4a494cf1f7cb4a63c80d734265d735af9e4f09455f427aa65a53563f87b336ca2c19d244fcbba617ba0b19e56ed34afe0b253ab91e2fdb1271f1b9e3c3232027ed8862a112f0706e234cf236914b939bcf959821ecb2a6c18057e070de3428046d94b175e1d89bd795e535499a091f5bc65a79d539a8d43891ec504058acb28c08393b5718b57600a211e803f4a634e5c57f25b9b8c4422c6fd90203010001300d06092a864886f70d0101050500038201010008e4ef699e9807677ff56753da73efb2390d5ae2c17e4db691d5df7a7b60fc071ae509c5414be7d5da74df2811e83d3668c4a0b1abc84b9fa7d96b4cdf30bba68517ad2a93e233b042972ac0553a4801c9ebe07bf57ebe9a3b3d6d663965260e50f3b8f46db0531761e60340a2bddc3426098397fda54044a17e5244549f9869b460ca5e6e216b6f6a2db0580b480ca2afe6ec6b46eedacfa4aa45038809ece0c5978653d6c85f678e7f5a2156d1bedd8117751e64a4b0dcd140f3040b021821a8d93aed8d01ba36db6c82372211fed714d9a32607038cdfd565bd529ffc637212aaa2c224ef22b603eccefb5bf1e085c191d4b24fe742b17ab3f55d4e6f05ef",
     "enabled": false
   }
-]
+]
\ No newline at end of file
diff --git a/legacy/src/main/res/values/default_repos.xml b/legacy/src/main/res/values/default_repos.xml
index 77b764db3..0b4ccabfe 100644
--- a/legacy/src/main/res/values/default_repos.xml
+++ b/legacy/src/main/res/values/default_repos.xml
@@ -19,6 +19,7 @@
             https://ftp.gwdg.de/pub/android/fdroid/repo
             https://ftp.lysator.liu.se/pub/fdroid/repo
             https://mirror.cyberbits.eu/fdroid/repo
+            https://mirror.eu.ossplanet.net/fdroid/repo
             https://mirror.fcix.net/fdroid/repo
             https://mirror.kumi.systems/fdroid/repo
             https://mirror.level66.network/fdroid/repo
@@ -28,7 +29,6 @@
             https://plug-mirror.rcac.purdue.edu/fdroid/repo
             https://mirror.init7.net/fdroid/repo
             https://mirror.freedif.org/fdroid/repo
-            https://de.freedif.org/fdroid/repo
         </item>
         <!-- description -->
         <item>The official F-Droid Free Software repository. Everything in this repository is always built from the source code.
@@ -60,6 +60,7 @@
             https://ftp.gwdg.de/pub/android/fdroid/archive
             https://ftp.lysator.liu.se/pub/fdroid/archive
             https://mirror.cyberbits.eu/fdroid/archive
+            https://mirror.eu.ossplanet.net/fdroid/archive
             https://mirror.fcix.net/fdroid/archive
             https://mirror.kumi.systems/fdroid/archive
             https://mirror.level66.network/fdroid/archive
@@ -69,7 +70,6 @@
             https://plug-mirror.rcac.purdue.edu/fdroid/archive
             https://mirror.init7.net/fdroid/archive
             https://mirror.freedif.org/fdroid/archive
-            https://de.freedif.org/fdroid/archive
         </item>
         <!-- description -->
         <item>The archive repository of the F-Droid client. This contains older versions of
diff --git a/tools/update-mirrors-in-default_repos.xml.py b/tools/update-mirrors-in-default_repos.xml.py
index 870a7953e..e5a674752 100755
--- a/tools/update-mirrors-in-default_repos.xml.py
+++ b/tools/update-mirrors-in-default_repos.xml.py
@@ -1,28 +1,49 @@
 #!/usr/bin/env python3
 #
-# Fetch the official mirrors from f-droid.org and update default_repos.xml.
+# Fetch the official mirrors from f-droid.org and update default_repos.json.
 
 import os
+import json
 import requests
 import lxml.etree as ET
 
+REPO_URL = "https://f-droid.org/repo"
+ARCHIVE_URL = "https://f-droid.org/archive"
+
 os.chdir(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+# get mirrors from index
 r = requests.get('https://f-droid.org/repo/index-v2.json')
 mirrors = []
+archive_mirrors = []
 for mirror in r.json()['repo']['mirrors']:
-    mirrors.append(mirror['url'])
+    if mirror['url'] != REPO_URL:
+        mirrors.append(mirror['url'])
+        archive_mirrors.append(mirror['url'].replace('/repo', '/archive'))
 
-default_repos = 'app/src/main/res/values/default_repos.xml'
-tree = ET.parse(default_repos)
+# default_repos.json
+default_repos = 'app/src/main/assets/default_repos.json'
+with open(default_repos, 'r') as json_file:
+    data = json.load(json_file)
+for repo in data:
+    if repo["address"] == REPO_URL:
+        repo["mirrors"] = mirrors
+    elif repo["address"] == ARCHIVE_URL:
+        repo["mirrors"] = archive_mirrors
+with open(default_repos, 'w') as json_file:
+    json.dump(data, json_file, indent=2)
+
+# legacy XML default repos
+default_repos_legacy = 'legacy/src/main/res/values/default_repos.xml'
+tree = ET.parse(default_repos_legacy)
 root = tree.getroot()
 i = 0
 indent = '\n            '
 for item in root.iter('item'):
     if i == 1:
-        item.text = indent + (indent.join(mirrors)) + '\n        '
+        item.text = indent + (indent.join([REPO_URL] + mirrors)) + '\n        '
     elif i == 8:
-        item.text = indent + (indent.join(mirrors).replace('/repo', '/archive')) + '\n        '
+        item.text = indent + (indent.join([ARCHIVE_URL] + mirrors).replace('/repo', '/archive')) + '\n        '
     i += 1
 
-tree.write(default_repos)
+tree.write(default_repos_legacy)

From dd3d4c532d4b28a42a43473293e2d673e6778d0c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 5 Jan 2026 18:08:10 -0300
Subject: [PATCH 164/180] Remove 2.0 dev cruft

---
 .gitlab-ci.yml                   |    2 +-
 app/build.gradle.kts             |    6 +-
 gradle/verification-metadata.xml | 1376 ++++++++++++++++++++++++++++++
 3 files changed, 1380 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 605c0ba42..98d0dda3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -327,7 +327,7 @@ libs database schema:
     - echo no | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager --verbose create avd --name "$NAME_AVD" --package "$AVD" --device "pixel"
     - df -h
     - start-emulator.sh
-    - ./gradlew installFullDebug
+    - ./gradlew :app:installBasicDebug :legacy:installFullDebug
     - adb shell am start -n org.fdroid.fdroid.debug/org.fdroid.fdroid.views.main.MainActivity
     - export FLAG="-Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.LargeTest,androidx.test.filters.FlakyTest"
     - ./gradlew $FLAG :app:connectedBasicDebugAndroidTest :legacy:connectedFullDebugAndroidTest :libs:database:connectedCheck :libs:download:connectedCheck :libs:index:connectedCheck
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 66e3733d6..833f20ecd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -17,15 +17,15 @@ android {
         applicationId = "org.fdroid"
         minSdk = 24
         targetSdk = 36
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 2000000
+        versionName = "2.0-alpha0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         all {
-            buildConfigField("String", "ACRA_REPORT_EMAIL", "\"t+fdroidnext@grobox.de\"")
+            buildConfigField("String", "ACRA_REPORT_EMAIL", "\"reports@f-droid.org\"")
         }
         getByName("release") {
             isMinifyEnabled = true
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 018a8eff0..8b1eca0da 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -201,6 +201,11 @@
             <sha256 value="26726186b34f90b0fe55bbf0ebbf640ade99915bc35f4cb0153ddcf751499bd3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity" version="1.12.2">
+         <artifact name="activity-1.12.2.aar">
+            <sha256 value="1d37a19022454f1e4a60fd982b3dc0256457d25257a6343c771acae864d15cd9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity" version="1.2.3">
          <artifact name="activity-1.2.3.aar">
             <sha256 value="1dce0705c334a6b2ef03382418dc7586f4e57ee23817267b403ea8cfc36c824e" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -246,6 +251,11 @@
             <sha256 value="03d5232a9371338475a3d9e40cabeb072faab16dd01d94b481c1ebf13535c59a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity-compose" version="1.12.2">
+         <artifact name="activity-compose-1.12.2.aar">
+            <sha256 value="8538db6f4ead968e5e768f62db9ca4ea787c4105ad87e6518f67bf293ec04776" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity-compose" version="1.7.2">
          <artifact name="activity-compose-1.7.2.aar">
             <sha256 value="c73db26b1672a63f144457271b49cc40380b5bafe60ed0710e82d0a774e36a88" origin="Generated by Gradle"/>
@@ -276,6 +286,11 @@
             <sha256 value="3663f6811a3c6c0c28f8ba82ba5e9f363f4bc12ee53155794f456d3c5b2acae3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity-ktx" version="1.12.2">
+         <artifact name="activity-ktx-1.12.2.aar">
+            <sha256 value="43107c7fcc04dff804b7541cf78f4432e813ff77a7dea7d500548f3420f29449" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity-ktx" version="1.2.2">
          <artifact name="activity-ktx-1.2.2.aar">
             <sha256 value="9829e13d6a6b045b03b21a330512e091dc76eb5b3ded0d88d1ab0509cf84a50e" origin="Generated by Gradle"/>
@@ -399,6 +414,11 @@
             <sha256 value="02b0a4256618f85386c92e5cec166dc7f300820888a290227a3c0c65b82cbb36" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.annotation" name="annotation-experimental" version="1.5.1">
+         <artifact name="annotation-experimental-1.5.1.aar">
+            <sha256 value="323a119b32e91d44e932fb97ed28eb568ca2a9d3ba57ec09392074b5c5e24ad4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.annotation" name="annotation-jvm" version="1.6.0">
          <artifact name="annotation-jvm-1.6.0.jar">
             <sha256 value="60b10b5ef5769b79570172e015b8159405c92f034ba88b9391a977589c9deb4e" origin="Generated by Gradle"/>
@@ -711,6 +731,11 @@
             <sha256 value="1806a8f30c76b7c0a3366f08287d55977679dc64be85c3e9d79ad18bc678d95a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.animation" name="animation-android" version="1.11.0-alpha02">
+         <artifact name="animation.aar">
+            <sha256 value="ba2e82d7991cea25d7caf9b91d58d1d8bf7585e3356f4589f0d53d793102ecd0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.animation" name="animation-android" version="1.5.4">
          <artifact name="animation-release.aar">
             <sha256 value="428538775ea55529b953fbb7a6000ccfddc89722c69c7a30431a630fa2fe74f2" origin="Generated by Gradle"/>
@@ -801,6 +826,11 @@
             <sha256 value="61ff5030fa00a03824ddc18797a9a152786f2c4d0734e4d3ebf4108a2581e86a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.animation" name="animation-core-android" version="1.11.0-alpha02">
+         <artifact name="animation-core.aar">
+            <sha256 value="f464b37d6831b9283b481353b36a6353d99acc4c7a3e4462dcfe3e8f605c58a0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.animation" name="animation-core-android" version="1.5.4">
          <artifact name="animation-core-release.aar">
             <sha256 value="d7e85fb4fb36db15eb15134ffec8363fda8517ee944af1441815131029f960c8" origin="Generated by Gradle"/>
@@ -906,6 +936,11 @@
             <sha256 value="60bd800a8ea375412ad069088d1d55ba344c73a174e2ae4a06d22a18e4b0cfdd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.foundation" name="foundation-android" version="1.11.0-alpha02">
+         <artifact name="foundation.aar">
+            <sha256 value="2820555239c5fe1d65a620688abbbb24b7a08964c02accad08cf297d33369a6a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.foundation" name="foundation-android" version="1.5.4">
          <artifact name="foundation-release.aar">
             <sha256 value="74075b7f5de082f77ce27b80b8787c59ac3ec86d0a66bf5754377211f2894072" origin="Generated by Gradle"/>
@@ -996,6 +1031,11 @@
             <sha256 value="75b44e51947c8ff496e2595d6142c065ff50dbb743973f54d3f8cb6022ee5cb7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.11.0-alpha02">
+         <artifact name="foundation-layout.aar">
+            <sha256 value="4acf670a7b5d5f1eacc3d8706c7dc9c13b472f8f49b11566d59fcdf3293aa79c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.5.4">
          <artifact name="foundation-layout-release.aar">
             <sha256 value="63d6b3832034e6f187213970f42d82d0ce136d6c6061748f34f05cf2ba1d4364" origin="Generated by Gradle"/>
@@ -1066,6 +1106,11 @@
             <sha256 value="e9028da82b72d3e1849c2d661e9f0cab57047a555f01e84e3c5efecabb3a5edd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material" name="material-android" version="1.11.0-alpha02">
+         <artifact name="material.aar">
+            <sha256 value="d4f95f445fff20ef09738484b0c4c8a9882b4ddc4477ea6501aa1df822ad615c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.material" name="material-android" version="1.5.4">
          <artifact name="material-release.aar">
             <sha256 value="6ff3b19950724e44348fd122765efdb7f9f58e4c607ca0439f0e15048766b993" origin="Generated by Gradle"/>
@@ -1271,6 +1316,11 @@
             <sha256 value="be45c0bae4891a897e381e60b05e02c88fefda8de12871133755565713d5dff1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material" name="material-ripple-android" version="1.11.0-alpha02">
+         <artifact name="material-ripple.aar">
+            <sha256 value="785716dee910874fc73b0d9fe84cb85fc7183e05010d556b15244fe49b035c13" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.material" name="material-ripple-android" version="1.5.4">
          <artifact name="material-ripple-release.aar">
             <sha256 value="8a6c8b4bfc8cae9dc7e79653a5de3a482cb9b96d290f6bbdc6d3002b91ed48cb" origin="Generated by Gradle"/>
@@ -1346,6 +1396,31 @@
             <sha256 value="3a37e8b36df3822fe1e6059f0f9fafda8800388860477624ac1b9422c418a36e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material3" name="material3-android" version="1.5.0-alpha11">
+         <artifact name="material3.aar">
+            <sha256 value="988fdf441710910d3cd2ac8c7a7fe616f6cf0cbe165e83a482270f62a7a25b1b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material3.adaptive" name="adaptive-android" version="1.3.0-alpha05">
+         <artifact name="adaptive.aar">
+            <sha256 value="172762b01feb65bc8c1499a405237aa3985253061d2310e3f366b9855c4418b8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material3.adaptive" name="adaptive-layout-android" version="1.3.0-alpha05">
+         <artifact name="adaptive-layout.aar">
+            <sha256 value="e4f0a59e92a1133a2a7699d7b6b733b0c8c60a43b9bc16c859e42cf5a2dceed3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material3.adaptive" name="adaptive-navigation-android" version="1.3.0-alpha05">
+         <artifact name="adaptive-navigation.aar">
+            <sha256 value="2549fdbcb5e03e68d6ccb376863af839afdb40cd94e9b404ab8818aacb63c0ae" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material3.adaptive" name="adaptive-navigation3-android" version="1.3.0-alpha05">
+         <artifact name="adaptive-navigation3.aar">
+            <sha256 value="507a335ca7fe36fdbf1d506ecaf60225aa883275e0646a77862d850a12692b56" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime" version="1.4.3">
          <artifact name="runtime-1.4.3.aar">
             <sha256 value="f975185e13d3e5b0c142e220e924bfe643d4421b0fdae3f2036f1e0160a390f4" origin="Generated by Gradle"/>
@@ -1391,6 +1466,11 @@
             <sha256 value="538f564e4ec48cfb1b7bf22277e455dd985fa3eeeb9227133dabf21cd74b03df" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime-android" version="1.11.0-alpha02">
+         <artifact name="runtime.aar">
+            <sha256 value="8593ee07281760c22b9b3fcf43489ba0c369e3a03f58394eee8e5faf64433e2f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime-android" version="1.5.4">
          <artifact name="runtime-release.aar">
             <sha256 value="a7df39bcc1327fa5a7ea5dca2976e11b87feea4ca89d1968cbbb6914f983cd4c" origin="Generated by Gradle"/>
@@ -1436,11 +1516,21 @@
             <sha256 value="a4ad4eb1139a80737755b3ddb7da993697f758f6555486d6eaae59cb8dca19d2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime-annotation-android" version="1.11.0-alpha02">
+         <artifact name="runtime-annotation.aar">
+            <sha256 value="a770b57bcaf44c5e8122a49792cbd4646f1128b668bf66651cfddc79e3e09851" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime-annotation-android" version="1.9.2">
          <artifact name="runtime-annotation.aar">
             <sha256 value="b5ad9d5a3adf5b7fc81eb8f8d53b4dc79f2252d66ced3e26277d29a92e9e01ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime-retain-android" version="1.11.0-alpha02">
+         <artifact name="runtime-retain.aar">
+            <sha256 value="787b14fb8a7458d1d14c8eed5b565000985156703cca180fdc0cb4777d257a21" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime-saveable" version="1.4.3">
          <artifact name="runtime-saveable-1.4.3.aar">
             <sha256 value="756d7f53d64b664ad168c7109aa88cc394fb51aee6a2bb7ac86982242834f5ca" origin="Generated by Gradle"/>
@@ -1486,6 +1576,11 @@
             <sha256 value="1b3725d0bf3d9ab82009329c7b78ba6a225a8b38985d041a30aba68e83f727ab" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.11.0-alpha02">
+         <artifact name="runtime-saveable.aar">
+            <sha256 value="118b780730ccf58886841850ded3a0f3f48b7682e25a3a42bf6b9835a41dbf5a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.5.4">
          <artifact name="runtime-saveable-release.aar">
             <sha256 value="5e834c12d7d226a1057e6e70b341cc27414afa2e9d0007660b9dffec6b7673ed" origin="Generated by Gradle"/>
@@ -1576,6 +1671,11 @@
             <sha256 value="dad6a6c7ea6a3e129f812fd95407529aba92b49dd3a6c535fc6ac6b980247076" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-android" version="1.11.0-alpha02">
+         <artifact name="ui.aar">
+            <sha256 value="6f85ae517ca8d67cf93f88e9119e737d75771c832f8703e4abe90248935ff8eb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-android" version="1.5.4">
          <artifact name="ui-release.aar">
             <sha256 value="13f39a8f0bfaf621ab57f77ad022d482b5f2b14803a5623cc4fdca2ef905ca26" origin="Generated by Gradle"/>
@@ -1666,6 +1766,11 @@
             <sha256 value="a5fbbb522462bb0ece5ce163c26c513ece96bf757506899a79c001a12f1bb112" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-geometry-android" version="1.11.0-alpha02">
+         <artifact name="ui-geometry.aar">
+            <sha256 value="d3463e8bcae6dd878ab06e376c3985c75ed9e94ef35cf371caa95491690fe709" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-geometry-android" version="1.5.4">
          <artifact name="ui-geometry-release.aar">
             <sha256 value="2ecd05d0c033325304834a361d3e5f2c01395bfc5da2402641cfcee4981a01a9" origin="Generated by Gradle"/>
@@ -1756,6 +1861,11 @@
             <sha256 value="4e63a373bb6a8016db4dea918e25754be90eb4d917bf5c9cfadf388b0c7f9c14" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-graphics-android" version="1.11.0-alpha02">
+         <artifact name="ui-graphics.aar">
+            <sha256 value="066ada88cc333ad1b30d360f4ca6aa7e885171901565b5e1bd682296cf5958bf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-graphics-android" version="1.5.4">
          <artifact name="ui-graphics-release.aar">
             <sha256 value="8f7811d34f178e2de66399e8b0fd747db3502a9b844a4e2d946a711e75655cbc" origin="Generated by Gradle"/>
@@ -1796,6 +1906,21 @@
             <sha256 value="e261890457ff185a4db53d14a8ed1d8563427d4ffdcb377ecdc935760a69ab0f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-test-android" version="1.11.0-alpha02">
+         <artifact name="ui-test.aar">
+            <sha256 value="25cd69ecfe97187197d9292d8b4c7bf597b73c66fa76b8196d55d7c8b39ce278" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-test-junit4-android" version="1.11.0-alpha02">
+         <artifact name="ui-test-junit4.aar">
+            <sha256 value="f94639ed2ab4231cdc2a7d388b1b71d74517079a389dbfb11b4c73a385938b0c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-test-manifest" version="1.11.0-alpha02">
+         <artifact name="ui-test-manifest-1.11.0-alpha02.aar">
+            <sha256 value="88a844526661c1b7bef5aa73a57a39639ce1c92aa08c05b5f5d5d96f813f0180" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-text" version="1.4.3">
          <artifact name="ui-text-1.4.3.aar">
             <sha256 value="dfa801c2b6b29c97a7f6a20fc45a9b2cb8da4d52b1601d9f10c70878f98f1faa" origin="Generated by Gradle"/>
@@ -1846,6 +1971,11 @@
             <sha256 value="52688967f73b5aa1836add16464b5549a4149255f0de1b8c91f084e3f7a47142" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-text-android" version="1.11.0-alpha02">
+         <artifact name="ui-text.aar">
+            <sha256 value="85ab5a49b156e345388c71cd0545343d3375e40aeeface8f206a58d635b5e1d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-text-android" version="1.5.4">
          <artifact name="ui-text-release.aar">
             <sha256 value="1633dd54142169a5066580f9a580d2660c790fc1b68c2e533c36a9c0f8b10abb" origin="Generated by Gradle"/>
@@ -1891,6 +2021,11 @@
             <sha256 value="e641617b76204f9a03771ee40455553d5ec23d0c1f4a49d1e8177553769b6c06" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-tooling-android" version="1.11.0-alpha02">
+         <artifact name="ui-tooling.aar">
+            <sha256 value="461e2de4fb1e5fcbf22b5d6ad5d56f2e652da04f26f37327c1d4627970f781c4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-tooling-android" version="1.5.4">
          <artifact name="ui-tooling-release.aar">
             <sha256 value="d7459ec30b27d1bd3e922fc69db1e27206a0721d825df44ffc7ef15842124264" origin="Generated by Gradle"/>
@@ -1936,6 +2071,11 @@
             <sha256 value="9b9a8d446f1f2bd12157329aba7751755118a659f02cbd7d40afba9ad1e7a61e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-tooling-data-android" version="1.11.0-alpha02">
+         <artifact name="ui-tooling-data.aar">
+            <sha256 value="dc05687db050122565a16a79bbfcd19d34f13b84e002c78fb802b9589ca6665f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-tooling-data-android" version="1.5.4">
          <artifact name="ui-tooling-data-release.aar">
             <sha256 value="d8185c38707f10d094458ab5b8026de93916d925876b32ac53278b1113f66bf1" origin="Generated by Gradle"/>
@@ -2026,6 +2166,11 @@
             <sha256 value="3bc78465aefc6115f367586c5ea1b4251ec2751508428f5e178e634a0e1e7d7b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-tooling-preview-android" version="1.11.0-alpha02">
+         <artifact name="ui-tooling-preview.aar">
+            <sha256 value="26755185298bfd55af2d2cdf7832789a31d6263f7163ea02caf9d048c4d1a6a5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-tooling-preview-android" version="1.5.4">
          <artifact name="ui-tooling-preview-release.aar">
             <sha256 value="1263288480372dbfb54d63234e9cabfa7f94b13a5ba108d06c4aa1976dbbaade" origin="Generated by Gradle"/>
@@ -2116,6 +2261,11 @@
             <sha256 value="899e0bcada320574e87f771835d31d45281c2f70d23c02dc23c12b79dfc4a495" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-unit-android" version="1.11.0-alpha02">
+         <artifact name="ui-unit.aar">
+            <sha256 value="5ce2741d9d93e864d3be8557bd3b760f328b9b3d1b9e4a2914c87f0317e179c9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-unit-android" version="1.5.4">
          <artifact name="ui-unit-release.aar">
             <sha256 value="ac753ab129b70bab79cfea691ed6bc8ec20fde278db7269b94f50227a712302e" origin="Generated by Gradle"/>
@@ -2196,6 +2346,11 @@
             <sha256 value="1e09195d218959d9f8c157ec813de61089fbb91ddc2e7a9c9a69ec0dad860779" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-util-android" version="1.11.0-alpha02">
+         <artifact name="ui-util.aar">
+            <sha256 value="ffa691101fb9ed3ef6a266711d433489d3c2f4338997947c87d3fd70bccf466d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-util-android" version="1.5.4">
          <artifact name="ui-util-release.aar">
             <sha256 value="02cd59abbccf95fef2825ba4c0871255380c6f5ba3eaea85b1892de24b4e6b50" origin="Generated by Gradle"/>
@@ -2246,11 +2401,21 @@
             <sha256 value="0ce067c514a0d1049d1bebdf709e344ed3266fe9744275682937cdcb13334e9e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.concurrent" name="concurrent-futures" version="1.2.0">
+         <artifact name="concurrent-futures-1.2.0.jar">
+            <sha256 value="4810315a798690b5d3bb40c92bcd41c045fd2c36bbfc50b27cbac3d6a0eda190" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.concurrent" name="concurrent-futures-ktx" version="1.1.0">
          <artifact name="concurrent-futures-ktx-1.1.0.jar">
             <sha256 value="1968bf52039e38636aa6f114cd17d7256919d1e8997417716fef9d1da1f24d85" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.concurrent" name="concurrent-futures-ktx" version="1.2.0">
+         <artifact name="concurrent-futures-ktx-1.2.0.jar">
+            <sha256 value="e1f3e17bb4358ccd6c77ca45f70635c9aba237261f19eaa4f64a0218c00e2a3e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.constraintlayout" name="constraintlayout" version="1.1.3">
          <artifact name="constraintlayout-1.1.3.aar">
             <sha256 value="5ff864def9d41cd04e08348d69591143bae3ceff4284cf8608bceb98c36ac830" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -2517,6 +2682,11 @@
             <sha256 value="66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.databinding" name="databinding-common" version="8.13.2">
+         <artifact name="databinding-common-8.13.2.jar">
+            <sha256 value="66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.databinding" name="databinding-common" version="8.2.1">
          <artifact name="databinding-common-8.2.1.jar">
             <sha256 value="66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732" origin="Generated by Gradle"/>
@@ -2575,6 +2745,11 @@
             <sha256 value="29ba01d24081d931bcad43b78b6dc88086501a882ccedf19be9b76a9cf8db8ba" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.databinding" name="databinding-compiler-common" version="8.13.2">
+         <artifact name="databinding-compiler-common-8.13.2.jar">
+            <sha256 value="a2c3fff0c39ac72c4c21c415017066c263efe170d8aeb9d339a3eca7c0d79f1e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.databinding" name="databinding-compiler-common" version="8.2.1">
          <artifact name="databinding-compiler-common-8.2.1.jar">
             <sha256 value="a55bef40d27aedbe7354e202da9f43bf66a00c9a7d5b799cd7e2aa148e7114f6" origin="Generated by Gradle"/>
@@ -2704,6 +2879,11 @@
             <sha256 value="12f0831b4f08092d5dda272c1923c11a022ff20ceffed3e801751e21bb8d1c1e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.fragment" name="fragment" version="1.5.4">
+         <artifact name="fragment-1.5.4.aar">
+            <sha256 value="bc3c2431dda42e94bb9511c587eae890d276e4aafe393a8da7b00169186dafde" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.fragment" name="fragment" version="1.6.1">
          <artifact name="fragment-1.6.1.aar">
             <sha256 value="5eeb5964a8edb25966d5cc7933fe893e3c58e245ac433d358478b20b6d09d4e3" origin="Generated by Gradle"/>
@@ -2747,6 +2927,36 @@
             <sha256 value="99dae726941cb2b11d22129be7883b58e8c244150cc65f6c2529920b7cba0de8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.hilt" name="hilt-common" version="1.3.0">
+         <artifact name="hilt-common-1.3.0.jar">
+            <sha256 value="f3bd79f6b830a432574dc734c36bf2c204f75dff963e507c47f6c6c6f91e661f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.hilt" name="hilt-compiler" version="1.3.0">
+         <artifact name="hilt-compiler-1.3.0.jar">
+            <sha256 value="aa4eaf65a3b50fa5ae1458b81a796a893c503ad5f17c322c9d9c10e09c58a624" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.hilt" name="hilt-lifecycle-viewmodel" version="1.3.0">
+         <artifact name="hilt-lifecycle-viewmodel-1.3.0.aar">
+            <sha256 value="918c20ae6b8ec31f55ad6ca6a333d9f967ab8165d63f42de316d3b258458c3bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.hilt" name="hilt-lifecycle-viewmodel-compose" version="1.3.0">
+         <artifact name="hilt-lifecycle-viewmodel-compose-1.3.0.aar">
+            <sha256 value="d47a3b2c031f0cb2ce72ded11d08a6361fad0d76e5042a5474b5e0ff76282e0a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.hilt" name="hilt-navigation-compose" version="1.3.0">
+         <artifact name="hilt-navigation-compose-1.3.0.aar">
+            <sha256 value="0f4a3eb57ea4e932ac4f81dd8a424b23c42b12eb1997d7f5e960143e24bdd6c1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.hilt" name="hilt-work" version="1.3.0">
+         <artifact name="hilt-work-1.3.0.aar">
+            <sha256 value="eb6aeff155531633cd4795c27e6ca0a36d3ab5247462579993235649071c7bc3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.interpolator" name="interpolator" version="1.0.0">
          <artifact name="interpolator-1.0.0.aar">
             <sha256 value="33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -2865,6 +3075,11 @@
             <sha256 value="c7a6e835da0712d15efeae0d72df91e6631042df4fcf0f9c20ceca740638c685" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.10.0">
+         <artifact name="lifecycle-common-java8-2.10.0.jar">
+            <sha256 value="497dd84de9f2fd46324f25f9a3af032d3a23d087e87af515c4b19435f6d6a651" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.6.1">
          <artifact name="lifecycle-common-java8-2.6.1.jar">
             <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/>
@@ -2900,6 +3115,11 @@
             <sha256 value="497dd84de9f2fd46324f25f9a3af032d3a23d087e87af515c4b19435f6d6a651" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-common-jvm" version="2.10.0">
+         <artifact name="lifecycle-common-jvm-2.10.0.jar">
+            <sha256 value="15943082d87bcd78830398fa377f2c8b12643de290d0906ed8e49a2d335ddb54" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-common-jvm" version="2.8.6">
          <artifact name="lifecycle-common-jvm-2.8.6.jar">
             <sha256 value="61c873a7327c946ec033c310bb98f3f92eeabcede0e1a5200ab8a1896483c7bf" origin="Generated by Gradle"/>
@@ -2938,6 +3158,11 @@
             <sha256 value="242e446bed3db36f0df0aab0cb7f91060bd2dab7adcad1117adf54e724cd1d26" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.10.0">
+         <artifact name="lifecycle-livedata-2.10.0.aar">
+            <sha256 value="3e8c009fc88da1c52e4ed05a81269d5ac9bd405046f300307f5e3a17e201a6df" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.4.1">
          <artifact name="lifecycle-livedata-2.4.1.aar">
             <sha256 value="78d04726be73a905870dafed01e107b350f84b38258c8f6a12acd310393e68ea" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -2998,6 +3223,11 @@
             <sha256 value="a150743e86c30eddf1660ad454b1f86041efdefcd1a039320c4c26db87f7119a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.10.0">
+         <artifact name="lifecycle-livedata-core-2.10.0.aar">
+            <sha256 value="12dd61a9843ccebb4547d3ebe2f6d030ca8f6988d22f8fad19c0af93b4a97e95" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.2.0">
          <artifact name="lifecycle-livedata-core-2.2.0.aar">
             <sha256 value="556c1f3af90aa9d7d0d330565adbf6da71b2429148bac91e07c485f4f9abf614" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -3066,6 +3296,11 @@
             <sha256 value="ea866f0c379d1f92837994010ab5ac0a5d5499dbab521efc71b3bc2b497d6ba4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.10.0">
+         <artifact name="lifecycle-livedata-core-ktx-2.10.0.aar">
+            <sha256 value="5f18429749a183e19178d8665ae42bf7b6310b50358ae9e0e0cc452afd6e0bc3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.3.1">
          <artifact name="lifecycle-livedata-core-ktx-2.3.1.aar">
             <sha256 value="6dd41c3c33daeb503fd87fbfff7043adb0be6c541a9c9e09bf531ca49520fddb" origin="Generated by Gradle"/>
@@ -3126,6 +3361,11 @@
             <sha256 value="f55b7a8d433e9b8163154ccaa42fa2be55c70cd1ede5eeea521a4b4b884dd4fe" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata-ktx" version="2.10.0">
+         <artifact name="lifecycle-livedata-ktx-2.10.0.aar">
+            <sha256 value="3b42f425ab72b1d142ada7e075d78d9ab1500703729c1a342148eff4c0c23dcf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-ktx" version="2.4.1">
          <artifact name="lifecycle-livedata-ktx-2.4.1.aar">
             <sha256 value="2a4f5fbbbc9fc039115dd1d78efa3a49dc55476ded36fad853626369b994318d" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -3181,6 +3421,11 @@
             <sha256 value="a7fe5ceaf1a20d6049b85ac834ac13179158dbd79be26ee4ee05f364d8d895b6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-process" version="2.10.0">
+         <artifact name="lifecycle-process-2.10.0.aar">
+            <sha256 value="10bb5bb12773dca11d8343c014cfd17dfb40967d6ece37e8f15d04d8ceb0775c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-process" version="2.4.0">
          <artifact name="lifecycle-process-2.4.0.aar">
             <sha256 value="32f175588bd62df5672448516d9e4f3d4935d0020c0d9517958c9ffbd7c207e5" origin="Generated by Gradle"/>
@@ -3302,6 +3547,11 @@
             <sha256 value="ba566d0f46dc01c2169778d27238789ecebaa00655642e02c24e4e83e7dc5905" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-android" version="2.10.0">
+         <artifact name="lifecycle-runtime.aar">
+            <sha256 value="2193a1573d623f37b20c7d27d1a8f903a72f651cc6f32e5794f85dda744fee75" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime-android" version="2.8.6">
          <artifact name="lifecycle-runtime-release.aar">
             <sha256 value="b41eebdb5b950c3122e403d898a20f4a1d2a70eb8a81f07a552205142cdcd71c" origin="Generated by Gradle"/>
@@ -3342,6 +3592,11 @@
             <sha256 value="8835416ac59a23f7152eb0f217bdab742a377e985462307639c12bafc1408e41" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-compose-android" version="2.10.0">
+         <artifact name="lifecycle-runtime-compose.aar">
+            <sha256 value="46e996d526829596f6db4626169a967f056fde7103507ff596bcd177b73c3675" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime-compose-android" version="2.8.6">
          <artifact name="lifecycle-runtime-compose-release.aar">
             <sha256 value="7a062110764cc8256d002d914e980550ece93de0c14ad4c71e415b0c84c0f19a" origin="Generated by Gradle"/>
@@ -3417,6 +3672,11 @@
             <sha256 value="5d74d1e9c45d538aafc48b2313e598eff9b4a13bfee9f2f3d776f5274d5cde22" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-ktx-android" version="2.10.0">
+         <artifact name="lifecycle-runtime-ktx.aar">
+            <sha256 value="871883703339f87284d232cb436e317c6f4af5612d92b43f27c6b13b92109fa7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime-ktx-android" version="2.8.6">
          <artifact name="lifecycle-runtime-ktx-release.aar">
             <sha256 value="7ab4028168bc871c47dc5efca4e5415bbe919ed5b04caad3d458a487ff368873" origin="Generated by Gradle"/>
@@ -3447,6 +3707,11 @@
             <sha256 value="23516745f34f16ff7850bb1eadd55cf193dd789cba428de4bca120433e3bfd69" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-service" version="2.10.0">
+         <artifact name="lifecycle-service-2.10.0.aar">
+            <sha256 value="60bea13bbea42b6aa007e5a48c0b432c9b3dd05887482a43baa8f5a9042dc2e2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-service" version="2.6.1">
          <artifact name="lifecycle-service-2.6.1.aar">
             <sha256 value="8ace99313f0ae6af47194bcafe28f344e363f4d293f84b2b97b481735b04ded2" origin="Generated by Gradle"/>
@@ -3487,6 +3752,11 @@
             <sha256 value="674155d592d5de18175ef0727442f7827a86cf8fe68d9927ba6a4140b69a5bc9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.10.0">
+         <artifact name="lifecycle-viewmodel-2.10.0.aar">
+            <sha256 value="4b809cf9eb7323d200504e95921feb777ff080215cadb8237742d5ed0ba5b792" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.2.0">
          <artifact name="lifecycle-viewmodel-2.2.0.aar">
             <sha256 value="967efab24d6c49dd414a8c0ac4a1cd09b018f0b8bb43b739ad360c4158ebde27" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -3560,6 +3830,11 @@
             <sha256 value="5410cdfdc3f25bccb5a4dbd8121a5d376b1379041cec6b1da25f9967ca09f019" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-android" version="2.10.0">
+         <artifact name="lifecycle-viewmodel.aar">
+            <sha256 value="9303287030027ca0b8cf98a748ddeb121ec1bfa1312c0069428e4765bbabce78" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-android" version="2.8.6">
          <artifact name="lifecycle-viewmodel-release.aar">
             <sha256 value="998e56ae2638881fb9519496b998f032e32fe3afed946b60636711b32a86f365" origin="Generated by Gradle"/>
@@ -3625,6 +3900,11 @@
             <sha256 value="73b5e68cbb713cc0bc5cc0b1bee3570624e3ddff664c00acf108a8fd4f3050eb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose-android" version="2.10.0">
+         <artifact name="lifecycle-viewmodel-compose.aar">
+            <sha256 value="225904e54ad5154768630471e108b98e143c261df0c08380ff43ea7e832dad7e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose-android" version="2.8.6">
          <artifact name="lifecycle-viewmodel-compose-release.aar">
             <sha256 value="f0d3e1febb960e495f21489403a4a6fbfdc4283b9bd31603e5bcc1944ddfb169" origin="Generated by Gradle"/>
@@ -3650,6 +3930,11 @@
             <sha256 value="f7825a08ca661de84044b6891293084bea8fbcc84aa08d8c13a3c558fc5956c9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.10.0">
+         <artifact name="lifecycle-viewmodel-ktx-2.10.0.aar">
+            <sha256 value="54295ac86b67886dc0613e38f621c531995d0662005fc763e340e19a90994f84" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.3.1">
          <artifact name="lifecycle-viewmodel-ktx-2.3.1.aar">
             <sha256 value="5fb3591b6a54eeb3e204be0125d48eb987b8ea45a5048140036865482ccf9de9" origin="Generated by Gradle"/>
@@ -3700,6 +3985,16 @@
             <sha256 value="b7d58bb86bb8e2ccc607d1f8570e714810f7cfb3feba37d375ff1646383435a1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-navigation3-android" version="2.10.0">
+         <artifact name="lifecycle-viewmodel-navigation3.aar">
+            <sha256 value="a4e0e66288a40659d927938c605fee060acdbad610b041fbf8984866318cb5ed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.10.0">
+         <artifact name="lifecycle-viewmodel-savedstate-2.10.0.aar">
+            <sha256 value="1fa22720c87b0fb3c1224f8580cf69369f3cfc4d9921708bb9449f878c7cb3e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.2.0">
          <artifact name="lifecycle-viewmodel-savedstate-2.2.0.aar">
             <sha256 value="3ce866fb822b20fe2f188f974992869a0a6233fe40acbefcff090d6def5e7f33" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -3758,6 +4053,11 @@
             <sha256 value="c0cc3e31fc358486d96f0270dfe2b0f44f985f0cab0efa773a2a567d55f761a5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate-android" version="2.10.0">
+         <artifact name="lifecycle-viewmodel-savedstate.aar">
+            <sha256 value="19404239fa584322c2f81e9659e162bc011b746d29dc950a11d260624d83225e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate-android" version="2.9.0">
          <artifact name="lifecycle-viewmodel-savedstate-release.aar">
             <sha256 value="db367838716e55866823c6deed62fcec23fce487bf2a8fa565a36f149ab3d1ef" origin="Generated by Gradle"/>
@@ -3802,6 +4102,41 @@
             <sha256 value="9cdfe5f7849069ad84dc4fb0407b3677fb8c22d3d66fd2b8fdb8dec8c5dc7411" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.navigation" name="navigation-common-android" version="2.9.0">
+         <artifact name="navigation-common-release.aar">
+            <sha256 value="5daf55e20705a0471e76da128870c331351c5a123ccef4a4b2477eb92d37d97b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-compose-android" version="2.9.0">
+         <artifact name="navigation-compose-release.aar">
+            <sha256 value="5784dc909239f99882f11eba653f23f48629e2120828cc9b46ae8926bbb22251" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-runtime-android" version="2.9.0">
+         <artifact name="navigation-runtime-release.aar">
+            <sha256 value="f76f04b84fc89b740013ba81cb0c1de914053dd55cf2d8f0c669c4d6f2b8ebe0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation3" name="navigation3-runtime-android" version="1.0.0">
+         <artifact name="navigation3-runtime.aar">
+            <sha256 value="ec5f820c5856ab72029dc58acd54cee1e1952ec7e6233848dd10e9071f0eedbc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation3" name="navigation3-ui-android" version="1.0.0">
+         <artifact name="navigation3-ui.aar">
+            <sha256 value="7b1130efacb6c427bd59e39908c48cb8289367de4d804da6945e8d82c992f743" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigationevent" name="navigationevent-android" version="1.0.1">
+         <artifact name="navigationevent.aar">
+            <sha256 value="c2acf20ffb1da29fa622b0ebb3b1a87eca889ba4cc724d24bcd7e09867e8cafc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigationevent" name="navigationevent-compose-android" version="1.0.1">
+         <artifact name="navigationevent-compose.aar">
+            <sha256 value="582cce7129aa0f6db8b2c7e067268c1ae1341d8b30ff14cf3b4b59dd109e97c1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.palette" name="palette" version="1.0.0">
          <artifact name="palette-1.0.0.aar">
             <sha256 value="6054ee0184ba0ffd66dc825e060e8c9bf2f6c2ea54336cf3bef15c575037a743" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -3981,6 +4316,11 @@
             <sha256 value="dc7b4e1a75a790f29c97afd5516b8bf8002d9b6e83e295bc569b33566f3b1ec0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.room" name="room-common-jvm" version="2.8.4">
+         <artifact name="room-common-jvm-2.8.4.jar">
+            <sha256 value="dc7b4e1a75a790f29c97afd5516b8bf8002d9b6e83e295bc569b33566f3b1ec0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.room" name="room-compiler" version="2.4.2">
          <artifact name="room-compiler-2.4.2.jar">
             <sha256 value="0e6930971a8b15f503e308da2c2f75587540cf5f014b664a555ac299197e4fca" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4026,6 +4366,11 @@
             <sha256 value="8c67827c39f758dd22119d75146928321949acb4de317a0c5eeeb2c73718ee06" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.room" name="room-compiler" version="2.8.4">
+         <artifact name="room-compiler-2.8.4.jar">
+            <sha256 value="9c253ed45e1b0cbfde8a62ff0bd7a2405fb9099176e0f0f9d11a57135cce95bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.room" name="room-compiler-processing" version="2.4.2">
          <artifact name="room-compiler-processing-2.4.2.jar">
             <sha256 value="e2d8462db15394945f5fe0be69792e5c25399a54d2fe17c6a954845e70f06377" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4046,6 +4391,11 @@
             <sha256 value="441823b9728a86cc26e492642f03154aaf57dd9a155354589925ef7d9a85cbfe" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.room" name="room-compiler-processing" version="2.6.0">
+         <artifact name="room-compiler-processing-2.6.0.jar">
+            <sha256 value="f67bfeb30cf81d677c8254a848ef798992afb04bf67765c26ae789738d6a6d6a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.room" name="room-compiler-processing" version="2.6.1">
          <artifact name="room-compiler-processing-2.6.1.jar">
             <sha256 value="6ce5f6c1aac61fc44595030cbf9e1c89cc29a29ea764472b4e4a49d272f0a7cd" origin="Generated by Gradle"/>
@@ -4071,6 +4421,11 @@
             <sha256 value="13f771217b751cf266135566d57e8b14867ba6ec0f648c50dfa8a3e57317eeea" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.room" name="room-compiler-processing" version="2.8.4">
+         <artifact name="room-compiler-processing-2.8.4.jar">
+            <sha256 value="a4282eceb6720a712f15cff50747f160a7efe6ac3974e86d514c45e3f416085f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.room" name="room-external-antlr" version="2.7.1">
          <artifact name="room-external-antlr-2.7.1.jar">
             <sha256 value="6bf794bffe8de263826502511b4c7df0570312b6cc99312ca7fc6bdb0880ca1e" origin="Generated by Gradle"/>
@@ -4091,6 +4446,11 @@
             <sha256 value="6bf794bffe8de263826502511b4c7df0570312b6cc99312ca7fc6bdb0880ca1e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.room" name="room-external-antlr" version="2.8.4">
+         <artifact name="room-external-antlr-2.8.4.jar">
+            <sha256 value="6bf794bffe8de263826502511b4c7df0570312b6cc99312ca7fc6bdb0880ca1e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.room" name="room-ktx" version="2.4.2">
          <artifact name="room-ktx-2.4.2.aar">
             <sha256 value="23aac021051bce72413e037be3dc636380693a07f7dad914c1dafff54899293a" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4136,6 +4496,11 @@
             <sha256 value="b51d2b6ad235d4c636296943426bd92e6698cd1c3ef948447c70be3c45e25be6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.room" name="room-ktx" version="2.8.4">
+         <artifact name="room-ktx-2.8.4.aar">
+            <sha256 value="f604fde53e259759633467c11bd3d8a36cc24d6ddb88894c96cddc5a0cf1f83d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.room" name="room-migration" version="2.4.2">
          <artifact name="room-migration-2.4.2.jar">
             <sha256 value="e0efe1ed8557f82628bfcb0b2058a5125472dcf31ef9af85c646d7eaaf900d20" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4203,6 +4568,11 @@
             <sha256 value="18e63f4ec289cf3f4545face849c6bbdd33eea9596eebe0b7293d49c00c511e2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.room" name="room-migration-jvm" version="2.8.4">
+         <artifact name="room-migration-jvm-2.8.4.jar">
+            <sha256 value="18e63f4ec289cf3f4545face849c6bbdd33eea9596eebe0b7293d49c00c511e2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.room" name="room-runtime" version="2.2.5">
          <artifact name="room-runtime-2.2.5.aar">
             <sha256 value="24a5549b796e43e337513d2908adac67f45350d9a90bca7e2e6120692140bb14" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4285,6 +4655,11 @@
             <sha256 value="29872c787765ed31aca27a1d9e96ac039e3121224e30c923b68f7e28e85eb458" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.room" name="room-runtime-android" version="2.8.4">
+         <artifact name="room-runtime.aar">
+            <sha256 value="3293575082024fa0a92b081c4e2d0609f14b5c109635ec227bc509db141a4e20" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.room" name="room-testing" version="2.5.2">
          <artifact name="room-testing-2.5.2.aar">
             <sha256 value="9b4269659237fd52bae9ca0d81b5035536bfb77efdf44b0dd7a1c5a9b1a7f49e" origin="Generated by Gradle"/>
@@ -4335,6 +4710,11 @@
             <sha256 value="00fad06171e98f98c1c422d416a00222e8941c0d58cd6ac2b5eb0f055dfcdd10" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.room" name="room-testing-android" version="2.8.4">
+         <artifact name="room-testing.aar">
+            <sha256 value="41e048f802d2016e285a5ea0a4eee54e49da07758b86c5a20ed0ca376a0c7b81" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.savedstate" name="savedstate" version="1.0.0">
          <artifact name="savedstate-1.0.0.aar">
             <sha256 value="2510a5619c37579c9ce1a04574faaf323cd0ffe2fc4e20fa8f8f01e5bb402e83" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4373,6 +4753,11 @@
             <sha256 value="84a7b7c75a3bed96f5b1345247a7a07bebefb50168e4ced654bf290d990e17b7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.savedstate" name="savedstate" version="1.4.0">
+         <artifact name="savedstate-1.4.0.aar">
+            <sha256 value="db3817020ee9fd7e36b36c1c56bca232d3019a5e4cb21c4adaeb20c27f57605d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.savedstate" name="savedstate-android" version="1.3.0">
          <artifact name="savedstate-release.aar">
             <sha256 value="210b6909bbd515dbf415905cbb220fca93a87fa546838f754077ebc8e0488590" origin="Generated by Gradle"/>
@@ -4388,6 +4773,11 @@
             <sha256 value="3d40baf742e6bdc90ada4650502e1d08c55cb5d8c045870d2c7c6d89f237d064" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.savedstate" name="savedstate-android" version="1.4.0">
+         <artifact name="savedstate.aar">
+            <sha256 value="1656ce62cd233d488bdbbd42e533b80b22435b7a690acae6dbe7302392512c14" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.savedstate" name="savedstate-compose" version="1.3.3">
          <artifact name="savedstate-compose-metadata-1.3.3.jar">
             <sha256 value="9a8d6197b3eb23452add1aa1e6d2c3dc7711f07e32d72199906de12cdb553e50" origin="Generated by Gradle"/>
@@ -4398,6 +4788,11 @@
             <sha256 value="ec3c09338a005136697824e8ca52ebb4a51b055258e670d4bd2e1f992e32945e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.savedstate" name="savedstate-compose-android" version="1.4.0">
+         <artifact name="savedstate-compose.aar">
+            <sha256 value="0f0ae3032d6c6eea834ee22179c8976160d09d841d30e47f53f56b1b3438774b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.savedstate" name="savedstate-ktx" version="1.1.0">
          <artifact name="savedstate-ktx-1.1.0.aar">
             <sha256 value="e44d61347463b0fafeeb649cbcc3d7109b2eb5e11d1522e986105170cdebbf68" origin="Generated by Gradle"/>
@@ -4428,6 +4823,11 @@
             <sha256 value="c4df27ba3fef3674da4c5cae64f43ff251f8f9b7507c6597e95a5b7f64860c6c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.savedstate" name="savedstate-ktx" version="1.4.0">
+         <artifact name="savedstate-ktx-1.4.0.aar">
+            <sha256 value="23593939446bc5a154a1e35fddd87b82f19e2adf072207f115bf29a8b431c1d3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.slidingpanelayout" name="slidingpanelayout" version="1.0.0">
          <artifact name="slidingpanelayout-1.0.0.aar">
             <sha256 value="76bffb7cefbf780794d8817002dad1562f3e27c0a9f746d62401c8edb30aeede" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4496,6 +4896,11 @@
             <sha256 value="fdc440f8269801772a09049fdc67c7dd820b69f8d21cf93cf174cdb84b89e2e7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.sqlite" name="sqlite-android" version="2.6.2">
+         <artifact name="sqlite.aar">
+            <sha256 value="514f8de4f7bdba2fa8d748d2b22fdcdfb623bd3770a667bf0adc0ad259f03ed2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.sqlite" name="sqlite-framework" version="2.1.0">
          <artifact name="sqlite-framework-2.1.0.aar">
             <sha256 value="8673737fdb2efbad91aeaeed1927ebb29212d36a867d93b9639c8069019f8a1e" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4551,6 +4956,11 @@
             <sha256 value="13aeef2152196fcda9a64b35a0227386278b228e9bf63374b88ec4c806382f2a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.sqlite" name="sqlite-framework-android" version="2.6.2">
+         <artifact name="sqlite-framework.aar">
+            <sha256 value="b19125c7fff34222e0f380361fc179ab214e4d82e1a50b0c068ca26c851a6231" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.startup" name="startup-runtime" version="1.0.0">
          <artifact name="startup-runtime-1.0.0.aar">
             <sha256 value="ff081d2db7dd28aec59f74934c514fbaf4ae5aac5258495fe10d612a3622f876" origin="Generated by Gradle"/>
@@ -4579,6 +4989,11 @@
             <sha256 value="2ce7906cd1dea05aec81975db22d54382359c05a21b2527ad848bc60f6b27293" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.swiperefreshlayout" name="swiperefreshlayout" version="1.2.0">
+         <artifact name="swiperefreshlayout-1.2.0.aar">
+            <sha256 value="1de8aee6173d2ca251a1126fe18d4ca7d5c0dbc7a80fb9e6ff74a3ba5e9c9b92" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="annotation" version="1.0.0">
          <artifact name="annotation-1.0.0.aar">
             <sha256 value="c0754928effe1968c3a9a7b55d1dfc7ceb1e1e7c9f3f09f98afd42431f712492" origin="Generated by Gradle"/>
@@ -4617,6 +5032,11 @@
             <sha256 value="7a7af31c21785ddb7c4319c838847e6d4d9b5bb531f3a951481ec3b98780bf51" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="core" version="1.7.0">
+         <artifact name="core-1.7.0.aar">
+            <sha256 value="f4dacd8edceeec48e0c76ecf28339b28f4b4f6b74f8e34e9e59b472c27d9eb81" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="core-ktx" version="1.4.0">
          <artifact name="core-ktx-1.4.0.aar">
             <sha256 value="e4f9ca2b8f700cc278d878ed3925730e1ad5d60135bbfd05ab6708a528ebfa58" origin="Generated by Gradle"/>
@@ -4627,6 +5047,11 @@
             <sha256 value="6386eced4d9ad0bc6e876ebca9143b7f0df51a10a5069ef13eded8e9ccab0680" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="core-ktx" version="1.7.0">
+         <artifact name="core-ktx-1.7.0.aar">
+            <sha256 value="2267e884ecbd789b5425c48aedb10d58f5ae09e06e58c2487d53060d442c8ae4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="monitor" version="1.2.0">
          <artifact name="monitor-1.2.0.aar">
             <sha256 value="fc97ca3f00f8ca30b7d5167fbd8736756048e2cc4f8e92dc891106751a5baeef" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4703,6 +5128,11 @@
             <sha256 value="49159517c0112e7f2c4174e50d0dfc4d198f2f2e26138473638d8d58e473e06f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="rules" version="1.7.0">
+         <artifact name="rules-1.7.0.aar">
+            <sha256 value="f5ae82d9b8b20864dcaaad69dcd0b5e4112b666850599865a58e8badb5fb4d0e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="runner" version="1.2.0">
          <artifact name="runner-1.2.0.aar">
             <sha256 value="5387e011167a3c8da08d99b5d59248c0e2da839317b48ebf202e31dc1f791ec1" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4741,6 +5171,11 @@
             <sha256 value="d8eac6d9864f432b15962b2c2739a7b31685c87777364ac97323c9e4b2c94744" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="runner" version="1.7.0">
+         <artifact name="runner-1.7.0.aar">
+            <sha256 value="970311c47119928a2e406a88892a3d270387cc5a49a181a1c44511105b41b818" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test.espresso" name="espresso-core" version="3.2.0">
          <artifact name="espresso-core-3.2.0.aar">
             <sha256 value="beb4712c2520c1da30ac1f25506871f16ea5b83ee686ece5a258769df1a01e15" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4769,6 +5204,11 @@
             <sha256 value="2495daa4d35cc0e6e6de4566d53a6e04cc13c316fe32c1a7ede13571ff11ffdd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test.espresso" name="espresso-core" version="3.7.0">
+         <artifact name="espresso-core-3.7.0.aar">
+            <sha256 value="5dd90e366838bf044cb52eae06474debd285df18a7a77c40441ac8e8951bb00f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test.espresso" name="espresso-idling-resource" version="3.2.0">
          <artifact name="espresso-idling-resource-3.2.0.aar">
             <sha256 value="c1a0454fe95788122ba652c3ecff7ec538c7e27de206aed970f2809fb8090d09" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4835,11 +5275,21 @@
             <sha256 value="7b146a73c545b983430d2fae0081df67c76722c19a9abd2904e131696a8c5b20" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test.ext" name="junit" version="1.3.0">
+         <artifact name="junit-1.3.0.aar">
+            <sha256 value="3363df84da4540ba8daff02c3f7cd65471037a6a5370591a7e6deba377b36e7f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test.ext" name="junit-ktx" version="1.2.1">
          <artifact name="junit-ktx-1.2.1.aar">
             <sha256 value="552cb286955465b81fb491e9495e7cc508329810c8617081ca7ea90984fa8836" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test.ext" name="junit-ktx" version="1.3.0">
+         <artifact name="junit-ktx-1.3.0.aar">
+            <sha256 value="c4f7def1ac7b197b2e3c0819979f686590e8337e4e8c0880705fe00251bc10b9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test.services" name="storage" version="1.4.0">
          <artifact name="storage-1.4.0.aar">
             <sha256 value="35cfbf442abb83e5876cd5deb9de02ae047459f18f831097c5caa76d626bc38a" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4855,6 +5305,11 @@
             <sha256 value="d59621845cff5ff5e8a6906445ef1b2d83624d796cbfad9a52e86a3ab42f8c48" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test.services" name="storage" version="1.6.0">
+         <artifact name="storage-1.6.0.aar">
+            <sha256 value="f97e3cf6aaf4e3fb97ef219d37a9c0a0720183c1f6db87b37642521e26fb6d30" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test.uiautomator" name="uiautomator" version="2.2.0">
          <artifact name="uiautomator-2.2.0.aar">
             <sha256 value="2838e9d961dbffefbbd229a2bd4f6f82ac4fb2462975862a9e75e9ed325a3197" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4906,6 +5361,11 @@
             <sha256 value="0aa66a0ea406d25a1091f96a3b753b4b12e44fdc43b91ec52c17831e9c31f54b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.transition" name="transition" version="1.6.0">
+         <artifact name="transition-1.6.0.aar">
+            <sha256 value="248c45e1254d31181d2047b0b01394f09a2e539a5d9e89b773d53c62c96860f6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.vectordrawable" name="vectordrawable" version="1.1.0">
          <artifact name="vectordrawable-1.1.0.aar">
             <sha256 value="46fd633ac01b49b7fcabc263bf098c5a8b9e9a69774d234edcca04fb02df8e26" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -4966,6 +5426,16 @@
             <sha256 value="3212985be4127373ca4d0ea7f8b81a250ae2105e924f7940105d067a0f9ac130" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.window" name="window" version="1.5.0">
+         <artifact name="window-1.5.0.aar">
+            <sha256 value="5de2d48aa578402f46deb5294a955cee62f0c7d8c1840ef626fc7afb8abe22f9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.window" name="window-core-android" version="1.5.0">
+         <artifact name="window-core.aar">
+            <sha256 value="d0d50db0756194a6d49a66ad8dafd17b24b4c5fbd8379375056e2eb9bdfeaf22" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.work" name="work-runtime" version="2.10.0">
          <artifact name="work-runtime-2.10.0.aar">
             <sha256 value="2ee10cd3345a7e6e37d50898fd0ebdd91e4a59267aa928effa8e507dae85c88b" origin="Generated by Gradle"/>
@@ -4986,6 +5456,11 @@
             <sha256 value="6c72e877bfed9fa8382b13856af9bf2086b886210f4c6ed5810880831bc85bc7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.work" name="work-runtime" version="2.11.0">
+         <artifact name="work-runtime-2.11.0.aar">
+            <sha256 value="85b0b63f4164f423a507c0055022406eecbe1cd399db0430e9e935edf6fba5a6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.work" name="work-runtime" version="2.4.0">
          <artifact name="work-runtime-2.4.0.aar">
             <sha256 value="7801441cb973fb007ef311d3db35c3b3c9d011cef890357e7ca33890833354e5" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -5011,6 +5486,11 @@
             <sha256 value="1be76486b894af179462941a39cab242b00d7235c3aeb4d756f45262b0c2e4a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.work" name="work-runtime-ktx" version="2.11.0">
+         <artifact name="work-runtime-ktx-2.11.0.aar">
+            <sha256 value="e0ab52221e25579c7134ac6dc9779d6e2d4639aa29f1217306c4ca4db26ae6d5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.work" name="work-runtime-ktx" version="2.4.0">
          <artifact name="work-runtime-ktx-2.4.0.aar">
             <sha256 value="290d2e9c1a22388b3f0c3dbc204a6176f8c49174126de884820befa83899f129" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -5046,6 +5526,11 @@
             <sha256 value="e6d1ee8340a0c6166863fb893f412c9cf117304068dfd62a9f6031e178327008" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.work" name="work-testing" version="2.11.0">
+         <artifact name="work-testing-2.11.0.aar">
+            <sha256 value="841452f28d719dd224fc82979ad650aae73e08c3d456122e1f16b806a0410032" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.work" name="work-testing" version="2.4.0">
          <artifact name="work-testing-2.4.0.aar">
             <sha256 value="dc1d9f743c59ee08c605aa924fc20819b6a0b734338e0a95af1943c3cd806e23" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -5079,6 +5564,11 @@
             <sha256 value="100f793ba27f8b4e4204edb46171ebf36e54e0f94cfc02527fea07a0bb1fceb7" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="app.cash.molecule" name="molecule-runtime-android" version="2.2.0">
+         <artifact name="molecule-runtime-release.aar">
+            <sha256 value="4feb9da44b60aecc2f1ec78204d43dbf0554a2c850b0ffad51a43d90171b77ac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="app.cash.turbine" name="turbine" version="1.0.0">
          <artifact name="Turbine-metadata.jar">
             <sha256 value="a65b488d928152a91b52d1a0f783fd150ff291998f103db6592f26393d701365" origin="Generated by Gradle"/>
@@ -5231,6 +5721,11 @@
             <sha256 value="0872c1a2a14c29ffcfc0e42227b80f7e99fb17a5456270499ac6cad0d0436f1c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="ch.qos.logback" name="logback-classic" version="1.5.22">
+         <artifact name="logback-classic-1.5.22.jar">
+            <sha256 value="875f31c4b4dc49808e503490701a21cee3e7279800d9c76601da82685342e54b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="ch.qos.logback" name="logback-classic" version="1.5.6">
          <artifact name="logback-classic-1.5.6.jar">
             <sha256 value="6115c6cac5ed1d9db810d14f2f7f4dd6a9f21f0acbba8016e4daaca2ba0f5eb8" origin="Generated by Gradle"/>
@@ -5276,6 +5771,11 @@
             <sha256 value="9ca72fe31e32fad244ec9339570452e29631f67b7b9a72a7cbecd73c94dc3f3c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="ch.qos.logback" name="logback-core" version="1.5.22">
+         <artifact name="logback-core-1.5.22.jar">
+            <sha256 value="7561b7a525364612966ff3823f8c62a81a3262742d455301f479273ef55570b8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="ch.qos.logback" name="logback-core" version="1.5.6">
          <artifact name="logback-core-1.5.6.jar">
             <sha256 value="898c7d120199f37e1acc8118d97ab15a4d02b0e72e27ba9f05843cb374e160c6" origin="Generated by Gradle"/>
@@ -5347,6 +5847,11 @@
             <sha256 value="c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android" name="signflinger" version="8.13.2">
+         <artifact name="signflinger-8.13.2.jar">
+            <sha256 value="c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android" name="signflinger" version="8.2.1">
          <artifact name="signflinger-8.2.1.jar">
             <sha256 value="c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" origin="Generated by Gradle"/>
@@ -5405,6 +5910,11 @@
             <sha256 value="a6a68f03e8d9f8944688c36c6d16c253e81a625930af1d0eb5e592bd2b2da9e8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android" name="zipflinger" version="8.13.2">
+         <artifact name="zipflinger-8.13.2.jar">
+            <sha256 value="07060069c35e469d7c343abc15f1d6362bc1356b81bf462539db88a53ed653f1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android" name="zipflinger" version="8.2.1">
          <artifact name="zipflinger-8.2.1.jar">
             <sha256 value="81dd485618a509a3235929b9eb13091d884452661de6ce5a45cc38b1c555421c" origin="Generated by Gradle"/>
@@ -5463,6 +5973,11 @@
             <sha256 value="794113709dab21b06c262b3795e73cb708fbacae61715f34361e1af6237a1870" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.databinding" name="baseLibrary" version="8.13.2">
+         <artifact name="baseLibrary-8.13.2.jar">
+            <sha256 value="794113709dab21b06c262b3795e73cb708fbacae61715f34361e1af6237a1870" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.databinding" name="baseLibrary" version="8.2.1">
          <artifact name="baseLibrary-8.2.1.jar">
             <sha256 value="794113709dab21b06c262b3795e73cb708fbacae61715f34361e1af6237a1870" origin="Generated by Gradle"/>
@@ -5521,6 +6036,11 @@
             <sha256 value="3b4bb9620c17d19e5bd91ac1988080553573b4c3b739fdd92416f42f2daf3e78" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="annotations" version="31.13.2">
+         <artifact name="annotations-31.13.2.jar">
+            <sha256 value="3b4bb9620c17d19e5bd91ac1988080553573b4c3b739fdd92416f42f2daf3e78" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="annotations" version="31.2.1">
          <artifact name="annotations-31.2.1.jar">
             <sha256 value="ee3bfd9cdb5012bdb61520f8654a785577e9bb337e5939c5c6149a446684ee16" origin="Generated by Gradle"/>
@@ -5579,6 +6099,11 @@
             <sha256 value="2f2b7f1a122b63ac3e04576c90043a81eb6d263cc6bad46e2c32c2ddca6b5bd3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="common" version="31.13.2">
+         <artifact name="common-31.13.2.jar">
+            <sha256 value="d4ebe1711de0cf509c4d562245624ba21ab147944bcdde6351bfb6e8daccf826" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="common" version="31.2.1">
          <artifact name="common-31.2.1.jar">
             <sha256 value="a2c1175f7fb1b9173b560667a27930133940d34f37f3e1cc7879d9bf89b0f08f" origin="Generated by Gradle"/>
@@ -5637,6 +6162,11 @@
             <sha256 value="e3cf3fdc947788dee8d5baa76cb72a66571174bc4741edf0e3bab97a7ca90e1b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="dvlib" version="31.13.2">
+         <artifact name="dvlib-31.13.2.jar">
+            <sha256 value="e3cf3fdc947788dee8d5baa76cb72a66571174bc4741edf0e3bab97a7ca90e1b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="dvlib" version="31.2.1">
          <artifact name="dvlib-31.2.1.jar">
             <sha256 value="0cb57c126ed95657ae1e0974af092b401a52b76d5683f7ccbe1f8f21af06794e" origin="Generated by Gradle"/>
@@ -5667,6 +6197,11 @@
             <sha256 value="c6fc15a5c203064cfd2c8a176fdeac72ae0a2d743ec47a2e66a0238d8d870b6b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="play-sdk-proto" version="31.13.2">
+         <artifact name="play-sdk-proto-31.13.2.jar">
+            <sha256 value="c6fc15a5c203064cfd2c8a176fdeac72ae0a2d743ec47a2e66a0238d8d870b6b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="play-sdk-proto" version="31.2.1">
          <artifact name="play-sdk-proto-31.2.1.jar">
             <sha256 value="e116cc979f3d94a029dea8a60a79acbb799130992ef9d771a6f2320c1d3af3b1" origin="Generated by Gradle"/>
@@ -5725,6 +6260,11 @@
             <sha256 value="095becb618937d1d2a4d77a921d70563ec9ffda05d62ec1aff6a9bae701d39da" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="repository" version="31.13.2">
+         <artifact name="repository-31.13.2.jar">
+            <sha256 value="e9509b30d088e899948f8cb0d73293c1efd2e1f121fccbbe25d533b648b93fa1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="repository" version="31.2.1">
          <artifact name="repository-31.2.1.jar">
             <sha256 value="0f1778a98a79fb6f3a8fa5116b7f16092960bf49509802656c1117c75cc7875c" origin="Generated by Gradle"/>
@@ -5783,6 +6323,11 @@
             <sha256 value="46f4645222d393c1131be1e66fdc0be0da4d7f2ab3c68a728308367f99f3bdf2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="sdk-common" version="31.13.2">
+         <artifact name="sdk-common-31.13.2.jar">
+            <sha256 value="8cfdf99d6f17689e7dd3bcf1834d734f6dd1c64d8c43904632c65d5469565934" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="sdk-common" version="31.2.1">
          <artifact name="sdk-common-31.2.1.jar">
             <sha256 value="621026e12772dd44ad5cbd5808f91fe5af0f3bc976cd9b2b3cfad9236848637d" origin="Generated by Gradle"/>
@@ -5841,6 +6386,11 @@
             <sha256 value="b9b62adb6f6369800b07815b41ca5f4532c20d2e07e407167f9522d6acbc8cfb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="sdklib" version="31.13.2">
+         <artifact name="sdklib-31.13.2.jar">
+            <sha256 value="def9b0e7f44e54add385cac1715483724f827f166511ebc0c10319742aa80865" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="sdklib" version="31.2.1">
          <artifact name="sdklib-31.2.1.jar">
             <sha256 value="4fc6f2d46f9790c9f9b58573e6f5f9d51d20694149ba015ced720106eb666aa2" origin="Generated by Gradle"/>
@@ -5899,6 +6449,11 @@
             <sha256 value="cca97ac29a1329bd310a3e832b6e57f46227e501aa529c00a63df217c5d7df41" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.analytics-library" name="crash" version="31.13.2">
+         <artifact name="crash-31.13.2.jar">
+            <sha256 value="cca97ac29a1329bd310a3e832b6e57f46227e501aa529c00a63df217c5d7df41" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.analytics-library" name="crash" version="31.2.1">
          <artifact name="crash-31.2.1.jar">
             <sha256 value="d5be79bfa90311d39dd767516539afa122f9d40bc1e4bd8fc76e07b8151379f3" origin="Generated by Gradle"/>
@@ -5957,6 +6512,11 @@
             <sha256 value="2e7c74d3a54257e4e12c39b8779cc7ae30dbe748a9c12c364835c5892f92a7fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.analytics-library" name="protos" version="31.13.2">
+         <artifact name="protos-31.13.2.jar">
+            <sha256 value="b2ded20a897fba9649efeb18ba2fc062ee39e500d4eb712045cb0e34b43b5efb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.analytics-library" name="protos" version="31.2.1">
          <artifact name="protos-31.2.1.jar">
             <sha256 value="70e472d0d48e11b33d2c45fe5ebdcfb1e156449bc4d51dd9719a154eec22b42d" origin="Generated by Gradle"/>
@@ -6015,6 +6575,11 @@
             <sha256 value="306355bafa0727ab1bffcab94ba4b607f8ce7b953c9ba20d58d72b325c1a8ce7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.analytics-library" name="shared" version="31.13.2">
+         <artifact name="shared-31.13.2.jar">
+            <sha256 value="75435816f202b7a3c84d9caf312a895625a244991f8fc52d0446239e3ae29a9c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.analytics-library" name="shared" version="31.2.1">
          <artifact name="shared-31.2.1.jar">
             <sha256 value="7bd455bda29e1528cda4153332b708ed2d0066dce68f60a51be11f529fabdd77" origin="Generated by Gradle"/>
@@ -6073,6 +6638,11 @@
             <sha256 value="a0e2fa1bcd6825bc1c3954e0a206d88083f46bb161c650fe7c8980eb13afc082" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.analytics-library" name="tracker" version="31.13.2">
+         <artifact name="tracker-31.13.2.jar">
+            <sha256 value="1b66514bf29152422ee8a19b98e0200d92eb0a3d28048eb4857564e9a1c7b85b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.analytics-library" name="tracker" version="31.2.1">
          <artifact name="tracker-31.2.1.jar">
             <sha256 value="30ca5340a5601f972dbb382ebd29402d9cfb9c6d8ed3c49469f85ad7bbf2f338" origin="Generated by Gradle"/>
@@ -6144,6 +6714,11 @@
             <sha256 value="5ce2f1c4262b99174047f3d413816c57ceef5fb00a520264cf5ed564576bf250" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="aapt2" version="8.13.2-14304508">
+         <artifact name="aapt2-8.13.2-14304508-linux.jar">
+            <sha256 value="839609d6d776d6dd60a02aa577d97193ce3e650cf1deaabf062321e23bbd6bf6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="aapt2" version="8.2.1-10154469">
          <artifact name="aapt2-8.2.1-10154469-linux.jar">
             <sha256 value="42419707fb466bcf4ffa2914e5f01c4b4fbe752bf15bc7c54122cc57672a96ee" origin="Generated by Gradle"/>
@@ -6218,6 +6793,11 @@
             <sha256 value="9fcf2e5ac206f630449184498814246d82af61bda39c484799cccb6761cf29e0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="aapt2-proto" version="8.13.2-14304508">
+         <artifact name="aapt2-proto-8.13.2-14304508.jar">
+            <sha256 value="a6cda82d508ec3b325a9e37f78f9fa84556ff340cf43bb23c627b0f39e746f0e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="8.2.1-10154469">
          <artifact name="aapt2-proto-8.2.1-10154469.jar">
             <sha256 value="79f84779bd8a3173c04b039ee7361419405fb44911dd3dd3474861d8656dc6fb" origin="Generated by Gradle"/>
@@ -6268,6 +6848,11 @@
             <sha256 value="02eba3da3c2b5dbc61244282e1e9e7ed4b829da9f4f2d28d53db9204b9c52d92" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="aaptcompiler" version="8.13.2">
+         <artifact name="aaptcompiler-8.13.2.jar">
+            <sha256 value="f6f6706d3b7a261e242820da5c855123d3c23738159ca3726e0c34e482b80770" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="aaptcompiler" version="8.2.1">
          <artifact name="aaptcompiler-8.2.1.jar">
             <sha256 value="1fb1c1aed866242a0ff995031dd6529a0fa5e2b5475046dde2efa35a7f11c56d" origin="Generated by Gradle"/>
@@ -6326,6 +6911,11 @@
             <sha256 value="c070ed1394629d74641aa0906f60b2ffa1ee77e6366a1f93437f59717b1aeb89" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="apksig" version="8.13.2">
+         <artifact name="apksig-8.13.2.jar">
+            <sha256 value="c070ed1394629d74641aa0906f60b2ffa1ee77e6366a1f93437f59717b1aeb89" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="apksig" version="8.2.1">
          <artifact name="apksig-8.2.1.jar">
             <sha256 value="468ee1852fa12461c6629608fe47be70e50f60be7c4744bb7f62ca48e85c0a6c" origin="Generated by Gradle"/>
@@ -6384,6 +6974,11 @@
             <sha256 value="29091c9457252f997ddfeafb33dd65a373ad45840128f945832d8eafd9118561" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="apkzlib" version="8.13.2">
+         <artifact name="apkzlib-8.13.2.jar">
+            <sha256 value="29091c9457252f997ddfeafb33dd65a373ad45840128f945832d8eafd9118561" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="apkzlib" version="8.2.1">
          <artifact name="apkzlib-8.2.1.jar">
             <sha256 value="1c1a67d6f4f186427ac166ebaa0dd867f595d5144fc925252b05ffb9d1a156b7" origin="Generated by Gradle"/>
@@ -6442,6 +7037,11 @@
             <sha256 value="1448d5476096c1c4e3bf05b8372948ac7c00d76dc38b4a4eb744b360a888b65c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="builder" version="8.13.2">
+         <artifact name="builder-8.13.2.jar">
+            <sha256 value="7d393f8553120c7d7a869cb33c4279aad9485986773f63af97af08ea2e1ff37a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="builder" version="8.2.1">
          <artifact name="builder-8.2.1.jar">
             <sha256 value="4810115b830a27dc75afa0ba92895d6eefacc680f881124a5088314ab68c3711" origin="Generated by Gradle"/>
@@ -6500,6 +7100,11 @@
             <sha256 value="2dac329a5c2ca619984c27bc0a18b16f556ffd5b10ac5b5095e86ce28a245807" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="builder-model" version="8.13.2">
+         <artifact name="builder-model-8.13.2.jar">
+            <sha256 value="ae5e95515ab348d34a35be83ed315c5fb7e8c0667e186f4e156c65dfaa2615fe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="builder-model" version="8.2.1">
          <artifact name="builder-model-8.2.1.jar">
             <sha256 value="3ae5c545d54f7f5bd4cacfa6fb104f1cce8ce5055333e690ef173cd317d21adb" origin="Generated by Gradle"/>
@@ -6558,6 +7163,11 @@
             <sha256 value="55e3c9846a454237234ca40bfb6bde31011e4c33a5d36fc56725e2ca22eba1c1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="builder-test-api" version="8.13.2">
+         <artifact name="builder-test-api-8.13.2.jar">
+            <sha256 value="3cfed0baec2e7d0e64566f6808a00ef5e051ad76fc4fba9d464d11a3c2f986a9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="builder-test-api" version="8.2.1">
          <artifact name="builder-test-api-8.2.1.jar">
             <sha256 value="0cf9e596d4822823141283a586fa8e653c52bfdb04ba7e23b6117afd482b09d5" origin="Generated by Gradle"/>
@@ -6664,6 +7274,11 @@
             <sha256 value="3f71d6d3bf4226a2c83131fe28980842f834b84375f04bf124cb00ab72506ea2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="gradle" version="8.13.2">
+         <artifact name="gradle-8.13.2.jar">
+            <sha256 value="e494f7ce75ca6c1abff301d4a70b18fdd3d6af855875f4f85082bb7608f041de" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="gradle" version="8.2.1">
          <artifact name="gradle-8.2.1.jar">
             <sha256 value="a1b8fd78c0fc035a6b6988b6bf260d7976eecc03051c311aa285d437e221e640" origin="Generated by Gradle"/>
@@ -6722,6 +7337,11 @@
             <sha256 value="46feb75bb1288bbd46534d770ec5debd01e9dce23a158afe3175fddf2684f008" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="gradle-api" version="8.13.2">
+         <artifact name="gradle-api-8.13.2.jar">
+            <sha256 value="a8dcdc6f1338f7055f6b1bc265317e14d65833e6c7f72b2102c5568e1df4d792" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="gradle-api" version="8.2.1">
          <artifact name="gradle-api-8.2.1.jar">
             <sha256 value="49ddd2b5fef8c80dee768466339323dd4b60f28b19b28430b3fbc3d289f3bc4f" origin="Generated by Gradle"/>
@@ -6737,6 +7357,11 @@
             <sha256 value="07f76bf2f8f7b2f376cc86eabd4f8a8279182b6570f440e7843d066f02c5f556" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="gradle-common-api" version="8.13.2">
+         <artifact name="gradle-common-api-8.13.2.jar">
+            <sha256 value="fcde805fcd5739aed607a9cdc325316f422fa05a46e140a291d2f24eca3a59fe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="gradle-settings-api" version="7.4.0">
          <artifact name="gradle-settings-api-7.4.0.jar">
             <sha256 value="5c5b71328889f5fe16b02cd0a98c54a7a7792bc66ee1c3f3360f037f9958ada7" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -6757,6 +7382,11 @@
             <sha256 value="cd8c64f253a923b122cd8545652e28b1c992c9facc22bf936c29e2503fd60266" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="gradle-settings-api" version="8.13.2">
+         <artifact name="gradle-settings-api-8.13.2.jar">
+            <sha256 value="370438bcf7782d8c5b407370365b047bf063f99a7745e1f5f1853183398d07a6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="gradle-settings-api" version="8.2.1">
          <artifact name="gradle-settings-api-8.2.1.jar">
             <sha256 value="a7874635d9866e94ce52becf079bf532a771d08e2aeb8246a5fe1ba96d6b9c8b" origin="Generated by Gradle"/>
@@ -6815,6 +7445,11 @@
             <sha256 value="129abb829aa931c23d8906b590c54d8dc8c046148bc3afb651917d69b7113fc8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="manifest-merger" version="31.13.2">
+         <artifact name="manifest-merger-31.13.2.jar">
+            <sha256 value="40d25f5940c2e50bf7e18e325f7fbb9c86cf45db5a85d1cef8ef985404227a1f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="manifest-merger" version="31.2.1">
          <artifact name="manifest-merger-31.2.1.jar">
             <sha256 value="a0210567b4886e9157c2ed169f11f47a8b4edffef03eb9ab29cc7b5e2598bd18" origin="Generated by Gradle"/>
@@ -6918,6 +7553,11 @@
             <sha256 value="839957f961100713ea0eed628a8684cc39aa479631c36249793e6df7e0cd63d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.ddms" name="ddmlib" version="31.13.2">
+         <artifact name="ddmlib-31.13.2.jar">
+            <sha256 value="839957f961100713ea0eed628a8684cc39aa479631c36249793e6df7e0cd63d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.ddms" name="ddmlib" version="31.2.1">
          <artifact name="ddmlib-31.2.1.jar">
             <sha256 value="5fc1f70b3b0b8069f25e3a229f4aada495e592ca5fe3fb88b02563b47c674c8e" origin="Generated by Gradle"/>
@@ -6963,6 +7603,11 @@
             <sha256 value="b77f81cc0751d79393ec4b2eb046f910d21abcd7608b5b0f5a1efea1b3243b48" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.emulator" name="proto" version="31.13.2">
+         <artifact name="proto-31.13.2.jar">
+            <sha256 value="b77f81cc0751d79393ec4b2eb046f910d21abcd7608b5b0f5a1efea1b3243b48" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.emulator" name="proto" version="31.2.1">
          <artifact name="proto-31.2.1.jar">
             <sha256 value="88c01b5b2d839c562845b8d7cb74883c17f070699d4624a582cafb3a739d0e31" origin="Generated by Gradle"/>
@@ -7016,6 +7661,11 @@
             <sha256 value="36815dd436cb9c02cb255e43e9c971422d10c33e6fd9c4fe1e48c71e92b180c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.13.2">
+         <artifact name="intellij-core-31.13.2.jar">
+            <sha256 value="9a6faa6061d0f3d54a64decb61944c1b2c6927f8d325cd298c82c2a8d867ee68" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.2.1">
          <artifact name="intellij-core-31.2.1.jar">
             <sha256 value="4ef3e25b701046576f063d5febee30de8ab44cc57dfceabacab3e6a83431142a" origin="Generated by Gradle"/>
@@ -7069,6 +7719,11 @@
             <sha256 value="b24d171f6ccaeaba526d7de6d9f94149ee12bad9a48098c558d1f47dfd3e0bb5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.13.2">
+         <artifact name="kotlin-compiler-31.13.2.jar">
+            <sha256 value="552dfaffe295d08504870816c27fc09007e1231fb9b14c1ff9bbf861f9b35990" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.2.1">
          <artifact name="kotlin-compiler-31.2.1.jar">
             <sha256 value="d4e1b1a25aada53fdb3101ac9f854d579db9675f3bd863ba2d9517d4b84d512c" origin="Generated by Gradle"/>
@@ -7122,6 +7777,11 @@
             <sha256 value="97ba20c9eaf66f5dd00c787b817b39992838155f96065e6629d08e18633ff55f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.13.2">
+         <artifact name="uast-31.13.2.jar">
+            <sha256 value="78f18ac2b2509fb6cb19058e8fc9585c361b97990dd7d5db0c2a94744dfb0a96" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.2.1">
          <artifact name="uast-31.2.1.jar">
             <sha256 value="ee2468681000a87bb6f19f3b42bb9f3a63ecd9c58b83c05f187b531bf947e928" origin="Generated by Gradle"/>
@@ -7180,6 +7840,11 @@
             <sha256 value="d06bc650247632a4a4e6596b87312019f45e900267c5476c47a5bfa6e3fd3132" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.13.2">
+         <artifact name="layoutlib-api-31.13.2.jar">
+            <sha256 value="d06bc650247632a4a4e6596b87312019f45e900267c5476c47a5bfa6e3fd3132" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.2.1">
          <artifact name="layoutlib-api-31.2.1.jar">
             <sha256 value="2b136521ad932f1a9c700a251a9ff5b6ebd4640423da68ce43ba4c7f7602c225" origin="Generated by Gradle"/>
@@ -7233,6 +7898,11 @@
             <sha256 value="5453d4519d7cb1fe729fe353b11ca9c14b4573baac4b5a191708f8721e7e303b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint" version="31.13.2">
+         <artifact name="lint-31.13.2.jar">
+            <sha256 value="7f875a980ee23916439d368d073cfbc2ee4e4d99ffe1b3e13da794fef347f29a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint" version="31.2.1">
          <artifact name="lint-31.2.1.jar">
             <sha256 value="4930d0256c072ad506037ed0f10b2433755fecc2756b8d7cee7532a834cb65ec" origin="Generated by Gradle"/>
@@ -7286,6 +7956,11 @@
             <sha256 value="bce7f154e8dc63d23684e997148350d4ee260bb0f55f2d17842a618ff813b19a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-api" version="31.13.2">
+         <artifact name="lint-api-31.13.2.jar">
+            <sha256 value="8f770657dba33f305e583c62953a4f174c75a7b1cd2da7d31134be36a96ae2ac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-api" version="31.2.1">
          <artifact name="lint-api-31.2.1.jar">
             <sha256 value="2085acce4e4715246dffb5be0bc11cb87525e31883b013420b6fd292cc827bfc" origin="Generated by Gradle"/>
@@ -7339,6 +8014,11 @@
             <sha256 value="268dfa6f53da439480f18f79bf881b9183ea2ea8a062819076d138210ddfa953" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-checks" version="31.13.2">
+         <artifact name="lint-checks-31.13.2.jar">
+            <sha256 value="3b64f395ae17fcea104882b00a4acdc7dc691f5daca5dff2bdde89fa052bb199" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-checks" version="31.2.1">
          <artifact name="lint-checks-31.2.1.jar">
             <sha256 value="43613f6af70d02af3356dc7176ff6aa5f4731c455deac96c258dc171cc1e0e4e" origin="Generated by Gradle"/>
@@ -7392,6 +8072,11 @@
             <sha256 value="a42b6a41c436d90ca31a13d67afba1157b157efc892a7496f67432bf8a831cbd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-gradle" version="31.13.2">
+         <artifact name="lint-gradle-31.13.2.jar">
+            <sha256 value="a42b6a41c436d90ca31a13d67afba1157b157efc892a7496f67432bf8a831cbd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-gradle" version="31.2.1">
          <artifact name="lint-gradle-31.2.1.jar">
             <sha256 value="6f9c92fdbab8a67552507238a06b7fb5305d1ae61b4a1e93b8f42c20550326aa" origin="Generated by Gradle"/>
@@ -7455,6 +8140,11 @@
             <sha256 value="84364a9bf0f234541d668d42318221516fd3a7273425bee2ee1bb3674c8e7723" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-model" version="31.13.2">
+         <artifact name="lint-model-31.13.2.jar">
+            <sha256 value="9ee55d8fd002736ed95ee97fb05f4df7ae01f4f976f738fbf37ecab795e59319" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-model" version="31.2.1">
          <artifact name="lint-model-31.2.1.jar">
             <sha256 value="3c96acb35de3194359f8fd4d8b5ed129da3588f32a1f010d54496f8db93253c1" origin="Generated by Gradle"/>
@@ -7495,6 +8185,11 @@
             <sha256 value="4a3ba3babfd79e6fc67bcef647fb4ecfeaf59b481b108f7c2eba4d1c5c6dea8e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.13.2">
+         <artifact name="lint-typedef-remover-31.13.2.jar">
+            <sha256 value="4a3ba3babfd79e6fc67bcef647fb4ecfeaf59b481b108f7c2eba4d1c5c6dea8e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.2.1">
          <artifact name="lint-typedef-remover-31.2.1.jar">
             <sha256 value="5b4f485215ca4d86ef2319fc398b5f2251e62f5446bc5fd0e00653648ddde318" origin="Generated by Gradle"/>
@@ -7540,6 +8235,11 @@
             <sha256 value="8d379928c4105444854866c92ff7bd136aa3583873950d1dd1c62f93bd5a14a2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.13.2">
+         <artifact name="android-device-provider-ddmlib-31.13.2.jar">
+            <sha256 value="b16ebfef5b63b03b803ead0a5e194ee34e0dd361c1e191557d998f01534744ff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.2.1">
          <artifact name="android-device-provider-ddmlib-31.2.1.jar">
             <sha256 value="24068e24363ff5d316dd8687f1d971a9f6d8f14d6ffdc2921309ff260abbfa9a" origin="Generated by Gradle"/>
@@ -7585,6 +8285,11 @@
             <sha256 value="047aecdd66e106137f77a52c442f1b83db7d6e8496899800251f206c7f39de65" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.13.2">
+         <artifact name="android-device-provider-ddmlib-proto-31.13.2.jar">
+            <sha256 value="047aecdd66e106137f77a52c442f1b83db7d6e8496899800251f206c7f39de65" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.2.1">
          <artifact name="android-device-provider-ddmlib-proto-31.2.1.jar">
             <sha256 value="1a288dfd22f5baa036bffdfdd3ac7504664b94c86dbf6be36630e5587c22e8fe" origin="Generated by Gradle"/>
@@ -7705,6 +8410,11 @@
             <sha256 value="4f13097aab853b98fa83ac5d82dd92f83ca7cba2a921e5eab48c45dfab1bdf8f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-device-provider-profile" version="31.13.2">
+         <artifact name="android-device-provider-profile-31.13.2.jar">
+            <sha256 value="9560c25859c9c15c77144cbb58370bad394882ecc3169fd5e589b7d4e52e866f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-device-provider-profile-proto" version="31.10.0">
          <artifact name="android-device-provider-profile-proto-31.10.0.jar">
             <sha256 value="3e7b098f6e3ecae31b6f7909c343b4ec09aa18d8a89f41bf92077ba4b056f453" origin="Generated by Gradle"/>
@@ -7720,6 +8430,11 @@
             <sha256 value="3e7b098f6e3ecae31b6f7909c343b4ec09aa18d8a89f41bf92077ba4b056f453" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-device-provider-profile-proto" version="31.13.2">
+         <artifact name="android-device-provider-profile-proto-31.13.2.jar">
+            <sha256 value="3e7b098f6e3ecae31b6f7909c343b4ec09aa18d8a89f41bf92077ba4b056f453" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="30.1.2">
          <artifact name="android-test-plugin-host-additional-test-output-30.1.2.jar">
             <sha256 value="92321f7844111e98ffe0298917ea26bda8c57e047eca53a7caf9ee8549932fb3" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -7750,6 +8465,11 @@
             <sha256 value="2cc32785d0fc0d4a21c2a117d531c041ed2f971f6ebfd91558ab1968bc3957ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.13.2">
+         <artifact name="android-test-plugin-host-additional-test-output-31.13.2.jar">
+            <sha256 value="faae42a16cf76d7529b59b1b9a4dbf9cb1bedca58118eba824fddb8312dc7655" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.2.1">
          <artifact name="android-test-plugin-host-additional-test-output-31.2.1.jar">
             <sha256 value="562c0a2292aaf8e1c9b70fc427eb5a6b041b0c503d431f3b1962db5ebde54e61" origin="Generated by Gradle"/>
@@ -7795,6 +8515,11 @@
             <sha256 value="6ba7e6ac2208d74c1bb5f1d1464abafc6a45d8710b20455a2dc02adf8726bc83" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.13.2">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-31.13.2.jar">
+            <sha256 value="6ba7e6ac2208d74c1bb5f1d1464abafc6a45d8710b20455a2dc02adf8726bc83" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.2.1">
          <artifact name="android-test-plugin-host-additional-test-output-proto-31.2.1.jar">
             <sha256 value="08d12e55fa91ab83dd1b757cdbca3d746809b0a50268f75cf52194f46a2c6673" origin="Generated by Gradle"/>
@@ -7825,6 +8550,11 @@
             <sha256 value="e5e1bac03ec96dbcf2ae5a4f08af628a6ff944891be987540bb2de0d8866b17b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.13.2">
+         <artifact name="android-test-plugin-host-apk-installer-31.13.2.jar">
+            <sha256 value="949c6f65122129d3ecd59b0899860e8e24e9682cec1c008d1f11a5cc93366f64" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.2.1">
          <artifact name="android-test-plugin-host-apk-installer-31.2.1.jar">
             <sha256 value="e67ec31f80251d386f0b7178201d1ac373260459a9abf421ac554bea17d075f9" origin="Generated by Gradle"/>
@@ -7855,6 +8585,11 @@
             <sha256 value="45705d61b21006e8533e6cf8ab7958a7de6decace68ed6c09db8ade1216d859c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.13.2">
+         <artifact name="android-test-plugin-host-apk-installer-proto-31.13.2.jar">
+            <sha256 value="4f2b610542e91a35a396b04368a784036e42b8787021460550b9a3495bb8245b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.2.1">
          <artifact name="android-test-plugin-host-apk-installer-proto-31.2.1.jar">
             <sha256 value="abd2aac816a81e2af7705f3edff3de22bcd806212a1d158f432a39b06ae544e4" origin="Generated by Gradle"/>
@@ -7900,6 +8635,11 @@
             <sha256 value="21b0eb80f7146100baa99757ac5ccc5d6a973592b2f389559e8aca4b6a2873a4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.13.2">
+         <artifact name="android-test-plugin-host-coverage-31.13.2.jar">
+            <sha256 value="4993a95049e52c4d3147e9c4dfc696cc5a76af8303a4206bb60c2bfabc563ae9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.2.1">
          <artifact name="android-test-plugin-host-coverage-31.2.1.jar">
             <sha256 value="3f456bc195d7240fd709dd8855e959334595beac8ecc4a049568eda391d2f8e7" origin="Generated by Gradle"/>
@@ -7945,6 +8685,11 @@
             <sha256 value="fa86719a3dc5de465f7e0c023184414c27f8fd53a34fd557289c0bf6df340244" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.13.2">
+         <artifact name="android-test-plugin-host-coverage-proto-31.13.2.jar">
+            <sha256 value="fa86719a3dc5de465f7e0c023184414c27f8fd53a34fd557289c0bf6df340244" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.2.1">
          <artifact name="android-test-plugin-host-coverage-proto-31.2.1.jar">
             <sha256 value="9ebc9c6279a32a453c90cf6b732b3a3f88a80498e746400850f2c66ea7933580" origin="Generated by Gradle"/>
@@ -7990,6 +8735,11 @@
             <sha256 value="0c924c0c68af3109ce8b6274b322d6798cda654fab870992bbe2fe23d99af723" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.13.2">
+         <artifact name="android-test-plugin-host-device-info-31.13.2.jar">
+            <sha256 value="a53b9f764d80bed29e0f2e0ee62576dc09b87386608bb62ef1453d032f976968" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.2.1">
          <artifact name="android-test-plugin-host-device-info-31.2.1.jar">
             <sha256 value="9efea7f8ae3bae8afcadaeb420f0b17cc55b51592939bbfa746566fd17bcbd64" origin="Generated by Gradle"/>
@@ -8035,6 +8785,11 @@
             <sha256 value="9683ac7648a7a41be9a1349f6981592944f627164898c3c8925a0beede8bb8bb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.13.2">
+         <artifact name="android-test-plugin-host-device-info-proto-31.13.2.jar">
+            <sha256 value="9683ac7648a7a41be9a1349f6981592944f627164898c3c8925a0beede8bb8bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.2.1">
          <artifact name="android-test-plugin-host-device-info-proto-31.2.1.jar">
             <sha256 value="3d5881c984ba6f7aebf3f79f69842655f7bac9963da68a0fc7f1e940758b4f31" origin="Generated by Gradle"/>
@@ -8065,6 +8820,11 @@
             <sha256 value="f03c3b2fa45ef7d3c107a65a9a0f4ea1f683d0c31ccdb0bf3096748be99abba3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.13.2">
+         <artifact name="android-test-plugin-host-emulator-control-31.13.2.jar">
+            <sha256 value="73022c2a2779eeacfbfce67dda7cfbb21e3b3cf5610a54e35fc30d8fcc860930" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.2.1">
          <artifact name="android-test-plugin-host-emulator-control-31.2.1.jar">
             <sha256 value="b38f3038adbf7f3c537aedff575f927f8acfdad369d413ec8197b1c9e058cc81" origin="Generated by Gradle"/>
@@ -8095,6 +8855,11 @@
             <sha256 value="a4f34aae0f9ffa026dbf7151436dd7ae53becb72622b40f2c479cac8943d9319" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.13.2">
+         <artifact name="android-test-plugin-host-emulator-control-proto-31.13.2.jar">
+            <sha256 value="a4f34aae0f9ffa026dbf7151436dd7ae53becb72622b40f2c479cac8943d9319" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.2.1">
          <artifact name="android-test-plugin-host-emulator-control-proto-31.2.1.jar">
             <sha256 value="435438bc84016ec5d28c34c9d017b01365f37949168cffc81126d43757c53ca4" origin="Generated by Gradle"/>
@@ -8140,6 +8905,11 @@
             <sha256 value="3c22962c63ae79d41fa147d78920459ce0fde948110e5f843227465ddf7726cd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.13.2">
+         <artifact name="android-test-plugin-host-logcat-31.13.2.jar">
+            <sha256 value="f559b7c544e29ac3547339805c5e98d938e2a2764691d74ebabeb36e1fca0fba" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.2.1">
          <artifact name="android-test-plugin-host-logcat-31.2.1.jar">
             <sha256 value="279652a39566fc6291faed6203d0c47420d10ba0c7d5800468fb7801d7c575e9" origin="Generated by Gradle"/>
@@ -8170,6 +8940,11 @@
             <sha256 value="c1f6ebbacdad559b6efe4eaa29561552b33156395f069cd9703fda09c462dea6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.13.2">
+         <artifact name="android-test-plugin-host-logcat-proto-31.13.2.jar">
+            <sha256 value="c1f6ebbacdad559b6efe4eaa29561552b33156395f069cd9703fda09c462dea6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.2.1">
          <artifact name="android-test-plugin-host-logcat-proto-31.2.1.jar">
             <sha256 value="d31ca97afbfcd71a54749d265da11a424b122cf1cfbedbff2cb3d7362c579d3b" origin="Generated by Gradle"/>
@@ -8275,6 +9050,11 @@
             <sha256 value="945692fa672bb58cacd6c6185fe68afd38118a53ee4a2094fb89423584fc89eb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.13.2">
+         <artifact name="android-test-plugin-result-listener-gradle-31.13.2.jar">
+            <sha256 value="f5ed39ecda77684730b2616d112d69f92f509e3d6c38828abc6a863ef77fe0e5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.2.1">
          <artifact name="android-test-plugin-result-listener-gradle-31.2.1.jar">
             <sha256 value="d536bdd898f946bf52d2078980a5ae2f927f737509e73f781365af3cb239af8b" origin="Generated by Gradle"/>
@@ -8320,6 +9100,11 @@
             <sha256 value="d429b9312dffa0503381d1ee1b18a999bd901e7456612b2fb48c6a5d5a2caf88" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.13.2">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-31.13.2.jar">
+            <sha256 value="d429b9312dffa0503381d1ee1b18a999bd901e7456612b2fb48c6a5d5a2caf88" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.2.1">
          <artifact name="android-test-plugin-result-listener-gradle-proto-31.2.1.jar">
             <sha256 value="b1e49ff23fa357f8702aef1632b04405224a3846f4fe76654c76ef9bd7b5a601" origin="Generated by Gradle"/>
@@ -8350,6 +9135,11 @@
             <sha256 value="cde678a64b13041cdd2cc9dad1685990a1d090fb04ff5da2261ff75a83598106" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="utp-common" version="31.13.2">
+         <artifact name="utp-common-31.13.2.jar">
+            <sha256 value="cde678a64b13041cdd2cc9dad1685990a1d090fb04ff5da2261ff75a83598106" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="utp-common" version="31.6.0">
          <artifact name="utp-common-31.6.0.jar">
             <sha256 value="595702fb80bcd4373a1b9b438e5977687cba3c5fba6fa1a2936beef79b13ee9d" origin="Generated by Gradle"/>
@@ -9185,6 +9975,51 @@
             <sha256 value="1fa226d2b4a02cc80950fa4d49a4a235cc8eced499b581fc358a55446a83f579" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.dagger" name="dagger" version="2.57.2">
+         <artifact name="dagger-2.57.2.jar">
+            <sha256 value="f0becd6b5e98d56e6ec43f52de3288e1c560847cb81ec170ae44a1c02c0600f0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="dagger-compiler" version="2.57.2">
+         <artifact name="dagger-compiler-2.57.2.jar">
+            <sha256 value="80712a62e4c1ba6a81e193bd29778b059950b6c2d81378b9cdf39b524226f9bc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="dagger-lint-aar" version="2.57.2">
+         <artifact name="dagger-lint-aar-2.57.2.aar">
+            <sha256 value="717545ca85fb3bb494432876b40f54c74f13f8f52e320d51e7962f5fe0c13e9f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="dagger-spi" version="2.57.2">
+         <artifact name="dagger-spi-2.57.2.jar">
+            <sha256 value="ce2779a7c287ee33b1bbd198f5e0de8cc26ba268f607061eafdb068b720494ac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="hilt-android" version="2.57.2">
+         <artifact name="hilt-android-2.57.2.aar">
+            <sha256 value="26239f4085f8e6db4ed53266a874e5cd913366cafd07c0093945517962b9a2a1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="hilt-android-compiler" version="2.57.2">
+         <artifact name="hilt-android-compiler-2.57.2.jar">
+            <sha256 value="25aabc8d5554343b4fd5ced8d4f0314d0ac261aa8bc47af8199ebacc3c97ac6a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="hilt-android-gradle-plugin" version="2.57.2">
+         <artifact name="hilt-android-gradle-plugin-2.57.2.jar">
+            <sha256 value="40c95f41b546e5eb826a240f56e8785390cdebbb400025370c6048e2285e6644" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="hilt-compiler" version="2.57.2">
+         <artifact name="hilt-compiler-2.57.2.jar">
+            <sha256 value="3a36faab725df71e5fd5ac35726ad4102fa88e4330aeb4a06dcfccb0a67e67c8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="hilt-core" version="2.57.2">
+         <artifact name="hilt-core-2.57.2.jar">
+            <sha256 value="2aaf51b4b319bbfd35ba5e7026ea3d84b6b84254b29cdef78b5698038f9d7b2f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing" version="2.0.20-1.0.25">
          <artifact name="symbol-processing-2.0.20-1.0.25.jar">
             <sha256 value="e71741ea913426a52532721991bda4a918a189b37256957331dc30fcf2dbeb11" origin="Generated by Gradle"/>
@@ -9220,6 +10055,11 @@
             <sha256 value="bfddb7d69e4288f973ce6ce4088ab40e9cec652d0eb2475b19fdfdf190a2a9a9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-aa-embeddable" version="2.3.4">
+         <artifact name="symbol-processing-aa-embeddable-2.3.4.jar">
+            <sha256 value="7c183299d072f9a797585c75afa8c8dad4f92d8b7d961232c96a3840f7d1db81" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-api" version="1.6.10-1.0.2">
          <artifact name="symbol-processing-api-1.6.10-1.0.2.jar">
             <pgp value="24D04176586361FDA94EE0315F7786DF73E61F56"/>
@@ -9257,6 +10097,11 @@
             <sha256 value="6b2134148c3bc9e9cf9cf239d45031a21cd789956a21592d1a3231fe8ae309af" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.1.21-2.0.2">
+         <artifact name="symbol-processing-api-2.1.21-2.0.2.jar">
+            <sha256 value="588d17c4ea982b11028c2c82cb1d7300d269023a8068009f9ae9fb2c9c20c6d9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.2.0-2.0.2">
          <artifact name="symbol-processing-api-2.2.0-2.0.2.jar">
             <sha256 value="588d17c4ea982b11028c2c82cb1d7300d269023a8068009f9ae9fb2c9c20c6d9" origin="Generated by Gradle"/>
@@ -9267,6 +10112,11 @@
             <sha256 value="a20644569ecc01467d3efe4f8b9787a8719ce27ed12b6a3475ae1d82bfb16a0e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.3.4">
+         <artifact name="symbol-processing-api-2.3.4.jar">
+            <sha256 value="a20644569ecc01467d3efe4f8b9787a8719ce27ed12b6a3475ae1d82bfb16a0e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="2.0.20-1.0.25">
          <artifact name="symbol-processing-cmdline-2.0.20-1.0.25.jar">
             <sha256 value="56dae1c971eee8b0ecf970223b79e2724596d62e25d36410aaab2ec242cc6622" origin="Generated by Gradle"/>
@@ -9307,6 +10157,11 @@
             <sha256 value="618db61b5aa753838ef86e726e73f359be8c29b6cd467e36871bc17ea86735d0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="2.3.4">
+         <artifact name="symbol-processing-common-deps-2.3.4.jar">
+            <sha256 value="618db61b5aa753838ef86e726e73f359be8c29b6cd467e36871bc17ea86735d0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.0.20-1.0.25">
          <artifact name="symbol-processing-gradle-plugin-2.0.20-1.0.25.jar">
             <sha256 value="4ce1fc1b6ea08c4eadc630768d608a624f556d65b056bea0f7b9789018105a41" origin="Generated by Gradle"/>
@@ -9327,6 +10182,11 @@
             <sha256 value="69a542f4f1107ecb6e4ffa81fa36139165d8d72165109233efbbec406c27ae10" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.3.4">
+         <artifact name="symbol-processing-gradle-plugin-2.3.4.jar">
+            <sha256 value="1140059611001d61d6bfa88d9b6e9e159a6f9397972c1883ba75a36a0fd1898b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotation" version="2.19.1">
          <artifact name="error_prone_annotation-2.19.1.jar">
             <sha256 value="38c45cdaf993a7df6697703ca6ee00acbe376d3dade8d44daac3e33f039ca516" origin="Generated by Gradle"/>
@@ -9495,12 +10355,22 @@
             <sha256 value="1569c081fa8358a06164372f9f541b8a0ea5ec0964931f5f74ead36ff52b4015" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="javac-shaded" version="9-dev-r4023-3">
+         <artifact name="javac-shaded-9-dev-r4023-3.jar">
+            <sha256 value="65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.flatbuffers" name="flatbuffers-java" version="1.12.0">
          <artifact name="flatbuffers-java-1.12.0.jar">
             <pgp value="BCC135FC7ED8214F823D73E97FE9900F412D622E"/>
             <sha256 value="3f8c088b4dd04a9858721f2e162508c94db0dd86f961e306ee63ef2eda871bf7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.googlejavaformat" name="google-java-format" version="1.5">
+         <artifact name="google-java-format-1.5.jar">
+            <sha256 value="aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="failureaccess" version="1.0.1">
          <artifact name="failureaccess-1.0.1.jar">
             <sha256 value="a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26" origin="Generated by Gradle"/>
@@ -9599,6 +10469,11 @@
             <sha256 value="6d4e2b5a118aab62e6e5e29d185a0224eed82c85c40ac3d33cf04a270c3b3744" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava" version="33.0.0-jre">
+         <artifact name="guava-33.0.0-jre.jar">
+            <sha256 value="f4d85c3e4d411694337cb873abea09b242b664bb013320be6105327c45991537" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="guava" version="33.2.1-jre">
          <artifact name="guava-33.2.1-jre.jar">
             <sha256 value="452b2d9787b7d366fa8cf5ed9a1c40404542d05effa7a598da03bbbbb76d9f31" origin="Generated by Gradle"/>
@@ -9965,6 +10840,11 @@
             <sha256 value="a8daf7aa94198e48049f17084d8a76a82a3edf87ae0f45a16476b90dd9e6e934" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.zxing" name="core" version="3.5.4">
+         <artifact name="core-3.5.4.jar">
+            <sha256 value="71de5d89341b5fcf5dd89da7f44e84d825d0e084cdf3ec77c9abe26b0f0ceb13" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.zxing" name="zxing-parent" version="3.3.3">
          <artifact name="zxing-parent-3.3.3.pom">
             <sha256 value="56d4157b6805d69e97d53550c9138fe725d4dc3cf0845100035b453cdafad444" origin="Generated by Gradle"/>
@@ -10408,6 +11288,16 @@
             <sha256 value="bd004dd9ba175e603ad44420bf605250291b9b7bc6b9d9e916f5741ac8663307" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.moshi" name="moshi" version="1.15.2">
+         <artifact name="moshi-1.15.2.jar">
+            <sha256 value="767f7592c6c61eb693549a26d333c121f5383826bd287b899867aa326dae55e4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.moshi" name="moshi-kotlin" version="1.15.2">
+         <artifact name="moshi-kotlin-1.15.2.jar">
+            <sha256 value="5c39cd77e83b111af9c54708173af96a89fd3b09d15019a11da355e83e97d75a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okhttp3" name="okhttp" version="3.14.9">
          <artifact name="okhttp-3.14.9.jar">
             <sha256 value="2570fab55515cbf881d7a4ceef49fc515490bc027057e666776a2832465aeca0" origin="Generated by Gradle"/>
@@ -10438,6 +11328,11 @@
             <sha256 value="acb328a30b8609b34d9bcaf9a147d72e2279b55f6b22540aa45e0f1441e1fff3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.okhttp3" name="okhttp-android" version="5.2.1">
+         <artifact name="okhttp-release.aar">
+            <sha256 value="1043f2bb063655041f96efe203323a970e33ca839baed2d94190f61fe6e602d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okhttp3" name="okhttp-jvm" version="5.1.0">
          <artifact name="okhttp-jvm-5.1.0.jar">
             <sha256 value="a6aac7f15d3c2c3cbd2af7ecf56f97407164a604b2db879529950e31cea699b2" origin="Generated by Gradle"/>
@@ -10498,6 +11393,11 @@
             <sha256 value="c737c035ca675187bf11a67ddb9581954bf0d5ca9f3e048e838b3267cf32b5c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.okio" name="okio-jvm" version="3.16.2">
+         <artifact name="okio-jvm-3.16.2.jar">
+            <sha256 value="a0a9f1abfb90c0a37b9c847cea39fff26d15f39253f5175632cdb948c96318d0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okio" name="okio-jvm" version="3.6.0">
          <artifact name="okio-jvm-3.6.0.jar">
             <sha256 value="67543f0736fc422ae927ed0e504b98bc5e269fda0d3500579337cb713da28412" origin="Generated by Gradle"/>
@@ -10513,16 +11413,31 @@
             <sha256 value="f7dc3883ceae2e1fe3425e1b54c5df28b8857c5fd00381b521fda60790f2952c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.retrofit2" name="converter-moshi" version="2.12.0">
+         <artifact name="converter-moshi-2.12.0.jar">
+            <sha256 value="19b7a35fa164093607f9a63ed810b4b1c1fbe9c7d45e3196277c1e6be1317f2e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.retrofit2" name="converter-moshi" version="2.9.0">
          <artifact name="converter-moshi-2.9.0.jar">
             <sha256 value="e26cf1256afa208e13ab6d8fbfd458faa448f24b72799d8de55c0363f619be43" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.retrofit2" name="converter-scalars" version="2.12.0">
+         <artifact name="converter-scalars-2.12.0.jar">
+            <sha256 value="115eb497eaed69b3854b27a2728e9f0f3001ff15340f15c469c930ff59610c73" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.retrofit2" name="converter-scalars" version="3.0.0">
          <artifact name="converter-scalars-3.0.0.jar">
             <sha256 value="b97cf06929a80d49bc632e44f219cf0a7185fc4cee861ec90ad1d0e482084023" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.retrofit2" name="retrofit" version="2.12.0">
+         <artifact name="retrofit-2.12.0.jar">
+            <sha256 value="3b2dfb82bb99cd33df95d92ad6fcd78ba7f17ac81e67904eb991fe404015d1d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.retrofit2" name="retrofit" version="2.9.0">
          <artifact name="retrofit-2.9.0.jar">
             <sha256 value="e6ea1929c46852f5bec66ab3357da383476cef4e8d1deefdbf195b79cc4d6581" origin="Generated by Gradle"/>
@@ -10615,6 +11530,11 @@
             <sha256 value="f47c96df5e76fae4351f8e8ef2a0054ed4cabef7f3373260c0f56fef263d2136" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.vanniktech" name="central-portal" version="0.35.0">
+         <artifact name="central-portal-0.35.0.jar">
+            <sha256 value="989ddc73efe534007e05eff2c7c314debbbd38b1207d33b0741a0d98cadca050" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.vanniktech" name="gradle-maven-publish-plugin" version="0.18.0">
          <artifact name="gradle-maven-publish-plugin-0.18.0.jar">
             <pgp value="7B72C18D9C362314BF8E981B0CAEBC0883C5BB65"/>
@@ -10626,6 +11546,16 @@
             <sha256 value="1b304ae327d7034de19511f77ad227ba59d7358e8b51d18b09da7a253fec4c05" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.vanniktech" name="gradle-maven-publish-plugin" version="0.35.0">
+         <artifact name="gradle-maven-publish-plugin-0.35.0.jar">
+            <sha256 value="f53ac93fefb44569b4e86f97956e608058fd55222b0ae5d44bcdad1474e117e0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.viktormykhailiv" name="compose-hints-android" version="2.0.1">
+         <artifact name="hints-release.aar">
+            <sha256 value="b2f66570d8940372f948f63945de2318386c627188645f04dc52ec9193011b7b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="commons-beanutils" name="commons-beanutils" version="1.9.3">
          <artifact name="commons-beanutils-1.9.3.jar">
             <pgp value="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119"/>
@@ -10787,6 +11717,21 @@
             <sha256 value="6442745031a59fdd0d9841a3f2332a03f7aa37735536dad206ee4fac8800ab93" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.coil-kt.coil3" name="coil-android" version="3.3.0">
+         <artifact name="coil-release.aar">
+            <sha256 value="1acd5a6598c51c46659296fbed7ab2615fc9e6f54fa37ca7b31a08d226296c13" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.coil-kt.coil3" name="coil-compose-android" version="3.3.0">
+         <artifact name="coil-compose-release.aar">
+            <sha256 value="487beefb453c6d4057652819f3366424ba9cd95075acc146a78f3781c7dc6a31" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.coil-kt.coil3" name="coil-compose-core-android" version="3.3.0">
+         <artifact name="coil-compose-core-release.aar">
+            <sha256 value="e2090a3e00e7278cc6245f9bf2a5613af392f0e30fc8b4477d2f594da5fded3e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.coil-kt.coil3" name="coil-core" version="3.3.0">
          <artifact name="coil-core-metadata-3.3.0.jar">
             <sha256 value="b1474de0af6c32f015d342b3050eb083451cb082b73e80e75ab1e60d785ffc30" origin="Generated by Gradle"/>
@@ -11162,6 +12107,11 @@
             <sha256 value="172206a81a2ee5877b2b8cab52cc51ba6cbabe8b738723bffabfe28f4ceb4c05" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-client-cio" version="3.3.3">
+         <artifact name="ktor-client-cio-metadata-3.3.3.jar">
+            <sha256 value="53af6703eadd7ef89e0733acf160d69fb4440333d94412faa0acab383d5b013c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-client-cio-jvm" version="1.6.7">
          <artifact name="ktor-client-cio-jvm-1.6.7.jar">
             <sha256 value="5b46898dff097e8c923f840e62113576fec37d86632bb9477a21a9e4711c2c3d" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -11265,6 +12215,11 @@
             <sha256 value="ca423a8c067a766166a206d6e7cbafec81d0d0e56c435c6bd7c1bc684c7ba0c1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-client-core" version="3.3.3">
+         <artifact name="ktor-client-core-metadata-3.3.3.jar">
+            <sha256 value="5985f38f5bc796b8f82300e15217c85eaa7337649aac40f72eb0d51fdb147820" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-client-core-jvm" version="1.6.7">
          <artifact name="ktor-client-core-jvm-1.6.7.jar">
             <sha256 value="375f7a9e23c2b3ad8183c4c77a5cf1fba4173f21239de122a2ecd36771aaafad" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -11336,6 +12291,11 @@
             <sha256 value="a63a95d390baacc6c2d64c34ea867d1dcf79a1cdc53c8070cb60329449a293da" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-client-core-jvm" version="3.3.3">
+         <artifact name="ktor-client-core-jvm-3.3.3.jar">
+            <sha256 value="6c403b39cac342892839c251275cc441b27c7f194983b9226cb46bc3a44259f9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-client-core-linuxx64" version="1.6.7">
          <artifact name="ktor-client-core.klib">
             <sha256 value="d9572dbcfba0b1eb091b365c132abd6c93524e05187d127ce1c25ecfae25b4a3" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -11501,6 +12461,11 @@
             <sha256 value="e59abf9444655111e213ce62304dbc25972f867c11e94e2b859db9235f2ab0b2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-client-mock" version="3.3.3">
+         <artifact name="ktor-client-mock-metadata-3.3.3.jar">
+            <sha256 value="c204e4c68fd37b5563fa14b94bbf753fe51c92782777ccea14f9bb8dd69d93a3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-client-mock-jvm" version="1.6.7">
          <artifact name="ktor-client-mock-jvm-1.6.7.jar">
             <sha256 value="18a1f03278658ebffc43210ccfc315ef98651a68a2b7cc893dbbcdd322163e3b" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -11562,6 +12527,11 @@
             <sha256 value="39156f807fc5a24dd6f3e553be8d1b6ee7be7ad54d5b63aa40db3c7efd7ad758" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-client-mock-jvm" version="3.3.3">
+         <artifact name="ktor-client-mock-jvm-3.3.3.jar">
+            <sha256 value="19f52e64dec3f709f0867f746b7eac99a8e36b464a564857a73f521a76840047" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-client-mock-linuxx64" version="1.6.7">
          <artifact name="ktor-client-mock.klib">
             <sha256 value="a642d23fd74a54e08326af04a9d6ecee154348e5f3d3aa73ca5a98f12f112de0" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -11649,6 +12619,11 @@
             <sha256 value="089e24417bf9f6c34eec5720eebb2cbcc82ea2855ecef90133eb17e1079d5868" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-client-okhttp" version="3.3.3">
+         <artifact name="ktor-client-okhttp-metadata-3.3.3.jar">
+            <sha256 value="089e24417bf9f6c34eec5720eebb2cbcc82ea2855ecef90133eb17e1079d5868" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-client-okhttp-jvm" version="2.0.0">
          <artifact name="ktor-client-okhttp-jvm-2.0.0.jar">
             <sha256 value="f4258ffa7da88e37c4cf26057b6c72697602cacca0a52b573ac77775694ea0d1" origin="Generated by Gradle"/>
@@ -11711,6 +12686,11 @@
             <sha256 value="ecaf9a8cd2b05e92b7a63e9bce0cfc1904c3e8ad8b503df44fb5ecc83e6a658c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-client-okhttp-jvm" version="3.3.3">
+         <artifact name="ktor-client-okhttp-jvm-3.3.3.jar">
+            <sha256 value="43624d509db6493fc2f685791ffbe5451db00616376958cd36d3603f627b682f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-events" version="2.0.0">
          <artifact name="ktor-events-2.0.0.jar">
             <sha256 value="f98526ebe576d707c96674350512d96d3ba2d90e9e68ed78babc4fc811f44d78" origin="Generated by Gradle"/>
@@ -11783,6 +12763,11 @@
             <sha256 value="153af3216fc43763947b113141e6b929dd899da7df2036167f1b4edd502ee8f1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-events" version="3.3.3">
+         <artifact name="ktor-events-metadata-3.3.3.jar">
+            <sha256 value="60ed0a319cfd713110130841e1a9dbc9683e1302779c7f49ba6a7519f39ff045" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-events-jvm" version="2.0.0">
          <artifact name="ktor-events-jvm-2.0.0.jar">
             <sha256 value="fdb425e731b3691f1e9316643b4a50a5968c0c40cfa8261dc5ffd22b9dbb6013" origin="Generated by Gradle"/>
@@ -11844,6 +12829,11 @@
             <sha256 value="e38802e4b219a9dc717b1f5e0ea2d4d5823ed78f1259ab25e05aad7b62092860" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-events-jvm" version="3.3.3">
+         <artifact name="ktor-events-jvm-3.3.3.jar">
+            <sha256 value="0d786a12576309dedc16f9a2ff464016d51cfc1fe20d7890912200ff2abce0ea" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-events-linuxx64" version="2.0.0-beta-1">
          <artifact name="ktor-events.klib">
             <sha256 value="b70c3750b7e93dbf4405943596f709c42b08752d0ac7233f140e5fab1caeb924" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -11937,6 +12927,11 @@
             <sha256 value="d4a52fed0279fe6deeaca398a65f8cbd8f8a5cd6f077f235f9dce56bff3312a4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-http" version="3.3.3">
+         <artifact name="ktor-http-metadata-3.3.3.jar">
+            <sha256 value="cd40d91f1b5350522d3e05a1d8c4f9fc17865242bdeab299f736663840caaccc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-http-cio" version="1.6.7">
          <artifact name="ktor-http-cio-1.6.7.jar">
             <sha256 value="27729d01a5a51c925ea804dff908152796d704041d5be3b245bd538c0ce8f701" origin="Generated by Gradle"/>
@@ -12014,6 +13009,11 @@
             <sha256 value="c2c65720f86fe2d9c785e97c64e38bc37c9ad7bfff8e0b44e2a0005cd4b5ef7f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-http-cio" version="3.3.3">
+         <artifact name="ktor-http-cio-metadata-3.3.3.jar">
+            <sha256 value="07faed0295638f78157b4a651b95d874fc5b1a526f0838a26e17ea95ca8023c5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-http-cio-jvm" version="1.6.7">
          <artifact name="ktor-http-cio-jvm-1.6.7.jar">
             <sha256 value="6180664707474b43da3dfa1e9482705e92eed303f18e10f5a67835d8816a6fd7" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -12049,6 +13049,11 @@
             <sha256 value="c0a1ed002adab9940770cc44c8a0261f6b9ed45d3ae7ea57f851418eaa0bf4d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-http-cio-jvm" version="3.3.3">
+         <artifact name="ktor-http-cio-jvm-3.3.3.jar">
+            <sha256 value="ff43508bf8fcc179bf672ac6e5e058f8010a62adf944a1e0cf0982b6657e064f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-http-cio-linuxx64" version="1.6.7">
          <artifact name="ktor-http-cio.klib">
             <sha256 value="22e92c72a0e769a94354dd0080776b723e3060b6bb7e32eb495c16541c42ae8d" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -12141,6 +13146,11 @@
             <sha256 value="cec53f5d1aec5b69bdb2b95699d456c862b5eebc803c8069e627fa24d80f1332" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-http-jvm" version="3.3.3">
+         <artifact name="ktor-http-jvm-3.3.3.jar">
+            <sha256 value="7f70cf5011d9cbafc0a2cc8dc51943e47aea5b25d6fb20b2dfb8b5dc6d591085" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-http-linuxx64" version="1.6.7">
          <artifact name="ktor-http.klib">
             <sha256 value="54a3955b59399f5d659be129a0920aabbc9f313508851d519afb5d433db40d40" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -12249,6 +13259,11 @@
             <sha256 value="eaa73c85b9134ad8c749baa2427a25dd86bf82f4deb8752ea6cc811027996840" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-io" version="3.3.3">
+         <artifact name="ktor-io-metadata-3.3.3.jar">
+            <sha256 value="10a3caac759b1e7a65731e0d96fa4b64bccac102ad66f66941592160537a00e8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-io-jvm" version="1.6.7">
          <artifact name="ktor-io-jvm-1.6.7.jar">
             <sha256 value="2f9d03cc878c6c1617641dc2434c1011703530a4691b856531af314b3d10ba4d" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -12325,6 +13340,11 @@
             <sha256 value="9964ba58d5fdb24ae4b1833bf436bb680ecde94bdae9b09537e005f8315bcb8d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-io-jvm" version="3.3.3">
+         <artifact name="ktor-io-jvm-3.3.3.jar">
+            <sha256 value="c1bead8c0a2218456a3b7c2bdfea79ac1395ad5b20f2c502a7f39e35911b2710" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-io-linuxx64" version="1.6.7">
          <artifact name="ktor-io-cinterop-bits.klib">
             <sha256 value="7ad2851bdbe483c560c44e2d4518f4cd589abf70a2dc7ff4c760ca36086fc7ea" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -12423,6 +13443,11 @@
             <sha256 value="8cb853460c616bf1aa1a29483d70caac241b7830a950584fe1efb49acf324a01" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-network" version="3.3.3">
+         <artifact name="ktor-network-metadata-3.3.3.jar">
+            <sha256 value="a76ed6742394568c3bc3c03302653a7790382022a59063c6c701ed654d63c016" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-network-jvm" version="1.6.7">
          <artifact name="ktor-network-jvm-1.6.7.jar">
             <sha256 value="e33accd7761df57cbc98183aecada06674c9b89c3a42e52a65551ea8875ac33f" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -12458,6 +13483,11 @@
             <sha256 value="c04eeb2c6991f576cb38f62b0efcab1d308e5c77326ddea80236f284b4cab4bf" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-network-jvm" version="3.3.3">
+         <artifact name="ktor-network-jvm-3.3.3.jar">
+            <sha256 value="f50c3898289c2bfb76aae862b4fa1b19de32e11ed5e3d8090b49eeb57ddf6626" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-network-tls" version="1.6.7">
          <artifact name="ktor-network-tls-metadata-1.6.7-all.jar">
             <sha256 value="29abeb9333b0e66d1e5822d8a8e827abb236b6ac3b7e20f141ede6e7c4f1a3e0" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -12529,6 +13559,11 @@
             <sha256 value="c75cc0e65916fdd381a888b20e84e0703c563ffd013b70fb3b79df47480e57d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-network-tls" version="3.3.3">
+         <artifact name="ktor-network-tls-metadata-3.3.3.jar">
+            <sha256 value="dc47f2bf129d3f3f4666d5a8bf4bae77c5cd5f0cb62f5a81de37976a74f74078" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-network-tls-jvm" version="1.6.7">
          <artifact name="ktor-network-tls-jvm-1.6.7.jar">
             <sha256 value="3083aa55119402f77e17a0ba7a880813dfb8446e0ff838a129ea462ea17ea96e" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -12616,6 +13651,11 @@
             <sha256 value="2c0ac9b53046801ff4809c7a023532ab5afac072b4c8109300557b5bd8ae2ee6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-serialization" version="3.3.3">
+         <artifact name="ktor-serialization-metadata-3.3.3.jar">
+            <sha256 value="12aa77ca51d0fde93502e56e137a637b4954714c5059ec49a39ecffd7db741b2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-serialization-jvm" version="2.0.0">
          <artifact name="ktor-serialization-jvm-2.0.0.jar">
             <sha256 value="e8cb74ee1adc720c8d2aee47563d30b2b483439eae6fd21e2daa9094269d55e2" origin="Generated by Gradle"/>
@@ -12677,6 +13717,11 @@
             <sha256 value="ca7cda5ad7660d639636876dfc62725644947e8739873be173102076b9e4baba" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-serialization-jvm" version="3.3.3">
+         <artifact name="ktor-serialization-jvm-3.3.3.jar">
+            <sha256 value="5a77106c9737f5abe3a13c41e567148eb9f3d7223fb2bc9613ec28175920fdf7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-serialization-linuxx64" version="2.0.0-beta-1">
          <artifact name="ktor-serialization.klib">
             <sha256 value="8f04142ef2234b718b590316c5d126fd9dcd6781e44b3499d17840a1813d2c47" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -12702,6 +13747,11 @@
             <sha256 value="22316ec6aaaf78a235ae1dc4cd2bb08ae0490e0cf500db895770e4019273f84c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-sse" version="3.3.3">
+         <artifact name="ktor-sse-metadata-3.3.3.jar">
+            <sha256 value="790a16ab4471ea2bf97e50c306ff1cf3e02561bb1d1091e267373edd5bdc6bc8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-sse-jvm" version="3.1.3">
          <artifact name="ktor-sse-jvm-3.1.3.jar">
             <sha256 value="a2ae8a338bb1d446d16dcfea2189ef5a5be31a88123b3879562b7955667a5639" origin="Generated by Gradle"/>
@@ -12722,6 +13772,11 @@
             <sha256 value="819a66a9d8ab72800dca6a044980309d9f06e7deef698961fcf1506c1bba0465" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-sse-jvm" version="3.3.3">
+         <artifact name="ktor-sse-jvm-3.3.3.jar">
+            <sha256 value="a87a8a0168671af46bdc762d9f345daca1ea8133a9c9d367334cc1e9b2c4ae2c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-utils" version="1.6.7">
          <artifact name="ktor-utils-1.6.7.jar">
             <sha256 value="a60fbe69b9300bc511642b184d6d798b48fc0d00759d8014a9e3b83fd2402b9a" origin="Generated by Gradle"/>
@@ -12810,6 +13865,11 @@
             <sha256 value="9e58fbd1a5cd3bfd2596b4ae62534cbd5273fdeff9ddd801d19c9a3f9d8a39d6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-utils" version="3.3.3">
+         <artifact name="ktor-utils-metadata-3.3.3.jar">
+            <sha256 value="1217db56159ace2643e2df130603c0b77dbeef22120d393b2efd7d01cd9c5269" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-utils-jvm" version="1.6.7">
          <artifact name="ktor-utils-jvm-1.6.7.jar">
             <sha256 value="c037d1cb3064cd5d5cdb00fd388aa4b4dd0f4cf4f25e5cd9b0559c3f8043143c" origin="Generated by Gradle because a key couldn't be downloaded"/>
@@ -12881,6 +13941,11 @@
             <sha256 value="5e16fc48d6d931590d90f67ea89af31a7cc21efa1ad3bcc353274f547b0dcdb4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-utils-jvm" version="3.3.3">
+         <artifact name="ktor-utils-jvm-3.3.3.jar">
+            <sha256 value="ad020bd9cd5cae0f5f5d743fc8786dfbffb9dc1d8efb76a6b1972b3578c81d7a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-utils-linuxx64" version="1.6.7">
          <artifact name="ktor-utils-cinterop-utils.klib">
             <sha256 value="0d9691f82f0e7a9363bcebf8a56a9c71faae47aea0cb5c503a2b7f628f2b4be2" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -12974,6 +14039,11 @@
             <sha256 value="7c700c09d5867cd645b06e25c62adc78cec491d2e6fbbf72f2791caff206e047" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-websocket-serialization" version="3.3.3">
+         <artifact name="ktor-websocket-serialization-metadata-3.3.3.jar">
+            <sha256 value="a01e06765cc3b5d332e54eaf4ec9ca1696ba2996588b4c8763831efe9828bd1f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-websocket-serialization-jvm" version="2.0.0">
          <artifact name="ktor-websocket-serialization-jvm-2.0.0.jar">
             <sha256 value="cfcec1c853f696c5794497a04713c8cbb93f4d530372f39fd9b28c777d32d0bd" origin="Generated by Gradle"/>
@@ -13035,6 +14105,11 @@
             <sha256 value="1bd093deb4436fac6c0e6f6dcc3d1d548a17a65a3a310d8dd3c6cc6a24e03fc4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-websocket-serialization-jvm" version="3.3.3">
+         <artifact name="ktor-websocket-serialization-jvm-3.3.3.jar">
+            <sha256 value="3fc9047c79ca3f174d86c37855ea846025d56341f7774addd1d369668fcb4f82" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-websocket-serialization-linuxx64" version="2.0.0-beta-1">
          <artifact name="ktor-websocket-serialization.klib">
             <sha256 value="49bdb43d612b15b88fd1a57a810a8c3d5aa65afd2bb7b8151d509d421c792688" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -13112,6 +14187,11 @@
             <sha256 value="7b29744f651e3ff57ac87528718f7df7f1f3e7519836d6306727db84fb3ec025" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-websockets" version="3.3.3">
+         <artifact name="ktor-websockets-metadata-3.3.3.jar">
+            <sha256 value="a42b75cd5d6585234cc8fbe6ede33d1c377b1c494f9b9859dcb50846040c38ed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-websockets-jvm" version="2.0.0">
          <artifact name="ktor-websockets-jvm-2.0.0.jar">
             <sha256 value="673bd57e11450ffbb9dd7fd31c5416d133ed90d24ab9aadd1a40e6a6a616a1e3" origin="Generated by Gradle"/>
@@ -13173,6 +14253,11 @@
             <sha256 value="708a9518ef0f8310d002064962cbc3e9b864d12a8b5e143d76572584c7b144a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.ktor" name="ktor-websockets-jvm" version="3.3.3">
+         <artifact name="ktor-websockets-jvm-3.3.3.jar">
+            <sha256 value="129cf6de3ee4ef12ad2a265acb932056eac9243ab6e5f053e8eb02e9cb14d894" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.ktor" name="ktor-websockets-linuxx64" version="2.0.0-beta-1">
          <artifact name="ktor-websockets.klib">
             <sha256 value="ed80b79d2426ec0f1fb900691dc61de64d83f649d0d0ad9f545413d6435cf9ff" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -13928,6 +15013,11 @@
             <sha256 value="8b0a0f52fa8b05c5431921a063ed866efaa41dadf2e3a7ee3e1961f2b0d9645b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="jakarta.inject" name="jakarta.inject-api" version="2.0.1">
+         <artifact name="jakarta.inject-api-2.0.1.jar">
+            <sha256 value="f7dc98062fccf14126abb751b64fab12c312566e8cbdc8483598bffcea93af7c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="jakarta.xml.bind" name="jakarta.xml.bind-api" version="2.3.2">
          <artifact name="jakarta.xml.bind-api-2.3.2.jar">
             <pgp value="FC411CD3CB7DCB0ABC9801058118B3BCDB1A5000"/>
@@ -14010,6 +15100,11 @@
             <sha256 value="8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="me.zhanghai.compose.preference" name="preference-android" version="2.1.0">
+         <artifact name="preference-release.aar">
+            <sha256 value="d26876f28ec837d08346824078f50033a26fdef9e567000f64fb665bfddf343f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="nekohtml" name="nekohtml" version="1.9.6.2">
          <artifact name="nekohtml-1.9.6.2.jar">
             <sha256 value="fdff6cfa9ed9cc911c842a5d2395f209ec621ef1239d46810e9e495809d3ae09" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -14171,6 +15266,11 @@
             <sha256 value="c41427be1e08b06efe8a07bfdde7651f5ec2043e313ad72e5e48db4ebf5f70f1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.ltgt.gradle.incap" name="incap" version="0.2">
+         <artifact name="incap-0.2.jar">
+            <sha256 value="b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.sf.jopt-simple" name="jopt-simple" version="4.9">
          <artifact name="jopt-simple-4.9.jar">
             <pgp value="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD"/>
@@ -14754,6 +15854,11 @@
             <sha256 value="0aa6dde3d61709b02af8200d24b73eea1680f3d18bf91f0ff67ff2f468ac158c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.bouncycastle" name="bcpkix-jdk15to18" version="1.83">
+         <artifact name="bcpkix-jdk15to18-1.83.jar">
+            <sha256 value="2d0b476e7c2fd8e75a622f287bf2e386b793720e4172eecc4274cf0b84e95197" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.77">
          <artifact name="bcpkix-jdk18on-1.77.jar">
             <sha256 value="1ac7fe8efd5b2f38cdc165be5a0675734fe44808dab92707201f03a535d6f1b8" origin="Generated by Gradle"/>
@@ -14810,6 +15915,11 @@
             <sha256 value="9c9ccecb08a0b00bd2a74afa6567d81d61a02bba1364f24e33fa0c4c1e929821" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.bouncycastle" name="bcprov-jdk15to18" version="1.83">
+         <artifact name="bcprov-jdk15to18-1.83.jar">
+            <sha256 value="048f19e51557d7c08ae9de683cf5ce2b32fda49304afa968ec3737850e228c54" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.bouncycastle" name="bcprov-jdk18on" version="1.72">
          <artifact name="bcprov-jdk18on-1.72.jar">
             <sha256 value="39287f2208a753db419f5ca529d6c80f094614aa74d790331126b3c9c6b85fda" origin="Generated by Gradle"/>
@@ -14860,6 +15970,11 @@
             <sha256 value="07751f7538699ce721123bd6abdd6029d152867c5860597c08d024a3f18df782" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.bouncycastle" name="bcutil-jdk15to18" version="1.83">
+         <artifact name="bcutil-jdk15to18-1.83.jar">
+            <sha256 value="e3463d037577f1639a618c5140e021965fb5b1be5a57091571a519647b5c2d92" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.bouncycastle" name="bcutil-jdk18on" version="1.77">
          <artifact name="bcutil-jdk18on-1.77.jar">
             <sha256 value="947673bcbc5a8dde2d2fa688a5b7598d0ca6e2a74a7ea30cd93f04f6b3ad68f8" origin="Generated by Gradle"/>
@@ -14875,6 +15990,11 @@
             <sha256 value="22eca687f7955411f456af33e6ea8e68fc73cd80cb8b32aa5f7a8b1827d7c678" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.checkerframework" name="checker-compat-qual" version="2.5.3">
+         <artifact name="checker-compat-qual-2.5.3.jar">
+            <sha256 value="d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checker-compat-qual" version="2.5.5">
          <artifact name="checker-compat-qual-2.5.5.jar">
             <pgp value="19BEAB2D799C020F17C69126B16698A4ADF4D638"/>
@@ -14924,6 +16044,11 @@
             <sha256 value="e4ce1376cc2735e1dde220b62ad0913f51297704daad155a33f386bc5db0d9f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.checkerframework" name="checker-qual" version="3.41.0">
+         <artifact name="checker-qual-3.41.0.jar">
+            <sha256 value="2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checker-qual" version="3.42.0">
          <artifact name="checker-qual-3.42.0.jar">
             <sha256 value="ccaedd33af0b7894d9f2f3b644f4d19e43928e32902e61ac4d10777830f5aac7" origin="Generated by Gradle"/>
@@ -15423,6 +16548,21 @@
             <sha256 value="893abb31f15b6216f74dc704c0c6bf1e567dcf2b62cca29cf42e4f53153637ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.compose.components" name="components-resources-android" version="1.8.2">
+         <artifact name="library-release.aar">
+            <sha256 value="09b37488fba12649563933ae46aecf23c8896bf781e5959f74b081ce1983d733" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.compose.ui" name="ui-backhandler-android" version="1.9.1">
+         <artifact name="ui-backhandler-release.aar">
+            <sha256 value="8f8f37d0eb33f597608bc20f875021b1d80db6f835c138cd7cef9093c7ad4c24" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.compose.ui" name="ui-backhandler-android-debug" version="1.9.1">
+         <artifact name="ui-backhandler-debug.aar">
+            <sha256 value="dbbcd638c9ebb9e97f61f2bf130408e56c6ce5d001dc5f5e70845ce09357c929" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="analysis-kotlin-descriptors" version="1.9.10">
          <artifact name="analysis-kotlin-descriptors-1.9.10.jar">
             <sha256 value="77d408f88487904e8818a05760c7b5f859767dbd9922d4da69fcf11b79c7e1f4" origin="Generated by Gradle"/>
@@ -15845,6 +16985,11 @@
             <sha256 value="24bacf795029d2831608d9b31fa8d0d29fe1c3fba7a9b2c7630d1593f2389884" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="abi-tools" version="2.3.0">
+         <artifact name="abi-tools-2.3.0.jar">
+            <sha256 value="be854a23032b2cb73c285e67e4ed0b04c2af2d36f4cf026355cca5940ad1833f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="abi-tools-api" version="2.2.0">
          <artifact name="abi-tools-api-2.2.0.jar">
             <sha256 value="8717838866642e3bdd47ec9e0260bbd3076e8c7e86be05e2ada86831eb2af90a" origin="Generated by Gradle"/>
@@ -15855,6 +17000,11 @@
             <sha256 value="239901f317c189b4b4cc8bc5e966943dc19e39259539e668baa5d7ef18eb916a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="abi-tools-api" version="2.3.0">
+         <artifact name="abi-tools-api-2.3.0.jar">
+            <sha256 value="4017bcc1f5d3285b17e6b6220d16a468c8715930f0df96396d764b57f0a6d365" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="compose-compiler-gradle-plugin" version="2.0.20">
          <artifact name="compose-compiler-gradle-plugin-2.0.20-gradle85.jar">
             <sha256 value="c0c32475f5284fe7c180caf00bf40b6fa3a3b0e90fec5817b6d020eb10ed29bc" origin="Generated by Gradle"/>
@@ -15875,6 +17025,16 @@
             <sha256 value="2dc6478dc179f8596c1faec059b1f06fea785f3c05241663690a6f7a160618c2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="compose-compiler-gradle-plugin" version="2.3.0">
+         <artifact name="compose-compiler-gradle-plugin-2.3.0-gradle813.jar">
+            <sha256 value="21e882c4548b137d4af616be169ae6b384ca52db6a070fbb4087b63814e0b48b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="compose-group-mapping" version="2.3.0">
+         <artifact name="compose-group-mapping-2.3.0.jar">
+            <sha256 value="bb6a7620ced43e04431171e4f81b52c0b3bad00edad2fe5866367478b5bd8e3c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="fus-statistics-gradle-plugin" version="2.1.21">
          <artifact name="fus-statistics-gradle-plugin-2.1.21-gradle85.jar">
             <sha256 value="fc0905810309a5ad3ea15dfbbe129a47e90db11215232364841b72044124e7b0" origin="Generated by Gradle"/>
@@ -15890,6 +17050,11 @@
             <sha256 value="27dcf4aeaa5bbb64d861bd29ed60d482f0ffd96244c81e2426b9dac5e7fdc63f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="fus-statistics-gradle-plugin" version="2.3.0">
+         <artifact name="fus-statistics-gradle-plugin-2.3.0-gradle813.jar">
+            <sha256 value="0fe72fdc6e51be2b274b0e64b84401f525036afb206162a4458214f11ebad787" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-android-extensions" version="1.6.10">
          <artifact name="kotlin-android-extensions-1.6.10.jar">
             <sha256 value="8e1dacd7d52cca7a824eadcf60f844fcb90a43ba3ec8e1c22c0acc415efe7917" origin="Generated by Gradle"/>
@@ -16035,6 +17200,11 @@
             <sha256 value="8dfdfb2b8f67fcdcc4cee3ef90a25af467ca295853b0ea019d0010acebd6f18a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-statistics" version="2.3.0">
+         <artifact name="kotlin-build-statistics-2.3.0.jar">
+            <sha256 value="6778559700e72d764e9e24d958f16ec0cc75e76b75b3814c2bcde144a6274f4e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="1.9.22">
          <artifact name="kotlin-build-tools-api-1.9.22.jar">
             <sha256 value="dd49cb7e28f4f3382f5250cfb05c864fd5f0a96d3265bb293c77b30adcc93ff6" origin="Generated by Gradle"/>
@@ -16060,6 +17230,16 @@
             <sha256 value="31645ca52239b221ebd060a00fff8d8516ffdc88bbd9f4e4cd7ddb41a7068c70" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.3.0">
+         <artifact name="kotlin-build-tools-api-2.3.0.jar">
+            <sha256 value="c6c09cf2853457249f707c86382112409d5a55f50b6b8568ba4f530dd003fedc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-compat" version="2.3.0">
+         <artifact name="kotlin-build-tools-compat-2.3.0.jar">
+            <sha256 value="009493e1caf04c8285f1fed157bbab688355db04d2deaec4f5a0f9b635f866e5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="1.9.22">
          <artifact name="kotlin-build-tools-impl-1.9.22.jar">
             <sha256 value="1b48d6de042a525f63b557513ae1266d699348225b013f940e32c63de2689428" origin="Generated by Gradle"/>
@@ -16085,6 +17265,11 @@
             <sha256 value="458b63ef8fc50a0a3180fe688ec1b995745992a05c495dac61e58d1088927a80" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="2.3.0">
+         <artifact name="kotlin-build-tools-impl-2.3.0.jar">
+            <sha256 value="93a5e8ffb1000801c832a862b23bd9766f444e6f6c185c32b1fb57877fb5cea3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.5.31">
          <artifact name="kotlin-compiler-embeddable-1.5.31.jar">
             <sha256 value="e39811a9e4c102e779c659eefe90b041c66ce87578c1bfdac07cf504d1551745" origin="Generated by Gradle"/>
@@ -16155,6 +17340,11 @@
             <sha256 value="9588fa696ac5507af764fd5660df6894185e12704ec1bc3f5cb772af4987f295" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.3.0">
+         <artifact name="kotlin-compiler-embeddable-2.3.0.jar">
+            <sha256 value="8dbd882fa58c3d17e683a27390288315f8b490f8e3e3b1be4dc3e280d37e285a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.6.10">
          <artifact name="kotlin-compiler-runner-1.6.10.jar">
             <sha256 value="65d3ade3609d9042689aa522365bfd99c010f16d5c3f395cd86c7dd99f3da728" origin="Generated by Gradle"/>
@@ -16215,6 +17405,11 @@
             <sha256 value="a3a422e06bcd35a32a798d191ef6ebb35ea6b39c3553e941d39c01e631fc5c77" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.3.0">
+         <artifact name="kotlin-compiler-runner-2.3.0.jar">
+            <sha256 value="870977f29605436c5eb2257b9c8e5d64f3282f2a88edee4544d34ec45f16a6a7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compose-compiler-plugin-embeddable" version="2.0.20">
          <artifact name="kotlin-compose-compiler-plugin-embeddable-2.0.20.jar">
             <sha256 value="e78f581fd56c11ed67af1cd9840df2f0e082f5db8a8f9b3de3d87281e65150f8" origin="Generated by Gradle"/>
@@ -16235,6 +17430,11 @@
             <sha256 value="bd6b2db8bbf5ef1c12888ae885b72054e70cea7ef4d6e8bb5eca4faa0539393f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compose-compiler-plugin-embeddable" version="2.3.0">
+         <artifact name="kotlin-compose-compiler-plugin-embeddable-2.3.0.jar">
+            <sha256 value="d8693e09d606625a583d30589e790e9da542114ed353483ee16d694077f7d67e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.6.10">
          <artifact name="kotlin-daemon-client-1.6.10.jar">
             <sha256 value="fd5700dc2f987783e1eff4d14fe2084af9712e7259dd777349dc4e72472dd214" origin="Generated by Gradle"/>
@@ -16295,6 +17495,11 @@
             <sha256 value="3ce2ca3c5d7bc7c87c4149ac2c593d21a791d6776229ae123db645a3017de814" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.3.0">
+         <artifact name="kotlin-daemon-client-2.3.0.jar">
+            <sha256 value="b2be67688caf11a138d5ae0ce1235381ad9ab0ddb9395ab06f8d846a0b466017" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.5.31">
          <artifact name="kotlin-daemon-embeddable-1.5.31.jar">
             <sha256 value="f61eaf89e5e3848631650b25cdfb66fe8cae0281a054d9d986716000a15ba8d6" origin="Generated by Gradle"/>
@@ -16365,6 +17570,11 @@
             <sha256 value="91c0673c22e44b054ae0314d323860ebe1f3aff3f0ebc74fff82c4733dde09be" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.3.0">
+         <artifact name="kotlin-daemon-embeddable-2.3.0.jar">
+            <sha256 value="39bcb02d8c293aa678554c8b49d7ff84657021709283c6186e3a40806af9bd10" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="1.6.10">
          <artifact name="kotlin-gradle-plugin-1.6.10.jar">
             <sha256 value="66c12048f8a4e9cf92ad65b12ac615702c11ae503f53c69f57f626128be1762a" origin="Generated by Gradle"/>
@@ -16437,6 +17647,11 @@
             <sha256 value="b7a52865c6a5e160d2cf61e4d423ce44a6a20de0a6b23d03404b6d01a2811737" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="2.3.0">
+         <artifact name="kotlin-gradle-plugin-2.3.0-gradle813.jar">
+            <sha256 value="3acf97d73a2581b032873fa89f56750d36b3b76d40d692d9839f2467ddae4d69" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="1.8.20">
          <artifact name="kotlin-gradle-plugin-annotations-1.8.20.jar">
             <sha256 value="32baa93f157652b6d3a870a41c967fc09195261110d4b7acf9fb53409ef0cf1c" origin="Generated by Gradle"/>
@@ -16467,6 +17682,11 @@
             <sha256 value="3594c40c7005d044952f80f704172bb6fd1844241025194fb16bee6d45da2e5b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="2.3.0">
+         <artifact name="kotlin-gradle-plugin-annotations-2.3.0.jar">
+            <sha256 value="fc7298c36b45f36d1652c703bab693f5fe9b11598ecd9ac7ec9fdfe88a6db0f0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="1.6.10">
          <artifact name="kotlin-gradle-plugin-api-1.6.10.jar">
             <sha256 value="7aa62528de3da7b66d97430c6d1b3f3781455b053231bbbf967e82900f527c44" origin="Generated by Gradle"/>
@@ -16580,6 +17800,11 @@
             <sha256 value="b7bfd07f5f1e0a44af612eb48474df6328ee0f6f3a6a73642ce473f30645e1a5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="2.3.0">
+         <artifact name="kotlin-gradle-plugin-api-2.3.0-gradle813.jar">
+            <sha256 value="ca1ead149a8c8f41ba60a839a83b23c3a06227c46c62124c51be999035deac31" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="1.7.10">
          <artifact name="kotlin-gradle-plugin-idea-1.7.10.jar">
             <sha256 value="e464e2ffe4ddedefa291e7ee746ffa99be48e6724300c7b48798b10342666d45" origin="Generated by Gradle"/>
@@ -16625,6 +17850,11 @@
             <sha256 value="ec969c5f0b099f823846232238f9bd64f3d3741e62ea9050ad2e432fad79d0a0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="2.3.0">
+         <artifact name="kotlin-gradle-plugin-idea-2.3.0.jar">
+            <sha256 value="952e73948e2a20d398c26b87a6bb70ccf66418fbaf1527c3515b188ea9d4bd60" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="1.7.20">
          <artifact name="kotlin-gradle-plugin-idea-proto-1.7.20.jar">
             <sha256 value="00081214394ac3a6de47dfb8dde0b299be233c16a2d1e67601959bb037fa8af0" origin="Generated by Gradle"/>
@@ -16665,6 +17895,11 @@
             <sha256 value="4b4be774efb9585af0fda180d33903d8272e497df7b81bb091fa9339ecda45bd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="2.3.0">
+         <artifact name="kotlin-gradle-plugin-idea-proto-2.3.0.jar">
+            <sha256 value="7a90503c9d787f9bcd2c1776e4cc527eb9de7912ef79c6c958f1305a2d1c43ba" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="1.6.10">
          <artifact name="kotlin-gradle-plugin-model-1.6.10.jar">
             <sha256 value="0792a3e7d0b51285689adfd1c40878e639b72471c17b0632bba84f8140840fbc" origin="Generated by Gradle"/>
@@ -16725,6 +17960,11 @@
             <sha256 value="908e6e5c890bb49dbc9266dccf28bdb0c258c48647039aed702fe9d586640186" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-klib-abi-reader" version="2.3.0">
+         <artifact name="kotlin-klib-abi-reader-2.3.0.jar">
+            <sha256 value="41e31422eb5eb224b9a475fe80eb8d06eb21ad34fb7d0a408d2c972a7abb8cbb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="1.6.10">
          <artifact name="kotlin-klib-commonizer-api-1.6.10.jar">
             <sha256 value="db14015976f9d4f3579935d1639ec857b48322c2d3b4144f513e508ad7f69f7e" origin="Generated by Gradle"/>
@@ -16785,6 +18025,11 @@
             <sha256 value="58bc451ce62ed6befd077ac107ea5f133443e74dd78cf3a4a48f868e61837e8b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="2.3.0">
+         <artifact name="kotlin-klib-commonizer-api-2.3.0.jar">
+            <sha256 value="9ba57d91abdeab9acd588a14b5f42209b99644c53416dff9e97ecb4bf97f5248" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable" version="1.6.10">
          <artifact name="kotlin-klib-commonizer-embeddable-1.6.10.jar">
             <sha256 value="96cd91eb44fc090ee9cd5bc39d680259089e2783ed2e004c6c7556bed59c8477" origin="Generated by Gradle"/>
@@ -16845,6 +18090,11 @@
             <sha256 value="fff95b9b5995798116407a7c0ca2da28f7d3304eee65191c7fe79b404f5f7308" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable" version="2.3.0">
+         <artifact name="kotlin-klib-commonizer-embeddable-2.3.0.jar">
+            <sha256 value="aae36a0eaad9c7070c9b0b9a16e525c991276fc08488cc7656a8671e7c538426" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-metadata-jvm" version="2.1.10">
          <artifact name="kotlin-metadata-jvm-2.1.10.jar">
             <sha256 value="da86ed4f3a8c8885592d6b8aa691fb8607b49f3773c8bbd08c3b14a31b14d2fd" origin="Generated by Gradle"/>
@@ -16860,6 +18110,11 @@
             <sha256 value="e181f32a21a3cdf195f974004a42f0067c2bd9deaa2a883636748d83fdefd99d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-metadata-jvm" version="2.3.0">
+         <artifact name="kotlin-metadata-jvm-2.3.0.jar">
+            <sha256 value="0c64203991d0232d989cd5e366d6028d27b1b087240818178bd50c268eeab56f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-native-prebuilt" version="2.0.20">
          <artifact name="kotlin-native-prebuilt-2.0.20-linux-x86_64.tar.gz">
             <sha256 value="b282918b5f5158b2f8d5b53de08093a72206fc23b91382e1ddd2630c72028427" origin="Generated by Gradle"/>
@@ -16930,6 +18185,11 @@
             <sha256 value="e74b14406dae0a02388187c62c1731183ba7d0d8e60675682de511a90afa6c56" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="2.3.0">
+         <artifact name="kotlin-native-utils-2.3.0.jar">
+            <sha256 value="ee4bf2833d10e5f37dd216a83129f59f3c7cbef5ebac130f70664839708c80b7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-project-model" version="1.6.10">
          <artifact name="kotlin-project-model-1.6.10.jar">
             <sha256 value="8d9f5e8e5402a05fb8c20447a56b697dc0cf73ea5c55534a9ee6a463920869c9" origin="Generated by Gradle"/>
@@ -17125,6 +18385,11 @@
             <sha256 value="44380abf37d245ce5c0f294f43512d1c39a59642bfa463922c74e96877cf49f8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.3.0">
+         <artifact name="kotlin-reflect-2.3.0.jar">
+            <sha256 value="714df4be819545ff4de1f36aa2183e0dea94b4c8cdf7ca29e9c89919baf36362" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="1.5.31">
          <artifact name="kotlin-script-runtime-1.5.31.jar">
             <sha256 value="24e450fee7645ed3590981dddccf397c0d9ebb725815c94c4f555cc3db2f9f96" origin="Generated by Gradle"/>
@@ -17195,6 +18460,11 @@
             <sha256 value="2b1519b427b514d1536c1b425674b03fe914af637924028e9959c6625442df51" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.3.0">
+         <artifact name="kotlin-script-runtime-2.3.0.jar">
+            <sha256 value="db826961371d6605318d9c4e4bfcdbfac94c3a0892cdcabd55224870fead57f1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="1.6.10">
          <artifact name="kotlin-scripting-common-1.6.10.jar">
             <sha256 value="f00943ce5008713f24828eac6e5eff73239f17a5912df32f76864f2e7c48c217" origin="Generated by Gradle"/>
@@ -17255,6 +18525,11 @@
             <sha256 value="414ed91c3f5e4492b23cb9537842b4651038e25dad84107939f434c2203f2a92" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="2.3.0">
+         <artifact name="kotlin-scripting-common-2.3.0.jar">
+            <sha256 value="4252b782cda53fcbfd953b90af03250e2197ffef6e55abd9b0a2e48f93eff253" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="1.6.10">
          <artifact name="kotlin-scripting-compiler-embeddable-1.6.10.jar">
             <sha256 value="63fa41101f45000efa0963b7bf8a680be232419405dad76382555aa93ede5e49" origin="Generated by Gradle"/>
@@ -17315,6 +18590,11 @@
             <sha256 value="d934b9d0c246bc09624b7068af58ad57cef11dbe2addbc7b19d250cce42de1c9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="2.3.0">
+         <artifact name="kotlin-scripting-compiler-embeddable-2.3.0.jar">
+            <sha256 value="67145dbea93194dbb2253e2f35a0a9fe78017c2cbce3ecdb4b1ff43fff4718d5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="1.6.10">
          <artifact name="kotlin-scripting-compiler-impl-embeddable-1.6.10.jar">
             <sha256 value="2c94e096db91c0452c215fac3b6f3a6b9e8a2791bb6eaf9840b926652a74fcb2" origin="Generated by Gradle"/>
@@ -17375,6 +18655,11 @@
             <sha256 value="788a3060c8e7997f8ae16ba5c0280d05005af0a42029f18cb10c5625b979fac3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="2.3.0">
+         <artifact name="kotlin-scripting-compiler-impl-embeddable-2.3.0.jar">
+            <sha256 value="32c7427f105e62d4f4eff3035da1e4280b27771be4ad6143ba8655d1887720cd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="1.6.10">
          <artifact name="kotlin-scripting-jvm-1.6.10.jar">
             <sha256 value="58984dd182f80d82ab03513382fd959ad33f7907e13cd34bf233ae2df79af768" origin="Generated by Gradle"/>
@@ -17435,6 +18720,11 @@
             <sha256 value="83820c5fcc5d28f045f914ecd5900bbbcf8115b0d7007334de069fe6c70669e6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="2.3.0">
+         <artifact name="kotlin-scripting-jvm-2.3.0.jar">
+            <sha256 value="36933eb83619a8a65e041dfa9b692d34e07d57c6fd62fe371c8bbf05880bec47" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-serialization" version="1.6.20">
          <artifact name="kotlin-serialization-1.6.20.jar">
             <sha256 value="af8a3533e70273a3d92c4266c6072ab5b905892b4e46b051641b248e34b85613" origin="Generated by Gradle"/>
@@ -17501,6 +18791,11 @@
             <sha256 value="bc91077b5812ca79fdb8940ae9dce7921bc4e0916cdf984ada467f122a55a8e2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-serialization" version="2.3.0">
+         <artifact name="kotlin-serialization-2.3.0-gradle813.jar">
+            <sha256 value="4dcb298ccb73de2c02e4220c4ca16196b202db29af28907c5beb5ff396de176a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-serialization-compiler-plugin-embeddable" version="1.9.22">
          <artifact name="kotlin-serialization-compiler-plugin-embeddable-1.9.22.jar">
             <sha256 value="38547d000b1661b14b924671cfb17ab5200beb834e3a3da4277ee09062e9a500" origin="Generated by Gradle"/>
@@ -17526,6 +18821,11 @@
             <sha256 value="c5e725c13ccb9f0d2d978cb10997b2972d7d46bef4a5aaa502637ec307478f46" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-serialization-compiler-plugin-embeddable" version="2.3.0">
+         <artifact name="kotlin-serialization-compiler-plugin-embeddable-2.3.0.jar">
+            <sha256 value="f244409a077c163b5c35280ff9b78029a75a367dddc45024e270f109750acf3e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.3.71">
          <artifact name="kotlin-stdlib-1.3.71.jar">
             <sha256 value="5ace22b102a96425e4ac44e0558b927f3857b56a33cbc289cf1b70aee645e6a7" origin="Generated by Gradle"/>
@@ -17733,6 +19033,19 @@
             <sha256 value="6558a3d233da56a20934b32159f9db5f86ed5816ef098f78a2c223dc6abb79dd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.3.0">
+         <artifact name="kotlin-stdlib-2.3.0-all.jar">
+            <sha256 value="f2d40d41c7be845b4c42c48cd30148f68366e909df822049a3de9dd152d48c02" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.3.0.jar">
+            <sha256 value="887587c91713250ad52fe14ad9166d042c33835049890e9437f355ffc5a195b1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.3.0-RC">
+         <artifact name="kotlin-stdlib-2.3.0-RC.jar">
+            <sha256 value="cc338d65bbec94b73036f7c3c3a5f6f09ae8705b95c0f920ec3287b46b6894d3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.3.71">
          <artifact name="kotlin-stdlib-common-1.3.71.jar">
             <sha256 value="974f8a9b7bfce3d730a86efe0eab219a72621e8530f91e30c89f400ba98092ec" origin="Generated by Gradle"/>
@@ -17953,6 +19266,11 @@
             <sha256 value="5343bf795783932e5fa538b0bca05af810bb07213edb9baa770c784068f57867" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="2.2.0">
+         <artifact name="kotlin-stdlib-jdk7-2.2.0.jar">
+            <sha256 value="0d10bc0d42b8605f23629a3f31ea27c19cdbca9dcdf4f53f6d22cd6366836d18" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.3.71">
          <artifact name="kotlin-stdlib-jdk8-1.3.71.jar">
             <sha256 value="a22192ac779ba8eff09d07084ae503e8be9e7c8ca1cb2b511ff8af4c68d83d66" origin="Generated by Gradle"/>
@@ -18068,6 +19386,11 @@
             <sha256 value="ed22217b5dc0940a068d8be9440bbe2f7f9f51c466cdd1185e2385cdec19f238" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="2.2.0">
+         <artifact name="kotlin-stdlib-jdk8-2.2.0.jar">
+            <sha256 value="adc16648dbbcf35b0d10e7ec301c35d746d1c2fe460c606aba59f12b117cf9b0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-test" version="1.6.10">
          <artifact name="kotlin-test-1.6.10.jar">
             <sha256 value="b891453cafbf961532d2ba0fb8969e40b0f7c168c9a2fc6a8cdf7c1b0577a36a" origin="Generated by Gradle"/>
@@ -18140,6 +19463,14 @@
             <sha256 value="612966ddee4d3d0486156f10c77a57c5c47dae65eb98a2bddf34cf2aeeb894c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-test" version="2.3.0">
+         <artifact name="kotlin-test-2.3.0-all.jar">
+            <sha256 value="deb72ce64a23fa5caf416b47c740f435da7a8242bf4331d89e40302a5c9cca3d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-test-2.3.0.jar">
+            <sha256 value="ae298a046eb9db6facb448685cb29f6ca77ab52afff1169b3fc52519de74da28" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-test-annotations-common" version="1.6.10">
          <artifact name="kotlin-test-annotations-common-1.6.10.jar">
             <sha256 value="4091ce07e91e8d96e9186cf3093431e4305800405a0f03aecfc10678b8bec4d4" origin="Generated by Gradle"/>
@@ -18280,6 +19611,11 @@
             <sha256 value="5d88fcf9a56ee501fbf874ee65e82375ea1221423867c598ff29b11e0ad49317" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-test-junit" version="2.3.0">
+         <artifact name="kotlin-test-junit-2.3.0.jar">
+            <sha256 value="3ab0e208804c1951f082e71ce8a3229015e9afd226393cffa847a263a2a2a927" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="1.7.10">
          <artifact name="kotlin-tooling-core-1.7.10.jar">
             <sha256 value="b06a1be22538d6d2db4a9be6e43de3691aeaa6c605aae20229f4e1bd39c0a539" origin="Generated by Gradle"/>
@@ -18330,6 +19666,11 @@
             <sha256 value="74014ec4f3ef78ce7da7e3e6964f2c526a3121d5c58fef8ca2979e5f344582f4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="2.3.0">
+         <artifact name="kotlin-tooling-core-2.3.0.jar">
+            <sha256 value="367142781299bc0f9120c1deec0e62934a1af9ea7f01aaa9c5a5354dc5d8d7d9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-tooling-metadata" version="1.6.10">
          <artifact name="kotlin-tooling-metadata-1.6.10.jar">
             <sha256 value="5f79b547f80ceba482d6f71844b23445e109f685eb74481044678cd75c28ad77" origin="Generated by Gradle"/>
@@ -18415,6 +19756,11 @@
             <sha256 value="266aa4026a106f59fcefc3f151768870af91cef15e4011fac0aa1f1f567d49f4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="2.3.0">
+         <artifact name="kotlin-util-io-2.3.0.jar">
+            <sha256 value="1c91203f27e73b9688ddfe1a8802328d35eb70fa55f5e13deadb721e78f92aa4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="1.6.10">
          <artifact name="kotlin-util-klib-1.6.10.jar">
             <sha256 value="12a572e6608423e9e71363008165bb2f11aa2dd61e2ee0cea722068dfa938c30" origin="Generated by Gradle"/>
@@ -18475,6 +19821,11 @@
             <sha256 value="55400a917e6b984a6197eae78b5b52edbdf2cd6e0a7c3843f7954481bafb243f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="2.3.0">
+         <artifact name="kotlin-util-klib-2.3.0.jar">
+            <sha256 value="64bba009966a028186d9ee706b0dc80fea61c0ae6eb1725ed1d7d70ef22b52e1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-util-klib-metadata" version="2.1.21">
          <artifact name="kotlin-util-klib-metadata-2.1.21.jar">
             <sha256 value="94c7fcb40405f56482400baa235c96e81010c1e043bff6300b70b34e5ea8d9bb" origin="Generated by Gradle"/>
@@ -18490,6 +19841,11 @@
             <sha256 value="022b95a3dfed949d7c2e47820bcd9836ee057b721513f773361e4333f6c76f8c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-klib-metadata" version="2.3.0">
+         <artifact name="kotlin-util-klib-metadata-2.3.0.jar">
+            <sha256 value="2598c26c34cc5c69eb00473463e950ae67e9b80967f43a0183c567ede66a9717" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="swift-export-embeddable" version="2.2.21">
          <artifact name="swift-export-embeddable-2.2.21.jar">
             <sha256 value="c7a17644e99fa8ab07393e896bb49aa3013b968b139e8107ac950cb04b2eb701" origin="Generated by Gradle"/>
@@ -18781,6 +20137,11 @@
             <sha256 value="f3d4f5de1c391bbcc20f3b3435ccbac013521e76b6902d7d59635ec15c1f797e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.9.0">
+         <artifact name="kotlinx-coroutines-core-jvm-1.9.0.jar">
+            <sha256 value="ad89c2892235e670f222d819cb3d81188143cb19a05b59df9889ae4269f5c70a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-linuxx64" version="1.5.2-native-mt">
          <artifact name="kotlinx-coroutines-core.klib">
             <sha256 value="bd5e3639e853cc1e8dca4db696ab29f95924453da93db96e20f30979e9463ef2" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -19290,6 +20651,11 @@
             <sha256 value="0802df585bb7c28f166bf2023687081b2c601ada35ead3ac3ded247a30899efd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jlleitschuh.gradle" name="ktlint-gradle" version="14.0.1">
+         <artifact name="ktlint-gradle-14.0.1.jar">
+            <sha256 value="bf8440aae1fd8e8851dce4c3f4f125fc986715ce51df48867b8a0d12a56c2bb5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jmdns" name="jmdns" version="3.5.5">
          <artifact name="jmdns-3.5.5.jar">
             <pgp value="5F7903F86C625ED6EFA07AB85110767B6248D3C0"/>
@@ -19632,6 +20998,11 @@
             <sha256 value="85b29371884ba31bb76edf22323c2c24e172c3267a67152eba3d1ccc2e041ef2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-analysis" version="9.8">
+         <artifact name="asm-analysis-9.8.jar">
+            <sha256 value="e640732fbcd3c6271925a504f125e38384688f4dfbbf92c8622dfcee0d09edb9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-commons" version="7.0">
          <artifact name="asm-commons-7.0.jar">
             <sha256 value="fed348ef05958e3e846a3ac074a12af5f7936ef3d21ce44a62c4fa08a771927d" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -19771,6 +21142,11 @@
             <sha256 value="f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-util" version="9.8">
+         <artifact name="asm-util-9.8.jar">
+            <sha256 value="8ba0460ecb28fd0e2980e5f3ef3433a513a457bc077f81a53bdc75b587a08d15" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.pcollections" name="pcollections" version="2.1.2">
          <artifact name="pcollections-2.1.2.jar">
             <sha256 value="29c8ffcc5c6a97f059941148593ad00fe2cdf78af1d88d46bcf0d1bb703606c2" origin="Generated by Gradle"/>

From 6ede37119a7e3351ef23d71918c50d68783d2498 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 5 Jan 2026 18:35:19 -0300
Subject: [PATCH 165/180] Allow one more year of SHA1 in index v1 tests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98d0dda3a..50f8c135c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ workflow:
     - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdk = "\([0-9][0-9]*\)".*,\1,p' gradle/libs.versions.toml`
     - echo y | sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" > /dev/null
     # index-v1.jar tests need SHA1 support still, TODO use apksig to validate JAR sigs
-    - sed -i 's,SHA1 denyAfter 20[0-9][0-9],SHA1 denyAfter 2026,'
+    - sed -i 's,SHA1 denyAfter 20[0-9][0-9],SHA1 denyAfter 2027,'
       /usr/lib/jvm/java-17-openjdk-amd64/conf/security/java.security
   after_script:
     # this file changes every time but should not be cached

From 4cdf79751540681db4472db0387b2888c07d34a9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 5 Jan 2026 18:55:25 -0300
Subject: [PATCH 166/180] Ignore failing test testGetReportingWeekStart()

as this doesn't get fixed for years and keeps coming up.

See #2339
---
 .../java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/legacy/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java b/legacy/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
index d5f8883f5..ce7ccbd4c 100644
--- a/legacy/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
+++ b/legacy/src/test/java/org/fdroid/fdroid/work/FDroidMetricsWorkerTest.java
@@ -16,6 +16,7 @@ import org.fdroid.fdroid.TestUtils;
 import org.fdroid.fdroid.installer.InstallHistoryService;
 import org.fdroid.fdroid.work.FDroidMetricsWorker.MatomoEvent;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -89,6 +90,7 @@ public class FDroidMetricsWorkerTest {
     }
 
     @Test
+    @Ignore("This fails in the first week of the year") // FIXME
     public void testGetReportingWeekStart() throws ParseException {
         long now = System.currentTimeMillis();
         long start = FDroidMetricsWorker.getReportingWeekStart(now);

From 16dec72976df397b88209af8eff040a9bf759887 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 6 Jan 2026 10:27:42 -0300
Subject: [PATCH 167/180] Adapt nightly builds to 2.0 basic

---
 .gitlab-ci.yml                | 12 +++++++++---
 config/nightly-repo/repo.json |  7 +++++++
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 config/nightly-repo/repo.json

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50f8c135c..e20945852 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -365,11 +365,15 @@ deploy_nightly:
     JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
   script:
     - test -z "$DEBUG_KEYSTORE" && exit 0
-    - apt-get install -t bookworm-backports androguard fdroidserver
+    - apt-get install -t bookworm-backports androguard fdroidserver jq moreutils
     - sed -i
-        's,<string name="app_name">.*</string>,<string name="app_name">F-Nightly</string>,'
+        's,<string name="app_name_basic">.*</string>,<string name="app_name_basic">F-Nightly Basic</string>,'
+        app/src/main/res/values*/strings.xml
+    - sed -i
+        's,<string name="app_name_full">.*</string>,<string name="app_name_full">F-Nightly</string>,'
         app/src/main/res/values*/strings.xml
     # add this nightly repo as a enabled repo
+    - jq --slurpfile new_dict config/nightly-repo/repo.json "[(\$new_dict[0] | .address = \"${CI_PROJECT_URL}-nightly/-/raw/master/fdroid/repo\")] + ." app/src/main/assets/default_repos.json | sponge app/src/main/assets/default_repos.json
     - sed -i -e '/<\/string-array>/d' -e '/<\/resources>/d' legacy/src/main/res/values/default_repos.xml
     - echo "<item>${CI_PROJECT_PATH}-nightly</item>" >> legacy/src/main/res/values/default_repos.xml
     - echo "<item>${CI_PROJECT_URL}-nightly/-/raw/master/fdroid/repo</item>" >> legacy/src/main/res/values/default_repos.xml
@@ -378,7 +382,9 @@ deploy_nightly:
     - export versionCode=`printf '%d%05d' $DB $(date '+%s'| cut -b1-8)`
     - sed -i "s,^\(\s*versionCode\)  *[0-9].*,\1 $versionCode," app/build.gradle
     # build the APKs!
-    - ./gradlew assembleDebug
+    - rm -rf app/build/outputs/apk
+    - ./gradlew :app:assembleBasicRelease :legacy:assembleFullDebug
+    - mv app/build/outputs/apk/basic/release/app-basic-release-unsigned.apk app/build/outputs/apk/basic/release/app-debug.apk
 
     # taken from fdroiddata/.gitlab-ci.yml as a tmp workaround until this is released:
     # https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1666
diff --git a/config/nightly-repo/repo.json b/config/nightly-repo/repo.json
new file mode 100644
index 000000000..60d495201
--- /dev/null
+++ b/config/nightly-repo/repo.json
@@ -0,0 +1,7 @@
+{
+  "name": "F-Droid Next Nightlies",
+  "address": "https://gitlab.com/fdroid/fdroidclient-nightly/-/raw/master/fdroid/repo",
+  "description": "This repo is nightly builds of F-Droid, it should only be used for testing!",
+  "certificate": "308201e53082014ea0030201020204503d3768300d06092a864886f70d01010505003037310b30090603550406130255533110300e060355040a1307416e64726f6964311630140603550403130d416e64726f6964204465627567301e170d3132303832383231323630305a170d3432303832313231323630305a3037310b30090603550406130255533110300e060355040a1307416e64726f6964311630140603550403130d416e64726f696420446562756730819f300d06092a864886f70d010101050003818d0030818902818100b5ba553eacbc4de5b45af812d9695140dafbc0a8a9c13ac9a7e24b2665371ce5072e5dfef60f705d58fdb2d0e2190264e42d83a6fd80cfd54690e9e3c3735fa8dce684ee99ac879b1b11e1c8a9cbb9dc6b23064b025f9db7dc87d48ee4bc038affd80d854c0ed5d88d93d6e8127e62344727e23886b97f5d10e2265c9c9b5bd10203010001300d06092a864886f70d0101050500038181006dae218bdbff79801b1935448c663319843a7b2eb5f5c8837f010e58da25ba4d23bc6650b53c93f9c42b379299f4659b4cc3c505aa1a7c08c8a1a58fffe78d29df2cf69b27c34a0ab5f44cf7e323e34f8252d9f6e4d67171ce38bab64623910811dae6b12203385b32d962dbd51e8a6b0dcab3fa4d1f4020cee69a5f3c6ddf69",
+  "enabled": true
+}

From be67dba0264a3708a1ab63c3d34c3212403d66c8 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 7 Jan 2026 09:49:44 -0300
Subject: [PATCH 168/180] Don't claim no apps installed when all apps have
 issues

---
 app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt         | 2 ++
 app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt b/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
index 08585a76b..d4950cc9d 100644
--- a/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/apps/MyApps.kt
@@ -70,6 +70,7 @@ fun MyApps(
     }
     val installingApps = myAppsModel.installingApps
     val updatableApps = myAppsModel.appUpdates
+    val appsWithIssue = myAppsModel.appsWithIssue
     val installedApps = myAppsModel.installedApps
     val scrollBehavior = enterAlwaysScrollBehavior(rememberTopAppBarState())
     var searchActive by rememberSaveable { mutableStateOf(false) }
@@ -151,6 +152,7 @@ fun MyApps(
         if (updatableApps == null && installedApps == null) BigLoadingIndicator()
         else if (installingApps.isEmpty() &&
             updatableApps.isNullOrEmpty() &&
+            appsWithIssue.isNullOrEmpty() &&
             installedApps.isNullOrEmpty()
         ) {
             Text(
diff --git a/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 57673dc65..50f4622bc 100644
--- a/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -152,8 +152,6 @@ class UpdatesManager @Inject constructor(
                         lastUpdated = -1,
                         iconModel = PackageName(app.packageName, null),
                     )
-                }.also {
-                    log.error { "ISSUE: $it" }
                 }
             }
             _appsWithIssues.value = issueItems

From 32e4a04cd6544f14e3d567e81cf81aa08ece045f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 7 Jan 2026 10:04:41 -0300
Subject: [PATCH 169/180] Handle disabled pre-approval

Pre-approval can be disabled and we get STATUS_FAILURE_BLOCKED which should be sufficient. There's also a hidden official error code we don't use for now:
https://cs.android.com/android/platform/superproject/+/android-latest-release:frameworks/base/core/java/android/content/pm/PackageManager.java;l=2644;drc=905556173324d48059d4bae77408748a76497ac9
---
 .../org/fdroid/install/SessionInstallManager.kt       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt b/app/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
index 6b9518c9c..8b829b0ba 100644
--- a/app/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
+++ b/app/src/main/kotlin/org/fdroid/install/SessionInstallManager.kt
@@ -150,12 +150,13 @@ class SessionInstallManager @Inject constructor(
                         context.unregisterReceiver(this)
                     }
                 }
-                else -> { // some error, can't help it now, continue
-                    if (status == PackageInstaller.STATUS_FAILURE_ABORTED) {
-                        cont.resume(PreApprovalResult.UserAborted)
-                    } else {
-                        cont.resume(PreApprovalResult.Error(msg))
+                else -> {
+                    val result = when (status) {
+                        PackageInstaller.STATUS_FAILURE_ABORTED -> PreApprovalResult.UserAborted
+                        PackageInstaller.STATUS_FAILURE_BLOCKED -> PreApprovalResult.NotSupported
+                        else -> PreApprovalResult.Error(msg)
                     }
+                    cont.resume(result)
                     context.unregisterReceiver(this)
                 }
             }

From b928235af2dfe18a59e68df749344e3ebc74ea01 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 7 Jan 2026 17:05:59 -0300
Subject: [PATCH 170/180] Fix top spacer when changing repos in app details

---
 app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 37fe1dd92..5bb38441f 100644
--- a/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -75,7 +75,7 @@ fun AppDetailsHeader(
     item: AppDetailsItem,
     innerPadding: PaddingValues,
 ) {
-    var showTopSpacer by rememberSaveable(item.app.packageName) { mutableStateOf(true) }
+    var showTopSpacer by rememberSaveable(item.featureGraphic) { mutableStateOf(true) }
     if (showTopSpacer) {
         Spacer(modifier = Modifier.padding(innerPadding))
     }

From f65f355e953f159662e7ec831ff33e903ea9a588 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 9 Jan 2026 16:07:02 -0300
Subject: [PATCH 171/180] Show changelog of update (if existing) in app details

previously only the changelog of the last installed version would get shown
---
 app/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
index f7832e2cd..76721d6ca 100644
--- a/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsItem.kt
@@ -120,7 +120,8 @@ data class AppDetailsItem(
         suggestedVersion = suggestedVersion,
         possibleUpdate = possibleUpdate,
         appPrefs = appPrefs,
-        whatsNew = installedVersion?.getWhatsNew(localeList),
+        whatsNew = suggestedVersion?.getWhatsNew(localeList)
+            ?: installedVersion?.getWhatsNew(localeList),
         antiFeatures = installedVersion?.getAntiFeatures(repository, localeList, proxy)
             ?: suggestedVersion?.getAntiFeatures(repository, localeList, proxy)
             ?: (versions?.first()?.version as? AppVersion).getAntiFeatures(

From b5a97911d949cebcf940e5a48469838479da65f7 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 9 Jan 2026 16:08:36 -0300
Subject: [PATCH 172/180] Don't keep retrying sending ACRA reports

we send via email intent. this typically doesn't fail. if it fails, usually because there's no email program installed and then we shouldn't keep trying
---
 app/src/main/kotlin/org/fdroid/App.kt               |  3 +++
 .../kotlin/org/fdroid/ui/crash/NoRetryPolicy.kt     | 13 +++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 app/src/main/kotlin/org/fdroid/ui/crash/NoRetryPolicy.kt

diff --git a/app/src/main/kotlin/org/fdroid/App.kt b/app/src/main/kotlin/org/fdroid/App.kt
index 3647fc7f9..b8e717c88 100644
--- a/app/src/main/kotlin/org/fdroid/App.kt
+++ b/app/src/main/kotlin/org/fdroid/App.kt
@@ -31,6 +31,7 @@ import org.fdroid.download.coil.DownloadRequestFetcher
 import org.fdroid.repo.RepoUpdateWorker
 import org.fdroid.settings.SettingsManager
 import org.fdroid.ui.crash.CrashActivity
+import org.fdroid.ui.crash.NoRetryPolicy
 import org.fdroid.ui.utils.applyNewTheme
 import org.fdroid.updates.AppUpdateWorker
 import javax.inject.Inject
@@ -72,6 +73,8 @@ class App : Application(), Configuration.Provider, SingletonImageLoader.Factory
                 ReportField.STACK_TRACE,
             )
             reportSendFailureToast = getString(R.string.crash_report_error)
+            // either sending via email intent works, or it doesn't, but don't keep trying
+            retryPolicyClass = NoRetryPolicy::class.java
             sendReportsInDevMode = true
             dialog {
                 reportDialogClass = CrashActivity::class.java
diff --git a/app/src/main/kotlin/org/fdroid/ui/crash/NoRetryPolicy.kt b/app/src/main/kotlin/org/fdroid/ui/crash/NoRetryPolicy.kt
new file mode 100644
index 000000000..a79dc1e6c
--- /dev/null
+++ b/app/src/main/kotlin/org/fdroid/ui/crash/NoRetryPolicy.kt
@@ -0,0 +1,13 @@
+package org.fdroid.ui.crash
+
+import org.acra.config.RetryPolicy
+import org.acra.sender.ReportSender
+
+class NoRetryPolicy() : RetryPolicy {
+    override fun shouldRetrySend(
+        senders: List<ReportSender>,
+        failedSenders: List<RetryPolicy.FailedSender>
+    ): Boolean {
+        return false
+    }
+}

From dba20832ee0f9f1bfb7f5e8b98730b2cc8f52ce0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 9 Jan 2026 16:17:44 -0300
Subject: [PATCH 173/180] Use proper Litecoin icon

otherwise it looks strange if Bitcoin and Litecoin use the same icon
---
 .../org/fdroid/ui/details/AppDetails.kt       |  3 +-
 .../kotlin/org/fdroid/ui/icons/Litecoin.kt    | 65 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/kotlin/org/fdroid/ui/icons/Litecoin.kt

diff --git a/app/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
index d34c7cbcf..6577b2ba6 100644
--- a/app/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/details/AppDetails.kt
@@ -66,6 +66,7 @@ import org.fdroid.install.InstallState
 import org.fdroid.ui.FDroidContent
 import org.fdroid.ui.categories.CategoryChip
 import org.fdroid.ui.icons.License
+import org.fdroid.ui.icons.Litecoin
 import org.fdroid.ui.lists.AppListType
 import org.fdroid.ui.navigation.NavigationKey
 import org.fdroid.ui.utils.BigLoadingIndicator
@@ -255,7 +256,7 @@ fun AppDetails(
                 }
                 item.litecoinUri?.let { litecoinUri ->
                     AppDetailsLink(
-                        icon = Icons.Default.CurrencyBitcoin,
+                        icon = Litecoin,
                         title = stringResource(R.string.menu_litecoin),
                         url = litecoinUri,
                         modifier = modifier
diff --git a/app/src/main/kotlin/org/fdroid/ui/icons/Litecoin.kt b/app/src/main/kotlin/org/fdroid/ui/icons/Litecoin.kt
new file mode 100644
index 000000000..ba6945a3a
--- /dev/null
+++ b/app/src/main/kotlin/org/fdroid/ui/icons/Litecoin.kt
@@ -0,0 +1,65 @@
+package org.fdroid.ui.icons
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+
+val Litecoin: ImageVector
+    get() {
+        if (_Litecoin != null) return _Litecoin!!
+
+        _Litecoin = ImageVector.Builder(
+            name = "litecoin",
+            defaultWidth = 24.dp,
+            defaultHeight = 24.dp,
+            viewportWidth = 24f,
+            viewportHeight = 24f
+        ).apply {
+            path(
+                fill = SolidColor(Color(0xFF000000))
+            ) {
+            }
+            path(
+                fill = SolidColor(Color(0xFF000000))
+            ) {
+            }
+            path(
+                fill = SolidColor(Color(0xFF000000))
+            ) {
+                moveTo(12f, 1f)
+                arcTo(11f, 11f, 0f, true, false, 23f, 12f)
+                arcTo(11f, 11f, 0f, false, false, 12f, 1f)
+                close()
+                moveToRelative(0.178277f, 11.361877f)
+                lineToRelative(-1.14417f, 3.860909f)
+                horizontalLineToRelative(6.119981f)
+                arcToRelative(0.31398162f, 0.31398162f, 0f, false, true, 0.300677f, 0.401791f)
+                lineToRelative(-0.532172f, 1.833333f)
+                arcToRelative(0.42041606f, 0.42041606f, 0f, false, true, -0.404451f, 0.303339f)
+                horizontalLineTo(7.170537f)
+                lineTo(8.7510885f, 13.423561f)
+                lineTo(7.0029028f, 13.955733f)
+                lineTo(7.3887276f, 12.707789f)
+                lineTo(9.1395743f, 12.175616f)
+                lineTo(11.358733f, 4.6773101f)
+                arcToRelative(0.4177552f, 0.4177552f, 0f, false, true, 0.401789f, -0.305999f)
+                horizontalLineToRelative(2.368167f)
+                arcToRelative(0.31398162f, 0.31398162f, 0f, false, true, 0.303338f, 0.3991292f)
+                lineTo(12.569424f, 11.111273f)
+                lineTo(14.31761f, 10.5791f)
+                lineTo(13.942429f, 11.848331f)
+                close()
+            }
+            path(
+                fill = SolidColor(Color(0xFF000000))
+            ) {
+            }
+        }.build()
+
+        return _Litecoin!!
+    }
+
+@Suppress("ktlint:standard:backing-property-naming")
+private var _Litecoin: ImageVector? = null

From 88c32b0b0029a3863d8c9fc3221664b8feee7c4d Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 12 Jan 2026 15:31:42 -0300
Subject: [PATCH 174/180] Only show repo errors if the repo is enabled

this allows "ignoring" repo errors by disabling the repo
---
 app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt | 2 +-
 .../main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
index 9939bd249..06bf47298 100644
--- a/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/discover/DiscoverViewModel.kt
@@ -88,7 +88,7 @@ class DiscoverViewModel @Inject constructor(
     }
     private val searchResults = MutableStateFlow<SearchResults?>(null)
     private val hasRepoIssues = repoManager.repositoriesState.map { repos ->
-        repos.any { it.errorCount >= 5 }
+        repos.any { it.enabled && it.errorCount >= 5 }
     }
 
     val localeList = LocaleListCompat.getDefault()
diff --git a/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
index 0f5bdc50b..8ef97db07 100644
--- a/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/repositories/RepositoryItem.kt
@@ -28,5 +28,5 @@ data class RepositoryItem(
         errorCount = repo.errorCount,
     )
 
-    val hasIssue: Boolean = errorCount >= 3
+    val hasIssue: Boolean = enabled && errorCount >= 3
 }

From 46634ce38d7786f7a77138717dd03635044e167f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 12 Jan 2026 15:32:49 -0300
Subject: [PATCH 175/180] Make repo error text selectable

so it can easily get copy and pasted
---
 .../ui/repositories/details/RepoDetailsHeader.kt    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
index 8f5eb6434..1f19c65eb 100644
--- a/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/repositories/details/RepoDetailsHeader.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.WarningAmber
 import androidx.compose.material3.CardDefaults
@@ -113,11 +114,13 @@ fun RepoDetailsHeader(
                 modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
             ) {
                 Icon(Icons.Default.WarningAmber, null)
-                Text(
-                    text = stringResource(R.string.repo_has_update_error_intro) +
-                        "\n\n${repo.lastError}",
-                    style = MaterialTheme.typography.bodyLarge
-                )
+                SelectionContainer {
+                    Text(
+                        text = stringResource(R.string.repo_has_update_error_intro) +
+                            "\n\n${repo.lastError}",
+                        style = MaterialTheme.typography.bodyLarge
+                    )
+                }
             }
         }
         if (repo.enabled) FDroidOutlineButton(

From 189c697e5f761c64867bad38f1d0e39f896bfa85 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 12 Jan 2026 15:40:36 -0300
Subject: [PATCH 176/180] Remove int preferences hack, because library now
 supports Long

---
 .../org/fdroid/settings/SettingsConstants.kt      |  2 +-
 .../kotlin/org/fdroid/settings/SettingsManager.kt | 15 ++++++++-------
 gradle/libs.versions.toml                         |  2 +-
 gradle/verification-metadata.xml                  | 10 ++++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
index a2a8e90f6..bbc7b7730 100644
--- a/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
+++ b/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt
@@ -6,7 +6,7 @@ import org.fdroid.settings.SettingsConstants.AutoUpdateValues
 object SettingsConstants {
 
     const val PREF_KEY_LAST_UPDATE_CHECK = "lastRepoUpdateCheck"
-    const val PREF_DEFAULT_LAST_UPDATE_CHECK = -1
+    const val PREF_DEFAULT_LAST_UPDATE_CHECK = -1L
 
     const val PREF_KEY_THEME = "theme"
     const val PREF_DEFAULT_THEME = "followSystem"
diff --git a/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
index 72ed65f64..571a538d1 100644
--- a/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
+++ b/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import me.zhanghai.compose.preference.createPreferenceFlow
+import me.zhanghai.compose.preference.isDefaultPreferenceFlowLongSupportEnabled
 import mu.KotlinLogging
 import org.fdroid.database.AppListSortOrder
 import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_APP_LIST_SORT_ORDER
@@ -51,7 +52,10 @@ class SettingsManager @Inject constructor(
     /**
      * This is mutable, so the settings UI can make changes to it.
      */
-    val prefsFlow by lazy { createPreferenceFlow(prefs) }
+    val prefsFlow by lazy {
+        isDefaultPreferenceFlowLongSupportEnabled = true
+        createPreferenceFlow(prefs)
+    }
     val theme get() = prefs.getString(PREF_KEY_THEME, PREF_DEFAULT_THEME)!!
     val themeFlow = prefsFlow.map { it.get<String>(PREF_KEY_THEME) }.distinctUntilChanged()
     val dynamicColorFlow: Flow<Boolean> = prefsFlow.map {
@@ -73,15 +77,12 @@ class SettingsManager @Inject constructor(
         }.distinctUntilChanged()
     var lastRepoUpdate: Long
         get() = try {
-            prefs.getInt(PREF_KEY_LAST_UPDATE_CHECK, PREF_DEFAULT_LAST_UPDATE_CHECK)
-                .toLong() * 1000
+            prefs.getLong(PREF_KEY_LAST_UPDATE_CHECK, PREF_DEFAULT_LAST_UPDATE_CHECK)
         } catch (_: Exception) {
-            // TODO remove Int hack, because preferences library crashes on Long
-            //  see: https://github.com/zhanghai/ComposePreference/issues/24
-            PREF_DEFAULT_LAST_UPDATE_CHECK.toLong()
+            PREF_DEFAULT_LAST_UPDATE_CHECK
         }
         set(value) {
-            prefs.edit { putInt(PREF_KEY_LAST_UPDATE_CHECK, (value / 1000).toInt()) }
+            prefs.edit { putLong(PREF_KEY_LAST_UPDATE_CHECK, value) }
             _lastRepoUpdateFlow.update { value }
         }
     private val _lastRepoUpdateFlow = MutableStateFlow(lastRepoUpdate)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3fc86804f..4f6222c5e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ glideCompose = "1.0.0-beta08"
 coilCompose = "3.3.0"
 molecule = "2.2.0"
 hints = "2.0.1"
-composePreference = "2.1.0"
+composePreference = "2.1.1"
 
 androidxCoreKtx = "1.17.0"
 androidxAppcompat = "1.7.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 8b1eca0da..767be1e05 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -15105,6 +15105,11 @@
             <sha256 value="d26876f28ec837d08346824078f50033a26fdef9e567000f64fb665bfddf343f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="me.zhanghai.compose.preference" name="preference-android" version="2.1.1">
+         <artifact name="preference-release.aar">
+            <sha256 value="e6f44e7da2cdc40ee5d05ad9d394d747e157072c00b7775b08759f696ae152c1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="nekohtml" name="nekohtml" version="1.9.6.2">
          <artifact name="nekohtml-1.9.6.2.jar">
             <sha256 value="fdff6cfa9ed9cc911c842a5d2395f209ec621ef1239d46810e9e495809d3ae09" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -16553,6 +16558,11 @@
             <sha256 value="09b37488fba12649563933ae46aecf23c8896bf781e5959f74b081ce1983d733" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.compose.components" name="components-resources-android" version="1.9.3">
+         <artifact name="library-release.aar">
+            <sha256 value="657c40d1dc5ca03dedf324b5b5352423ee10e23d2ceb078e462b6b0f1e1fbab7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.compose.ui" name="ui-backhandler-android" version="1.9.1">
          <artifact name="ui-backhandler-release.aar">
             <sha256 value="8f8f37d0eb33f597608bc20f875021b1d80db6f835c138cd7cef9093c7ad4c24" origin="Generated by Gradle"/>

From e337cf031ea249b4dde5406cbca6161d4696bee6 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 15 Jan 2026 10:40:27 -0300
Subject: [PATCH 177/180] Take signer into account when finding installed
 version in app details

and multiple candidates with the same version code exist
---
 .../org/fdroid/ui/details/DetailsPresenter.kt | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
index f037bcab0..4ff9f91f5 100644
--- a/app/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
@@ -126,14 +126,14 @@ fun DetailsPresenter(
             )
         }
     }
-    val possibleUpdate = remember(versions, appPrefs) {
-        if (versions == null || appPrefs == null) {
+    val possibleUpdate = remember(versions, appPrefs, packageInfo) {
+        if (versions == null || appPrefs == null || packageInfo == null) {
             null
         } else {
             updateChecker.getUpdate(
                 versions = versions,
-                allowedSignersGetter = app.metadata.preferredSigner?.let { { setOf(it) } },
-                allowedReleaseChannels = appPrefs.releaseChannels,
+                packageInfo = packageInfo,
+                releaseChannels = appPrefs.releaseChannels,
                 // ignoring existing preferences to include ignored versions
                 preferencesGetter = null,
             )
@@ -143,7 +143,22 @@ fun DetailsPresenter(
         getLongVersionCode(packageInfo)
     }
     val installedVersion = packageInfo?.let {
-        versions?.find { it.versionCode == installedVersionCode }
+        val installedVersions = versions?.filter { it.versionCode == installedVersionCode }
+        when (installedVersions?.size) {
+            null -> null
+            0 -> null
+            1 -> installedVersions.first()
+            // more than version with the same version code, find a matching signer
+            else -> installedVersions.find {
+                val versionSigners = it.signer?.sha256?.toSet()
+                // F-Droid allows versions without a signer entry, allow those
+                if (versionSigners != null && installedSigner != null) {
+                    versionSigners.intersect(setOf(installedSigner)).isNotEmpty()
+                } else {
+                    true
+                }
+            }
+        }
     }
     val authorName = app.authorName
     val authorHasMoreThanOneApp = if (authorName == null) false else {

From 7dfe86eea51a16cb86d435c2766a226ef6cda237 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 15 Jan 2026 18:02:31 -0300
Subject: [PATCH 178/180] Improve behavior of updating our own app last

Now our own app will show as in progress of getting updated. No more 'Update all' button will be shown after it has been pressed already.
---
 .../org/fdroid/install/AppInstallManager.kt     | 17 +++++++++++++++--
 .../kotlin/org/fdroid/install/InstallState.kt   | 14 ++++++++++++++
 .../org/fdroid/ui/details/AppDetailsHeader.kt   |  1 +
 .../kotlin/org/fdroid/updates/UpdatesManager.kt | 16 +++++++++++++++-
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/org/fdroid/install/AppInstallManager.kt b/app/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
index 2f760d9f6..f301d749d 100644
--- a/app/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
+++ b/app/src/main/kotlin/org/fdroid/install/AppInstallManager.kt
@@ -67,7 +67,7 @@ class AppInstallManager @Inject constructor(
                 // assign a category to each in progress state
                 val appStateCategory = when (state) {
                     is InstallState.Installing, is InstallState.PreApproved,
-                    is InstallState.Starting -> AppStateCategory.INSTALLING
+                    is InstallState.Waiting, is InstallState.Starting -> AppStateCategory.INSTALLING
                     is InstallState.Downloading -> {
                         numBytesDownloaded += state.downloadedBytes
                         numTotalBytes += state.totalBytes
@@ -123,7 +123,7 @@ class AppInstallManager @Inject constructor(
     ): InstallState {
         val packageName = appMetadata.packageName
         val currentState = apps.value[packageName]
-        if (currentState?.showProgress == true) {
+        if (currentState?.showProgress == true && currentState !is InstallState.Waiting) {
             log.warn { "Attempted to install $packageName with install in progress: $currentState" }
             return currentState
         }
@@ -159,6 +159,19 @@ class AppInstallManager @Inject constructor(
         return result
     }
 
+    fun setWaitingState(
+        packageName: String,
+        name: String,
+        versionName: String,
+        currentVersionName: String,
+        lastUpdated: Long,
+    ) {
+        apps.updateApp(packageName) {
+            InstallState.Waiting(name, versionName, currentVersionName, lastUpdated)
+        }
+        onStatesUpdated()
+    }
+
     @WorkerThread
     private suspend fun startInstall(
         appMetadata: AppMetadata,
diff --git a/app/src/main/kotlin/org/fdroid/install/InstallState.kt b/app/src/main/kotlin/org/fdroid/install/InstallState.kt
index fda917fad..de4f9dc5a 100644
--- a/app/src/main/kotlin/org/fdroid/install/InstallState.kt
+++ b/app/src/main/kotlin/org/fdroid/install/InstallState.kt
@@ -7,6 +7,20 @@ import org.fdroid.download.DownloadRequest
 
 sealed class InstallState(val showProgress: Boolean) {
     data object Unknown : InstallState(false)
+
+    /**
+     * Used for our own app which will be updated last,
+     * so this is waiting for all other updates to complete.
+     */
+    data class Waiting(
+        override val name: String,
+        override val versionName: String,
+        override val currentVersionName: String? = null,
+        override val lastUpdated: Long,
+    ) : InstallStateWithInfo(true) {
+        override val iconDownloadRequest: DownloadRequest? = null
+    }
+
     data class Starting(
         override val name: String,
         override val versionName: String,
diff --git a/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
index 5bb38441f..227d7e6af 100644
--- a/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
+++ b/app/src/main/kotlin/org/fdroid/ui/details/AppDetailsHeader.kt
@@ -226,6 +226,7 @@ fun AppDetailsHeader(
         ) {
             Column {
                 val strRes = when (item.installState) {
+                    is InstallState.Waiting -> R.string.status_install_preparing
                     is InstallState.Starting -> R.string.status_install_preparing
                     is InstallState.PreApproved -> R.string.status_install_preparing
                     is InstallState.Downloading -> R.string.downloading
diff --git a/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt b/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
index 50f4622bc..9b69d8620 100644
--- a/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
+++ b/app/src/main/kotlin/org/fdroid/updates/UpdatesManager.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import mu.KotlinLogging
+import org.fdroid.LocaleChooser.getBestLocale
 import org.fdroid.NotificationManager
 import org.fdroid.database.AppVersion
 import org.fdroid.database.AvailableAppWithIssue
@@ -171,7 +172,20 @@ class UpdatesManager @Inject constructor(
         val updateLast = appsToUpdate.find { it.packageName == context.packageName }
         appsToUpdate.mapNotNull { update ->
             // don't update our own app just yet
-            if (update.packageName == context.packageName) return@mapNotNull null
+            if (update.packageName == context.packageName) {
+                // set app to update last to Starting as well, so it doesn't seem stuck
+                val app = db.getAppDao().getApp(update.repoId, update.packageName)
+                    ?: return@mapNotNull null
+                appInstallManager.setWaitingState(
+                    packageName = update.packageName,
+                    name = app.metadata.name.getBestLocale(LocaleListCompat.getDefault())
+                        ?: "Unknown",
+                    versionName = update.update.versionName,
+                    currentVersionName = update.installedVersionName,
+                    lastUpdated = update.update.added,
+                )
+                return@mapNotNull null
+            }
             currentCoroutineContext().ensureActive()
             // launch a new co-routine for each app to update
             coroutineScope.launch {

From b55babcdce5ec4c879447ac5c6a221d2eb04026a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 20 Jan 2026 10:13:21 -0300
Subject: [PATCH 179/180] Move new strings into a separate file

so they are not exposed to translators until they've undergone review
---
 app/src/main/res/values/new-strings.xml | 179 +++++++++++++++++++++++
 app/src/main/res/values/strings.xml     | 180 ------------------------
 2 files changed, 179 insertions(+), 180 deletions(-)
 create mode 100644 app/src/main/res/values/new-strings.xml

diff --git a/app/src/main/res/values/new-strings.xml b/app/src/main/res/values/new-strings.xml
new file mode 100644
index 000000000..1e99908b0
--- /dev/null
+++ b/app/src/main/res/values/new-strings.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--
+    New strings to be added to strings.xml once reviewed
+     -->
+
+    <string name="about_text">F-Droid distributes (Free and Open Source Software) apps for Android. All apps in its official app repository are built from their source code to ensure that they are completely transparent and only include Free Software.\n\nThis app makes it easy to browse and install apps from F-Droid or other repositories. It also helps you to keep your apps up to date.\n\nF-Droid is a non-profit volunteer project. Although every effort is made to ensure all apps are safe to install, you use it AT YOUR OWN RISK. The app’s source code is automatically checked for potential security or privacy issues. However, this is far from exhaustive and there are no guarantees.\n\nF-Droid respects your privacy. We don’t track you, or your device. We don’t track what you install. You don’t need an account to use this app, and it sends no additional identifying data when communicating with repositories, other than its version number.</string>
+    <string name="about_license_text">This program is Free Software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
+
+    <string name="menu_about">About</string>
+    <string name="menu_discover">Discover</string>
+    <string name="menu_apps_my">My apps</string>
+
+    <string name="first_start_loading">Retrieving apps…\n\nThis may take some time.</string>
+    <string name="first_start_intro">We need to download the latest app repository to get you started.</string>
+    <string name="first_start_offline">However, you seem to be offline. Connect to the internet and tap the button below when ready.</string>
+    <string name="first_start_metered">However, you are on mobile data and we\'ll need to download more than 10 MB. Tap the button below when ready to download.</string>
+    <string name="first_start_button">Download app repository</string>
+    <string name="no_repos_enabled">No repositories enabled.\nEnable or add at least one repository to see apps.</string>
+
+    <string name="my_apps_empty">No apps installed.\n\nInstall apps and they will appear here.</string>
+    <string name="my_apps_header_apps_with_issue">Apps with issues</string>
+    <string name="my_apps_ignore_dialog_title">Hide app issue</string>
+    <string name="my_apps_ignore_dialog_text">Do you want to hide the issue with the app \"%1$s\"?</string>
+    <string name="my_apps_ignore_dialog_button">Hide</string>
+
+    <string name="app_list_new">New apps</string>
+    <string name="app_list_recently_updated">Recently updated</string>
+    <string name="app_list_most_downloaded">Most downloaded</string>
+    <string name="app_list_all">All apps</string>
+    <string name="app_list_author">Apps by %s</string>
+
+    <string name="search_placeholder">Search…</string>
+    <string name="search_no_results">No apps found.\n\nTry to use less search terms or add/enable more repositories.</string>
+    <string name="search_filter_no_results">No matching apps.\n\nTry to use less search terms or remove filters.</string>
+    <string name="search_my_apps_no_results">No matching apps.\n\nTry to use less search terms.</string>
+    <string name="sort_title">Sorting and compatibility</string>
+    <string name="sort_by_name">Sort by name</string>
+    <string name="sort_by_latest">Sort by latest</string>
+    <string name="filter_only_compatible">Apps compatible with this device</string>
+    <string name="filter_button_save">Save above as default</string>
+    <string name="filter_button_clear_all">Clear all filters</string>
+    <!-- Used for filtering lists of apps by certain criteria -->
+    <string name="filter">Filter</string>
+    <!-- Used for filter chips (e.g. categories) when they are currently selected -->
+    <string name="filter_selected">selected</string>
+    <string name="category">Category</string>
+
+    <string name="dialog_metered_title">Continue with mobile data?</string>
+    <!-- The placeholder will be replaced with a size string such as "13 MB" -->
+    <string name="dialog_metered_text">You are currently on a metered internet connection. Do you want to continue downloading %1$s?</string>
+    <string name="dialog_metered_text_no_size">You are currently on a metered internet connection. Do you want to continue downloading?</string>
+    <string name="dialog_metered_button">Download</string>
+    <string name="screenshots_metered">Tap to load screenshots via mobile data</string>
+
+    <string name="category_group_productivity">Productivity</string>
+    <string name="category_group_tools">Tools</string>
+    <string name="category_group_wallets">Finances &amp; Wallets</string>
+    <string name="category_group_media">Entertainment &amp; Media</string>
+    <string name="category_group_communication">Communication</string>
+    <string name="category_group_device">Device</string>
+    <string name="category_group_network">Network</string>
+    <string name="category_group_storage">Files &amp; Storage</string>
+    <string name="category_group_interests">Interests</string>
+    <string name="category_group_misc">Miscellaneous</string>
+
+    <string name="author_by">By %1$s</string>
+    <string name="last_updated">Last updated: %1$s</string>
+    <!-- The placeholder in round brackets will be replaced with the size of the app -->
+    <string name="last_updated_with_size">Last updated: %1$s (%2$s)</string>
+    <string name="status_install_preparing">Preparing installation…</string>
+    <string name="whats_new_title">What\'s new</string>
+    <string name="donate_title">Donate</string>
+    <string name="anti_features_title">This app has anti-features</string>
+    <string name="developer_contact">Developer contact</string>
+    <string name="technical_info">Technical information</string>
+    <string name="package_name">Package Name:</string>
+    <string name="installed_version">Installed Version:</string>
+    <string name="copy_link">Copy link</string>
+    <string name="app_no_compatible_versions">This app is not compatible with your device.</string>
+    <string name="app_no_compatible_signer">Can not update this app, because all versions have an incompatible signature.\n\nIf you don\'t receive updates through other means, you may need to uninstall and then reinstall this app. The app\'s data will be lost.</string>
+    <string name="app_no_compatible_signer_in_this_repo">Can not update this app, because there are no compatible versions in the preferred repository.\n\nTry changing the preferred repository.</string>
+    <string name="app_no_auto_update">Auto-update not available, because app targets old version of Android.</string>
+    <string name="app_issue_update_other_repo">An update is available in another repository, but will not get installed, because that repository is not preferred.</string>
+    <string name="app_issue_not_available_title">No longer available</string>
+    <string name="app_issue_not_available_text">This app is not receiving updates, because it is no longer in any enabled repository.\n\nIt may have been in a repository you removed or disabled. Or it was simply removed.</string>
+    <string name="app_issue_not_available_button">Show app info</string>
+    <string name="added_x_ago">Added %1$s</string>
+    <string name="size_colon">Size: %1$s</string>
+    <string name="sdk_versions_colon">SDK versions: %1$s</string>
+    <!-- The minimum SDK version the app can be installed on, e.g. only Android 10 or higher -->
+    <string name="sdk_min_version">%1$s (Min)</string>
+    <!-- The target SDK version of the app -->
+    <string name="sdk_target_version">%1$s (Target)</string>
+    <!-- The maximum SDK version the app can be installed on, e.g. only Android 10 or lower -->
+    <string name="sdk_max_version">%1$s (Max)</string>
+    <string name="signer_colon">Signer: %1$s</string>
+    <string name="architectures_colon">Architectures: %1$s</string>
+    <string name="app_details_incompatible_version">Incompatible • Installation likely to fail</string>
+    <string name="app_details_incompatible_signer">Signature mismatch, can\'t install</string>
+    <string name="app_details_install_error_text">Sorry! There was an unexpected error installing this app.</string>
+
+    <string name="notification_title">Notifications</string>
+    <string name="notification_summary">Opens system notification settings</string>
+    <string name="notification_channel_install_success_title">Automatically installed apps</string>
+    <string name="notification_channel_install_success_description">Displays a notification after apps were installed automatically.</string>
+    <string name="notification_channel_updates_available_title">Available app updates</string>
+    <string name="notification_channel_updates_available_description">Displays a notification after repositories were updated and app updates were found.</string>
+
+    <string name="notification_repo_update_default">Connecting to %1$s…</string>
+    <string name="notification_repo_update_downloading">Downloaded %1$s from %2$s</string>
+    <plurals name="notification_repo_update_saving">
+        <item quantity="one">Saved %1$d app from %2$s</item>
+        <item quantity="other">Saved %1$d apps from %2$s</item>
+    </plurals>
+    <plurals name="notification_installing_title">
+        <item quantity="one">Installing %1$d app…</item>
+        <item quantity="other">Installing %1$d apps…</item>
+    </plurals>
+    <plurals name="notification_updating_title">
+        <item quantity="one">Updating %1$d app…</item>
+        <item quantity="other">Updating %1$d apps…</item>
+    </plurals>
+    <plurals name="notification_update_success_title">
+        <item quantity="one">%1$d app updated</item>
+        <item quantity="other">%1$d apps updated</item>
+    </plurals>
+    <string name="notification_installing_section_installing">Installing:</string>
+    <string name="notification_installing_section_confirmation">Needs user confirmation:</string>
+    <string name="notification_installing_section_installed">Installed:</string>
+    <string name="notification_installing_confirmation">Tap to confirm.</string>
+
+    <string name="onboarding_app_list_filter_title">Filter</string>
+    <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
+    <string name="got_it">Got it</string>
+    <string name="clear">Clear</string>
+    <string name="error">Error</string>
+    <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
+    <string name="repo_has_update_error">Had errors updating</string>
+    <string name="repo_has_update_error_intro">An error occurred while trying to update this repository:</string>
+    <string name="repo_last_update_upstream">Published %s</string>
+    <string name="repo_last_downloaded">Downloaded %s</string>
+    <string name="repo_basicauth_username">Username</string>
+    <string name="repo_basicauth_password">Password</string>
+    <string name="repo_basicauth_edit">Save Changes</string>
+    <string name="repo_force_update">Check for updates</string>
+
+    <string name="pref_dyn_colors_title">Use system colors</string>
+    <string name="pref_dyn_colors_summary">Apply dynamic colors from your system settings</string>
+    <string name="pref_language_summary">Opens system language settings</string>
+    <string name="pref_auto_updates_only_wifi">Only on WiFi</string>
+    <string name="pref_auto_updates_only_always">Always (even on mobile data)</string>
+    <string name="pref_auto_updates_only_never">Never</string>
+    <string name="pref_auto_updates_summary_only_wifi">Download and update apps daily when on WiFi and the device isn\'t being used.</string>
+    <string name="pref_auto_updates_summary_always">Download and update apps daily even on mobile data when the device isn\'t being used.</string>
+    <string name="pref_auto_updates_summary_never">Auto-updates disabled • Apps will need to be updated manually</string>
+    <string name="pref_repo_updates_title">Check for updates</string>
+    <string name="pref_repo_updates_summary_only_wifi">Periodically ask all repositories for app updates, but only when on WiFi.</string>
+    <string name="pref_repo_updates_summary_always">Periodically ask all repositories for app updates even when on mobile data.</string>
+    <string name="pref_repo_updates_summary_never">Do NOT check for updates • Apps will become outdated</string>
+    <string name="pref_category_network">Network</string>
+    <string name="pref_proxy_title">Connect via SOCKS proxy</string>
+    <string name="pref_proxy_disabled">Connect to the internet without proxy</string>
+    <string name="pref_proxy_enabled">Uses proxy %s to connect</string>
+    <string name="pref_proxy_hint">Proxy is expected in host:port format.</string>
+    <string name="pref_proxy_error">Proxy format invalid</string>
+
+    <string name="crash_report_text">An unexpected error occurred.
+        This is not your fault.
+        Would you like to e-mail the details to help us fix the issue?
+    </string>
+    <string name="crash_report_comment_hint">Tell us what happened right before the crash</string>
+    <string name="crash_report_button_send">Send report</string>
+    <string name="crash_report_error">Could not send report. No email program found :(</string>
+    <string name="crash_report_save">Save crash report as file</string>
+    <string name="crash_report_saved">Saved report to file</string>
+    <string name="crash_report_error_saving">Error saving crash report to file</string>
+
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95228df75..dced9a1da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -816,184 +816,4 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="expand">Expand</string>
     <string name="collapse">Collapse</string>
 
-
-    <!--
-
-    New strings to be merged into the above ones as soon as old code and usages were removed
-
-     -->
-
-
-    <string name="about_text">F-Droid distributes (Free and Open Source Software) apps for Android. All apps in its official app repository are built from their source code to ensure that they are completely transparent and only include Free Software.\n\nThis app makes it easy to browse and install apps from F-Droid or other repositories. It also helps you to keep your apps up to date.\n\nF-Droid is a non-profit volunteer project. Although every effort is made to ensure all apps are safe to install, you use it AT YOUR OWN RISK. The app’s source code is automatically checked for potential security or privacy issues. However, this is far from exhaustive and there are no guarantees.\n\nF-Droid respects your privacy. We don’t track you, or your device. We don’t track what you install. You don’t need an account to use this app, and it sends no additional identifying data when communicating with repositories, other than its version number.</string>
-    <string name="about_license_text">This program is Free Software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
-
-    <string name="menu_about">About</string>
-    <string name="menu_discover">Discover</string>
-    <string name="menu_apps_my">My apps</string>
-
-    <string name="first_start_loading">Retrieving apps…\n\nThis may take some time.</string>
-    <string name="first_start_intro">We need to download the latest app repository to get you started.</string>
-    <string name="first_start_offline">However, you seem to be offline. Connect to the internet and tap the button below when ready.</string>
-    <string name="first_start_metered">However, you are on mobile data and we\'ll need to download more than 10 MB. Tap the button below when ready to download.</string>
-    <string name="first_start_button">Download app repository</string>
-    <string name="no_repos_enabled">No repositories enabled.\nEnable or add at least one repository to see apps.</string>
-
-    <string name="my_apps_empty">No apps installed.\n\nInstall apps and they will appear here.</string>
-    <string name="my_apps_header_apps_with_issue">Apps with issues</string>
-    <string name="my_apps_ignore_dialog_title">Hide app issue</string>
-    <string name="my_apps_ignore_dialog_text">Do you want to hide the issue with the app \"%1$s\"?</string>
-    <string name="my_apps_ignore_dialog_button">Hide</string>
-
-    <string name="app_list_new">New apps</string>
-    <string name="app_list_recently_updated">Recently updated</string>
-    <string name="app_list_most_downloaded">Most downloaded</string>
-    <string name="app_list_all">All apps</string>
-    <string name="app_list_author">Apps by %s</string>
-
-    <string name="search_placeholder">Search…</string>
-    <string name="search_no_results">No apps found.\n\nTry to use less search terms or add/enable more repositories.</string>
-    <string name="search_filter_no_results">No matching apps.\n\nTry to use less search terms or remove filters.</string>
-    <string name="search_my_apps_no_results">No matching apps.\n\nTry to use less search terms.</string>
-    <string name="sort_title">Sorting and compatibility</string>
-    <string name="sort_by_name">Sort by name</string>
-    <string name="sort_by_latest">Sort by latest</string>
-    <string name="filter_only_compatible">Apps compatible with this device</string>
-    <string name="filter_button_save">Save above as default</string>
-    <string name="filter_button_clear_all">Clear all filters</string>
-    <!-- Used for filtering lists of apps by certain criteria -->
-    <string name="filter">Filter</string>
-    <!-- Used for filter chips (e.g. categories) when they are currently selected -->
-    <string name="filter_selected">selected</string>
-    <string name="category">Category</string>
-
-    <string name="dialog_metered_title">Continue with mobile data?</string>
-    <!-- The placeholder will be replaced with a size string such as "13 MB" -->
-    <string name="dialog_metered_text">You are currently on a metered internet connection. Do you want to continue downloading %1$s?</string>
-    <string name="dialog_metered_text_no_size">You are currently on a metered internet connection. Do you want to continue downloading?</string>
-    <string name="dialog_metered_button">Download</string>
-    <string name="screenshots_metered">Tap to load screenshots via mobile data</string>
-
-    <string name="category_group_productivity">Productivity</string>
-    <string name="category_group_tools">Tools</string>
-    <string name="category_group_wallets">Finances &amp; Wallets</string>
-    <string name="category_group_media">Entertainment &amp; Media</string>
-    <string name="category_group_communication">Communication</string>
-    <string name="category_group_device">Device</string>
-    <string name="category_group_network">Network</string>
-    <string name="category_group_storage">Files &amp; Storage</string>
-    <string name="category_group_interests">Interests</string>
-    <string name="category_group_misc">Miscellaneous</string>
-
-    <string name="author_by">By %1$s</string>
-    <string name="last_updated">Last updated: %1$s</string>
-    <!-- The placeholder in round brackets will be replaced with the size of the app -->
-    <string name="last_updated_with_size">Last updated: %1$s (%2$s)</string>
-    <string name="status_install_preparing">Preparing installation…</string>
-    <string name="whats_new_title">What\'s new</string>
-    <string name="donate_title">Donate</string>
-    <string name="anti_features_title">This app has anti-features</string>
-    <string name="developer_contact">Developer contact</string>
-    <string name="technical_info">Technical information</string>
-    <string name="package_name">Package Name:</string>
-    <string name="installed_version">Installed Version:</string>
-    <string name="copy_link">Copy link</string>
-    <string name="app_no_compatible_versions">This app is not compatible with your device.</string>
-    <string name="app_no_compatible_signer">Can not update this app, because all versions have an incompatible signature.\n\nIf you don\'t receive updates through other means, you may need to uninstall and then reinstall this app. The app\'s data will be lost.</string>
-    <string name="app_no_compatible_signer_in_this_repo">Can not update this app, because there are no compatible versions in the preferred repository.\n\nTry changing the preferred repository.</string>
-    <string name="app_no_auto_update">Auto-update not available, because app targets old version of Android.</string>
-    <string name="app_issue_update_other_repo">An update is available in another repository, but will not get installed, because that repository is not preferred.</string>
-    <string name="app_issue_not_available_title">No longer available</string>
-    <string name="app_issue_not_available_text">This app is not receiving updates, because it is no longer in any enabled repository.\n\nIt may have been in a repository you removed or disabled. Or it was simply removed.</string>
-    <string name="app_issue_not_available_button">Show app info</string>
-    <string name="added_x_ago">Added %1$s</string>
-    <string name="size_colon">Size: %1$s</string>
-    <string name="sdk_versions_colon">SDK versions: %1$s</string>
-    <!-- The minimum SDK version the app can be installed on, e.g. only Android 10 or higher -->
-    <string name="sdk_min_version">%1$s (Min)</string>
-    <!-- The target SDK version of the app -->
-    <string name="sdk_target_version">%1$s (Target)</string>
-    <!-- The maximum SDK version the app can be installed on, e.g. only Android 10 or lower -->
-    <string name="sdk_max_version">%1$s (Max)</string>
-    <string name="signer_colon">Signer: %1$s</string>
-    <string name="architectures_colon">Architectures: %1$s</string>
-    <string name="app_details_incompatible_version">Incompatible • Installation likely to fail</string>
-    <string name="app_details_incompatible_signer">Signature mismatch, can\'t install</string>
-    <string name="app_details_install_error_text">Sorry! There was an unexpected error installing this app.</string>
-
-    <string name="notification_title">Notifications</string>
-    <string name="notification_summary">Opens system notification settings</string>
-    <string name="notification_channel_install_success_title">Automatically installed apps</string>
-    <string name="notification_channel_install_success_description">Displays a notification after apps were installed automatically.</string>
-    <string name="notification_channel_updates_available_title">Available app updates</string>
-    <string name="notification_channel_updates_available_description">Displays a notification after repositories were updated and app updates were found.</string>
-
-    <string name="notification_repo_update_default">Connecting to %1$s…</string>
-    <string name="notification_repo_update_downloading">Downloaded %1$s from %2$s</string>
-    <plurals name="notification_repo_update_saving">
-        <item quantity="one">Saved %1$d app from %2$s</item>
-        <item quantity="other">Saved %1$d apps from %2$s</item>
-    </plurals>
-    <plurals name="notification_installing_title">
-        <item quantity="one">Installing %1$d app…</item>
-        <item quantity="other">Installing %1$d apps…</item>
-    </plurals>
-    <plurals name="notification_updating_title">
-        <item quantity="one">Updating %1$d app…</item>
-        <item quantity="other">Updating %1$d apps…</item>
-    </plurals>
-    <plurals name="notification_update_success_title">
-        <item quantity="one">%1$d app updated</item>
-        <item quantity="other">%1$d apps updated</item>
-    </plurals>
-    <string name="notification_installing_section_installing">Installing:</string>
-    <string name="notification_installing_section_confirmation">Needs user confirmation:</string>
-    <string name="notification_installing_section_installed">Installed:</string>
-    <string name="notification_installing_confirmation">Tap to confirm.</string>
-
-    <string name="onboarding_app_list_filter_title">Filter</string>
-    <string name="onboarding_app_list_filter_message">Here you can apply filters to the list of apps, e.g. showing only apps within a certain category or repository. Changing the sort order is also possible.</string>
-    <string name="got_it">Got it</string>
-    <string name="clear">Clear</string>
-    <string name="error">Error</string>
-    <string name="permission_camera_denied">Scanning the QR code can only work if you grant camera permission. Tap to grant it in settings.</string>
-    <string name="repo_has_update_error">Had errors updating</string>
-    <string name="repo_has_update_error_intro">An error occurred while trying to update this repository:</string>
-    <string name="repo_last_update_upstream">Published %s</string>
-    <string name="repo_last_downloaded">Downloaded %s</string>
-    <string name="repo_basicauth_username">Username</string>
-    <string name="repo_basicauth_password">Password</string>
-    <string name="repo_basicauth_edit">Save Changes</string>
-    <string name="repo_force_update">Check for updates</string>
-
-    <string name="pref_dyn_colors_title">Use system colors</string>
-    <string name="pref_dyn_colors_summary">Apply dynamic colors from your system settings</string>
-    <string name="pref_language_summary">Opens system language settings</string>
-    <string name="pref_auto_updates_only_wifi">Only on WiFi</string>
-    <string name="pref_auto_updates_only_always">Always (even on mobile data)</string>
-    <string name="pref_auto_updates_only_never">Never</string>
-    <string name="pref_auto_updates_summary_only_wifi">Download and update apps daily when on WiFi and the device isn\'t being used.</string>
-    <string name="pref_auto_updates_summary_always">Download and update apps daily even on mobile data when the device isn\'t being used.</string>
-    <string name="pref_auto_updates_summary_never">Auto-updates disabled • Apps will need to be updated manually</string>
-    <string name="pref_repo_updates_title">Check for updates</string>
-    <string name="pref_repo_updates_summary_only_wifi">Periodically ask all repositories for app updates, but only when on WiFi.</string>
-    <string name="pref_repo_updates_summary_always">Periodically ask all repositories for app updates even when on mobile data.</string>
-    <string name="pref_repo_updates_summary_never">Do NOT check for updates • Apps will become outdated</string>
-    <string name="pref_category_network">Network</string>
-    <string name="pref_proxy_title">Connect via SOCKS proxy</string>
-    <string name="pref_proxy_disabled">Connect to the internet without proxy</string>
-    <string name="pref_proxy_enabled">Uses proxy %s to connect</string>
-    <string name="pref_proxy_hint">Proxy is expected in host:port format.</string>
-    <string name="pref_proxy_error">Proxy format invalid</string>
-
-    <string name="crash_report_text">An unexpected error occurred.
-        This is not your fault.
-        Would you like to e-mail the details to help us fix the issue?
-    </string>
-    <string name="crash_report_comment_hint">Tell us what happened right before the crash</string>
-    <string name="crash_report_button_send">Send report</string>
-    <string name="crash_report_error">Could not send report. No email program found :(</string>
-    <string name="crash_report_save">Save crash report as file</string>
-    <string name="crash_report_saved">Saved report to file</string>
-    <string name="crash_report_error_saving">Error saving crash report to file</string>
-
 </resources>

From f0c039cecca8ca28fd91110fdee4056de0026f1b Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 21 Jan 2026 10:09:10 +0100
Subject: [PATCH 180/180] remove all diffs in
 app/src/main/res/values/strings.xml

This should avoid any potential merge/rebase conflicts
---
 app/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dced9a1da..3d03c6bf7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -815,5 +815,4 @@ This often occurs with apps installed via Google Play or other sources, if they
 
     <string name="expand">Expand</string>
     <string name="collapse">Collapse</string>
-
 </resources>