Redesign discover screen

removes category groups and uses featured categories instead

app/src/androidTest/java/org/fdroid/ui/screenshots/DiscoverScreenshotTest.kt

@@ -1,5 +1,6 @@
 package org.fdroid.ui.screenshots
 
+import java.text.Collator
 import org.fdroid.ui.discover.Discover
 import org.fdroid.ui.discover.LoadedDiscoverModel
 import org.junit.Test
@@ -16,12 +17,16 @@ class DiscoverScreenshotTest(localeName: String) : LocalizedScreenshotTest(local
   @Test
   fun appDetails() =
     screenshotTest("1_Discover") { localeList ->
+      val collator = Collator.getInstance(localeList.get(0))
       val model =
         LoadedDiscoverModel(
           newApps = getNewApps(localeList),
           recentlyUpdatedApps = getRecentlyUpdatedApps(localeList),
           mostDownloadedApps = getMostDownloadedApps(localeList),
-          categories = getCategoryItems(localeList).groupBy { it.group },
+          categories =
+            getCategoryItems(localeList).filter { it.featured }.sortedWith { c1, c2 ->
+              collator.compare(c1.name, c2.name)
+            },
           hasRepoIssues = false,
         )
       Discover(discoverModel = model, onListTap = {}, onAppTap = {}, onNav = {})