Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update preferences library, remove unneeded "shouldDisableView" (#1254)

This commit is contained in:
pandasoft0 2019-05-09 22:00:50 +03:00 committed by Konrad Pozniak
parent 5c61786e05
commit 126aefacbf
5 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -95,7 +95,7 @@ dependencies {
implementation 'com.google.android.material:material:1.1.0-alpha05'
implementation 'androidx.exifinterface:exifinterface:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.preference:preference:1.1.0-alpha04'
implementation 'androidx.preference:preference:1.1.0-alpha05'
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'

12
app/src/main/res/xml/account_preferences.xml
View File

@ -18,9 +18,7 @@
android:key="blockedUsersPreference"
android:title="@string/action_view_blocks" />
<PreferenceCategory
android:shouldDisableView="true"
android:title="@string/pref_publishing">
<PreferenceCategory android:title="@string/pref_publishing">
<ListPreference
android:defaultValue="public"
android:entries="@array/post_privacy_names"
@ -36,9 +34,7 @@
android:title="@string/pref_default_media_sensitivity" />
</PreferenceCategory>
<PreferenceCategory
android:shouldDisableView="true"
android:title="@string/pref_title_timelines">
<PreferenceCategory android:title="@string/pref_title_timelines">
<SwitchPreferenceCompat
android:key="mediaPreviewEnabled"
android:title="@string/pref_title_show_media_preview" />
@ -48,9 +44,7 @@
android:title="@string/pref_title_alway_show_sensitive_media" />
</PreferenceCategory>
<PreferenceCategory
android:shouldDisableView="true"
android:title="@string/pref_title_timeline_filters">
<PreferenceCategory android:title="@string/pref_title_timeline_filters">
<Preference
android:key="publicFilters"
android:title="@string/pref_title_public_filter_keywords" />

2
app/src/main/res/xml/notification_preferences.xml
View File

@ -12,7 +12,6 @@
<PreferenceCategory
android:dependency="notificationsEnabled"
android:shouldDisableView="true"
android:title="@string/pref_title_notification_filters"
app:iconSpaceReserved="false">
@ -49,7 +48,6 @@
<PreferenceCategory
android:dependency="notificationsEnabled"
android:shouldDisableView="true"
android:title="@string/pref_title_notification_alerts"
app:iconSpaceReserved="false">

16
app/src/main/res/xml/preferences.xml
View File

@ -2,9 +2,7 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="@string/preferences_file_key">
<PreferenceCategory
android:shouldDisableView="true"
android:title="@string/pref_title_appearance_settings">
<PreferenceCategory android:title="@string/pref_title_appearance_settings">
<ListPreference
android:defaultValue="night"
@ -53,9 +51,7 @@
android:title="@string/pref_title_bot_overlay" />
</PreferenceCategory>
<PreferenceCategory
android:shouldDisableView="true"
android:title="@string/pref_title_browser_settings">
<PreferenceCategory android:title="@string/pref_title_browser_settings">
<SwitchPreferenceCompat
android:defaultValue="false"
@ -63,18 +59,14 @@
android:title="@string/pref_title_custom_tabs" />
</PreferenceCategory>
<PreferenceCategory
android:shouldDisableView="true"
android:title="@string/pref_title_status_filter">
<PreferenceCategory android:title="@string/pref_title_status_filter">
<Preference
android:key="timelineFilterPreferences"
android:title="@string/pref_title_status_tabs" />
</PreferenceCategory>
<PreferenceCategory
android:shouldDisableView="true"
android:title="@string/pref_title_proxy_settings">
<PreferenceCategory android:title="@string/pref_title_proxy_settings">
<Preference
android:key="httpProxyPreferences"

1
app/src/main/res/xml/timeline_filter_preferences.xml
View File

@ -4,7 +4,6 @@
android:title="@string/pref_title_status_tabs">
<PreferenceCategory
android:shouldDisableView="true"
android:title="@string/title_home"
app:iconSpaceReserved="false">