Skip to content

Added wrapping settings titles to the next line #6952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2021
Merged

Added wrapping settings titles to the next line #6952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d69672e
Added wrapping settings titles to the next line (#6951)
Aga-C Aug 21, 2021
5c31dff
Added title wrap to other preferences
Aga-C Aug 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/src/main/res/xml/appearance_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
android:key="@string/theme_key"
android:summary="%s"
android:title="@string/theme_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<ListPreference
Expand All @@ -19,13 +20,15 @@
android:key="@string/night_theme_key"
android:summary="@string/night_theme_summary"
android:title="@string/night_theme_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/show_hold_to_append_key"
android:summary="@string/show_hold_to_append_summary"
android:title="@string/show_hold_to_append_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<ListPreference
Expand All @@ -35,12 +38,14 @@
android:key="@string/list_view_mode_key"
android:summary="%s"
android:title="@string/list_view_mode"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:key="@string/caption_settings_key"
android:summary="@string/caption_setting_description"
android:title="@string/caption_setting_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<ListPreference
Expand All @@ -50,5 +55,6 @@
android:key="@string/tablet_mode_key"
android:summary="%s"
android:title="@string/tablet_mode_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />
</PreferenceScreen>
19 changes: 19 additions & 0 deletions app/src/main/res/xml/content_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
android:key="@string/app_language_key"
android:summary="%s"
android:title="@string/app_language_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<ListPreference
Expand All @@ -19,6 +20,7 @@
android:key="@string/content_language_key"
android:summary="%s"
android:title="@string/content_language_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<ListPreference
Expand All @@ -28,98 +30,113 @@
android:key="@string/content_country_key"
android:summary="%s"
android:title="@string/default_content_country_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<PreferenceScreen
android:fragment="org.schabi.newpipe.settings.tabs.ChooseTabsFragment"
android:key="@string/main_page_content_key"
android:summary="@string/main_page_content_summary"
android:title="@string/main_page_content"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<PreferenceScreen
android:fragment="org.schabi.newpipe.settings.PeertubeInstanceListFragment"
android:key="@string/peertube_instance_setup_key"
android:summary="@string/peertube_instance_url_summary"
android:title="@string/peertube_instance_url_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/show_age_restricted_content"
android:summary="@string/show_age_restricted_content_summary"
android:title="@string/show_age_restricted_content_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/youtube_restricted_mode_enabled"
android:summary="@string/youtube_restricted_mode_enabled_summary"
android:title="@string/youtube_restricted_mode_enabled_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/show_search_suggestions_key"
android:summary="@string/show_search_suggestions_summary"
android:title="@string/show_search_suggestions_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/download_thumbnail_key"
android:summary="@string/download_thumbnail_summary"
android:title="@string/download_thumbnail_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/show_comments_key"
android:summary="@string/show_comments_summary"
android:title="@string/show_comments_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/show_next_video_key"
android:title="@string/show_next_and_similar_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/show_description_key"
android:summary="@string/show_description_summary"
android:title="@string/show_description_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/show_meta_info_key"
android:summary="@string/show_meta_info_summary"
android:title="@string/show_meta_info_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:key="@string/import_data"
android:summary="@string/import_data_summary"
android:title="@string/import_data_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:key="@string/export_data"
android:summary="@string/export_data_summary"
android:title="@string/export_data_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:key="@string/clear_cookie_key"
android:summary="@string/clear_cookie_summary"
android:title="@string/clear_cookie_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<PreferenceCategory
android:layout="@layout/settings_category_header_layout"
android:title="@string/settings_category_feed_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false">

<org.schabi.newpipe.settings.custom.DurationListPreference
Expand All @@ -129,13 +146,15 @@
android:key="@string/feed_update_threshold_key"
android:summary="@string/feed_update_threshold_summary"
android:title="@string/feed_update_threshold_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/feed_use_dedicated_fetch_method_key"
android:summary="@string/feed_use_dedicated_fetch_method_summary"
android:title="@string/feed_use_dedicated_fetch_method_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

</PreferenceCategory>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/xml/debug_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,42 @@
android:key="@string/allow_heap_dumping_key"
android:summary="@string/enable_leak_canary_summary"
android:title="@string/leakcanary"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:key="@string/show_memory_leaks_key"
android:title="@string/show_memory_leaks"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/allow_disposed_exceptions_key"
android:summary="@string/enable_disposed_exceptions_summary"
android:title="@string/enable_disposed_exceptions_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/show_original_time_ago_key"
android:summary="@string/show_original_time_ago_summary"
android:title="@string/show_original_time_ago_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/disable_media_tunneling_key"
android:summary="@string/disable_media_tunneling_summary"
android:title="@string/disable_media_tunneling_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:key="@string/crash_the_app_key"
android:title="@string/crash_the_app"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />
</PreferenceScreen>
9 changes: 9 additions & 0 deletions app/src/main/res/xml/download_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,30 @@
android:key="@string/downloads_storage_ask"
android:summary="@string/downloads_storage_ask_summary"
android:title="@string/downloads_storage_ask_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:key="@string/storage_use_saf"
android:summary="@string/downloads_storage_use_saf_summary"
android:title="@string/downloads_storage_use_saf_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:dialogTitle="@string/download_path_dialog_title"
android:key="@string/download_path_video_key"
android:summary="@string/download_path_summary"
android:title="@string/download_path_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:dialogTitle="@string/download_path_audio_dialog_title"
android:key="@string/download_path_audio_key"
android:summary="@string/download_path_audio_summary"
android:title="@string/download_path_audio_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<ListPreference
Expand All @@ -37,13 +41,15 @@
android:key="@string/settings_file_charset_key"
android:summary="%s"
android:title="@string/settings_file_charset_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<EditTextPreference
android:defaultValue="@string/settings_file_replacement_character_default_value"
android:key="@string/settings_file_replacement_character_key"
android:summary="@string/settings_file_replacement_character_summary"
android:title="@string/settings_file_replacement_character_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<ListPreference
Expand All @@ -53,20 +59,23 @@
android:key="@string/downloads_maximum_retry"
android:summary="@string/max_retry_desc"
android:title="@string/max_retry_msg"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/downloads_cross_network"
android:summary="@string/pause_downloads_on_mobile_desc"
android:title="@string/pause_downloads_on_mobile"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/downloads_queue_limit"
android:summary="@string/enable_queue_limit_desc"
android:title="@string/enable_queue_limit"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

</PreferenceScreen>
9 changes: 9 additions & 0 deletions app/src/main/res/xml/history_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:key="@string/enable_watch_history_key"
android:summary="@string/enable_watch_history_summary"
android:title="@string/enable_watch_history_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
Expand All @@ -17,49 +18,57 @@
android:key="@string/enable_playback_resume_key"
android:summary="@string/enable_playback_resume_summary"
android:title="@string/enable_playback_resume_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/enable_playback_state_lists_key"
android:summary="@string/enable_playback_state_lists_summary"
android:title="@string/enable_playback_state_lists_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/enable_search_history_key"
android:summary="@string/enable_search_history_summary"
android:title="@string/enable_search_history_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<PreferenceCategory
android:layout="@layout/settings_category_header_layout"
android:title="@string/settings_category_clear_data_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false">

<Preference
android:key="@string/metadata_cache_wipe_key"
android:summary="@string/metadata_cache_wipe_summary"
android:title="@string/metadata_cache_wipe_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:key="@string/clear_views_history_key"
android:summary="@string/clear_views_history_summary"
android:title="@string/clear_views_history_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:key="@string/clear_playback_states_key"
android:summary="@string/clear_playback_states_summary"
android:title="@string/clear_playback_states_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<Preference
android:key="@string/clear_search_history_key"
android:summary="@string/clear_search_history_summary"
android:title="@string/clear_search_history_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

</PreferenceCategory>
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/xml/notification_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,23 @@
android:key="@string/scale_to_square_image_in_notifications_key"
android:summary="@string/notification_scale_to_square_image_summary"
android:title="@string/notification_scale_to_square_image_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/notification_colorize_key"
android:summary="@string/notification_colorize_summary"
android:title="@string/notification_colorize_title"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/show_thumbnail_key"
android:title="@string/show_thumbnail_title"
android:summary="@string/show_thumbnail_summary"
app:singleLineTitle="false"
app:iconSpaceReserved="false" />

<PreferenceCategory
Expand Down
Loading