aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-09-18 20:09:39 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-09-18 20:09:39 +0200
commit6b904d4de1ab755277212d574bee618d7296cd2d (patch)
treee6097d19f260fa35d76277d6748720c4c3cb0d7c /src/main/res
parent7bdd4166c02a88b1e5249056fabcf0e1833ab555 (diff)
use proper paddings in dialogs on android < 5
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/create_conference_dialog.xml16
-rw-r--r--src/main/res/layout/dialog_clear_history.xml7
-rw-r--r--src/main/res/layout/dialog_show_password.xml5
-rw-r--r--src/main/res/layout/enter_jid_dialog.xml20
-rw-r--r--src/main/res/values-v21/themes.xml6
-rw-r--r--src/main/res/values/attrs.xml3
-rw-r--r--src/main/res/values/themes.xml6
7 files changed, 43 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"
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 330bd610..d6612552 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -37,6 +37,9 @@
<item name="attr/icon_alpha">0.54</item>
+ <item name="attr/dialog_horizontal_padding">24dp</item>
+ <item name="attr/dialog_vertical_padding">16dp</item>
+
<item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
<item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item>
<item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
@@ -100,6 +103,9 @@
<item name="attr/icon_alpha">1.0</item>
+ <item name="attr/dialog_horizontal_padding">24dp</item>
+ <item name="attr/dialog_vertical_padding">16dp</item>
+
<item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
<item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item>
<item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 8062cd7e..82f9db89 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -53,4 +53,7 @@
<attr name="icon_notifications_paused" format="reference"/>
<attr name="icon_notifications_none" format="reference"/>
+ <attr name="dialog_horizontal_padding" format="dimension"/>
+ <attr name="dialog_vertical_padding" format="dimension"/>
+
</resources> \ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 1b3a4098..f15822c9 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -43,6 +43,9 @@
<item name="attr/icon_alpha">1.0</item>
+ <item name="attr/dialog_horizontal_padding">16dp</item>
+ <item name="attr/dialog_vertical_padding">16dp</item>
+
<item name="attr/icon_group">@drawable/ic_action_group</item>
<item name="attr/icon_new">@drawable/ic_action_new</item>
<item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
@@ -93,6 +96,9 @@
<item name="attr/icon_alpha">1.0</item>
+ <item name="attr/dialog_horizontal_padding">16dp</item>
+ <item name="attr/dialog_vertical_padding">16dp</item>
+
<item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
<item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
<item name="attr/icon_cancel">@drawable/ic_action_cancel</item>