Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use radio buttons for column number on subscriptions screen

This commit is contained in:
ByteHamster 2020-11-03 23:55:12 +01:00
parent b3c69f1a20
commit ed2348570c
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
View File

@ -27,6 +27,7 @@ import android.widget.TextView;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.joanzapata.iconify.Iconify;
import java.util.Locale;
import java.util.concurrent.Callable;
import de.danoeh.antennapod.R;
@ -69,6 +70,12 @@ public class SubscriptionFragment extends Fragment implements Toolbar.OnMenuItem
public static final String TAG = "SubscriptionFragment";
private static final String PREFS = "SubscriptionFragment";
private static final String PREF_NUM_COLUMNS = "columns";
private static final int MIN_NUM_COLUMNS = 2;
private static final int[] COLUMN_CHECKBOX_IDS = {
R.id.subscription_num_columns_2,
R.id.subscription_num_columns_3,
R.id.subscription_num_columns_4,
R.id.subscription_num_columns_5};
private GridView subscriptionGridLayout;
private DBReader.NavDrawerData navDrawerData;
@ -101,6 +108,11 @@ public class SubscriptionFragment extends Fragment implements Toolbar.OnMenuItem
toolbar.setOnMenuItemClickListener(this);
((MainActivity) getActivity()).setupToolbarToggle(toolbar);
toolbar.inflateMenu(R.menu.subscriptions);
for (int i = 0; i < COLUMN_CHECKBOX_IDS.length; i++) {
// Do this in Java to localize numbers
toolbar.getMenu().findItem(COLUMN_CHECKBOX_IDS[i])
.setTitle(String.format(Locale.getDefault(), "%d", i + MIN_NUM_COLUMNS));
}
refreshToolbarState();
subscriptionGridLayout = root.findViewById(R.id.subscriptions_grid);
@ -123,10 +135,7 @@ public class SubscriptionFragment extends Fragment implements Toolbar.OnMenuItem
private void refreshToolbarState() {
int columns = prefs.getInt(PREF_NUM_COLUMNS, getDefaultNumOfColumns());
toolbar.getMenu().findItem(R.id.subscription_num_columns_2).setChecked(columns == 2);
toolbar.getMenu().findItem(R.id.subscription_num_columns_3).setChecked(columns == 3);
toolbar.getMenu().findItem(R.id.subscription_num_columns_4).setChecked(columns == 4);
toolbar.getMenu().findItem(R.id.subscription_num_columns_5).setChecked(columns == 5);
toolbar.getMenu().findItem(COLUMN_CHECKBOX_IDS[columns - MIN_NUM_COLUMNS]).setChecked(true);
isUpdatingFeeds = MenuItemUtils.updateRefreshMenuItem(toolbar.getMenu(),
R.id.refresh_item, updateRefreshMenuItemChecker);

31
app/src/main/res/menu/subscriptions.xml
View File

@ -23,22 +23,21 @@
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"/>
<group
android:checkableBehavior="single">
<item
android:id="@+id/subscription_num_columns_2"
android:title="2"/>
<item
android:id="@+id/subscription_num_columns_3"
android:title="3"/>
<item
android:id="@+id/subscription_num_columns_4"
android:title="4"/>
<item
android:id="@+id/subscription_num_columns_5"
android:title="5"/>
</group>
</menu>
</item>
</menu>