From b7206c8abe1c5d0911028debd5166bf8cc6aa45b Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 7 Mar 2023 17:20:09 -0300
Subject: [PATCH] [app] Bring categories back to basic app

---
 .../fdroid/fdroid/views/main/MainViewController.java  |  5 ++++-
 .../fdroid/views/main/CategoriesViewBinder.java       |  1 -
 .../{full => main}/res/layout/main_tab_categories.xml |  0
 app/src/main/res/menu/main_activity_screens.xml       | 11 +++++++++--
 4 files changed, 13 insertions(+), 4 deletions(-)
 rename app/src/{full => main}/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java (99%)
 rename app/src/{full => main}/res/layout/main_tab_categories.xml (100%)

diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java
index d7ec5fda3..cdfefe870 100644
--- a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java
+++ b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java
@@ -72,8 +72,11 @@ class MainViewController extends RecyclerView.ViewHolder {
         }
     }
 
+    /**
+     * @see CategoriesViewBinder
+     */
     public void bindCategoriesView() {
-        throw new IllegalStateException("unimplemented");
+        new CategoriesViewBinder(activity, frame);
     }
 
     public void bindSwapView() {
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
rename to app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
index d6797dfb5..c1d1d5c08 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
@@ -9,7 +9,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import org.fdroid.database.Category;
 import org.fdroid.database.FDroidDatabase;
-import org.fdroid.database.FDroidDatabaseHolder;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.UpdateService;
diff --git a/app/src/full/res/layout/main_tab_categories.xml b/app/src/main/res/layout/main_tab_categories.xml
similarity index 100%
rename from app/src/full/res/layout/main_tab_categories.xml
rename to app/src/main/res/layout/main_tab_categories.xml
diff --git a/app/src/main/res/menu/main_activity_screens.xml b/app/src/main/res/menu/main_activity_screens.xml
index 3e8dcd708..c03364f8b 100644
--- a/app/src/main/res/menu/main_activity_screens.xml
+++ b/app/src/main/res/menu/main_activity_screens.xml
@@ -10,18 +10,25 @@
         android:orderInCategory="0"
         android:title="@string/main_menu__latest_apps"
         app:showAsAction="ifRoom|withText" />
+    <item
+        android:id="@+id/categories"
+        android:enabled="true"
+        android:icon="@drawable/ic_categories"
+        android:orderInCategory="1"
+        android:title="@string/main_menu__categories"
+        app:showAsAction="ifRoom|withText" />
     <item
         android:id="@+id/updates"
         android:enabled="true"
         android:icon="@drawable/ic_updates"
-        android:orderInCategory="1"
+        android:orderInCategory="2"
         android:title="@string/main_menu__updates"
         app:showAsAction="ifRoom|withText" />
     <item
         android:id="@+id/settings"
         android:enabled="true"
         android:icon="@drawable/ic_settings"
-        android:orderInCategory="2"
+        android:orderInCategory="3"
         android:title="@string/menu_settings"
         app:showAsAction="ifRoom|withText" />
 </menu>
\ No newline at end of file