Merge pull request #1411 from EmmanuelMess/fix-colorpickercrash

Fixed missing padding constant for API < 22 in ColorPickerDialog's xml
TeamAmaze · Aug 23, 2018 · 4606d36 · 4606d36
1 parent 4a47689
commit 4606d36
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/app/src/main/res/layout-v22/dialog_colorpicker.xml b/app/src/main/res/layout-v22/dialog_colorpicker.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingEnd="?android:dialogPreferredPadding"
+    android:paddingStart="?android:dialogPreferredPadding">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_colorpicker.xml b/app/src/main/res/layout/dialog_colorpicker.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              android:paddingEnd="?android:attr/dialogPreferredPadding"
-              android:paddingStart="?android:attr/dialogPreferredPadding">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/dialogPreferredPadding"
+    android:paddingRight="@dimen/dialogPreferredPadding">
 
     <ScrollView
         android:layout_width="match_parent"

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -505,5 +505,7 @@
   <string name="items">Éléments</string>
   <string name="byte_singular">octet</string>
   <string name="bytes">Octets</string>
+    <string name="preselectedconfigs_title">Couleurs préconfigurées</string>
+  <string name="selectcolorconfig">Configurer les couleurs</string>
   <!-- end of plurals -->
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -50,4 +50,6 @@
     <dimen name="md_content_textsize">16sp</dimen>
     <dimen name="md_content_padding_top">8dp</dimen>
 
+    <dimen name="dialogPreferredPadding">24dp</dimen>
+
 </resources>