cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Design fixes for header, QR Code shared element transitions

Browse Source
This commit is contained in:
Dominik Schürmann
2015-02-25 19:38:13 +01:00
parent 27263edda5
commit 57fa702cbf
8 changed files with 85 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenKeychain/src/main/res/layout/qr_code_activity.xml
View File

@@ -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>

13
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -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"

2
OpenKeychain/src/main/res/values-v21/dimens.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/values-v21/themes.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/values/dimens.xml
View File

@@ -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>