diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-27 01:44:40 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-27 01:44:40 +0100 |
| commit | 11c34364545ff99268949e558cddcb853ea1810b (patch) | |
| tree | 44cd4d58e20637a0ce8f933f232101ce4c03683c /OpenKeychain/src/main/res/layout | |
| parent | 4ccd9f9bb148a75e9cde48648216d1037a617c03 (diff) | |
| download | open-keychain-11c34364545ff99268949e558cddcb853ea1810b.tar.gz open-keychain-11c34364545ff99268949e558cddcb853ea1810b.tar.bz2 open-keychain-11c34364545ff99268949e558cddcb853ea1810b.zip | |
Prettify qr code in advanced key view
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml index 127fe36de..1056a4681 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml @@ -1,4 +1,5 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:card_view="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -67,15 +68,36 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - <ImageView - android:id="@+id/view_key_fingerprint_qr_code_image" - android:paddingTop="8dp" - android:paddingBottom="8dp" + + <android.support.v7.widget.CardView + android:id="@+id/view_key_qr_code_layout" + android:transitionName="qr_code" + android:visibility="visible" android:layout_width="200dp" android:layout_height="200dp" android:layout_gravity="center_horizontal" android:layout_weight="1" - style="@style/SelectableItem" /> + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + card_view:cardBackgroundColor="@android:color/white" + card_view:cardUseCompatPadding="true" + card_view:cardCornerRadius="4dp"> + + <ImageView + android:id="@+id/view_key_qr_code" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </android.support.v7.widget.CardView> + + <!--<ImageView--> + <!--android:id="@+id/view_key_fingerprint_qr_code_image"--> + <!--android:paddingTop="8dp"--> + <!--android:paddingBottom="8dp"--> + <!--android:layout_width="200dp"--> + <!--android:layout_height="200dp"--> + <!--android:layout_gravity="center_horizontal"--> + <!--android:layout_weight="1"--> + <!--style="@style/SelectableItem" />--> <TextView style="@style/SectionHeader" |