diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-25 19:38:13 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-25 19:38:13 +0100 |
commit | 57fa702cbf28368994810c33dcc9afeebf60932d (patch) | |
tree | 2ad65ffdcf84efc394a5b6d928934ed9d4ee79da /OpenKeychain/src/main/res/layout | |
parent | 27263edda5ffba4241e54e2f64f35eb1058663e7 (diff) | |
download | open-keychain-57fa702cbf28368994810c33dcc9afeebf60932d.tar.gz open-keychain-57fa702cbf28368994810c33dcc9afeebf60932d.tar.bz2 open-keychain-57fa702cbf28368994810c33dcc9afeebf60932d.zip |
Design fixes for header, QR Code shared element transitions
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/qr_code_activity.xml | 23 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 13 |
2 files changed, 23 insertions, 13 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 diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 25b978e37..bc46ac85f 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -56,9 +56,7 @@ android:text="" android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceLarge" - 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" /> + android:layout_above="@+id/view_key_status" /> <TextView android:id="@+id/view_key_status" @@ -71,9 +69,7 @@ android:text="" android:textColor="@color/tab_text" android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_above="@+id/toolbar2" - android:layout_toLeftOf="@+id/view_key_qr_code_layout" - android:layout_toStartOf="@+id/view_key_qr_code_layout" /> + android:layout_above="@+id/toolbar2" /> <LinearLayout android:id="@+id/toolbar2" @@ -135,8 +131,9 @@ <android.support.v7.widget.CardView android:id="@+id/view_key_qr_code_layout" - android:visibility="gone" - android:layout_below="@id/toolbar" + android:transitionName="qr_code" + android:visibility="visible" + android:layout_above="@id/toolbar2" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_marginRight="20dp" |