diff options
Diffstat (limited to 'app/src/main/res/xml')
| -rw-r--r-- | app/src/main/res/xml/gestures_and_buttons_preference.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/xml/interface_preference.xml | 44 | ||||
| -rw-r--r-- | app/src/main/res/xml/main_preferences.xml | 67 | ||||
| -rw-r--r-- | app/src/main/res/xml/notification_preferences.xml | 2 |
4 files changed, 76 insertions, 56 deletions
diff --git a/app/src/main/res/xml/gestures_and_buttons_preference.xml b/app/src/main/res/xml/gestures_and_buttons_preference.xml new file mode 100644 index 00000000..2f15e6be --- /dev/null +++ b/app/src/main/res/xml/gestures_and_buttons_preference.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> + + <SwitchPreference + app:defaultValue="true" + app:key="swipe_to_go_back_from_post_detail" + app:title="@string/settings_swipe_to_go_back_from_post_detail_title" /> + + <SwitchPreference + app:defaultValue="false" + app:key="volume_keys_navigate_comments" + app:title="@string/settings_volume_keys_navigate_comments_title" /> + + <SwitchPreference + app:defaultValue="false" + app:key="volume_keys_navigate_posts" + app:title="@string/settings_volume_keys_navigate_posts_title" /> + +</PreferenceScreen>
\ No newline at end of file diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml new file mode 100644 index 00000000..434a0173 --- /dev/null +++ b/app/src/main/res/xml/interface_preference.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <Preference + app:title="@string/settings_font_size_title" + app:icon="@drawable/ic_font_size_24dp" + app:fragment="ml.docilealligator.infinityforreddit.Settings.FontSizePreferenceFragment" /> + + <SwitchPreference + app:defaultValue="true" + app:key="immersive_interface" + app:title="@string/settings_immersive_interface_title" + app:isPreferenceVisible="false" /> + + <SwitchPreference + app:defaultValue="false" + app:key="bottom_app_bar" + app:title="@string/settings_enable_bottom_app_bar_title" /> + + <SwitchPreference + app:defaultValue="false" + app:key="vote_buttons_on_the_right" + app:title="@string/settings_vote_buttons_on_the_right_title" /> + + <SwitchPreference + app:defaultValue="false" + app:key="show_elapsed_time" + app:title="@string/settings_show_elapsed_time" /> + + <ListPreference + app:defaultValue="0" + android:entries="@array/settings_default_post_layout" + app:entryValues="@array/settings_default_post_layout_values" + app:key="default_post_layout" + app:title="@string/settings_default_post_layout" + app:useSimpleSummaryProvider="true" /> + + <SwitchPreference + app:defaultValue="true" + app:key="show_divider_in_compact_layout" + app:title="@string/settings_show_divider_in_compact_layout" /> + +</PreferenceScreen>
\ No newline at end of file diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml index 395d10e1..f79b8234 100644 --- a/app/src/main/res/xml/main_preferences.xml +++ b/app/src/main/res/xml/main_preferences.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <Preference - app:icon="@drawable/ic_outline_notifications_24px" + app:icon="@drawable/ic_outline_notifications_24dp" app:title="@string/settings_notification_master_title" app:fragment="ml.docilealligator.infinityforreddit.Settings.NotificationPreferenceFragment" /> @@ -20,59 +20,21 @@ app:key="amoled_dark" app:title="@string/settings_amoled_dark_title" /> - <SwitchPreference - app:defaultValue="true" - app:key="immersive_interface" - app:title="@string/settings_immersive_interface_title" - app:isPreferenceVisible="false" /> - - <SwitchPreference - app:defaultValue="false" - app:key="bottom_app_bar" - app:title="@string/settings_enable_bottom_app_bar_title" /> - - <SwitchPreference - app:defaultValue="false" - app:key="vote_buttons_on_the_right" - app:title="@string/settings_vote_buttons_on_the_right_title" /> - - <SwitchPreference - app:defaultValue="false" - app:key="show_elapsed_time" - app:title="@string/settings_show_elapsed_time" /> - - <ListPreference - app:defaultValue="0" - android:entries="@array/settings_default_post_layout" - app:entryValues="@array/settings_default_post_layout_values" - app:key="default_post_layout" - app:title="@string/settings_default_post_layout" - app:useSimpleSummaryProvider="true" /> - - <SwitchPreference - app:defaultValue="true" - app:key="show_divider_in_compact_layout" - app:title="@string/settings_show_divider_in_compact_layout" /> - - <SwitchPreference - app:defaultValue="true" - app:key="swipe_to_go_back_from_post_detail" - app:title="@string/swipe_to_go_back_from_post_detail" /> - - <SwitchPreference - app:defaultValue="true" - app:key="swipe_to_go_back_from_post_detail" - app:title="@string/swipe_to_go_back_from_post_detail" /> + <Preference + app:icon="@drawable/ic_interface_24dp" + app:title="@string/settings_interface_title" + app:fragment="ml.docilealligator.infinityforreddit.Settings.InterfacePreferenceFragment" /> - <SwitchPreference - app:defaultValue="false" - app:key="volume_keys_navigate_comments" - app:title="@string/settings_volume_keys_navigate_comments_title" /> + <Preference + app:icon="@drawable/ic_gesture_24dp" + app:title="@string/settings_gestures_and_buttons_title" + app:fragment="ml.docilealligator.infinityforreddit.Settings.GesturesAndButtonsPreferenceFragment" /> <SwitchPreference app:defaultValue="false" - app:key="volume_keys_navigate_posts" - app:title="@string/settings_volume_keys_navigate_posts_title" /> + app:icon="@drawable/ic_link" + app:key="open_link_in_app" + app:title="@string/settings_open_link_in_app_title" /> <SwitchPreference app:defaultValue="false" @@ -80,11 +42,6 @@ android:icon="@drawable/ic_mute_preferences_24dp" app:title="@string/settings_mute_video_title" /> - <Preference - app:title="@string/settings_font_size_title" - app:icon="@drawable/ic_font_size_24dp" - app:fragment="ml.docilealligator.infinityforreddit.Settings.FontSizePreferenceFragment" /> - <ListPreference app:defaultValue="2.5" android:entries="@array/settings_lazy_mode_interval" diff --git a/app/src/main/res/xml/notification_preferences.xml b/app/src/main/res/xml/notification_preferences.xml index 93956533..8ef76485 100644 --- a/app/src/main/res/xml/notification_preferences.xml +++ b/app/src/main/res/xml/notification_preferences.xml @@ -5,7 +5,7 @@ <SwitchPreference app:defaultValue="true" app:key="enable_notification" - app:icon="@drawable/ic_outline_notifications_24px" + app:icon="@drawable/ic_outline_notifications_24dp" app:title="@string/settings_notification_enable_notification_title"/> <ListPreference |