Skip to content

Commit ce6a5eb

Browse files
authored
Merge pull request TeamNewPipe#2107 from chin123/fix_padding_settings
Fix padding in settings layout (Fixes TeamNewPipe#1866)
2 parents 5fb0729 + 1b6c49f commit ce6a5eb

8 files changed

+60
-0
lines changed

app/src/main/res/xml/appearance_settings.xml

+7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PreferenceScreen
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
45
android:title="@string/settings_category_appearance_title">
56

67
<ListPreference
8+
app:iconSpaceReserved="false"
79
android:defaultValue="@string/default_theme_value"
810
android:entries="@array/theme_description_list"
911
android:entryValues="@array/theme_values_list"
@@ -12,17 +14,20 @@
1214
android:title="@string/theme_title"/>
1315

1416
<SwitchPreference
17+
app:iconSpaceReserved="false"
1518
android:defaultValue="true"
1619
android:key="@string/show_next_video_key"
1720
android:title="@string/show_next_and_similar_title"/>
1821

1922
<SwitchPreference
23+
app:iconSpaceReserved="false"
2024
android:defaultValue="true"
2125
android:key="@string/show_hold_to_append_key"
2226
android:title="@string/show_hold_to_append_title"
2327
android:summary="@string/show_hold_to_append_summary"/>
2428

2529
<ListPreference
30+
app:iconSpaceReserved="false"
2631
android:defaultValue="@string/list_view_mode_value"
2732
android:entries="@array/list_view_mode_description"
2833
android:entryValues="@array/list_view_mode_values"
@@ -31,11 +36,13 @@
3136
android:title="@string/list_view_mode"/>
3237

3338
<Preference
39+
app:iconSpaceReserved="false"
3440
android:key="@string/caption_settings_key"
3541
android:title="@string/caption_setting_title"
3642
android:summary="@string/caption_setting_description"/>
3743

3844
<PreferenceScreen
45+
app:iconSpaceReserved="false"
3946
android:fragment="org.schabi.newpipe.settings.tabs.ChooseTabsFragment"
4047
android:summary="@string/main_page_content_summary"
4148
android:key="@string/main_page_content_key"

app/src/main/res/xml/content_settings.xml

+8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PreferenceScreen
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
45
android:title="@string/content">
56
<ListPreference
7+
app:iconSpaceReserved="false"
68
android:defaultValue="@string/default_country_value"
79
android:entries="@array/country_names"
810
android:entryValues="@array/country_codes"
@@ -11,6 +13,7 @@
1113
android:title="@string/default_content_country_title"/>
1214

1315
<ListPreference
16+
app:iconSpaceReserved="false"
1417
android:defaultValue="@string/default_language_value"
1518
android:entries="@array/language_names"
1619
android:entryValues="@array/language_codes"
@@ -19,28 +22,33 @@
1922
android:title="@string/content_language_title"/>
2023

2124
<SwitchPreference
25+
app:iconSpaceReserved="false"
2226
android:defaultValue="false"
2327
android:key="@string/show_age_restricted_content"
2428
android:title="@string/show_age_restricted_content_title"/>
2529

2630
<SwitchPreference
31+
app:iconSpaceReserved="false"
2732
android:defaultValue="true"
2833
android:key="@string/show_search_suggestions_key"
2934
android:summary="@string/show_search_suggestions_summary"
3035
android:title="@string/show_search_suggestions_title"/>
3136

3237
<SwitchPreference
38+
app:iconSpaceReserved="false"
3339
android:defaultValue="true"
3440
android:key="@string/download_thumbnail_key"
3541
android:title="@string/download_thumbnail_title"
3642
android:summary="@string/download_thumbnail_summary"/>
3743

3844
<Preference
45+
app:iconSpaceReserved="false"
3946
android:summary="@string/import_data_summary"
4047
android:key="@string/import_data"
4148
android:title="@string/import_data_title"/>
4249

4350
<Preference
51+
app:iconSpaceReserved="false"
4452
android:title="@string/export_data_title"
4553
android:key="@string/export_data"
4654
android:summary="@string/export_data_summary"/>

app/src/main/res/xml/debug_settings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PreferenceScreen
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
45
android:key="general_preferences"
56
android:title="@string/settings_category_debug_title">
67

78
<SwitchPreference
9+
app:iconSpaceReserved="false"
810
android:defaultValue="false"
911
android:key="@string/allow_heap_dumping_key"
1012
android:title="@string/enable_leak_canary_title"
1113
android:summary="@string/enable_leak_canary_summary"/>
1214

1315
<SwitchPreference
16+
app:iconSpaceReserved="false"
1417
android:defaultValue="false"
1518
android:key="@string/allow_disposed_exceptions_key"
1619
android:title="@string/enable_disposed_exceptions_title"

app/src/main/res/xml/download_settings.xml

+7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PreferenceScreen
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
45
android:title="@string/settings_category_downloads_title">
56

67
<Preference
8+
app:iconSpaceReserved="false"
79
android:dialogTitle="@string/download_path_dialog_title"
810
android:key="@string/download_path_key"
911
android:summary="@string/download_path_summary"
1012
android:title="@string/download_path_title"/>
1113

1214
<Preference
15+
app:iconSpaceReserved="false"
1316
android:dialogTitle="@string/download_path_audio_dialog_title"
1417
android:key="@string/download_path_audio_key"
1518
android:summary="@string/download_path_audio_summary"
1619
android:title="@string/download_path_audio_title"/>
1720

1821
<ListPreference
22+
app:iconSpaceReserved="false"
1923
android:defaultValue="@string/default_file_charset_value"
2024
android:entries="@array/settings_filename_charset_name"
2125
android:entryValues="@array/settings_filename_charset"
@@ -24,12 +28,14 @@
2428
android:title="@string/settings_file_charset_title"/>
2529

2630
<EditTextPreference
31+
app:iconSpaceReserved="false"
2732
android:defaultValue="@string/settings_file_replacement_character_default_value"
2833
android:key="@string/settings_file_replacement_character_key"
2934
android:summary="@string/settings_file_replacement_character_summary"
3035
android:title="@string/settings_file_replacement_character_title"/>
3136

3237
<ListPreference
38+
app:iconSpaceReserved="false"
3339
android:defaultValue="@string/downloads_maximum_retry_default"
3440
android:entries="@array/downloads_maximum_retry_list"
3541
android:entryValues="@array/downloads_maximum_retry_list"
@@ -38,6 +44,7 @@
3844
android:title="@string/max_retry_msg" />
3945

4046
<SwitchPreference
47+
app:iconSpaceReserved="false"
4148
android:defaultValue="false"
4249
android:key="@string/downloads_cross_network"
4350
android:summary="@string/pause_downloads_on_mobile_desc"

app/src/main/res/xml/history_settings.xml

+6
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,38 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PreferenceScreen
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
45
android:key="general_preferences"
56
android:title="@string/settings_category_history_title">
67

78
<SwitchPreference
9+
app:iconSpaceReserved="false"
810
android:defaultValue="true"
911
android:key="@string/enable_watch_history_key"
1012
android:summary="@string/enable_watch_history_summary"
1113
android:title="@string/enable_watch_history_title"/>
1214

1315
<SwitchPreference
16+
app:iconSpaceReserved="false"
1417
android:defaultValue="true"
1518
android:key="@string/enable_search_history_key"
1619
android:summary="@string/enable_search_history_summary"
1720
android:title="@string/enable_search_history_title"/>
1821

1922
<Preference
23+
app:iconSpaceReserved="false"
2024
android:key="@string/metadata_cache_wipe_key"
2125
android:summary="@string/metadata_cache_wipe_summary"
2226
android:title="@string/metadata_cache_wipe_title"/>
2327

2428
<Preference
29+
app:iconSpaceReserved="false"
2530
android:key="@string/clear_views_history_key"
2631
android:title="@string/clear_views_history_title"
2732
android:summary="@string/clear_views_history_summary"/>
2833

2934
<Preference
35+
app:iconSpaceReserved="false"
3036
android:key="@string/clear_search_history_key"
3137
android:title="@string/clear_search_history_title"
3238
android:summary="@string/clear_search_history_summary"/>

app/src/main/res/xml/main_settings.xml

+8
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,49 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PreferenceScreen
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
45
android:key="general_preferences"
56
android:title="@string/settings">
67

78
<PreferenceScreen
9+
app:iconSpaceReserved="false"
810
android:fragment="org.schabi.newpipe.settings.VideoAudioSettingsFragment"
911
android:icon="?attr/audio"
1012
android:title="@string/settings_category_video_audio_title"/>
1113

1214
<PreferenceScreen
15+
app:iconSpaceReserved="false"
1316
android:fragment="org.schabi.newpipe.settings.DownloadSettingsFragment"
1417
android:icon="?attr/download"
1518
android:title="@string/settings_category_downloads_title"/>
1619

1720
<PreferenceScreen
21+
app:iconSpaceReserved="false"
1822
android:fragment="org.schabi.newpipe.settings.AppearanceSettingsFragment"
1923
android:icon="?attr/palette"
2024
android:title="@string/settings_category_appearance_title"/>
2125

2226
<PreferenceScreen
27+
app:iconSpaceReserved="false"
2328
android:fragment="org.schabi.newpipe.settings.HistorySettingsFragment"
2429
android:icon="?attr/history"
2530
android:title="@string/settings_category_history_title"/>
2631

2732
<PreferenceScreen
33+
app:iconSpaceReserved="false"
2834
android:fragment="org.schabi.newpipe.settings.ContentSettingsFragment"
2935
android:icon="?attr/language"
3036
android:title="@string/content"/>
3137

3238
<PreferenceScreen
39+
app:iconSpaceReserved="false"
3340
android:fragment="org.schabi.newpipe.settings.UpdateSettingsFragment"
3441
android:icon="?attr/ic_settings_update"
3542
android:title="@string/settings_category_updates_title"
3643
android:key="update_pref_screen_key"/>
3744

3845
<PreferenceScreen
46+
app:iconSpaceReserved="false"
3947
android:fragment="org.schabi.newpipe.settings.DebugSettingsFragment"
4048
android:icon="?attr/bug"
4149
android:title="@string/settings_category_debug_title"

app/src/main/res/xml/update_settings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PreferenceScreen
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
45
android:key="general_preferences"
56
android:title="@string/settings_category_updates_title">
67

78
<SwitchPreference
9+
app:iconSpaceReserved="false"
810
android:defaultValue="true"
911
android:key="@string/update_app_key"
1012
android:title="@string/updates_setting_title"

0 commit comments

Comments
 (0)