Fixes L10n with the prompt widget (#2607)

MozillaReality · Jan 13, 2020 · dd3477c · dd3477c
1 parent 6a253bd
commit dd3477c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/app/src/main/res/layout/prompt_auth.xml b/app/src/main/res/layout/prompt_auth.xml
@@ -132,8 +132,8 @@
 
                 <CheckBox
                     android:id="@+id/showPasswordCheckbox"
-                    android:layout_marginStart="5dp"
-                    style="@style/settingsSwitch" />
+                    style="@style/checkbox"
+                    android:layout_marginStart="5dp"/>
 
             </LinearLayout>
 

diff --git a/app/src/main/res/layout/prompt_dialog.xml b/app/src/main/res/layout/prompt_dialog.xml
@@ -93,12 +93,7 @@
             android:layout_above="@+id/buttonsLayout">
             <CheckBox
                 android:id="@+id/checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:button="@drawable/checkbox"
-                android:layout_gravity="center_horizontal"
-                android:textSize="@dimen/text_medium_size"
-                android:text="Checkbox"
+                style="@style/checkbox"
                 tools:text="Checkbox" />
         </FrameLayout>
 

diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
@@ -243,7 +243,7 @@
 
     <!-- Prompt dialog -->
     <dimen name="prompt_dialog_width">450dp</dimen>
-    <dimen name="prompt_dialog_height">365dp</dimen>
+    <dimen name="prompt_dialog_height">375dp</dimen>
     <dimen name="prompt_dialog_padding_top">20dp</dimen>
     <dimen name="prompt_dialog_padding_bottom">42dp</dimen>
     <dimen name="prompt_dialog_padding_sides">64dp</dimen>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -297,14 +297,23 @@
 
     <style name="settingsSwitch">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
         <item name="android:switchMinWidth">0dp</item>
         <item name="android:textOff">""</item>
         <item name="android:textOn">""</item>
         <item name="android:thumb">@drawable/switch_thumb</item>
         <item name="android:track">@drawable/switch_track</item>
     </style>
 
+    <style name="checkbox">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:button">@drawable/checkbox</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:textSize">@dimen/text_medium_size</item>
+        <item name="android:paddingStart">5dp</item>
+    </style>
+
     <style name="settingsHelpButton">
         <item name="android:layout_width">20dp</item>
         <item name="android:layout_height">20dp</item>