New decryption screen UI with modernPGP icons

This commit is contained in:
Dominik Schürmann
2014-10-08 17:32:32 +02:00
parent adcc07ca65
commit b573afe235
31 changed files with 391 additions and 242 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

View File

@@ -1,97 +1,144 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/result"
android:id="@+id/result_main_layout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:background="@color/android_purple_light">
android:background="@color/holo_gray_bright">
<View
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/result_main_layout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:layout_marginTop="4dp" />
<TextView
android:id="@+id/result_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="result text"
android:textColor="@color/white"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" />
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/result_encryption_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/status_lock_open"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/result_encryption_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Not Encrypted (set in-code)"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/result_signature_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/status_signature_unverified_cutout"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/result_signature_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Signed by (set in-code)"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" />
</LinearLayout>
<View
android:id="@+id/result_signature_divider1"
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginLeft="32dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:id="@+id/result_signature_layout"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:layout_marginLeft="32dp"
android:paddingRight="4dp"
style="@style/SelectableItem"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingRight="4dp"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/result_signature_name"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Alice (set in-code)" />
<TextView
android:id="@+id/result_signature_email"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/tertiary_text_light"
android:text="alice@example.com (set in-code)"
android:gravity="center_vertical" />
</LinearLayout>
<View
android:layout_width="1dip"
android:layout_height="match_parent"
android:gravity="right"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/result_signature_action"
android:paddingLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="Show"
android:drawableRight="@drawable/ic_action_accounts"
android:drawablePadding="8dp"
android:gravity="center_vertical"
style="@style/SelectableItem" />
</LinearLayout>
<View
android:id="@+id/result_signature_divider2"
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginLeft="32dp"
android:background="?android:attr/listDivider" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<RelativeLayout
android:id="@+id/result_signature"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:orientation="horizontal"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/result_signature_image">
<ImageView
android:id="@+id/ic_signature"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/signed_large" />
<ImageView
android:id="@+id/ic_signature_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/overlay_error" />
</RelativeLayout>
<TextView
android:id="@+id/mainUserId"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_gravity="left"
android:text="@string/label_main_user_id"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_toRightOf="@+id/result_signature_image"
android:textColor="@color/white" />
<TextView
android:id="@+id/mainUserIdRest"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_gravity="left"
android:text="Main User Id Rest"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_below="@+id/mainUserId"
android:layout_toRightOf="@+id/result_signature_image"
android:textColor="@color/white" />
<Button
android:id="@+id/lookup_key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/btn_lookup_key"
android:drawableRight="@drawable/ic_action_download"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/button_edgy"/>
</RelativeLayout>
</LinearLayout>

View File

@@ -397,10 +397,10 @@
<string name="key_view_tab_certs">Certifikáty</string>
<string name="user_id_info_revoked_title">Zneplatněno</string>
<string name="user_id_info_revoked_text">Tato identity byla zneplatněna vlastníkem klíče. Klíč již není platný.</string>
<string name="user_id_info_verified_title">Ověřeno</string>
<string name="user_id_info_verified_text">Tato identita byla ověřena.</string>
<string name="user_id_info_not_verified_title">Neověřeno</string>
<string name="user_id_info_not_verified_text">Tato identita nebyla ještě ověřena. Nemůžete si být jisti, jestli identita opravdu odpovídá určité osobě.</string>
<string name="user_id_info_certified_title">Ověřeno</string>
<string name="user_id_info_certified_text">Tato identita byla ověřena.</string>
<string name="user_id_info_uncertified_title">Neověřeno</string>
<string name="user_id_info_uncertified_text">Tato identita nebyla ještě ověřena. Nemůžete si být jisti, jestli identita opravdu odpovídá určité osobě.</string>
<string name="user_id_info_invalid_title">Neplatná</string>
<string name="user_id_info_invalid_text">S touto identitou je něco v nepořádku!</string>
<!--Edit key-->

View File

@@ -438,10 +438,10 @@
<string name="key_view_tab_certs">Beglaubigungen</string>
<string name="user_id_info_revoked_title">Wiederrufen</string>
<string name="user_id_info_revoked_text">Diese Identität wurde durch den Schlüsselinhaber wiederrufen. Sie ist nicht mehr gültig.</string>
<string name="user_id_info_verified_title">Überprüft</string>
<string name="user_id_info_verified_text">Diese Identität wurde überprüft.</string>
<string name="user_id_info_not_verified_title">Nicht überprüft</string>
<string name="user_id_info_not_verified_text">Diese Identität wurde noch nicht verifiziert. Du kannst nicht sicher sein, ob diese Identität wirklich zu einer bestimmten Person gehört.</string>
<string name="user_id_info_certified_title">Überprüft</string>
<string name="user_id_info_certified_text">Diese Identität wurde überprüft.</string>
<string name="user_id_info_uncertified_title">Nicht überprüft</string>
<string name="user_id_info_uncertified_text">Diese Identität wurde noch nicht verifiziert. Du kannst nicht sicher sein, ob diese Identität wirklich zu einer bestimmten Person gehört.</string>
<string name="user_id_info_invalid_title">Ungültig</string>
<string name="user_id_info_invalid_text">Irgend etwas ist mit dieser Identität nicht in Ordnung!</string>
<!--Edit key-->

View File

@@ -421,10 +421,10 @@
<string name="key_view_tab_certs">Certificados</string>
<string name="user_id_info_revoked_title">Revocada</string>
<string name="user_id_info_revoked_text">Esta identidad ha sido revocada por el propietario de la clave. En adelante no es válida.</string>
<string name="user_id_info_verified_title">Verificada</string>
<string name="user_id_info_verified_text">Esta identidad ha sido verificada</string>
<string name="user_id_info_not_verified_title">No verificada</string>
<string name="user_id_info_not_verified_text">Esta identidad no se ha verificado aún. No puede estar seguro de si la identidad realmente corresponde a una persona en concreto.</string>
<string name="user_id_info_certified_title">Verificada</string>
<string name="user_id_info_certified_text">Esta identidad ha sido verificada</string>
<string name="user_id_info_uncertified_title">No verificada</string>
<string name="user_id_info_uncertified_text">Esta identidad no se ha verificado aún. No puede estar seguro de si la identidad realmente corresponde a una persona en concreto.</string>
<string name="user_id_info_invalid_title">No válido</string>
<string name="user_id_info_invalid_text">¡Algo está mal con esta identidad!</string>
<!--Edit key-->

View File

@@ -421,10 +421,10 @@
<string name="key_view_tab_certs">Certificats</string>
<string name="user_id_info_revoked_title">Révoquée</string>
<string name="user_id_info_revoked_text">Cette identité a été révoquée par le propriétaire de la clef. Elle n\'est plus valide.</string>
<string name="user_id_info_verified_title">Vérifiée</string>
<string name="user_id_info_verified_text">Cette identité a été vérifiée.</string>
<string name="user_id_info_not_verified_title">Non vérifiée</string>
<string name="user_id_info_not_verified_text">Cette identité n\'a pas encore été vérifiée. Vous ne pouvez pas être certain si l\'identité corresponds vraiment à une personne spécifique.</string>
<string name="user_id_info_certified_title">Vérifiée</string>
<string name="user_id_info_certified_text">Cette identité a été vérifiée.</string>
<string name="user_id_info_uncertified_title">Non vérifiée</string>
<string name="user_id_info_uncertified_text">Cette identité n\'a pas encore été vérifiée. Vous ne pouvez pas être certain si l\'identité corresponds vraiment à une personne spécifique.</string>
<string name="user_id_info_invalid_title">Invalide</string>
<string name="user_id_info_invalid_text">Quelque chose ne va pas avec cette identité !</string>
<!--Edit key-->

View File

@@ -426,10 +426,10 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
<string name="key_view_tab_certs">Certificati</string>
<string name="user_id_info_revoked_title">Revocato</string>
<string name="user_id_info_revoked_text">Questa identità è stata revocata dal suo proprietario. Non è più valida.</string>
<string name="user_id_info_verified_title">Verificato</string>
<string name="user_id_info_verified_text">Questa identità è stata verificata.</string>
<string name="user_id_info_not_verified_title">Non verificato</string>
<string name="user_id_info_not_verified_text">Questa identità non è stata ancora verificata. Non puoi esser sicuro che l\'identità corrisponda veramente ad una specifica persona.</string>
<string name="user_id_info_certified_title">Verificato</string>
<string name="user_id_info_certified_text">Questa identità è stata verificata.</string>
<string name="user_id_info_uncertified_title">Non verificato</string>
<string name="user_id_info_uncertified_text">Questa identità non è stata ancora verificata. Non puoi esser sicuro che l\'identità corrisponda veramente ad una specifica persona.</string>
<string name="user_id_info_invalid_title">Non valido</string>
<string name="user_id_info_invalid_text">C\'è qualcosa che non va con questa identità!</string>
<!--Edit key-->

View File

@@ -443,10 +443,10 @@
<string name="key_view_tab_certs">証明</string>
<string name="user_id_info_revoked_title">破棄</string>
<string name="user_id_info_revoked_text">このIDは鍵の所有者により破棄されています。もう適正ではありません。</string>
<string name="user_id_info_verified_title">検証</string>
<string name="user_id_info_verified_text">このIDは検証されています。</string>
<string name="user_id_info_not_verified_title">未検証</string>
<string name="user_id_info_not_verified_text">このIDはまだ検証されていません。IDが本当に特定の人に対応している場合を、あなたは確認することができません。</string>
<string name="user_id_info_certified_title">検証</string>
<string name="user_id_info_certified_text">このIDは検証されています。</string>
<string name="user_id_info_uncertified_title">未検証</string>
<string name="user_id_info_uncertified_text">このIDはまだ検証されていません。IDが本当に特定の人に対応している場合を、あなたは確認することができません。</string>
<string name="user_id_info_invalid_title">不適正</string>
<string name="user_id_info_invalid_text">このIDではなにかしら問題があります!</string>
<!--Edit key-->

View File

@@ -361,9 +361,9 @@
<string name="key_view_tab_keys">Доп. ключи</string>
<string name="key_view_tab_certs">Сертификация</string>
<string name="user_id_info_revoked_title">Аннулировано</string>
<string name="user_id_info_verified_title">Подтверждено</string>
<string name="user_id_info_not_verified_title">Не подтверждено</string>
<string name="user_id_info_not_verified_text">Этот идентификатор не был заверен. Нет гарантии, что он принадлежит этому человеку.</string>
<string name="user_id_info_certified_title">Подтверждено</string>
<string name="user_id_info_uncertified_title">Не подтверждено</string>
<string name="user_id_info_uncertified_text">Этот идентификатор не был заверен. Нет гарантии, что он принадлежит этому человеку.</string>
<string name="user_id_info_invalid_title">Недействительно</string>
<string name="user_id_info_invalid_text">Что-то не так с идентификатором!</string>
<!--Edit key-->

View File

@@ -380,9 +380,9 @@
<string name="key_view_tab_certs">Certifikati</string>
<string name="user_id_info_revoked_title">Preklican</string>
<string name="user_id_info_revoked_text">Lastnik ključa je preklical to identiteto. Ta ni več veljavna.</string>
<string name="user_id_info_verified_title">Preverjen</string>
<string name="user_id_info_verified_text">Identiteta je bila preverjena</string>
<string name="user_id_info_not_verified_title">Nepreverjen</string>
<string name="user_id_info_certified_title">Preverjen</string>
<string name="user_id_info_certified_text">Identiteta je bila preverjena</string>
<string name="user_id_info_uncertified_title">Nepreverjen</string>
<string name="user_id_info_invalid_title">Neveljaven</string>
<!--Edit key-->
<string name="edit_key_action_change_passphrase">Zamenjaj geslo</string>

View File

@@ -393,10 +393,10 @@
<string name="key_view_tab_certs">Сертификати</string>
<string name="user_id_info_revoked_title">Опозван</string>
<string name="user_id_info_revoked_text">Власник кључа је опозвао овај идентитет. Више није исправан.</string>
<string name="user_id_info_verified_title">Оверен</string>
<string name="user_id_info_verified_text">Овај идентитет није оверен.</string>
<string name="user_id_info_not_verified_title">Није оверен</string>
<string name="user_id_info_not_verified_text">Овај идентитет још није оверен. Не можете бити сигурни да идентитет заиста одговара одређеној особи.</string>
<string name="user_id_info_certified_title">Оверен</string>
<string name="user_id_info_certified_text">Овај идентитет није оверен.</string>
<string name="user_id_info_uncertified_title">Није оверен</string>
<string name="user_id_info_uncertified_text">Овај идентитет још није оверен. Не можете бити сигурни да идентитет заиста одговара одређеној особи.</string>
<string name="user_id_info_invalid_title">Неисправан</string>
<string name="user_id_info_invalid_text">Нешто није у реду са овим идентитетом!</string>
<!--Edit key-->

View File

@@ -353,10 +353,10 @@
<string name="key_view_tab_share">Paylaş</string>
<string name="key_view_tab_keys">Alt anahtarlar</string>
<string name="key_view_tab_certs">Sertifikalar</string>
<string name="user_id_info_verified_title">Doğrulanmış</string>
<string name="user_id_info_verified_text">Kimlik doğrulandı.</string>
<string name="user_id_info_not_verified_title">Doğrulanmamış</string>
<string name="user_id_info_not_verified_text">Bu kimlik henüz doğrulanmadı. Bu kimliğin belirli bir kişiye ait olduğundan emin olamazsınız.</string>
<string name="user_id_info_certified_title">Doğrulanmış</string>
<string name="user_id_info_certified_text">Kimlik doğrulandı.</string>
<string name="user_id_info_uncertified_title">Doğrulanmamış</string>
<string name="user_id_info_uncertified_text">Bu kimlik henüz doğrulanmadı. Bu kimliğin belirli bir kişiye ait olduğundan emin olamazsınız.</string>
<string name="user_id_info_invalid_title">Geçersiz</string>
<string name="user_id_info_invalid_text">Bu kimlikle ilgili yanlış olan bazı şeyler var!</string>
<!--Edit key-->

View File

@@ -383,10 +383,10 @@
<string name="key_view_tab_certs">Сертифікати</string>
<string name="user_id_info_revoked_title">Відхилено</string>
<string name="user_id_info_revoked_text">Ця сутність вже відкликана власником ключа. Вона більше не дійсна.</string>
<string name="user_id_info_verified_title">Перевірено</string>
<string name="user_id_info_verified_text">Не перевірено</string>
<string name="user_id_info_not_verified_title">Не перевірено</string>
<string name="user_id_info_not_verified_text">Ця сутність ще не перевірена. Ви не можете переконатися, чи сутність справді відповідає вказаній особі.</string>
<string name="user_id_info_certified_title">Перевірено</string>
<string name="user_id_info_certified_text">Не перевірено</string>
<string name="user_id_info_uncertified_title">Не перевірено</string>
<string name="user_id_info_uncertified_text">Ця сутність ще не перевірена. Ви не можете переконатися, чи сутність справді відповідає вказаній особі.</string>
<string name="user_id_info_invalid_title">Недійсна</string>
<string name="user_id_info_invalid_text">Щось неправильне у цій сутності!</string>
<!--Edit key-->

View File

@@ -266,14 +266,15 @@
<string name="error_generic_report_bug">"A generic error occurred, please create a new bug report for OpenKeychain."</string>
<!-- results shown after decryption/verification -->
<string name="decrypt_result_no_signature">"Not Signed"</string>
<string name="decrypt_result_invalid_signature">"Invalid signature!"</string>
<string name="decrypt_result_signature_unknown_pub_key">"Unknown public key"</string>
<string name="decrypt_result_signature_uncertified">"Valid signature (uncertified)"</string>
<string name="decrypt_result_signature_certified">"Valid signature (certified)"</string>
<string name="decrypt_result_decrypted">"Successfully decrypted"</string>
<string name="decrypt_result_decrypted_unknown_pub_key">"Successfully decrypted but unknown public key"</string>
<string name="decrypt_result_decrypted_and_signature_uncertified">"Successfully decrypted and valid signature (uncertified)"</string>
<string name="decrypt_result_decrypted_and_signature_certified">"Successfully decrypted and valid signature (certified)"</string>
<string name="decrypt_result_signature_uncertified">"Signed by (not certified!)"</string>
<string name="decrypt_result_signature_certified">"Signed by"</string>
<string name="decrypt_result_encrypted">"Encrypted"</string>
<string name="decrypt_result_not_encrypted">"Not Encrypted"</string>
<string name="decrypt_result_action_show">"Show"</string>
<string name="decrypt_result_action_Lookup">"Lookup"</string>
<!-- Add keys -->
<string name="add_keys_section_secure_exchange">"Exchange"</string>
@@ -507,10 +508,10 @@
<string name="key_view_tab_certs">"Certificates"</string>
<string name="user_id_info_revoked_title">"Revoked"</string>
<string name="user_id_info_revoked_text">"This identity has been revoked by the key owner. It is no longer valid."</string>
<string name="user_id_info_verified_title">"Verified"</string>
<string name="user_id_info_verified_text">"This identity has been verified."</string>
<string name="user_id_info_not_verified_title">"Not verified"</string>
<string name="user_id_info_not_verified_text">"This identity has not been verified yet. You cannot be sure if the identity really corresponds to a specific person."</string>
<string name="user_id_info_certified_title">"Certified"</string>
<string name="user_id_info_certified_text">"This identity has been certified by you."</string>
<string name="user_id_info_uncertified_title">"Not certified"</string>
<string name="user_id_info_uncertified_text">"This identity has not been certified yet. You cannot be sure if the identity really corresponds to a specific person."</string>
<string name="user_id_info_invalid_title">"Invalid"</string>
<string name="user_id_info_invalid_text">"Something is wrong with this identity!"</string>