aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-04-28 14:46:52 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-04-28 14:46:52 +0200
commit92d14c4a0090c71842440d96be1f84dab5a82d16 (patch)
tree38758d335100bce246ba880e04cd90e44eb36a4b /src/main/res
parent93e942f96d856b4ea2ac2595dd8f76ffa0832db3 (diff)
increased padding on image buttons on v21 to match material guidelines
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/activity_edit_account.xml2
-rw-r--r--src/main/res/layout/activity_muc_details.xml4
-rw-r--r--src/main/res/layout/contact_key.xml2
-rw-r--r--src/main/res/values-v21/dimens.xml1
-rw-r--r--src/main/res/values/dimens.xml7
5 files changed, 9 insertions, 7 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 750c28e0..7d84a4af 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -337,7 +337,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
- android:padding="8dp"
+ android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
android:visibility="visible"
android:contentDescription="@string/copy_otr_clipboard_description"/>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 36873654..11602651 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -75,7 +75,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
- android:padding="8dp"
+ android:padding="@dimen/image_button_padding"
android:src="?attr/icon_edit_dark"/>
</RelativeLayout>
@@ -102,7 +102,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
- android:padding="8dp"
+ android:padding="@dimen/image_button_padding"
android:src="?attr/icon_settings"/>
</RelativeLayout>
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 75572877..b7817b38 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -34,7 +34,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
- android:padding="8dp"
+ android:padding="@dimen/image_button_padding"
android:src="?attr/icon_remove"
android:visibility="invisible" />
diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml
index 8bc8f3f7..b689d100 100644
--- a/src/main/res/values-v21/dimens.xml
+++ b/src/main/res/values-v21/dimens.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="elv_undo_bottom_offset">63dp</dimen> <!-- 48dp + 15dp -->
+ <dimen name="image_button_padding">12dp</dimen>
</resources> \ No newline at end of file
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 79e920e9..95e80055 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -1,7 +1,8 @@
<resources>
- <!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">8dp</dimen>
- <dimen name="activity_vertical_margin">8dp</dimen>
+ <!-- Default screen margins, per the Android Design guidelines. -->
+ <dimen name="activity_horizontal_margin">8dp</dimen>
+ <dimen name="activity_vertical_margin">8dp</dimen>
<dimen name="infocard_padding">16dp</dimen>
<dimen name="conversations_overview_width">288dp</dimen>
+ <dimen name="image_button_padding">8dp</dimen>
</resources>