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

tls-psk: some cleanup

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-30 23:21:08 +02:00
parent a919bb3a9e
commit 99441660ca
14 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/res/layout/key_transfer_item.xml
View File

@@ -56,7 +56,7 @@
android:outAnimation="@anim/fade_out"
android:inAnimation="@anim/fade_in"
android:id="@+id/transfer_state"
custom:initialView="04">
custom:initialView="01">
<Space
android:layout_width="wrap_content"
@@ -68,8 +68,8 @@
android:layout_gravity="end|center_vertical"
android:padding="8dp"
android:id="@+id/button_transfer"
android:src="@drawable/ic_play_arrow_white_24dp"
android:tint="@color/md_black_1000"
android:src="@drawable/ic_send_24dp"
android:tint="@color/md_grey_600"
android:background="?selectableItemBackground"
/>
@@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:id="@+id/button_import"
android:text="Import"
android:text="@string/button_import"
/>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>

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

@@ -33,8 +33,9 @@
android:layout_gravity="center_horizontal"
android:layout_margin="8dp"
android:id="@+id/button_scan"
android:text="Scan"
android:text="@string/button_scan"
android:drawableLeft="@drawable/ic_qrcode_white_24dp"
android:drawableTint="@color/md_black_1000"
android:drawablePadding="8dp"
/>
@@ -43,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="8dp"
android:text="Scan with either device to establish a secure connection for device setup."
android:text="@string/transfer_scan_explanation"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
@@ -58,7 +59,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:text="Connection status:"
android:text="@string/connection_status"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@@ -75,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Available Keys:"
android:text="@string/section_transfer_keys"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SectionHeader"
/>
@@ -104,7 +105,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:text="Connection status:"
android:text="@string/connection_status"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@@ -121,7 +122,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Received Keys:"
android:text="@string/section_received_keys"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SectionHeader"
/>
@@ -161,7 +162,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="8dp"
android:text="This feature can only be used on Wifi."
android:text="@string/transfer_scan_only_wifi"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>