diff options
author | TacoTheDank <SkytkRSfan3895@gmail.com> | 2020-05-19 20:39:37 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-19 20:39:37 +0000 |
commit | 6126df39a5e1fc0a935327cfdedb4d15beba62be (patch) | |
tree | 4713b6ce43ab25b0c4427150065dc1fa896c1d84 /app/src/main/res/xml | |
parent | fc284a3dc01a99234785a0633630931f5abad648 (diff) | |
parent | 07710908ba44f3ada4d95c1fffd3cb708029a633 (diff) | |
download | infinity-for-reddit-6126df39a5e1fc0a935327cfdedb4d15beba62be.tar infinity-for-reddit-6126df39a5e1fc0a935327cfdedb4d15beba62be.tar.gz infinity-for-reddit-6126df39a5e1fc0a935327cfdedb4d15beba62be.tar.bz2 infinity-for-reddit-6126df39a5e1fc0a935327cfdedb4d15beba62be.tar.lz infinity-for-reddit-6126df39a5e1fc0a935327cfdedb4d15beba62be.tar.xz infinity-for-reddit-6126df39a5e1fc0a935327cfdedb4d15beba62be.tar.zst infinity-for-reddit-6126df39a5e1fc0a935327cfdedb4d15beba62be.zip |
Merge branch 'master' into master
Diffstat (limited to 'app/src/main/res/xml')
-rw-r--r-- | app/src/main/res/xml/customize_main_page_tabs_preferences.xml | 76 | ||||
-rw-r--r-- | app/src/main/res/xml/gestures_and_buttons_preference.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/xml/interface_preference.xml | 5 |
3 files changed, 86 insertions, 0 deletions
diff --git a/app/src/main/res/xml/customize_main_page_tabs_preferences.xml b/app/src/main/res/xml/customize_main_page_tabs_preferences.xml new file mode 100644 index 00000000..37e17d0c --- /dev/null +++ b/app/src/main/res/xml/customize_main_page_tabs_preferences.xml @@ -0,0 +1,76 @@ +<?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 + android:icon="@drawable/ic_info_preference_24dp" + app:summary="@string/settings_tab_info" + app:enabled="false" /> + + <PreferenceCategory + app:title="@string/settings_tab_1_summary" /> + + <EditTextPreference + app:defaultValue="@string/home" + app:key="main_page_tab_1_title" + app:title="@string/settings_tab_title" + app:useSimpleSummaryProvider="true" /> + + <ListPreference + app:defaultValue="0" + android:entries="@array/settings_tab_post_type" + app:entryValues="@array/settings_tab_post_type_values" + app:key="main_page_tab_1_post_type" + app:title="@string/settings_tab_post_type" + app:useSimpleSummaryProvider="true" /> + + <EditTextPreference + app:key="main_page_tab_1_name" + app:isPreferenceVisible="false" + app:useSimpleSummaryProvider="true" /> + + <PreferenceCategory + app:title="@string/settings_tab_2_summary" /> + + <EditTextPreference + app:defaultValue="@string/popular" + app:key="main_page_tab_2_title" + app:title="@string/settings_tab_title" + app:useSimpleSummaryProvider="true" /> + + <ListPreference + app:defaultValue="1" + android:entries="@array/settings_tab_post_type" + app:entryValues="@array/settings_tab_post_type_values" + app:key="main_page_tab_2_post_type" + app:title="@string/settings_tab_post_type" + app:useSimpleSummaryProvider="true" /> + + <EditTextPreference + app:key="main_page_tab_2_name" + app:isPreferenceVisible="false" + app:useSimpleSummaryProvider="true" /> + + <PreferenceCategory + app:title="@string/settings_tab_3_summary" /> + + <EditTextPreference + app:defaultValue="@string/all" + app:key="main_page_tab_3_title" + app:title="@string/settings_tab_title" + app:useSimpleSummaryProvider="true" /> + + <ListPreference + app:defaultValue="2" + android:entries="@array/settings_tab_post_type" + app:entryValues="@array/settings_tab_post_type_values" + app:key="main_page_tab_3_post_type" + app:title="@string/settings_tab_post_type" + app:useSimpleSummaryProvider="true" /> + + <EditTextPreference + app:key="main_page_tab_3_name" + app:isPreferenceVisible="false" + app:useSimpleSummaryProvider="true" /> + +</PreferenceScreen>
\ No newline at end of file diff --git a/app/src/main/res/xml/gestures_and_buttons_preference.xml b/app/src/main/res/xml/gestures_and_buttons_preference.xml index 4d111187..8cd307e0 100644 --- a/app/src/main/res/xml/gestures_and_buttons_preference.xml +++ b/app/src/main/res/xml/gestures_and_buttons_preference.xml @@ -33,4 +33,9 @@ app:key="volume_keys_navigate_posts" app:title="@string/settings_volume_keys_navigate_posts_title" /> + <SwitchPreference + app:defaultValue="false" + app:key="swap_tap_and_long_in_comments" + app:title="@string/settings_swap_tap_and_long_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 index 8b67a3bc..58de9ef4 100644 --- a/app/src/main/res/xml/interface_preference.xml +++ b/app/src/main/res/xml/interface_preference.xml @@ -20,6 +20,11 @@ app:summary="@string/settings_immersive_interface_ignore_nav_bar_summary" app:isPreferenceVisible="false" /> + <Preference + app:title="@string/settings_customize_tabs_in_main_page_title" + app:summary="@string/settings_customize_tabs_in_main_page_summary" + app:fragment="ml.docilealligator.infinityforreddit.Settings.CustomizeMainPageTabsFragment" /> + <SwitchPreference app:defaultValue="false" app:key="bottom_app_bar" |