From 86a7571c76392471043e22aeaa085e0042266b90 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 21 Oct 2015 16:19:16 +0200
Subject: linked: fix colors for dark theme

---
 OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml | 2 +-
 OpenKeychain/src/main/res/layout/linked_id_item.xml                | 1 -
 OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml       | 2 +-
 OpenKeychain/src/main/res/layout/view_key_fragment.xml             | 2 +-
 OpenKeychain/src/main/res/values/strings.xml                       | 3 ++-
 5 files changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
index e1c8db383..7fa581905 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
@@ -156,7 +156,7 @@
                     android:drawableLeft="@drawable/ic_repeat_black_24dp"
                     android:drawableStart="@drawable/ic_repeat_black_24dp"
                     android:drawablePadding="12dp"
-                    android:text="@string/linked_button_retry"
+                    android:text="@string/linked_button_retry_step"
                     android:id="@+id/button_retry"
                     />
 
diff --git a/OpenKeychain/src/main/res/layout/linked_id_item.xml b/OpenKeychain/src/main/res/layout/linked_id_item.xml
index e4fe58551..d6e437dd5 100644
--- a/OpenKeychain/src/main/res/layout/linked_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/linked_id_item.xml
@@ -6,7 +6,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:singleLine="true"
-    android:background="#ffffff"
     tools:showIn="@layout/linked_id_view_fragment">
 
     <ImageView
diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
index 377ce4fb6..8b275fcef 100644
--- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
@@ -14,7 +14,7 @@
         android:transitionName="card_linked_ids"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        card_view:cardBackgroundColor="@android:color/white"
+        card_view:cardBackgroundColor="?attr/colorCardViewBackground"
         card_view:cardElevation="2dp"
         card_view:cardUseCompatPadding="true"
         card_view:cardCornerRadius="4dp">
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 5bf36f564..8715945bf 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         tools:visibility="visible"
-        card_view:cardBackgroundColor="@android:color/white"
+        card_view:cardBackgroundColor="?attr/colorCardViewBackground"
         card_view:cardElevation="2dp"
         card_view:cardUseCompatPadding="true"
         card_view:cardCornerRadius="4dp">
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 033eea754..dd120023b 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1630,7 +1630,8 @@
     <string name="linked_title_twitter">"Twitter"</string>
     <string name="card_linked_identity">"Linked Identity"</string>
     <string name="linked_button_verify">"Verify"</string>
-    <string name="linked_button_retry">"Retry last step"</string>
+    <string name="linked_button_retry">"Retry"</string>
+    <string name="linked_button_retry_step">"Retry last step"</string>
     <string name="linked_button_confirm">"Confirm"</string>
     <string name="linked_button_view">"View"</string>
     <string name="linked_text_verifying">"Verifying…"</string>
-- 
cgit v1.2.3