moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-07 01:35:00 -05:00
Code Issues Releases Wiki Activity

prettify import

Browse Source
This commit is contained in:
Dominik Schürmann 2014-01-14 21:47:01 +01:00
parent 7cde5c89d0
commit b5013be037
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenPGP-Keychain/res/layout/import_keys_clipboard_fragment.xml
View File

@ -10,7 +10,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:text="@string/import_from_clipboard" android:text="@string/import_clipboard_button"
bootstrapbutton:bb_icon_left="fa-clipboard"
bootstrapbutton:bb_size="default" bootstrapbutton:bb_size="default"
bootstrapbutton:bb_type="default" /> bootstrapbutton:bb_type="default" />

21
OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml
View File

@ -1,17 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp"
android:orientation="horizontal" > android:orientation="horizontal" >
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/import_nfc_button" android:id="@+id/import_nfc_button"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_margin="10dp" android:layout_alignParentRight="true"
android:text="@string/menu_import_from_nfc" android:layout_alignParentTop="true"
android:layout_marginLeft="10dp"
android:text="@string/import_nfc_help_button"
bootstrapbutton:bb_icon_left="fa-question"
bootstrapbutton:bb_size="default" bootstrapbutton:bb_size="default"
bootstrapbutton:bb_type="default" /> bootstrapbutton:bb_type="default" />
</LinearLayout> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/import_nfc_button"
android:text="@string/import_nfc_text" />
</RelativeLayout>

3
OpenPGP-Keychain/res/values/strings.xml
View File

@ -332,6 +332,9 @@
<string name="import_qr_code_wrong">QR Code malformed! Please try again!</string> <string name="import_qr_code_wrong">QR Code malformed! Please try again!</string>
<string name="import_qr_code_finished">QR Code scanning finished!</string> <string name="import_qr_code_finished">QR Code scanning finished!</string>
<string name="import_qr_scan_button">Scan QR Code with \'Barcode Scanner\'</string> <string name="import_qr_scan_button">Scan QR Code with \'Barcode Scanner\'</string>
<string name="import_nfc_text">To exchange keys via NFC, the device needs to be unlocked.</string>
<string name="import_nfc_help_button">Help</string>
<string name="import_clipboard_button">Get key from clipboard</string>
<!-- Intent labels --> <!-- Intent labels -->
<string name="intent_decrypt_file">OpenPGP: Decrypt File</string> <string name="intent_decrypt_file">OpenPGP: Decrypt File</string>