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

move select file logic into EncryptDecryptOverviewFragment

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-22 23:44:03 +02:00
parent 8d1dc940c4
commit 4826e0a8c8
6 changed files with 63 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:paddingTop="4dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
@@ -89,31 +90,16 @@
style="?android:attr/borderlessButtonStyle"
android:orientation="horizontal"
android:paddingLeft="8dp"
android:paddingRight="0dp">
android:paddingRight="0dp"
tools:ignore="UseCompoundDrawables">
<LinearLayout
<TextView
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingRight="4dp"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/btn_decrypt_clipboard" />
<TextView
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/tertiary_text_light"
android:text="@string/btn_decrypt_and_verify"
android:gravity="center_vertical" />
</LinearLayout>
android:layout_gravity="center_vertical"
android:text="@string/btn_decrypt_clipboard" />
<ImageView
android:id="@+id/clipboard_icon"

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

@@ -55,7 +55,7 @@
<string name="section_key_server">"Keyserver"</string>
<string name="section_fingerprint">"Fingerprint"</string>
<string name="section_encrypt">"Encrypt"</string>
<string name="section_decrypt">"Decrypt"</string>
<string name="section_decrypt">"Decrypt / Verify"</string>
<string name="section_current_expiry">"Current expiry"</string>
<string name="section_new_expiry">"New expiry"</string>
@@ -80,9 +80,8 @@
<string name="btn_add_files">"Add file(s)"</string>
<string name="btn_share_decrypted_text">"Share decrypted text"</string>
<string name="btn_copy_decrypted_text">"Copy decrypted text"</string>
<string name="btn_decrypt_clipboard">"Decrypt text from clipboard"</string>
<string name="btn_decrypt_and_verify">"and verify signatures"</string>
<string name="btn_decrypt_files">"Decrypt files"</string>
<string name="btn_decrypt_clipboard">"Read from clipboard"</string>
<string name="btn_decrypt_files">"Select input file"</string>
<string name="btn_encrypt_files">"Encrypt files"</string>
<string name="btn_encrypt_text">"Encrypt text"</string>
<string name="btn_add_email">"Add additional email address"</string>