From a8d5c7b95a53f90ef74f873161abdefd596e4e48 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 27 Jul 2019 21:51:37 +0200
Subject: [PATCH] set SwitchPreferenceCompat titles to multiline (#1421)
---
app/build.gradle | 2 +-
app/src/main/res/xml/account_preferences.xml | 10 +++++++---
app/src/main/res/xml/preferences.xml | 15 ++++++++++-----
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 922d9ed2..cd1b909c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -102,7 +102,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-rc01'
implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"
diff --git a/app/src/main/res/xml/account_preferences.xml b/app/src/main/res/xml/account_preferences.xml
index 1f93eaca..dff44b9f 100644
--- a/app/src/main/res/xml/account_preferences.xml
+++ b/app/src/main/res/xml/account_preferences.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<Preference
@@ -35,17 +36,20 @@
android:defaultValue="false"
android:icon="@drawable/ic_eye_24dp"
android:key="defaultMediaSensitivity"
- android:title="@string/pref_default_media_sensitivity" />
+ android:title="@string/pref_default_media_sensitivity"
+ app:singleLineTitle="false" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_title_timelines">
<SwitchPreferenceCompat
android:key="mediaPreviewEnabled"
- android:title="@string/pref_title_show_media_preview" />
+ android:title="@string/pref_title_show_media_preview"
+ app:singleLineTitle="false" />
<SwitchPreferenceCompat
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 android:title="@string/pref_title_timeline_filters">
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e8af4a75..b565d4a9 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -39,27 +39,32 @@
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="fabHide"
- android:title="@string/pref_title_hide_follow_button" />
+ android:title="@string/pref_title_hide_follow_button"
+ app:singleLineTitle="false" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="absoluteTimeView"
- android:title="@string/pref_title_absolute_time" />
+ android:title="@string/pref_title_absolute_time"
+ app:singleLineTitle="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="showBotOverlay"
- android:title="@string/pref_title_bot_overlay" />
+ android:title="@string/pref_title_bot_overlay"
+ app:singleLineTitle="false" />
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="animateGifAvatars"
- android:title="@string/pref_title_animate_gif_avatars" />
+ android:title="@string/pref_title_animate_gif_avatars"
+ app:singleLineTitle="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="showNotificationsFilter"
- android:title="@string/pref_title_show_notifications_filter" />
+ android:title="@string/pref_title_show_notifications_filter"
+ app:singleLineTitle="false" />
</PreferenceCategory>