From 4e1053c6fa23181ee7a1018e56fa4cc63618f387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 15 Oct 2014 23:05:29 +0200
Subject: More color/icon consistency

---
 OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml |  4 ++--
 OpenKeychain/src/main/res/layout/key_list_item.xml         | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
index c58e2d7e6..59e401f31 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
@@ -100,14 +100,14 @@
             android:text="@string/decrypt_invalid_text"
             android:padding="8dp"
             android:layout_gravity="center"
-            android:textColor="@color/android_red_dark" />
+            android:textColor="@color/android_red_light" />
 
         <Button
             android:id="@+id/decrypt_text_invalid_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/button_edgy"
-            android:textColor="@color/android_red_dark"
+            android:textColor="@color/android_red_light"
             android:text="@string/decrypt_invalid_button"
             android:layout_gravity="center_horizontal" />
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 7428d68e2..a2f3d650c 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -22,14 +22,14 @@
         android:paddingBottom="4dp">
 
         <TextView
-            android:id="@+id/mainUserId"
+            android:id="@+id/key_list_item_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/label_main_user_id"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
-            android:id="@+id/mainUserIdRest"
+            android:id="@+id/key_list_item_email"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
@@ -39,7 +39,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/slinger_view"
+        android:id="@+id/key_list_item_slinger_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
@@ -54,7 +54,7 @@
             android:background="?android:attr/listDivider" />
 
         <ImageButton
-            android:id="@+id/slinger_button"
+            android:id="@+id/key_list_item_slinger_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -65,7 +65,7 @@
     </LinearLayout>
 
     <ImageView
-        android:id="@+id/status_icon"
+        android:id="@+id/key_list_item_status_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-- 
cgit v1.2.3


From 0cdcc909849a1a77dc4f7ad5123adce7648335bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 15 Oct 2014 23:22:08 +0200
Subject: More consisitency

---
 OpenKeychain/src/main/res/layout/decrypt_result_include.xml | 4 +---
 OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml  | 2 +-
 OpenKeychain/src/main/res/layout/key_list_item.xml          | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 8a0519872..9140ad07b 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -6,8 +6,7 @@
     android:layout_height="wrap_content"
     android:background="@color/holo_gray_bright">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/result_main_layout"
+    <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -99,7 +98,6 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/tertiary_text_light"
                     android:text="alice@example.com (set in-code)"
                     android:gravity="center_vertical" />
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
index 59e401f31..cbe03056c 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
@@ -98,7 +98,7 @@
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/decrypt_invalid_text"
-            android:padding="8dp"
+            android:padding="16dp"
             android:layout_gravity="center"
             android:textColor="@color/android_red_light" />
 
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index a2f3d650c..df69e4237 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -41,7 +41,7 @@
     <LinearLayout
         android:id="@+id/key_list_item_slinger_view"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="?android:attr/listPreferredItemHeight"
         android:layout_gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -56,10 +56,10 @@
         <ImageButton
             android:id="@+id/key_list_item_slinger_button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
             android:src="@drawable/ic_action_safeslinger"
-            android:padding="16dp"
+            android:padding="12dp"
             style="@style/SelectableItem" />
 
     </LinearLayout>
-- 
cgit v1.2.3