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

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"