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 @@ + { @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