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

slight changes to ui

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-08-29 20:34:39 +02:00
parent 5122c20e3d
commit e3b1cf7209
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
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"
@@ -58,6 +58,17 @@
</LinearLayout> </LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="@string/transfer_scan_warning"
android:textColor="@color/android_red_dark"
android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -65,6 +76,7 @@
android:gravity="center" android:gravity="center"
tools:ignore="ButtonStyle" > tools:ignore="ButtonStyle" >
<!--
<Button <Button
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -74,6 +86,7 @@
android:drawableLeft="@drawable/ic_live_help_24dp" android:drawableLeft="@drawable/ic_live_help_24dp"
android:drawableTint="@color/md_black_1000" android:drawableTint="@color/md_black_1000"
android:drawablePadding="8dp"/> android:drawablePadding="8dp"/>
-->
<Button <Button
android:layout_width="wrap_content" android:layout_width="wrap_content"

3
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -1891,7 +1891,8 @@
<string name="button_scan">"Scan"</string> <string name="button_scan">"Scan"</string>
<string name="button_more_info">"More Info"</string> <string name="button_more_info">"More Info"</string>
<string name="transfer_scan_explanation">"To transfer your keys, establish a secure connection by scanning with either device."</string> <string name="transfer_scan_explanation">"To share or import your key setup, establish a secure connection by scanning with either device."</string>
<string name="transfer_scan_warning">Use with your own devices only!</string>
<string name="connection_status">"Connection status:"</string> <string name="connection_status">"Connection status:"</string>
<string name="section_transfer_keys">"Available keys for transfer"</string> <string name="section_transfer_keys">"Available keys for transfer"</string>
<string name="section_received_keys">"Received keys"</string> <string name="section_received_keys">"Received keys"</string>