Merge pull request #3106 from ByteHamster/subscriptions-columns

Set number of subscription columns

app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java

@@ -1,11 +1,14 @@
 package de.danoeh.antennapod.fragment;
 
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -41,6 +44,8 @@ public class SubscriptionFragment extends Fragment {
 
     private static final int EVENTS = EventDistributor.FEED_LIST_UPDATE
             | EventDistributor.UNREAD_ITEMS_UPDATE;
+    private static final String PREFS = "SubscriptionFragment";
+    private static final String PREF_NUM_COLUMNS = "columns";
 
     private GridView subscriptionGridLayout;
     private DBReader.NavDrawerData navDrawerData;
@@ -49,6 +54,7 @@ public class SubscriptionFragment extends Fragment {
     private int mPosition = -1;
 
     private Disposable disposable;
+    private SharedPreferences prefs;
 
     public SubscriptionFragment() {
     }
@@ -57,11 +63,9 @@ public class SubscriptionFragment extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setRetainInstance(true);
-
-        // So, we certainly *don't* have an options menu,
-        // but unless we say we do, old options menus sometimes
-        // persist.  mfietz thinks this causes the ActionBar to be invalidated
         setHasOptionsMenu(true);
+
+        prefs = getActivity().getSharedPreferences(PREFS, Context.MODE_PRIVATE);
     }
 
     @Override
@@ -69,10 +73,52 @@ public class SubscriptionFragment extends Fragment {
                              Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_subscriptions, container, false);
         subscriptionGridLayout = root.findViewById(R.id.subscriptions_grid);
+        subscriptionGridLayout.setNumColumns(prefs.getInt(PREF_NUM_COLUMNS, 3));
         registerForContextMenu(subscriptionGridLayout);
         return root;
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.subscriptions, menu);
+
+        int columns = prefs.getInt(PREF_NUM_COLUMNS, 3);
+        menu.findItem(R.id.subscription_num_columns_2).setChecked(columns == 2);
+        menu.findItem(R.id.subscription_num_columns_3).setChecked(columns == 3);
+        menu.findItem(R.id.subscription_num_columns_4).setChecked(columns == 4);
+        menu.findItem(R.id.subscription_num_columns_5).setChecked(columns == 5);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (super.onOptionsItemSelected(item)) {
+            return true;
+        }
+        switch (item.getItemId()) {
+            case R.id.subscription_num_columns_2:
+                setColumnNumber(2);
+                return true;
+            case R.id.subscription_num_columns_3:
+                setColumnNumber(3);
+                return true;
+            case R.id.subscription_num_columns_4:
+                setColumnNumber(4);
+                return true;
+            case R.id.subscription_num_columns_5:
+                setColumnNumber(5);
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private void setColumnNumber(int columns) {
+        subscriptionGridLayout.setNumColumns(columns);
+        prefs.edit().putInt(PREF_NUM_COLUMNS, columns).apply();
+        getActivity().invalidateOptionsMenu();
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);

app/src/main/res/menu/subscriptions.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
+
+    <item
+            android:id="@+id/subscription_num_columns"
+            android:title="@string/subscription_num_columns"
+            custom:showAsAction="never">
+        <menu>
+            <item
+                    android:id="@+id/subscription_num_columns_2"
+                    android:checkable="true"
+                    android:title="2"/>
+            <item
+                    android:id="@+id/subscription_num_columns_3"
+                    android:checkable="true"
+                    android:title="3"/>
+            <item
+                    android:id="@+id/subscription_num_columns_4"
+                    android:checkable="true"
+                    android:title="4"/>
+            <item
+                    android:id="@+id/subscription_num_columns_5"
+                    android:checkable="true"
+                    android:title="5"/>
+        </menu>
+    </item>
+</menu>

core/src/main/res/values/strings.xml

@@ -758,6 +758,9 @@
     <string name="proxy_host_invalid_error">Host is not a valid IP address or domain</string>
     <string name="proxy_port_invalid_error">Port not valid</string>
 
+    <!-- Subscriptions fragment -->
+    <string name="subscription_num_columns">Number of columns</string>
+
     <!-- Database import/export -->
     <string name="import_export">Database import/export</string>
     <string name="import_export_warning">This experimental function can be used to transfer your subscriptions and played episodes to another device.\n\nExported databases can only be imported when using the same version of AntennaPod. Otherwise, this function will lead to unexpected behavior.\n\nAfter importing, episodes might be displayed as downloaded even though they are not. Just press the play button of the episodes to make AntennaPod detect this.</string>