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

tls-psk: put QR code in card

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-06-02 19:15:14 +02:00
parent 3a728b94a6
commit 4846ee5328
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenKeychain/src/main/res/layout/transfer_fragment.xml
View File

@@ -8,7 +8,7 @@
android:id="@+id/transfer_animator" android:id="@+id/transfer_animator"
android:inAnimation="@anim/fade_in_delayed" android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out" android:outAnimation="@anim/fade_out"
custom:initialView="03"> custom:initialView="0">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -17,15 +17,34 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp"> android:padding="16dp">
<ImageView <LinearLayout
android:layout_width="250dp" android:layout_width="match_parent"
android:layout_height="250dp" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:orientation="horizontal"
android:layout_marginBottom="16dp" android:gravity="center_horizontal"
android:id="@+id/qr_code_image" android:weightSum="1">
tools:src="@drawable/ic_qrcode_white_24dp"
tools:tint="@color/md_black_1000" <android.support.v7.widget.CardView
/> android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.75"
android:layout_marginBottom="16dp"
custom:cardUseCompatPadding="true"
custom:cardCornerRadius="4dp"
>
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/qr_code_image"
tools:layout_height="240dp"
tools:src="@drawable/ic_qrcode_white_24dp"
tools:tint="@color/md_black_1000"
/>
</android.support.v7.widget.CardView>
</LinearLayout>
<Button <Button
android:layout_width="wrap_content" android:layout_width="wrap_content"