diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
-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 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-v21/dimens.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-v21/themes.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/dimens.xml | 2 |
5 files changed, 27 insertions, 15 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" diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml index eee21b52e..7e07ae0f9 100644 --- a/OpenKeychain/src/main/res/values-v21/dimens.xml +++ b/OpenKeychain/src/main/res/values-v21/dimens.xml @@ -7,5 +7,5 @@ <dimen name="statusbar_height">24dp</dimen> <!-- 120dp + statusbar_height --> <dimen name="big_toolbar">141dp</dimen> - <dimen name="huge_toolbar">233dp</dimen> + <dimen name="huge_toolbar">243dp</dimen> </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml index 93d534873..b47026e5b 100644 --- a/OpenKeychain/src/main/res/values-v21/themes.xml +++ b/OpenKeychain/src/main/res/values-v21/themes.xml @@ -4,10 +4,12 @@ <style name="KeychainTheme" parent="KeychainTheme.Base"> <item name="android:windowTranslucentStatus">true</item> + <!-- enable window content transitions --> <item name="android:windowContentTransitions">true</item> <item name="android:windowAllowEnterTransitionOverlap">true</item> <item name="android:windowAllowReturnTransitionOverlap">true</item> <item name="android:windowSharedElementEnterTransition">@android:transition/move</item> <item name="android:windowSharedElementExitTransition">@android:transition/move</item> + </style> </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml index 08b072202..434a0a171 100644 --- a/OpenKeychain/src/main/res/values/dimens.xml +++ b/OpenKeychain/src/main/res/values/dimens.xml @@ -3,5 +3,5 @@ <!-- on Android < 5, we do not color the status bar, thus 0dp! --> <dimen name="statusbar_height">0dp</dimen> <dimen name="big_toolbar">120dp</dimen> - <dimen name="huge_toolbar">212dp</dimen> + <dimen name="huge_toolbar">222dp</dimen> </resources>
\ No newline at end of file |