diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/fragment_subscriptions.xml | 16 | ||||
| -rw-r--r-- | app/src/main/res/layout/nav_section_item.xml | 22 | ||||
| -rw-r--r-- | app/src/main/res/menu/subscriptions.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/xml/preferences_user_interface.xml | 34 |
4 files changed, 57 insertions, 20 deletions
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index f37a6febd..a1a5a26f2 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/app/src/main/res/layout/fragment_subscriptions.xml @@ -14,8 +14,22 @@ app:title="@string/subscriptions_label" android:id="@+id/toolbar"/> - <GridView + <TextView + android:id="@+id/feeds_filtered_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_below="@id/toolbar" + android:background="?android:attr/selectableItemBackground" + android:gravity="start" + android:paddingStart="8dp" + android:paddingTop="4dp" + android:paddingEnd="8dp" + android:paddingBottom="8dp" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_small" /> + + <GridView + android:layout_below="@id/feeds_filtered_message" android:id="@+id/subscriptions_grid" android:layout_width="match_parent" android:numColumns="3" diff --git a/app/src/main/res/layout/nav_section_item.xml b/app/src/main/res/layout/nav_section_item.xml index 45d0dff59..fb3021556 100644 --- a/app/src/main/res/layout/nav_section_item.xml +++ b/app/src/main/res/layout/nav_section_item.xml @@ -1,16 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="16dp" + android:layout_height="wrap_content" android:background="@android:color/transparent" android:orientation="vertical" - android:importantForAccessibility="no"> + android:importantForAccessibility="no" + android:paddingTop="8dp" + android:paddingBottom="8dp"> <View android:layout_width="match_parent" android:layout_height="1dp" - android:layout_centerVertical="true" android:background="?android:attr/listDivider" tools:background="@android:color/holo_red_dark"/> -</RelativeLayout> + + <TextView + android:id="@+id/nav_feeds_filtered_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="start" + android:paddingStart="@dimen/listitem_icon_leftpadding" + android:paddingTop="4dp" + android:paddingEnd="@dimen/listitem_icon_leftpadding" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_small" /> +</LinearLayout> diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml index 1780592d5..8009061e5 100644 --- a/app/src/main/res/menu/subscriptions.xml +++ b/app/src/main/res/menu/subscriptions.xml @@ -9,6 +9,11 @@ custom:showAsAction="always" android:icon="?attr/navigation_refresh"/> + + <item + android:id="@+id/subscriptions_filter" + android:title="@string/filter" + custom:showAsAction="never" /> <item android:id="@+id/subscription_num_columns" android:title="@string/subscription_num_columns" diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml index 1a1f125b6..adcbf5569 100644 --- a/app/src/main/res/xml/preferences_user_interface.xml +++ b/app/src/main/res/xml/preferences_user_interface.xml @@ -14,20 +14,6 @@ android:key="prefHiddenDrawerItems" android:summary="@string/pref_nav_drawer_items_sum" android:title="@string/pref_nav_drawer_items_title"/> - <ListPreference - android:entryValues="@array/nav_drawer_feed_order_values" - android:entries="@array/nav_drawer_feed_order_options" - android:title="@string/pref_nav_drawer_feed_order_title" - android:key="prefDrawerFeedOrder" - android:summary="@string/pref_nav_drawer_feed_order_sum" - android:defaultValue="0"/> - <ListPreference - android:entryValues="@array/nav_drawer_feed_counter_values" - android:entries="@array/nav_drawer_feed_counter_options" - android:title="@string/pref_nav_drawer_feed_counter_title" - android:key="prefDrawerFeedIndicator" - android:summary="@string/pref_nav_drawer_feed_counter_sum" - android:defaultValue="1"/> <SwitchPreference android:title="@string/pref_episode_cover_title" android:key="prefEpisodeCover" @@ -35,6 +21,26 @@ android:defaultValue="true" android:enabled="true"/> </PreferenceCategory> + <PreferenceCategory android:title="@string/subscriptions_label"> + <ListPreference + android:entryValues="@array/nav_drawer_feed_order_values" + android:entries="@array/nav_drawer_feed_order_options" + android:title="@string/pref_nav_drawer_feed_order_title" + android:key="prefDrawerFeedOrder" + android:summary="@string/pref_nav_drawer_feed_order_sum" + android:defaultValue="0"/> + <ListPreference + android:entryValues="@array/nav_drawer_feed_counter_values" + android:entries="@array/nav_drawer_feed_counter_options" + android:title="@string/pref_nav_drawer_feed_counter_title" + android:key="prefDrawerFeedIndicator" + android:summary="@string/pref_nav_drawer_feed_counter_sum" + android:defaultValue="1"/> + <Preference + android:title="@string/pref_filter_feed_title" + android:key="prefFeedFilter" + android:summary="@string/pref_filter_feed_sum" /> + </PreferenceCategory> <PreferenceCategory android:title="@string/external_elements"> <SwitchPreference android:defaultValue="false" |