diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
29 files changed, 123 insertions, 71 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_chat_black_24dp.png Binary files differnew file mode 100644 index 000000000..fa4d2c14d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_chat_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png Binary files differdeleted file mode 100644 index bb6aef1d0..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png Binary files differnew file mode 100644 index 000000000..22acc5500 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_save_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_save_black_24dp.png Binary files differnew file mode 100644 index 000000000..b959dc4a8 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_save_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..b09a6926d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_chat_black_24dp.png Binary files differnew file mode 100644 index 000000000..d239cfa09 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_chat_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png Binary files differdeleted file mode 100644 index 01d681697..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png Binary files differnew file mode 100644 index 000000000..0e4f2f6ea --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_save_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_save_black_24dp.png Binary files differnew file mode 100644 index 000000000..663479b73 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_save_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..e944fd70c --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png Binary files differnew file mode 100644 index 000000000..e9e92e5f8 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png Binary files differdeleted file mode 100644 index 930ca8d95..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png Binary files differnew file mode 100644 index 000000000..9f10aa275 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_black_24dp.png Binary files differnew file mode 100644 index 000000000..eca2d92ec --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..22a8783e7 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png Binary files differnew file mode 100644 index 000000000..9102f25df --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png Binary files differnew file mode 100644 index 000000000..94d5ab98c --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_black_24dp.png Binary files differnew file mode 100644 index 000000000..871291b4e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..a35b3cd14 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png Binary files differnew file mode 100644 index 000000000..55d42e284 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png Binary files differnew file mode 100644 index 000000000..4642a3b66 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_black_24dp.png Binary files differnew file mode 100644 index 000000000..ba001835a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..e351c7beb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml index 048595dd8..7869b9a8a 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml @@ -24,7 +24,7 @@ android:outAnimation="@anim/fade_out" android:id="@+id/view_animator" android:measureAllChildren="false" - custom:initialView="0" + custom:initialView="1" android:minHeight="?listPreferredItemHeightSmall" android:animateLayoutChanges="true" > @@ -78,14 +78,25 @@ <TextView android:id="@+id/result_encryption_text" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_weight="1" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:text="" tools:text="Encryption status text" /> + + <ImageView + android:id="@+id/context_menu" + android:scaleType="center" + android:layout_width="36dip" + android:layout_height="48dip" + android:clickable="true" + android:background="?attr/selectableItemBackgroundBorderless" + android:src="@drawable/ic_more_vert_black_24dp" /> + </LinearLayout> <LinearLayout @@ -121,7 +132,9 @@ android:layout_height="wrap_content" android:clickable="true" android:background="?android:selectableItemBackground" - android:orientation="horizontal"> + android:orientation="horizontal" + style="?listPreferredItemHeight" + > <LinearLayout android:layout_width="0dp" @@ -184,62 +197,10 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/file" - android:clickable="true" - android:background="?android:selectableItemBackground" - > + android:id="@+id/file_list" + android:orientation="vertical"> - <ImageView - android:id="@+id/thumbnail" - android:layout_gravity="center_vertical" - android:layout_width="36dp" - android:layout_height="36dp" - android:scaleType="center" - android:padding="6dp" - android:src="@drawable/ic_doc_generic_am" /> - - <LinearLayout - android:orientation="vertical" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:layout_weight="1"> - - <TextView - android:id="@+id/filename" - android:maxLines="1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="?android:attr/textColorSecondary" - android:textAppearance="?android:attr/textAppearanceMedium" - android:ellipsize="end" - android:text="" - tools:text="filename.jpg" /> - - <TextView - android:id="@+id/filesize" - android:maxLines="1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="?android:attr/textColorTertiary" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textSize="12sp" - android:ellipsize="end" - android:text="" - tools:text="14kb" /> - - </LinearLayout> - - <ImageView - android:id="@+id/context_menu" - android:scaleType="center" - android:layout_width="36dip" - android:layout_height="48dip" - android:clickable="true" - android:background="?android:selectableItemBackground" - android:src="@drawable/ic_menu_moreoverflow_normal_holo_light" /> + <include layout="@layout/decrypt_list_file_item" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml new file mode 100644 index 000000000..f13a43fd6 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml @@ -0,0 +1,55 @@ +<?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:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/file" + android:clickable="true" + android:background="?android:selectableItemBackground" + android:minHeight="?listPreferredItemHeight" + > + + <ImageView + android:id="@+id/thumbnail" + android:layout_gravity="center_vertical" + android:layout_width="36dp" + android:layout_height="36dp" + android:scaleType="center" + android:padding="6dp" + android:src="@drawable/ic_doc_generic_am" /> + + <LinearLayout + android:orientation="vertical" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:layout_weight="1"> + + <TextView + android:id="@+id/filename" + android:maxLines="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorSecondary" + android:textAppearance="?android:attr/textAppearanceMedium" + android:ellipsize="end" + android:text="" + tools:text="filename.jpg" /> + + <TextView + android:id="@+id/filesize" + android:maxLines="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorTertiary" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textSize="12sp" + android:ellipsize="end" + android:text="" + tools:text="14kb" /> + + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/decrypt_bottom_sheet.xml b/OpenKeychain/src/main/res/menu/decrypt_bottom_sheet.xml new file mode 100644 index 000000000..11b79bd5f --- /dev/null +++ b/OpenKeychain/src/main/res/menu/decrypt_bottom_sheet.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/decrypt_open" + android:title="Open with…" + android:icon="@drawable/ic_apps_black_24dp" /> + + <item + android:id="@+id/decrypt_share" + android:title="@string/btn_share_decrypted_text" + android:icon="@drawable/ic_share_black_24dp" /> + + <item + android:id="@+id/decrypt_save" + android:title="@string/btn_save" + android:icon="@drawable/ic_save_black_24dp" /> + +</menu> diff --git a/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml b/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml index ab526c4a5..65b8f210d 100644 --- a/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml +++ b/OpenKeychain/src/main/res/menu/decrypt_item_context_menu.xml @@ -8,18 +8,6 @@ /> <item - android:id="@+id/decrypt_share" - android:title="@string/btn_share_decrypted_text" - android:icon="@drawable/ic_share_grey_24dp" - /> - - <item - android:id="@+id/decrypt_save" - android:title="@string/btn_save_file" - android:icon="@drawable/ic_action_encrypt_file_24dp" - /> - - <item android:id="@+id/decrypt_delete" android:title="@string/btn_delete_original" android:icon="@drawable/ic_delete_grey_24dp" diff --git a/OpenKeychain/src/main/res/menu/log_display.xml b/OpenKeychain/src/main/res/menu/log_display.xml index a7f7e286d..a32153359 100644 --- a/OpenKeychain/src/main/res/menu/log_display.xml +++ b/OpenKeychain/src/main/res/menu/log_display.xml @@ -4,7 +4,7 @@ <item android:id="@+id/menu_log_display_export_log" - android:icon="@drawable/ic_share_black_24dp" + android:icon="@drawable/ic_share_white_24dp" android:title="@string/menu_share_log" app:showAsAction="ifRoom|withText" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 7c8296648..f12be176e 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1355,6 +1355,27 @@ <string name="msg_lv_fetch_error_format">"Format error!"</string> <string name="msg_lv_fetch_error_nothing">"Resource not found!"</string> + <string name="msg_data">"Processing input data"</string> + <string name="msg_data_openpgp">"Attempting to process OpenPGP data"</string> + <string name="msg_data_detached">"Encountered detached signature"</string> + <string name="msg_data_detached_clear">"Clearing earlier, unsigned data!"</string> + <string name="msg_data_detached_sig">"Processing detached signature"</string> + <string name="msg_data_detached_raw">"Processing signed data"</string> + <string name="msg_data_detached_nested">"Skipping nested signed data!"</string> + <string name="msg_data_detached_trailing">"Skipping trailing data after signed part!"</string> + <string name="msg_data_detached_unsupported">"Unsupported type of detached signature!"</string> + <string name="msg_data_error_io">"Error reading input data!"</string> + <string name="msg_data_error_openpgp">"Error processing OpenPGP data!"</string> + <string name="msg_data_mime_error">"Error parsing MIME data!"</string> + <string name="msg_data_mime_filename">"Filename: '%s'"</string> + <string name="msg_data_mime_length">"Content-Length: %s"</string> + <string name="msg_data_mime">"Parsing MIME data structure"</string> + <string name="msg_data_mime_ok">"Finished parsing</string> + <string name="msg_data_mime_none">"No MIME structure found"</string> + <string name="msg_data_mime_part">"Processing MIME part"</string> + <string name="msg_data_mime_type">"Content-Type: %s"</string> + <string name="msg_data_ok">"Data processing successful"</string> + <string name="msg_data_skip_mime">"Skipping MIME parsing"</string> <string name="msg_acc_saved">"Account saved"</string> @@ -1380,6 +1401,11 @@ <string name="msg_keybase_error_specific">"%s"</string> <string name="msg_keybase_error_msg_payload_mismatch">"Decrypted proof post does not match expected value"</string> + <!-- Messages for Mime parsing operation --> + <string name="msg_mime_parsing_start">"Parsing the MIME structure"</string> + <string name="msg_mime_parsing_error">"MIME parsing failed"</string> + <string name="msg_mime_parsing_success">"MIME parsing successfully!"</string> + <!-- PassphraseCache --> <string name="passp_cache_notif_click_to_clear">"Touch to clear passwords."</string> <plurals name="passp_cache_notif_n_keys"> @@ -1521,9 +1547,12 @@ <string name="error_loading_keys">"Error loading keys!"</string> <string name="error_empty_log">"(error, empty log)"</string> <string name="error_reading_text">"Could not read input to decrypt!"</string> + <string name="error_reading_aosp">"Failed reading data, this is a bug in the Android E-Mail client! (Issue #290)"</string> + <string name="error_reading_k9">"Received incomplete data, try pressing 'Download complete message' in K-9 Mail!"</string> <string name="filename_unknown">Unknown filename (click to open)</string> <string name="filename_unknown_text">Text (click to show)</string> <string name="intent_show">Show Signed/Encrypted Content</string> + <string name="intent_share">Share Signed/Encrypted Content</string> <string name="view_internal">"View in OpenKeychain"</string> <string name="error_preparing_data">"Error preparing data!"</string> <string name="label_clip_title">"Encrypted Data"</string> |
