From 515360173b3ace1fff17da02b4830654be3ed6d4 Mon Sep 17 00:00:00 2001
From: crackededed <90209774+crackededed@users.noreply.github.com>
Date: Tue, 16 Jan 2024 21:09:57 +0200
Subject: [PATCH] multi line preference titles

---
 app/build.gradle.kts                          |  19 +-
 app/src/main/res/xml/api_preferences.xml      |   3 +-
 .../main/res/xml/api_token_preferences.xml    |  30 ++-
 app/src/main/res/xml/buffer_preferences.xml   |  35 ++-
 .../res/xml/player_button_preferences.xml     |  75 ++++--
 .../main/res/xml/player_menu_preferences.xml  |  45 ++--
 app/src/main/res/xml/proxy_preferences.xml    |  14 +-
 app/src/main/res/xml/root_preferences.xml     | 242 ++++++++++++------
 app/src/main/res/xml/theme_preferences.xml    |  27 +-
 app/src/main/res/xml/token_preferences.xml    |  18 +-
 gradle/libs.versions.toml                     |   2 +-
 11 files changed, 338 insertions(+), 172 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c6567bd64..1b2778743 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,7 +28,7 @@ android {
         minSdk = 16
         targetSdk = 34
         versionCode = 121
-        versionName = "2.27.1"
+        versionName = "2.27.2"
         resourceConfigurations += listOf("ar", "de", "en", "es", "fr", "in", "ja", "pt-rBR", "ru", "tr", "zh-rTW")
     }
 
@@ -54,12 +54,17 @@ android {
         disable += "ContentDescription"
     }
     configurations.all {
-        resolutionStrategy {
-            force("androidx.webkit:webkit:1.9.0-alpha01")
-            force("com.squareup.okhttp3:logging-interceptor:3.12.13")
-            force("com.squareup.retrofit2:retrofit:2.6.4")
-            force("com.squareup.retrofit2:converter-gson:2.6.4")
-        }
+        resolutionStrategy.force(listOf(
+            "androidx.lifecycle:lifecycle-common-java8:2.7.0-alpha03",
+            "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0-alpha03",
+            "androidx.lifecycle:lifecycle-process:2.7.0-alpha03",
+            "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0-alpha03",
+            "androidx.webkit:webkit:1.9.0-alpha01",
+            "com.google.android.material:material:1.11.0",
+            "com.squareup.okhttp3:logging-interceptor:3.12.13",
+            "com.squareup.retrofit2:retrofit:2.6.4",
+            "com.squareup.retrofit2:converter-gson:2.6.4",
+        ))
     }
 }
 
diff --git a/app/src/main/res/xml/api_preferences.xml b/app/src/main/res/xml/api_preferences.xml
index b005edd33..49987cdb7 100644
--- a/app/src/main/res/xml/api_preferences.xml
+++ b/app/src/main/res/xml/api_preferences.xml
@@ -4,6 +4,7 @@
     <Preference
         android:key="api_token_settings"
         android:title="@string/tokens"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/api_token_preferences.xml b/app/src/main/res/xml/api_token_preferences.xml
index f5685d069..dc870c414 100644
--- a/app/src/main/res/xml/api_token_preferences.xml
+++ b/app/src/main/res/xml/api_token_preferences.xml
@@ -8,61 +8,71 @@
         android:key="api_login"
         android:summary="%s"
         android:title="@string/api_login"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:defaultValue="ilfexgv3nnljz3isbm257gzwrzr7bi"
         android:key="helix_client_id"
         android:title="@string/api_helix"
         app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:defaultValue="https://localhost"
         android:key="helix_redirect"
         android:title="@string/api_helix_redirect"
         app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:defaultValue="kd1unb4b3q4t58fwlpcbzcbnm76a8fp"
         android:key="gql_client_id2"
         android:title="@string/api_gql"
         app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:defaultValue="https://www.twitch.tv/"
         android:key="gql_redirect2"
         android:title="@string/api_gql_redirect"
         app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <PreferenceCategory android:title="@string/api_current_login" app:iconSpaceReserved="false"/>
     <EditTextPreference
         android:key="user_id"
         android:title="@string/api_user_id"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:key="username"
         android:title="@string/api_user_login"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:key="token"
         android:title="@string/api_helix_token"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:key="gql_token2"
         android:title="@string/api_gql_token"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="validate_tokens"
         android:title="@string/api_validate_tokens"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/buffer_preferences.xml b/app/src/main/res/xml/buffer_preferences.xml
index 89c0827d2..c1ab28472 100644
--- a/app/src/main/res/xml/buffer_preferences.xml
+++ b/app/src/main/res/xml/buffer_preferences.xml
@@ -7,8 +7,9 @@
         android:singleLine="true"
         android:title="@string/player_buffer_min"
         app:dialogMessage="@string/player_buffer_min_summary"
-        app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
         android:defaultValue="50000"
@@ -16,8 +17,9 @@
         android:singleLine="true"
         android:title="@string/player_buffer_max"
         app:dialogMessage="@string/player_buffer_max_summary"
-        app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
         android:defaultValue="2000"
@@ -25,8 +27,9 @@
         android:singleLine="true"
         android:title="@string/player_buffer_playback"
         app:dialogMessage="@string/player_buffer_playback_summary"
-        app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
         android:defaultValue="5000"
@@ -34,8 +37,9 @@
         android:singleLine="true"
         android:title="@string/player_buffer_rebuffer"
         app:dialogMessage="@string/player_buffer_rebuffer_summary"
-        app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
         android:defaultValue=""
@@ -43,8 +47,9 @@
         android:singleLine="true"
         android:title="@string/player_minspeedlive"
         app:dialogMessage="@string/player_minspeedlive_summary"
-        app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
         android:defaultValue=""
@@ -52,8 +57,9 @@
         android:singleLine="true"
         android:title="@string/player_maxspeedlive"
         app:dialogMessage="@string/player_maxspeedlive_summary"
-        app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
         android:defaultValue="5000"
@@ -61,7 +67,8 @@
         android:singleLine="true"
         android:title="@string/player_targetoffset"
         app:dialogMessage="@string/player_targetoffset_summary"
-        app:useSimpleSummaryProvider="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
+        app:useSimpleSummaryProvider="true" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/player_button_preferences.xml b/app/src/main/res/xml/player_button_preferences.xml
index b5f20bea8..6a593061f 100644
--- a/app/src/main/res/xml/player_button_preferences.xml
+++ b/app/src/main/res/xml/player_button_preferences.xml
@@ -5,150 +5,175 @@
         android:defaultValue="false"
         android:key="player_viewerlist"
         android:title="@string/player_viewerlist"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_channel"
         android:title="@string/player_channel"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_title"
         android:title="@string/show_title"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_category"
         android:title="@string/show_category"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_show_uptime"
         android:title="@string/show_uptime"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_viewericon"
         android:title="@string/show_view_count_icon"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_minimize"
         android:title="@string/player_minimize"
-        android:icon="@drawable/baseline_expand_more_black_24" />
+        android:icon="@drawable/baseline_expand_more_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_download"
         android:title="@string/player_download"
-        android:icon="@drawable/ic_file_download_black_24dp" />
+        android:icon="@drawable/ic_file_download_black_24dp"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_follow"
         android:title="@string/show_follow_button"
-        android:icon="@drawable/baseline_favorite_border_black_24" />
+        android:icon="@drawable/baseline_favorite_border_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_sleep"
         android:title="@string/player_sleep"
-        android:icon="@drawable/baseline_alarm_black_24" />
+        android:icon="@drawable/baseline_alarm_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_aspect"
         android:title="@string/player_aspect"
-        android:icon="@drawable/baseline_aspect_ratio_black_24" />
+        android:icon="@drawable/baseline_aspect_ratio_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_speedbutton"
         android:title="@string/show_speed_button"
-        android:icon="@drawable/exo_ic_speed" />
+        android:icon="@drawable/exo_ic_speed"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_settings"
         android:title="@string/show_quality_options"
-        android:icon="@drawable/baseline_settings_black_24" />
+        android:icon="@drawable/baseline_settings_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_menu"
         android:title="@string/show_player_menu"
-        android:icon="@drawable/baseline_more_vert_black_24" />
+        android:icon="@drawable/baseline_more_vert_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_gamesbutton"
         android:title="@string/player_gamesbutton"
-        android:icon="@drawable/baseline_format_list_bulleted_black_24" />
+        android:icon="@drawable/baseline_format_list_bulleted_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_restart"
         android:title="@string/show_restart"
-        android:icon="@drawable/baseline_replay_black_24" />
+        android:icon="@drawable/baseline_replay_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_seeklive"
         android:title="@string/show_seeklive"
-        android:icon="@drawable/exo_icon_fastforward" />
+        android:icon="@drawable/exo_icon_fastforward"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_volumebutton"
         android:title="@string/player_volumebutton"
-        android:icon="@drawable/baseline_volume_up_black_24" />
+        android:icon="@drawable/baseline_volume_up_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_audio_compressor_button"
         android:title="@string/show_audio_compressor_button"
-        android:icon="@drawable/baseline_audio_compressor_on_24dp" />
+        android:icon="@drawable/baseline_audio_compressor_on_24dp"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_mode"
         android:title="@string/show_player_mode"
-        android:icon="@drawable/baseline_audiotrack_black_24" />
+        android:icon="@drawable/baseline_audiotrack_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_subtitles"
         android:title="@string/show_subtitles_button"
-        android:icon="@drawable/exo_ic_subtitle_off" />
+        android:icon="@drawable/exo_ic_subtitle_off"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_chatbartoggle"
         android:title="@string/player_chatbartoggle"
-        android:icon="@drawable/baseline_keyboard_black_24" />
+        android:icon="@drawable/baseline_keyboard_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_chattoggle"
         android:title="@string/player_chattoggle"
-        android:icon="@drawable/baseline_speaker_notes_black_24" />
+        android:icon="@drawable/baseline_speaker_notes_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_fullscreen"
         android:title="@string/player_fullscreen"
-        android:icon="@drawable/baseline_fullscreen_black_24" />
+        android:icon="@drawable/baseline_fullscreen_black_24"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_pause"
         android:title="@string/player_pause"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/player_menu_preferences.xml b/app/src/main/res/xml/player_menu_preferences.xml
index dabcb6a32..dd2045b3c 100644
--- a/app/src/main/res/xml/player_menu_preferences.xml
+++ b/app/src/main/res/xml/player_menu_preferences.xml
@@ -5,90 +5,105 @@
         android:defaultValue="false"
         android:key="player_menu_quality"
         android:title="@string/quality"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_menu_speed"
         android:title="@string/playback_speed"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_menu_viewer_list"
         android:title="@string/viewer_list"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_menu_games"
         android:title="@string/vod_games"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_menu_download"
         android:title="@string/download"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_menu_bookmark"
         android:title="@string/bookmark"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_menu_sleep"
         android:title="@string/sleep_timer"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_menu_aspect"
         android:title="@string/aspect_ratio"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_menu_volume"
         android:title="@string/volume"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_menu_subtitles"
         android:title="@string/toggle_subtitles"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_menu_restart"
         android:title="@string/restart_player"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_menu_chat_bar"
         android:title="@string/toggle_chat_bar"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_menu_chat_toggle"
         android:title="@string/toggle_chat"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_menu_reload_emotes"
         android:title="@string/reload_emotes"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_menu_chat_disconnect"
         android:title="@string/disconnect_chat"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/proxy_preferences.xml b/app/src/main/res/xml/proxy_preferences.xml
index ba1bb04cc..8eafbf628 100644
--- a/app/src/main/res/xml/proxy_preferences.xml
+++ b/app/src/main/res/xml/proxy_preferences.xml
@@ -5,34 +5,40 @@
         android:defaultValue="false"
         android:key="proxy_playback_access_token"
         android:title="@string/proxy_playback_access_token"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="proxy_multivariant_playlist"
         android:title="@string/proxy_multivariant_playlist"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:key="proxy_host"
         android:title="@string/proxy_host"
         app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
         app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
         android:key="proxy_port"
         android:title="@string/proxy_port"
         app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
         app:useSimpleSummaryProvider="true" />
 
     <EditTextPreference
         android:key="proxy_user"
         android:title="@string/proxy_user"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:key="proxy_password"
         android:title="@string/proxy_password"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 66a714998..64406d1ce 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -9,7 +9,8 @@
         android:key="ui_language"
         android:summary="%s"
         android:title="@string/language"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="0"
@@ -18,48 +19,56 @@
         android:key="ui_cutoutmode"
         android:summary="%s"
         android:title="@string/ignore_cutouts"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <Preference
         android:key="theme_settings"
         android:title="@string/theme"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_rounduserimage"
         android:title="@string/rounduserimage"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="ui_truncateviewcount"
         android:title="@string/truncated_view_counts"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_uptime"
         android:title="@string/show_uptime"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_tags"
         android:title="@string/show_tags"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_broadcasterscount"
         android:title="@string/broadcastersCount"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_gamepager"
         android:title="@string/use_gamepager"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="1"
@@ -68,7 +77,8 @@
         android:key="ui_startonfollowed"
         android:summary="%s"
         android:title="@string/startonfollowed"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="0"
@@ -77,13 +87,15 @@
         android:key="ui_follow_default_page"
         android:summary="%s"
         android:title="@string/default_follow_tab"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_followpager"
         android:title="@string/use_followpager"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="0"
@@ -92,19 +104,22 @@
         android:key="ui_saved_default_page"
         android:summary="%s"
         android:title="@string/default_saved_tab"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_savedpager"
         android:title="@string/use_savedpager"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_bookmark_time_left"
         android:title="@string/show_vod_time_left"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="0"
@@ -113,13 +128,15 @@
         android:key="ui_follow_button"
         android:summary="%s"
         android:title="@string/follow_button"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_scrolltop"
         android:title="@string/show_scrolltop"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="@string/portraitColumns"
@@ -128,7 +145,8 @@
         android:entryValues="@array/portraitColumnCount"
         android:summary="%s"
         android:title="@string/portrait_column_count"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="@string/landscapeColumns"
@@ -137,7 +155,8 @@
         android:entryValues="@array/landscapeColumnCount"
         android:summary="%s"
         android:title="@string/landscape_column_count"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="disabled"
@@ -146,38 +165,44 @@
         android:key="compactStreamsV2"
         android:summary="@string/compact_streams_description"
         android:title="@string/compact_streams_title"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <PreferenceCategory android:title="@string/settings_chat" app:iconSpaceReserved="false" />
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="chat_boldnames"
         android:title="@string/bold_usernames"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_randomcolor"
         android:title="@string/randomcolor"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="animatedGifEmotes"
         android:title="@string/animated_emotes"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_zerowidth"
         android:title="@string/zerowidth"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="chat_timestamps"
         android:title="@string/timestamps"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="0"
@@ -186,7 +211,8 @@
         android:key="chat_timestamp_format"
         android:summary="%s"
         android:title="@string/timestamp_format"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="0"
@@ -195,25 +221,29 @@
         android:key="chat_firstmsg_visibility"
         android:summary="%s"
         android:title="@string/chat_firstmsg_visibility"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_show_usernotice"
         android:title="@string/show_usernotice"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_show_clearmsg"
         android:title="@string/show_clearmsg"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_show_clearchat"
         android:title="@string/show_clearchat"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="4"
@@ -222,7 +252,8 @@
         android:key="chat_image_quality"
         android:summary="%s"
         android:title="@string/image_quality"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SeekBarPreference
         android:defaultValue="600"
@@ -231,13 +262,15 @@
         android:title="@string/message_limit"
         app:iconSpaceReserved="false"
         app:min="1"
-        app:showSeekBarValue="true" />
+        app:showSeekBarValue="true"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_recent"
         android:title="@string/recentMsg_enable"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SeekBarPreference
         android:defaultValue="100"
@@ -246,104 +279,121 @@
         android:title="@string/recentMsg_limit"
         app:iconSpaceReserved="false"
         app:min="1"
-        app:showSeekBarValue="true" />
+        app:showSeekBarValue="true"
+        app:singleLineTitle="false" />
 
     <SeekBarPreference
         android:defaultValue="30"
         android:key="chatWidth"
-        android:title="@string/landscape_chat_width"
         android:max="100"
+        android:title="@string/landscape_chat_width"
+        app:iconSpaceReserved="false"
         app:showSeekBarValue="true"
-        app:iconSpaceReserved="false"/>
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_enable_stv"
         android:title="@string/enable_stv"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_enable_bttv"
         android:title="@string/enable_bttv"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_enable_ffz"
         android:title="@string/enable_ffz"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_keep_chat_open"
         android:title="@string/keep_chat_open"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="chat_use_websocket"
         android:title="@string/use_websocket"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_use_ssl"
         android:title="@string/chat_ssl"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_pubsub_enabled"
         android:title="@string/enable_pubsub"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_points_collect"
         android:title="@string/points_collect"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="chat_points_notify"
         android:title="@string/points_notify"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_raids_show"
         android:title="@string/show_raids"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="chat_raids_auto_switch"
         android:title="@string/auto_switch_raids"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="chat_disable"
         android:title="@string/disable_chat"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <PreferenceCategory android:title="@string/settings_player" app:iconSpaceReserved="false"/>
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_doubletap"
         android:title="@string/player_doubletap"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <Preference
         android:key="player_button_settings"
         android:title="@string/player_buttons"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <Preference
         android:key="player_menu_settings"
         android:title="@string/player_menu"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:entries="@array/backgroundPlaybackEntries"
@@ -351,37 +401,43 @@
         android:key="player_background_playback"
         android:summary="%s"
         android:title="@string/background_playback"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_disable_background_video"
         android:title="@string/disable_background_video"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_use_background_audio_track"
         android:title="@string/use_background_audio_track"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_keep_screen_on_when_paused"
         android:title="@string/keep_screen_on_when_paused"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_audio_focus"
         android:title="@string/use_audio_focus"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_handle_audio_becoming_noisy"
         android:title="@string/handle_audio_becoming_noisy"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="10000"
@@ -390,7 +446,8 @@
         android:entryValues="@array/playerSeekValues"
         android:summary="@string/seconds_full"
         android:title="@string/rewind"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="10000"
@@ -399,12 +456,14 @@
         android:entryValues="@array/playerSeekValues"
         android:summary="@string/seconds_full"
         android:title="@string/forward"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <Preference
         android:key="buffer_settings"
         android:title="@string/buffer_settings"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="saved"
@@ -413,71 +472,83 @@
         android:key="player_defaultquality"
         android:summary="%s"
         android:title="@string/player_defaultquality"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:defaultValue="0.25\n0.5\n0.75\n1.0\n1.25\n1.5\n1.75\n2.0\n3.0\n4.0\n8.0"
         android:key="player_speed_list"
         android:title="@string/playback_speeds"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="player_use_videopositions"
         android:title="@string/save_video_positions"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <Preference
         android:key="clear_video_positions"
         android:title="@string/clear_video_positions"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_hide_ads"
         android:title="@string/hide_ads"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="player_stream_proxy"
         android:summary="@string/use_custom_proxy_desc"
         android:title="@string/use_custom_proxy"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:defaultValue="https://api.ttv.lol/playlist/$channel.m3u8?allow_source=true&amp;allow_audio_only=true&amp;fast_bread=true"
         android:key="player_proxy_url"
         android:summary="@string/stream_proxy_url_desc"
         android:title="@string/stream_proxy_url"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:key="player_stream_headers"
         android:summary="@string/stream_headers_desc"
         android:title="@string/stream_headers"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <Preference
         android:key="proxy_settings"
         android:title="@string/proxy_settings"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <Preference
         android:key="token_settings"
         android:title="@string/token_settings"
         app:allowDividerAbove="true"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <Preference
         android:key="api_settings"
         android:title="@string/api_settings"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <Preference
         android:key="admin_settings"
         android:title="@string/admin_settings"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SeekBarPreference
         android:defaultValue="10"
@@ -486,54 +557,63 @@
         android:title="@string/download_limit"
         app:iconSpaceReserved="false"
         app:min="1"
-        app:showSeekBarValue="true" />
+        app:showSeekBarValue="true"
+        app:singleLineTitle="false" />
 
     <PreferenceCategory android:title="@string/settings_debug" app:iconSpaceReserved="false"/>
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="debug_chat_fullmsg"
         android:title="@string/show_copy_fullmsg"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="debug_secondview"
         android:title="@string/debug_secondview"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="debug_api_commands"
         android:title="@string/debug_api_commands"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="debug_player_menu_playlist_tags"
         android:title="@string/show_playlist_tags"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="enable_integrity"
         android:title="@string/use_integrity"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:key="gql_headers"
         android:title="@string/gql_headers"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="debug_workmanager_downloads"
         android:title="@string/use_workmanager_downloads"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="debug_show_conscrypt_error_toast"
         android:title="@string/show_conscrypt_error_toast"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/theme_preferences.xml b/app/src/main/res/xml/theme_preferences.xml
index 46c127025..9c66a39c7 100644
--- a/app/src/main/res/xml/theme_preferences.xml
+++ b/app/src/main/res/xml/theme_preferences.xml
@@ -8,19 +8,22 @@
         android:key="theme"
         android:summary="%s"
         android:title="@string/theme"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_theme_rounded_corners"
         android:title="@string/rounded_corners"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="ui_theme_follow_system"
         android:title="@string/follow_system_theme"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="0"
@@ -29,7 +32,8 @@
         android:key="ui_theme_dark_on"
         android:summary="%s"
         android:title="@string/dark_theme_on"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="2"
@@ -38,30 +42,35 @@
         android:key="ui_theme_dark_off"
         android:summary="%s"
         android:title="@string/dark_theme_off"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_theme_edge_to_edge"
         android:title="@string/edge_to_edge"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_theme_appbar_lift"
         android:title="@string/appbar_lift"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_theme_bottom_nav_color"
         android:title="@string/bottom_nav_color"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="ui_theme_material3"
         android:title="@string/material_3"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/token_preferences.xml b/app/src/main/res/xml/token_preferences.xml
index ec561d812..006f2c704 100644
--- a/app/src/main/res/xml/token_preferences.xml
+++ b/app/src/main/res/xml/token_preferences.xml
@@ -8,6 +8,7 @@
         android:key="token_xdeviceid"
         android:title="X-Device-Id"
         app:iconSpaceReserved="false"
+        app:singleLineTitle="false"
         app:useSimpleSummaryProvider="true" />
 
     <SwitchPreferenceCompat
@@ -15,13 +16,15 @@
         android:disableDependentsState="true"
         android:key="token_random_deviceid"
         android:title="@string/token_random_deviceid"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <EditTextPreference
         android:defaultValue="site"
         android:key="token_playertype"
         android:title="playerType"
         app:iconSpaceReserved="false"
+        app:singleLineTitle="false" 
         app:useSimpleSummaryProvider="true" />
 
     <SwitchPreferenceCompat
@@ -29,7 +32,8 @@
         android:key="token_include_token_stream"
         android:summary="@string/sub_only_summary"
         android:title="@string/include_gql_token"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <PreferenceCategory android:title="@string/videos" app:iconSpaceReserved="false"/>
     <EditTextPreference
@@ -37,6 +41,7 @@
         android:key="token_playertype_video"
         android:title="playerType"
         app:iconSpaceReserved="false"
+        app:singleLineTitle="false" 
         app:useSimpleSummaryProvider="true" />
 
     <SwitchPreferenceCompat
@@ -44,7 +49,8 @@
         android:key="token_include_token_video"
         android:summary="@string/sub_only_summary"
         android:title="@string/include_gql_token"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="2"
@@ -53,7 +59,8 @@
         android:key="token_skip_video_access_token"
         android:summary="%s"
         android:title="@string/skip_video_access_token"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
     <ListPreference
         android:defaultValue="2"
@@ -62,6 +69,7 @@
         android:key="token_skip_clip_access_token"
         android:summary="%s"
         android:title="@string/skip_clip_access_token"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:singleLineTitle="false" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f5f286fed..a0ba42446 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ hilt-extension-compiler = "1.1.0"
 hilt-work = "1.1.0"
 kotlin = "1.9.22"
 ksp = "1.9.22-1.0.16"
-lifecycle = "2.6.2"
+lifecycle = "2.7.0"
 material = "1.11.0"
 media3 = "1.2.0"
 navigation = "2.7.6"