diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-03 18:39:07 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-03 18:39:07 +0100 |
commit | d6d679997b7bb7d6b10b58c8b1ce0a416ccf9b05 (patch) | |
tree | cdcc198fce59d58e64337d28bbeb5b5150572191 /OpenKeychain/src/main/res | |
parent | 9e011860c480d274d9a99bf32947eaea9229dcd8 (diff) | |
download | open-keychain-d6d679997b7bb7d6b10b58c8b1ce0a416ccf9b05.tar.gz open-keychain-d6d679997b7bb7d6b10b58c8b1ce0a416ccf9b05.tar.bz2 open-keychain-d6d679997b7bb7d6b10b58c8b1ce0a416ccf9b05.zip |
Move encrypt decrypt operations in own starter activity
Diffstat (limited to 'OpenKeychain/src/main/res')
17 files changed, 44 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png Binary files differnew file mode 100644 index 000000000..0888c6173 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png Binary files differdeleted file mode 100644 index 8ac075245..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png Binary files differdeleted file mode 100644 index fc019db72..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png Binary files differnew file mode 100644 index 000000000..d18d4b667 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png Binary files differdeleted file mode 100644 index 9e6d0f0ac..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png Binary files differdeleted file mode 100644 index 1df91994c..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png Binary files differnew file mode 100644 index 000000000..8856c70df --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png Binary files differdeleted file mode 100644 index 9cd050100..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png Binary files differdeleted file mode 100644 index ae48a3bf7..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png Binary files differnew file mode 100644 index 000000000..c49d420e0 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png Binary files differdeleted file mode 100644 index 529a7724b..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png Binary files differdeleted file mode 100644 index cf149aa37..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png Binary files differnew file mode 100644 index 000000000..db080df4e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png Binary files differdeleted file mode 100644 index a0fe0156f..000000000 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png Binary files differdeleted file mode 100644 index 7460e0894..000000000 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml index c3e31bf11..465fd195e 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml @@ -12,10 +12,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="@string/section_decrypt_files" /> + android:text="@string/section_encrypt" /> <TextView - android:id="@+id/decrypt_files" + android:id="@+id/encrypt_files" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" @@ -24,23 +24,52 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" style="@style/SelectableItem" - android:text="@string/btn_decrypt_files" + android:text="@string/btn_encrypt_files" android:drawableRight="@drawable/ic_action_collection" android:drawablePadding="8dp" android:gravity="center_vertical" /> - <View + <TextView + android:id="@+id/encrypt_text" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:layout_marginBottom="8dp" /> + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="@style/SelectableItem" + android:text="@string/btn_encrypt_text" + android:drawableRight="@drawable/ic_action_copy" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> <TextView style="@style/SectionHeader" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="32dp" - android:text="@string/section_decrypt_text" /> + android:layout_marginTop="16dp" + android:text="@string/section_decrypt" /> + + <TextView + android:id="@+id/decrypt_files" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="@style/SelectableItem" + android:text="@string/btn_decrypt_files" + android:drawableRight="@drawable/ic_action_collection" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> <LinearLayout android:id="@+id/decrypt_from_clipboard" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 23b549660..e01f1c049 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -62,6 +62,8 @@ <string name="section_decrypt_files">"Files"</string> <string name="section_decrypt_text">"Text"</string> <string name="section_certs">"Certificates"</string> + <string name="section_encrypt">"Encrypt"</string> + <string name="section_decrypt">"Decrypt"</string> <!-- button --> <string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string> @@ -82,9 +84,11 @@ <string name="btn_create_key">"Create key"</string> <string name="btn_add_files">"Add file(s)"</string> <string name="btn_add_share_decrypted_text">"Share decrypted text"</string> - <string name="btn_decrypt_clipboard">"Decrypt from clipboard"</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_encrypt_files">"Encrypt files"</string> + <string name="btn_encrypt_text">"Encrypt text"</string> <!-- menu --> <string name="menu_preferences">"Settings"</string> @@ -584,9 +588,7 @@ <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> - <string name="nav_encrypt_text">"Encrypt text"</string> - <string name="nav_encrypt_files">"Encrypt files"</string> - <string name="nav_decrypt">"Decrypt"</string> + <string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string> <string name="nav_apps">"Apps"</string> <string name="drawer_open">"Open navigation drawer"</string> <string name="drawer_close">"Close navigation drawer"</string> |