use proper paddings in dialogs on android < 5

4 files changed, 28 insertions, 20 deletions

diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml
index 8aae08a6..d81ed0f2 100644
--- a/src/main/res/layout/create_conference_dialog.xml
+++ b/src/main/res/layout/create_conference_dialog.xml
@@ -1,12 +1,12 @@
 <?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:paddingBottom="8dp"
-              android:paddingLeft="24dp"
-              android:paddingRight="24dp"
-              android:paddingTop="16dp">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="?attr/dialog_vertical_padding"
+    android:paddingLeft="?attr/dialog_horizontal_padding"
+    android:paddingRight="?attr/dialog_horizontal_padding"
+    android:paddingTop="?attr/dialog_vertical_padding">
 
     <TextView
         android:id="@+id/your_account"
@@ -37,6 +37,6 @@
         android:inputType="textAutoComplete"
         android:textColor="?attr/color_text_primary"
         android:textColorHint="?attr/color_text_secondary"
-        android:textSize="?attr/TextSizeBody"/>
+        android:textSize="?attr/TextSizeBody" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 252808c8..d130b710 100644
--- a/src/main/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
@@ -3,11 +3,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="8dp" >
+    android:paddingLeft="?attr/dialog_horizontal_padding"
+    android:paddingRight="?attr/dialog_horizontal_padding"
+    android:paddingBottom="?attr/dialog_vertical_padding"
+    android:paddingTop="?attr/dialog_vertical_padding">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="?attr/color_text_primary"
         android:paddingBottom="8dp"
         android:text="@string/clear_histor_msg"
         android:textSize="?attr/TextSizeBody" />
@@ -15,6 +19,7 @@
     <CheckBox
         android:id="@+id/end_conversation_checkbox"
         android:layout_width="wrap_content"
+        android:textColor="?attr/color_text_primary"
         android:layout_height="wrap_content"
         android:text="@string/also_end_conversation" />
 
diff --git a/src/main/res/layout/dialog_show_password.xml b/src/main/res/layout/dialog_show_password.xml
index dba0690c..16765963 100644
--- a/src/main/res/layout/dialog_show_password.xml
+++ b/src/main/res/layout/dialog_show_password.xml
@@ -3,7 +3,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp" >
+    android:paddingLeft="?attr/dialog_horizontal_padding"
+    android:paddingRight="?attr/dialog_horizontal_padding"
+    android:paddingBottom="?attr/dialog_vertical_padding"
+    android:paddingTop="?attr/dialog_vertical_padding">
 
     <TextView
         android:id="@+id/password"
diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index f8a861a9..700fea9b 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -1,12 +1,12 @@
 <?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:paddingBottom="8dp"
-              android:paddingLeft="24dp"
-              android:paddingRight="24dp"
-              android:paddingTop="16dp">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="?attr/dialog_vertical_padding"
+    android:paddingLeft="?attr/dialog_horizontal_padding"
+    android:paddingRight="?attr/dialog_horizontal_padding"
+    android:paddingTop="?attr/dialog_vertical_padding">
 
     <TextView
         android:id="@+id/your_account"
@@ -14,12 +14,12 @@
         android:layout_height="wrap_content"
         android:text="@string/your_account"
         android:textColor="?attr/color_text_primary"
-        android:textSize="?attr/TextSizeBody"/>
+        android:textSize="?attr/TextSizeBody" />
 
     <Spinner
         android:id="@+id/account"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <TextView
         android:id="@+id/jabber_id"
@@ -28,7 +28,7 @@
         android:layout_marginTop="8dp"
         android:text="@string/account_settings_jabber_id"
         android:textColor="?attr/color_text_primary"
-        android:textSize="?attr/TextSizeBody"/>
+        android:textSize="?attr/TextSizeBody" />
 
     <AutoCompleteTextView
         android:id="@+id/jid"