greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #201 from Poslovitch/ignore-icon-reserved-space

Browse Source 
Ignore icon reserved space for preferences in SettingsActivity
This commit is contained in:
Stefan Schüller 2020-07-05 00:17:25 +02:00 committed by GitHub
commit 90029aaf76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
View File

@ -25,8 +25,6 @@ import androidx.preference.PreferenceFragmentCompat;
import net.schueller.peertube.R; import net.schueller.peertube.R;
import java.util.Objects;
public class SettingsActivity extends CommonActivity { public class SettingsActivity extends CommonActivity {
@Override @Override

38
app/src/main/res/xml/root_preferences.xml
View File

@ -1,6 +1,6 @@
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory app:title="@string/settings_activity_look_and_feel_category_title"> <PreferenceCategory app:title="@string/settings_activity_look_and_feel_category_title" app:iconSpaceReserved="false">
<ListPreference <ListPreference
app:defaultValue="@array/empty_array" app:defaultValue="@array/empty_array"
@ -8,7 +8,8 @@
app:entryValues="@array/supportedLanguagesValues" app:entryValues="@array/supportedLanguagesValues"
app:key="pref_language_app" app:key="pref_language_app"
app:summary="@string/pref_description_language_app" app:summary="@string/pref_description_language_app"
app:title="@string/pref_language_app" /> app:title="@string/pref_language_app"
app:iconSpaceReserved="false"/>
<ListPreference <ListPreference
app:defaultValue="AppTheme.BLUE" app:defaultValue="AppTheme.BLUE"
@ -16,23 +17,26 @@
app:entryValues="@array/themeValues" app:entryValues="@array/themeValues"
app:key="pref_theme" app:key="pref_theme"
app:summary="@string/pref_description_app_theme" app:summary="@string/pref_description_app_theme"
app:title="@string/pref_title_app_theme" /> app:title="@string/pref_title_app_theme"
app:iconSpaceReserved="false"/>
<SwitchPreference <SwitchPreference
app:defaultValue="false" app:defaultValue="false"
app:key="pref_dark_mode" app:key="pref_dark_mode"
app:summary="@string/pref_description_dark_mode" app:summary="@string/pref_description_dark_mode"
app:title="@string/pref_title_dark_mode" /> app:title="@string/pref_title_dark_mode"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/settings_activity_video_list_category_title"> <PreferenceCategory app:title="@string/settings_activity_video_list_category_title" app:iconSpaceReserved="false">
<SwitchPreference <SwitchPreference
app:defaultValue="false" app:defaultValue="false"
app:key="pref_show_nsfw" app:key="pref_show_nsfw"
app:summary="@string/pref_description_show_nsfw" app:summary="@string/pref_description_show_nsfw"
app:title="@string/pref_title_show_nsfw" /> app:title="@string/pref_title_show_nsfw"
app:iconSpaceReserved="false"/>
<MultiSelectListPreference <MultiSelectListPreference
app:defaultValue="@array/empty_array" app:defaultValue="@array/empty_array"
@ -40,17 +44,19 @@
app:entryValues="@array/languageValues" app:entryValues="@array/languageValues"
app:key="pref_language" app:key="pref_language"
app:summary="@string/pref_description_language" app:summary="@string/pref_description_language"
app:title="@string/pref_language" /> app:title="@string/pref_language"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/settings_activity_video_playback_category_title"> <PreferenceCategory app:title="@string/settings_activity_video_playback_category_title" app:iconSpaceReserved="false">
<SwitchPreference <SwitchPreference
app:defaultValue="true" app:defaultValue="true"
app:key="pref_back_pause" app:key="pref_back_pause"
app:summary="@string/pref_description_back_pause" app:summary="@string/pref_description_back_pause"
app:title="@string/pref_title_back_pause" /> app:title="@string/pref_title_back_pause"
app:iconSpaceReserved="false"/>
<ListPreference <ListPreference
app:defaultValue="@array/empty_array" app:defaultValue="@array/empty_array"
@ -58,25 +64,29 @@
app:entryValues="@array/backgroundBehaviorValues" app:entryValues="@array/backgroundBehaviorValues"
app:key="pref_background_behavior" app:key="pref_background_behavior"
app:summary="@string/pref_background_behavior_summary" app:summary="@string/pref_background_behavior_summary"
app:title="@string/pref_background_behavior" /> app:title="@string/pref_background_behavior"
app:iconSpaceReserved="false"/>
<SwitchPreference <SwitchPreference
app:defaultValue="false" app:defaultValue="false"
app:key="pref_torrent_player" app:key="pref_torrent_player"
app:summary="@string/pref_description_torrent_player" app:summary="@string/pref_description_torrent_player"
app:title="@string/pref_title_torrent_player" /> app:title="@string/pref_title_torrent_player"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/settings_activity_about_category_title"> <PreferenceCategory app:title="@string/settings_activity_about_category_title" app:iconSpaceReserved="false">
<Preference <Preference
app:summary="@string/versionName" app:summary="@string/versionName"
app:title="@string/pref_title_version" /> app:title="@string/pref_title_version"
app:iconSpaceReserved="false"/>
<Preference <Preference
app:summary="@string/pref_description_license" app:summary="@string/pref_description_license"
app:title="@string/pref_title_license" /> app:title="@string/pref_title_license"
app:iconSpaceReserved="false"/>
</PreferenceCategory> </PreferenceCategory>