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

fix some small layout bugs, add barcode scanner lib as source lib, fix qr code scanning issues

Browse Source
This commit is contained in:
Dominik Schürmann
2014-01-14 21:19:43 +01:00
parent 008db45dff
commit 59217ec9ba
20 changed files with 703 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenPGP-Keychain/res/layout/edit_key_activity.xml
View File

@@ -45,7 +45,7 @@
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/edit_key_btn_change_pass_phrase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="60dp"
android:padding="4dp"
android:text="@string/btn_set_passphrase"
bootstrapbutton:bb_icon_left="fa-pencil"

2
OpenPGP-Keychain/res/layout/edit_key_key_item.xml
View File

@@ -82,7 +82,7 @@
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/expiry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="60dp"
android:text="@string/none"
bootstrapbutton:bb_type="default" />
</TableRow>

12
OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_margin="10dp"
android:text="@string/menu_import_from_qr_code"
android:text="@string/import_qr_scan_button"
bootstrapbutton:bb_icon_left="fa-barcode"
bootstrapbutton:bb_size="default"
bootstrapbutton:bb_type="default" />
@@ -18,13 +18,19 @@
<TextView
android:id="@+id/import_qrcode_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:visibility="gone" />
<ProgressBar
android:id="@+id/import_qrcode_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:progress="0" />
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:progress="0"
android:visibility="gone" />
</LinearLayout>

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

@@ -322,9 +322,16 @@
<string name="import_import">Import selected keys</string>
<string name="import_sign_and_upload">Import, Sign, and upload selected keys</string>
<string name="import_from_clipboard">Import from Clipboard</string>
<string name="import_qr_code_missing">Missing QR Codes: %1$s</string>
<plurals name="import_qr_code_missing">
<item quantity="one">Missing QR Code with ID %1$s</item>
<item quantity="other">Missing QR Codes with IDs %1$s</item>
</plurals>
<string name="import_qr_code_start_with_one">Please start with QR Code with ID 1</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_scan_button">Scan QR Code with \'Barcode Scanner\'</string>
<!-- Intent labels -->
<string name="intent_decrypt_file">OpenPGP: Decrypt File</string>
@@ -354,7 +361,7 @@
<!-- Share -->
<string name="share_qr_code_dialog_start">Go through all QR Codes using \'Next\', and scan them one by one.</string>
<string name="share_qr_code_dialog_progress">QR Code %1$d of %2$d</string>
<string name="share_qr_code_dialog_progress">QR Code with ID %1$d of %2$d</string>
<string name="share_nfc_dialog">Share with NFC</string>
<!-- Key list -->