From af7b94ff4c58788261b5f6a4c626aae227e104e2 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 31 Jul 2018 14:15:17 +0200
Subject: [PATCH] add Latest view to basic flavor

This is a quick hack to reuse the Latest view with a slightly simpler
layout.  It makes the "basic" flavor fully functional as an fdroid client.
The goal here is just to have something simpler with as little new code as
possible.  It is essential that the whitelabeling and "Light" aka "basic"
flavor does not increase the maintenance load.

closes fdroid/fdroidclient#48
fdroid/fdroidclient!692
fdroid/fdroidclient!695
---
 .../fdroid/fdroid/views/hiding/HidingManager.java    |  5 +++++
 .../fdroid/fdroid/views/main/MainViewController.java |  5 ++++-
 app/src/basic/res/menu/main_activity_screens.xml     |  5 +++++
 .../org/fdroid/fdroid/views/main/MainActivity.java   |  3 ++-
 .../fdroid/fdroid/views/main/WhatsNewViewBinder.java |  0
 .../fdroid/views/whatsnew/WhatsNewAdapter.java       | 12 +++++++++++-
 .../{full => main}/res/layout/main_tab_whats_new.xml |  0
 7 files changed, 27 insertions(+), 3 deletions(-)
 rename app/src/{full => main}/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java (100%)
 rename app/src/{full => main}/res/layout/main_tab_whats_new.xml (100%)

diff --git a/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java b/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java
index 6a574e0fb..02387a5a8 100644
--- a/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java
+++ b/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java
@@ -29,4 +29,9 @@ public class HidingManager {
     public static boolean isHidden(Context context) {
         return false;
     }
+
+    public static void showHideDialog(final Context context) {
+        throw new IllegalStateException("unimplemented");
+    }
+
 }
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 ba85cd1dc..d2f2ae9c8 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
@@ -48,8 +48,11 @@ class MainViewController extends RecyclerView.ViewHolder {
         this.frame = frame;
     }
 
+    /**
+     * @see WhatsNewViewBinder
+     */
     public void bindWhatsNewView() {
-        throw new IllegalStateException("unimplemented");
+        new WhatsNewViewBinder(activity, frame);
     }
 
     /**
diff --git a/app/src/basic/res/menu/main_activity_screens.xml b/app/src/basic/res/menu/main_activity_screens.xml
index 4785bd5c0..b4a139661 100644
--- a/app/src/basic/res/menu/main_activity_screens.xml
+++ b/app/src/basic/res/menu/main_activity_screens.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:title="@string/main_menu__latest_apps"
+        android:icon="@drawable/ic_latest"
+        app:showAsAction="ifRoom|withText"
+        android:id="@+id/whats_new" />
     <item
         android:title="@string/updates"
         android:icon="@drawable/ic_updates"
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index 888dd0aec..b9f679eb5 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -115,9 +115,10 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB
         updatesBadge = new TextBadgeItem().hide(false);
 
         bottomNavigation = (BottomNavigationBar) findViewById(R.id.bottom_navigation);
+        bottomNavigation
+                .addItem(new BottomNavigationItem(R.drawable.ic_latest, R.string.main_menu__latest_apps));
         if (BuildConfig.FLAVOR.startsWith("full")) {
             bottomNavigation
-                    .addItem(new BottomNavigationItem(R.drawable.ic_latest, R.string.main_menu__latest_apps))
                     .addItem(new BottomNavigationItem(R.drawable.ic_categories, R.string.main_menu__categories))
                     .addItem(new BottomNavigationItem(R.drawable.ic_nearby, R.string.main_menu__swap_nearby));
         }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
similarity index 100%
rename from app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
rename to app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
diff --git a/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java
index 671ec8b27..0553335a0 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java
@@ -10,6 +10,7 @@ import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
+import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.views.categories.AppCardController;
@@ -57,10 +58,19 @@ public class WhatsNewAdapter extends RecyclerView.Adapter<AppCardController> {
 
     @Override
     public int getItemViewType(int position) {
+        int relativePositionInCycle = position % 5;
+
+        if (BuildConfig.FLAVOR.startsWith("basic")) {
+            if (relativePositionInCycle > 0) {
+                return R.id.whats_new_small_tile;
+            } else {
+                return R.id.whats_new_regular_list;
+            }
+        }
+
         if (position == 0) {
             return R.id.whats_new_feature;
         } else {
-            int relativePositionInCycle = position % 5;
             switch (relativePositionInCycle) {
                 case 1:
                 case 2:
diff --git a/app/src/full/res/layout/main_tab_whats_new.xml b/app/src/main/res/layout/main_tab_whats_new.xml
similarity index 100%
rename from app/src/full/res/layout/main_tab_whats_new.xml
rename to app/src/main/res/layout/main_tab_whats_new.xml