PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Better qr code resizing

Browse source
This commit is contained in:
Dominik Schürmann 2015-02-27 22:26:11 +01:00
parent 2cd7be6373
commit 54e04f496e
6 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OpenKeychain/src/main/AndroidManifest.xml
View file

@ -106,9 +106,9 @@
android:name=".ui.EditKeyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_edit_key" />
<!-- NOTE: Dont use configChanges for QR Code view! We use a different layout for landscape -->
<activity
android:name=".ui.QrCodeViewActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/share_qr_code_dialog_title" />
<activity
android:name=".ui.ViewKeyActivity"

39
OpenKeychain/src/main/res/layout-land/qr_code_activity.xml Normal file
View file

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/qr_code_image_layout"
android:transitionName="qr_code"
android:layout_gravity="center_horizontal"
android:layout_margin="32dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@android:color/white"
app:cardUseCompatPadding="true"
app:cardCornerRadius="4dp">
<org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
android:id="@+id/qr_code_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
app:dominantMeasurement="height"
app:aspectRatioEnabled="true" />
</android.support.v7.widget.CardView>
</LinearLayout>
</RelativeLayout>

4
OpenKeychain/src/main/res/layout/qr_code_activity.xml
View file

@ -12,11 +12,12 @@
android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="horizontal">
<android.support.v7.widget.CardView
android:id="@+id/qr_code_image_layout"
android:transitionName="qr_code"
android:layout_gravity="center_vertical"
android:layout_margin="32dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -30,6 +31,7 @@
android:id="@+id/qr_code_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dominantMeasurement="width"
app:aspectRatioEnabled="true" />
</android.support.v7.widget.CardView>

1
OpenKeychain/src/main/res/layout/view_key_activity.xml
View file

@ -134,6 +134,7 @@
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
card_view:cardBackgroundColor="@android:color/white"
card_view:cardElevation="2dp"
card_view:cardUseCompatPadding="true"
card_view:cardCornerRadius="4dp">

5
OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
View file

@ -68,11 +68,11 @@
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<android.support.v7.widget.CardView
android:id="@+id/view_key_qr_code_layout"
android:transitionName="qr_code"
android:visibility="visible"
android:layout_marginTop="16dp"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_gravity="center_horizontal"
@ -81,6 +81,7 @@
android:foreground="?android:attr/selectableItemBackground"
card_view:cardBackgroundColor="@android:color/white"
card_view:cardUseCompatPadding="true"
card_view:cardElevation="2dp"
card_view:cardCornerRadius="4dp">
<ImageView
@ -93,7 +94,7 @@
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="14dp"
android:layout_marginTop="16dp"
android:text="@string/section_share_key"
android:layout_weight="1" />

2
OpenKeychain/src/main/res/layout/view_key_fragment.xml
View file

@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardBackgroundColor="@android:color/white"
card_view:cardElevation="2sp"
card_view:cardElevation="2dp"
card_view:cardUseCompatPadding="true"
card_view:cardCornerRadius="4dp">