change key activities to cards

4 files changed, 170 insertions, 145 deletions

diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 2ebffb5be..7ba6fd674 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -1,129 +1,141 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/grey200">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/button_bar"
-        android:layout_alignParentTop="true">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/color_background_secondary">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <ScrollView
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_above="@+id/button_bar"
+            android:layout_alignParentTop="true">
 
             <LinearLayout
-                android:id="@+id/key_error_message_card"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
-                android:orientation="vertical"
-                android:padding="@dimen/infocard_padding"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/key_error_message_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold"
-                    android:text="@string/error_trustkeys_title" />
-
-                <TextView
-                    android:id="@+id/key_error_message"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeBody"
-                    android:padding="8dp" />
-
-            </LinearLayout>
+                android:orientation="vertical">
 
-            <LinearLayout
-                android:id="@+id/own_keys_card"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
-                android:orientation="vertical"
-                android:padding="@dimen/infocard_padding"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/own_keys_title"
-                    android:layout_width="wrap_content"
+                <android.support.v7.widget.CardView
+                    android:id="@+id/key_error_message_card"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold" />
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:visibility="gone">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="@dimen/infocard_padding">
+
+                        <TextView
+                            android:id="@+id/key_error_message_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/error_trustkeys_title"
+                            android:textColor="?attr/color_text_primary"
+                            android:textSize="?attr/TextSizeHeadline"
+                            android:textStyle="bold"/>
+
+                        <TextView
+                            android:id="@+id/key_error_message"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="8dp"
+                            android:textColor="?attr/color_text_primary"
+                            android:textSize="?attr/TextSizeBody"/>
+                    </LinearLayout>
+
+                </android.support.v7.widget.CardView>
+
+                <android.support.v7.widget.CardView
+                    android:id="@+id/own_keys_card"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:visibility="gone">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="@dimen/infocard_padding">
+
+                        <TextView
+                            android:id="@+id/own_keys_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="?attr/color_text_primary"
+                            android:textSize="?attr/TextSizeHeadline"
+                            android:textStyle="bold"/>
+
+                        <LinearLayout
+                            android:id="@+id/own_keys_details"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:divider="?android:dividerHorizontal"
+                            android:orientation="vertical"
+                            android:showDividers="middle">
+                        </LinearLayout>
+                    </LinearLayout>
+
+                </android.support.v7.widget.CardView>
 
                 <LinearLayout
-                    android:id="@+id/own_keys_details"
+                    android:id="@+id/foreign_keys"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:divider="?android:dividerHorizontal"
-                    android:showDividers="middle"
-                    android:orientation="vertical"></LinearLayout>
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/foreign_keys"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:orientation="vertical">
+                </LinearLayout>
 
             </LinearLayout>
+        </ScrollView>
 
-        </LinearLayout>
-    </ScrollView>
-
-    <LinearLayout
-        android:id="@+id/button_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true">
-
-        <Button
-            android:id="@+id/cancel_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/cancel"
-            android:textColor="@color/black87" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="fill_parent"
-            android:layout_marginBottom="7dp"
-            android:layout_marginTop="7dp"
-            android:background="@color/black12" />
-
-        <Button
-            android:id="@+id/save_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:id="@+id/button_bar"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:enabled="true"
-            android:textColor="@color/black54"
-            android:text="@string/done" />
-    </LinearLayout>
-</RelativeLayout>
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentStart="true">
+
+            <Button
+                android:id="@+id/cancel_button"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/cancel"
+                android:textColor="?attr/color_text_primary"/>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="fill_parent"
+                android:layout_marginBottom="7dp"
+                android:layout_marginTop="7dp"
+                android:background="?attr/divider"/>
+
+            <Button
+                android:id="@+id/save_button"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:enabled="true"
+                android:text="@string/done"
+                android:textColor="?attr/color_text_secondary"/>
+        </LinearLayout>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index 89c47c904..b312e4227 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -1,38 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@+id/foreign_keys_card"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/activity_vertical_margin"
-    android:layout_marginLeft="@dimen/activity_horizontal_margin"
-    android:layout_marginRight="@dimen/activity_horizontal_margin"
-    android:layout_marginTop="@dimen/activity_vertical_margin"
-    android:background="@drawable/infocard_border"
-    android:orientation="vertical"
-    android:padding="@dimen/infocard_padding">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <TextView
-        android:id="@+id/foreign_keys_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeHeadline"
-        android:textStyle="bold" />
+    <android.support.v7.widget.CardView
+        android:id="@+id/foreign_keys_card"
 
-    <LinearLayout
-        android:id="@+id/foreign_keys_details"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:divider="?android:dividerHorizontal"
-        android:orientation="vertical"
-        android:showDividers="middle"></LinearLayout>
+        android:layout_marginBottom="@dimen/activity_vertical_margin"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_vertical_margin">
 
-    <TextView
-        android:layout_marginTop="8dp"
-        android:id="@+id/no_keys_to_accept"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/black87"
-        android:text="@string/no_keys_just_confirm"
-        android:textSize="?attr/TextSizeBody" />
-</LinearLayout>
\ No newline at end of file
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/infocard_padding">
+
+            <TextView
+                android:id="@+id/foreign_keys_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/color_text_primary"
+                android:textSize="?attr/TextSizeHeadline"
+                android:textStyle="bold"/>
+
+            <LinearLayout
+                android:id="@+id/foreign_keys_details"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:divider="?android:dividerHorizontal"
+                android:orientation="vertical"
+                android:showDividers="middle">
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/no_keys_to_accept"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/no_keys_just_confirm"
+                android:textColor="?attr/color_text_primary"
+                android:textSize="?attr/TextSizeBody"/>
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 17c1c5607..208a60cfb 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -7,6 +7,10 @@
     <attr name="TextSeparation" format="dimension"/>
     <attr name="IconSize" format="dimension" />
 
+    <attr name="color_background_secondary" format="reference|color" />
+    <attr name="color_background_primary" format="reference|color" />
+    <attr name="color_warning" format="reference|color"/>
+
     <attr name="color_text_primary" format="reference|color" />
     <attr name="color_text_secondary" format="reference|color" />
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index b2fb36418..7c433f720 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -9,8 +9,8 @@
         <item name="color_text_primary">@color/black87</item>
         <item name="color_text_secondary">@color/black54</item>
 
-        <!--<item name="color_background_primary">@color/grey50</item>-->
-        <!--<item name="color_background_secondary">@color/grey200</item>-->
+        <item name="color_background_primary">@color/grey50</item>
+        <item name="color_background_secondary">@color/grey200</item>
 
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:actionModeBackground">@color/accent</item>