CardView and more header design

1 files changed, 25 insertions, 18 deletions

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 17303ee84..25b978e37 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -52,12 +53,12 @@
             android:layout_marginStart="48dp"
             android:layout_marginRight="48dp"
             android:layout_marginEnd="48dp"
-            android:layout_above="@+id/view_key_status"
             android:text=""
             android:textColor="@color/icons"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_toLeftOf="@+id/view_key_qr_code"
-            android:layout_toStartOf="@+id/view_key_qr_code" />
+            android:layout_above="@+id/view_key_status"
+            android:layout_toLeftOf="@+id/view_key_qr_code_layout"
+            android:layout_toStartOf="@+id/view_key_qr_code_layout" />
 
         <TextView
             android:id="@+id/view_key_status"
@@ -67,19 +68,18 @@
             android:layout_marginStart="48dp"
             android:layout_marginRight="48dp"
             android:layout_marginEnd="48dp"
-            android:layout_above="@+id/toolbar2"
             android:text=""
             android:textColor="@color/tab_text"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:layout_toLeftOf="@+id/view_key_qr_code"
-            android:layout_toStartOf="@+id/view_key_qr_code" />
-
+            android:layout_above="@+id/toolbar2"
+            android:layout_toLeftOf="@+id/view_key_qr_code_layout"
+            android:layout_toStartOf="@+id/view_key_qr_code_layout" />
 
         <LinearLayout
             android:id="@+id/toolbar2"
             android:orientation="horizontal"
             android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:minHeight="?attr/actionBarSize"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
@@ -128,23 +128,30 @@
             android:visibility="invisible"
             android:src="@drawable/status_signature_unverified_cutout_96px"
             android:layout_height="96dp"
-            android:layout_gravity="center_vertical"
-            android:layout_above="@+id/toolbar2"
+            android:layout_above="@id/toolbar2"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:layout_marginRight="16dp" />
 
-        <ImageButton
-            android:id="@+id/view_key_qr_code"
-            android:layout_width="96dp"
-            android:layout_height="96dp"
+        <android.support.v7.widget.CardView
+            android:id="@+id/view_key_qr_code_layout"
             android:visibility="gone"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_above="@+id/toolbar2"
+            android:layout_below="@id/toolbar"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginRight="20dp" />
+            android:layout_marginRight="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardUseCompatPadding="true"
+            card_view:cardCornerRadius="4dp">
+
+            <ImageButton
+                android:id="@+id/view_key_qr_code"
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                style="?android:attr/borderlessButtonStyle" />
+        </android.support.v7.widget.CardView>
 
     </RelativeLayout>