multi line preference titles

(cherry picked from commit 604e271)
crackededed · Jan 16, 2024 · 7510e50 · 7510e50
1 parent d6c3196
commit 7510e50
Show file tree

Hide file tree

Showing 11 changed files with 336 additions and 171 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -28,8 +28,8 @@ android {
  applicationId = "com.github.andreyasadchy.xtra"
  minSdk = 21
  targetSdk = 34
- versionCode = 219
- versionName = "2.27.1"
+ versionCode = 220
+ versionName = "2.27.2"
  resourceConfigurations += listOf("ar", "de", "en", "es", "fr", "in", "ja", "pt-rBR", "ru", "tr", "zh-rTW")
  }
 

diff --git 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
@@ -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
@@ -7,61 +7,68 @@
  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"
  android:key="player_buffer_max"
  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"
  android:key="player_buffer_playback"
  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"
  android:key="player_buffer_rebuffer"
  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=""
  android:key="player_live_min_speed"
  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=""
  android:key="player_live_max_speed"
  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"
  android:key="player_live_target_offset"
  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
@@ -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>