Design fixes for header, QR Code shared element transitions

1 files changed, 18 insertions, 5 deletions

diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
index 11b502b34..126be4c3a 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -13,12 +15,23 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/qr_code_image"
-            android:padding="32dp"
+        <android.support.v7.widget.CardView
+            android:id="@+id/qr_code_image_layout"
+            android:transitionName="qr_code"
+            android:layout_margin="32dp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            style="@style/SelectableItem" />
+            android:layout_height="wrap_content"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardUseCompatPadding="true"
+            card_view:cardCornerRadius="4dp">
+
+            <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
+                android:id="@+id/qr_code_image"
+                app:aspectRatioEnabled="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="?android:attr/borderlessButtonStyle" />
+        </android.support.v7.widget.CardView>
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file