Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

set SwitchPreferenceCompat titles to multiline (#1421)

This commit is contained in:
Konrad Pozniak 2019-07-27 21:51:37 +02:00 committed by GitHub
parent ce84233c4e
commit a8d5c7b95a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -102,7 +102,7 @@ dependencies {
implementation 'com.google.android.material:material:1.1.0-alpha05' implementation 'com.google.android.material:material:1.1.0-alpha05'
implementation 'androidx.exifinterface:exifinterface:1.0.0' implementation 'androidx.exifinterface:exifinterface:1.0.0'
implementation 'androidx.cardview:cardview: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-rc01'
implementation "com.squareup.retrofit2:retrofit:$retrofitVersion" implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion" implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion" implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"

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

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:key="@string/preferences_file_key"> android:key="@string/preferences_file_key">
<Preference <Preference
@ -35,17 +36,20 @@
android:defaultValue="false" android:defaultValue="false"
android:icon="@drawable/ic_eye_24dp" android:icon="@drawable/ic_eye_24dp"
android:key="defaultMediaSensitivity" android:key="defaultMediaSensitivity"
android:title="@string/pref_default_media_sensitivity" /> android:title="@string/pref_default_media_sensitivity"
app:singleLineTitle="false" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_title_timelines"> <PreferenceCategory android:title="@string/pref_title_timelines">
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="mediaPreviewEnabled" android:key="mediaPreviewEnabled"
android:title="@string/pref_title_show_media_preview" /> android:title="@string/pref_title_show_media_preview"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="alwaysShowSensitiveMedia" android:key="alwaysShowSensitiveMedia"
android:title="@string/pref_title_alway_show_sensitive_media" /> android:title="@string/pref_title_alway_show_sensitive_media"
app:singleLineTitle="false" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_title_timeline_filters"> <PreferenceCategory android:title="@string/pref_title_timeline_filters">

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

@ -39,27 +39,32 @@
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="fabHide" android:key="fabHide"
android:title="@string/pref_title_hide_follow_button" /> android:title="@string/pref_title_hide_follow_button"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="absoluteTimeView" android:key="absoluteTimeView"
android:title="@string/pref_title_absolute_time" /> android:title="@string/pref_title_absolute_time"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="true"
android:key="showBotOverlay" android:key="showBotOverlay"
android:title="@string/pref_title_bot_overlay" /> android:title="@string/pref_title_bot_overlay"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="animateGifAvatars" android:key="animateGifAvatars"
android:title="@string/pref_title_animate_gif_avatars" /> android:title="@string/pref_title_animate_gif_avatars"
app:singleLineTitle="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="true"
android:key="showNotificationsFilter" android:key="showNotificationsFilter"
android:title="@string/pref_title_show_notifications_filter" /> android:title="@string/pref_title_show_notifications_filter"
app:singleLineTitle="false" />
</PreferenceCategory> </PreferenceCategory>