aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Torlaschi <runnerway@gmail.com>2016-05-17 17:41:04 +0200
committerAndrea Torlaschi <runnerway@gmail.com>2016-05-17 17:48:59 +0200
commitdc32ff270732053fec29f44b27b320276bb139de (patch)
treea26d8f91c97cd113625256a35d9c0958c15a7a57
parent7a7d32f7066fd873a6b19a6a4ab1a4c4c2bc54dd (diff)
downloadopen-keychain-dc32ff270732053fec29f44b27b320276bb139de.tar.gz
open-keychain-dc32ff270732053fec29f44b27b320276bb139de.tar.bz2
open-keychain-dc32ff270732053fec29f44b27b320276bb139de.zip
Padding cleanup
-rw-r--r--OpenKeychain/src/main/res/layout/backup_restore_fragment.xml9
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml67
2 files changed, 29 insertions, 47 deletions
diff --git a/OpenKeychain/src/main/res/layout/backup_restore_fragment.xml b/OpenKeychain/src/main/res/layout/backup_restore_fragment.xml
index a71a0783b..21bd4ba88 100644
--- a/OpenKeychain/src/main/res/layout/backup_restore_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/backup_restore_fragment.xml
@@ -10,12 +10,11 @@
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
- android:paddingTop="24dp">
+ android:paddingTop="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingBottom="8dip"
android:text="@string/backup_text"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -36,8 +35,6 @@
android:drawableRight="@drawable/ic_save_grey_24dp"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
android:text="@string/backup_all"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -56,8 +53,6 @@
android:drawableRight="@drawable/ic_save_grey_24dp"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
android:text="@string/backup_public_keys"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -78,8 +73,6 @@
android:drawableRight="@drawable/ic_folder_grey_24dp"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
android:text="@string/btn_decrypt_files"
android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml
index c5cf16e1b..55b3d6b51 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
- xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -8,33 +7,29 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="4dp"
+ android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
- android:orientation="vertical"
- >
+ android:paddingTop="16dp">
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
android:text="@string/section_encrypt" />
<TextView
android:id="@+id/encrypt_files"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
- style="?android:attr/borderlessButtonStyle"
- android:text="@string/btn_encrypt_files"
- android:drawableRight="@drawable/ic_folder_grey_24dp"
android:drawablePadding="8dp"
- android:gravity="center_vertical" />
+ android:drawableRight="@drawable/ic_folder_grey_24dp"
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:text="@string/btn_encrypt_files"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<View
android:layout_width="match_parent"
@@ -43,18 +38,16 @@
<TextView
android:id="@+id/encrypt_text"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
- style="?android:attr/borderlessButtonStyle"
- android:text="@string/btn_encrypt_text"
- android:drawableRight="@drawable/ic_comment_text_grey600_24dp"
android:drawablePadding="8dp"
- android:gravity="center_vertical" />
+ android:drawableRight="@drawable/ic_comment_text_grey600_24dp"
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:text="@string/btn_encrypt_text"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
style="@style/SectionHeader"
@@ -65,18 +58,16 @@
<TextView
android:id="@+id/decrypt_files"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
- style="?android:attr/borderlessButtonStyle"
- android:text="@string/btn_decrypt_files"
- android:drawableRight="@drawable/ic_folder_grey_24dp"
android:drawablePadding="8dp"
- android:gravity="center_vertical" />
+ android:drawableRight="@drawable/ic_folder_grey_24dp"
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:text="@string/btn_decrypt_files"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<View
android:layout_width="match_parent"
@@ -85,30 +76,28 @@
<LinearLayout
android:id="@+id/decrypt_from_clipboard"
+ style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
- style="?android:attr/borderlessButtonStyle"
android:orientation="horizontal"
- android:paddingLeft="8dp"
- android:paddingRight="0dp"
tools:ignore="UseCompoundDrawables">
<TextView
- android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_weight="1"
android:layout_gravity="center_vertical"
- android:text="@string/btn_decrypt_clipboard" />
+ android:layout_weight="1"
+ android:text="@string/btn_decrypt_clipboard"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<ImageView
android:id="@+id/clipboard_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:padding="8dp"
- android:src="@drawable/ic_content_paste_grey_24dp"
- android:layout_gravity="center_vertical" />
+ android:layout_gravity="center_vertical"
+ android:paddingLeft="8dp"
+ android:src="@drawable/ic_content_paste_grey_24dp" />
</LinearLayout>