diff options
Diffstat (limited to 'app/src')
7 files changed, 63 insertions, 64 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java index ff0311ab6..7854f7aa9 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -196,7 +196,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> bindFeedView((NavDrawerData.FeedDrawerItem) item, (FeedHolder) holder); holder.itemView.setOnCreateContextMenuListener(itemAccess); } else { - bindFolderView((NavDrawerData.FolderDrawerItem) item, (FeedHolder) holder); + bindTagView((NavDrawerData.TagDrawerItem) item, (FeedHolder) holder); } } if (viewType != VIEW_TYPE_SECTION_DIVIDER) { @@ -327,16 +327,16 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> } } - private void bindFolderView(NavDrawerData.FolderDrawerItem folder, FeedHolder holder) { + private void bindTagView(NavDrawerData.TagDrawerItem tag, FeedHolder holder) { Activity context = activity.get(); if (context == null) { return; } - if (folder.isOpen) { + if (tag.isOpen) { holder.count.setVisibility(View.GONE); } Glide.with(context).clear(holder.image); - holder.image.setImageResource(R.drawable.ic_folder); + holder.image.setImageResource(R.drawable.ic_tag); holder.failure.setVisibility(View.GONE); } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java index 689f4fcbc..773f15dcb 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java @@ -213,7 +213,7 @@ public class SubscriptionsRecyclerAdapter extends SelectableAdapter<Subscription .load(); } else { new CoverLoader(mainActivityRef.get()) - .withResource(R.drawable.ic_folder) + .withResource(R.drawable.ic_tag) .withPlaceholderView(feedTitle, true) .withCoverView(imageView) .load(); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java index 8ef01590f..0ff6fb79f 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java @@ -75,7 +75,7 @@ public class TagSettingsDialog extends DialogFragment { AlertDialog.Builder dialog = new AlertDialog.Builder(getContext()); dialog.setView(viewBinding.getRoot()); - dialog.setTitle(R.string.feed_folders_label); + dialog.setTitle(R.string.feed_tags_label); dialog.setPositiveButton(android.R.string.ok, (d, input) -> { addTag(viewBinding.newTagEditText.getText().toString().trim()); preferences.getTags().clear(); @@ -96,7 +96,7 @@ public class TagSettingsDialog extends DialogFragment { List<NavDrawerData.DrawerItem> items = data.items; List<String> folders = new ArrayList<String>(); for (NavDrawerData.DrawerItem item : items) { - if (item.type == NavDrawerData.DrawerItem.Type.FOLDER) { + if (item.type == NavDrawerData.DrawerItem.Type.TAG) { folders.add(item.getTitle()); } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java index 826a7e0ab..911f262cb 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java @@ -157,7 +157,7 @@ public class NavDrawerFragment extends Fragment implements SharedPreferences.OnS }; removeAllNewFlagsConfirmationDialog.createNewDialog().show(); return true; - } else if (itemId == R.id.add_to_folder) { + } else if (itemId == R.id.edit_tags) { TagSettingsDialog.newInstance(feed.getPreferences()).show(getChildFragmentManager(), TagSettingsDialog.TAG); return true; } else if (itemId == R.id.rename_item) { @@ -318,7 +318,7 @@ public class NavDrawerFragment extends Fragment implements SharedPreferences.OnS ((MainActivity) getActivity()).getBottomSheet() .setState(BottomSheetBehavior.STATE_COLLAPSED); } else { - NavDrawerData.FolderDrawerItem folder = ((NavDrawerData.FolderDrawerItem) clickedItem); + NavDrawerData.TagDrawerItem folder = ((NavDrawerData.TagDrawerItem) clickedItem); if (openFolders.contains(folder.name)) { openFolders.remove(folder.name); } else { @@ -388,11 +388,11 @@ public class NavDrawerFragment extends Fragment implements SharedPreferences.OnS for (NavDrawerData.DrawerItem item : items) { item.setLayer(layer); flatItems.add(item); - if (item.type == NavDrawerData.DrawerItem.Type.FOLDER) { - NavDrawerData.FolderDrawerItem folder = ((NavDrawerData.FolderDrawerItem) item); + if (item.type == NavDrawerData.DrawerItem.Type.TAG) { + NavDrawerData.TagDrawerItem folder = ((NavDrawerData.TagDrawerItem) item); folder.isOpen = openFolders.contains(folder.name); if (folder.isOpen) { - flatItems.addAll(makeFlatDrawerData(((NavDrawerData.FolderDrawerItem) item).children, layer + 1)); + flatItems.addAll(makeFlatDrawerData(((NavDrawerData.TagDrawerItem) item).children, layer + 1)); } } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java index 90ed2a8bd..68cc04a28 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java @@ -292,9 +292,9 @@ public class SubscriptionFragment extends Fragment NavDrawerData data = DBReader.getNavDrawerData(); List<NavDrawerData.DrawerItem> items = data.items; for (NavDrawerData.DrawerItem item : items) { - if (item.type == NavDrawerData.DrawerItem.Type.FOLDER + if (item.type == NavDrawerData.DrawerItem.Type.TAG && item.getTitle().equals(displayedFolder)) { - return ((NavDrawerData.FolderDrawerItem) item).children; + return ((NavDrawerData.TagDrawerItem) item).children; } } return items; @@ -339,7 +339,7 @@ public class SubscriptionFragment extends Fragment R.string.remove_all_new_flags_confirmation_msg, () -> DBWriter.removeFeedNewFlag(feed.getId())); return true; - } else if (itemId == R.id.add_to_folder) { + } else if (itemId == R.id.edit_tags) { TagSettingsDialog.newInstance(feed.getPreferences()).show(getChildFragmentManager(), TagSettingsDialog.TAG); return true; } else if (itemId == R.id.rename_item) { diff --git a/app/src/main/res/menu/nav_feed_context.xml b/app/src/main/res/menu/nav_feed_context.xml index e2b990023..ac3b24d0d 100644 --- a/app/src/main/res/menu/nav_feed_context.xml +++ b/app/src/main/res/menu/nav_feed_context.xml @@ -7,7 +7,7 @@ android:title="@string/remove_all_new_flags_label" /> <item - android:id="@+id/add_to_folder" + android:id="@+id/edit_tags" android:menuCategory="container" android:title="@string/add_to_folder" /> diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml index 457ff6e5b..5b81ddd54 100644 --- a/app/src/main/res/xml/feed_settings.xml +++ b/app/src/main/res/xml/feed_settings.xml @@ -1,72 +1,71 @@ <?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android" +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:key="feedSettingsScreen"> <SwitchPreferenceCompat - android:key="keepUpdated" - android:icon="@drawable/ic_refresh" - android:title="@string/keep_updated" - android:summary="@string/keep_updated_summary"/> + android:icon="@drawable/ic_refresh" + android:key="keepUpdated" + android:summary="@string/keep_updated_summary" + android:title="@string/keep_updated" /> <SwitchPreferenceCompat - android:key="episodeNotification" - android:defaultValue="false" - android:dependency="keepUpdated" - android:icon="@drawable/ic_notifications" - android:title="@string/episode_notification" - android:summary="@string/episode_notification_summary"/> + android:defaultValue="false" + android:dependency="keepUpdated" + android:icon="@drawable/ic_notifications" + android:key="episodeNotification" + android:summary="@string/episode_notification_summary" + android:title="@string/episode_notification" /> <Preference - android:key="authentication" - android:icon="@drawable/ic_key" - android:title="@string/authentication_label" - android:summary="@string/authentication_descr"/> + android:icon="@drawable/ic_key" + android:key="authentication" + android:summary="@string/authentication_descr" + android:title="@string/authentication_label" /> <Preference - android:key="tags" - android:icon="@drawable/ic_folder" - android:title="@string/feed_folders_label" - android:summary="@string/feed_folders_summary"/> + android:icon="@drawable/ic_tag" + android:key="tags" + android:summary="@string/feed_tags_summary" + android:title="@string/feed_tags_label" /> <ListPreference - android:key="feedPlaybackSpeed" - android:icon="@drawable/ic_playback_speed" - android:title="@string/playback_speed" - android:summary="@string/pref_feed_playback_speed_sum"/> + android:icon="@drawable/ic_playback_speed" + android:key="feedPlaybackSpeed" + android:summary="@string/pref_feed_playback_speed_sum" + android:title="@string/playback_speed" /> <Preference - android:key="feedAutoSkip" - android:icon="@drawable/ic_skip_24dp" - android:summary="@string/pref_feed_skip_sum" - android:title="@string/pref_feed_skip" /> + android:icon="@drawable/ic_skip_24dp" + android:key="feedAutoSkip" + android:summary="@string/pref_feed_skip_sum" + android:title="@string/pref_feed_skip" /> <ListPreference - android:entries="@array/spnAutoDeleteItems" - android:entryValues="@array/spnAutoDeleteValues" - android:icon="@drawable/ic_delete" - android:title="@string/auto_delete_label" - android:summary="@string/feed_auto_download_global" - android:key="autoDelete"/> + android:entries="@array/spnAutoDeleteItems" + android:entryValues="@array/spnAutoDeleteValues" + android:icon="@drawable/ic_delete" + android:key="autoDelete" + android:summary="@string/feed_auto_download_global" + android:title="@string/auto_delete_label" /> <ListPreference - android:entries="@array/spnVolumeReductionItems" - android:entryValues="@array/spnVolumeReductionValues" - android:icon="@drawable/ic_volume_adaption" - android:summary="@string/feed_volume_reduction_summary" - android:title="@string/feed_volume_reduction" - android:defaultValue="off" - android:key="volumeReduction"/> + android:defaultValue="off" + android:entries="@array/spnVolumeReductionItems" + android:entryValues="@array/spnVolumeReductionValues" + android:icon="@drawable/ic_volume_adaption" + android:key="volumeReduction" + android:summary="@string/feed_volume_reduction_summary" + android:title="@string/feed_volume_reduction" /> <PreferenceCategory - android:title="@string/auto_download_settings_label" - android:key="autoDownloadCategory"> + android:key="autoDownloadCategory" + android:title="@string/auto_download_settings_label"> <SwitchPreferenceCompat - android:key="autoDownload" - android:title="@string/auto_download_label"/> + android:key="autoDownload" + android:title="@string/auto_download_label" /> <Preference - android:key="episodeFilter" - android:title="@string/episode_filters_label" - android:summary="@string/episode_filters_description"/> + android:key="episodeFilter" + android:summary="@string/episode_filters_description" + android:title="@string/episode_filters_label" /> </PreferenceCategory> </PreferenceScreen> |