Shift preferences to the left of the screen. (#342)

CypherpunkArmory · Oct 15, 2018 · 4f4c4e3 · 4f4c4e3
1 parent 5e6775b
commit 4f4c4e3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -6,10 +6,10 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowBackground">@color/colorPrimaryDark</item>
-        <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="preferenceTheme">@style/preferenceTheme</item>
     </style>
 
-    <style name="PreferenceTheme" parent="PreferenceThemeOverlay">
+    <style name="preferenceTheme" parent="PreferenceThemeOverlay">
         <item name="android:textSize">14sp</item>
     </style>
 

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <!-- TODO set preference categories to not reserve icon space after androidx > 1.0.0 is released -->
     <PreferenceCategory
         android:title="@string/pref_app_category"
         android:key="pref_app_category" >
@@ -9,35 +11,32 @@
             android:summary="@string/pref_default_landing_page_message"
             android:entries="@array/default_landing_pages"
             android:entryValues="@array/default_landing_pages"
-            android:defaultValue="@string/apps" />
+            android:defaultValue="@string/apps"
+            app:iconSpaceReserved="false"/>
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/pref_proot_category"
-        android:key="pref_proot_category" >
+        android:key="pref_proot_category"
+        app:iconSpaceReserved="false">
         <CheckBoxPreference
             android:key="pref_proot_debug_enabled"
             android:title="@string/pref_proot_debugging_enabled_title"
             android:summary="@string/pref_proot_debugging_enabled_summary"
-            android:defaultValue="false" />
+            android:defaultValue="false"
+            app:iconSpaceReserved="false"/>
         <ListPreference
             android:dependency="pref_proot_debug_enabled"
             android:key="pref_proot_debug_level"
             android:title="@string/pref_proot_debugging_level_title"
             android:summary="@string/pref_proot_debugging_level_summary"
             android:entries="@array/proot_debug_levels"
             android:entryValues="@array/proot_debug_levels"
-            android:defaultValue="@string/pref_proot_debugging_level_default" />
-        <!-- TODO Re-enable this preference once bug is fixed.
-        <CheckBoxPreference
-            android:dependency="pref_proot_debug_enabled"
-            android:key="pref_proot_local_file_enabled"
-            android:title="@string/pref_proot_local_file_enabled_title"
-            android:summary="@string/pref_proot_local_file_enabled_summary"
-            android:defaultValue="true" />
-        -->
+            android:defaultValue="@string/pref_proot_debugging_level_default"
+            app:iconSpaceReserved="false"/>
         <Preference
             android:dependency="pref_proot_debug_enabled"
             android:key="pref_proot_delete_debug_file"
-            android:title="@string/pref_proot_delete_debug_file_title" />
+            android:title="@string/pref_proot_delete_debug_file_title"
+            app:iconSpaceReserved="false"/>
     </PreferenceCategory>
 </PreferenceScreen>