diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-26 00:33:26 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-26 00:33:26 +0200 |
commit | c442d3bd0d3bac96614d3d5c0e833a42cab4706e (patch) | |
tree | cd5b314d4a0a1d207e8b94a4c96c59980f12aebc /OpenKeychain/src/main/res | |
parent | f1f0126048a66b3e649f35f2e2768bd43fe1fad1 (diff) | |
download | open-keychain-c442d3bd0d3bac96614d3d5c0e833a42cab4706e.tar.gz open-keychain-c442d3bd0d3bac96614d3d5c0e833a42cab4706e.tar.bz2 open-keychain-c442d3bd0d3bac96614d3d5c0e833a42cab4706e.zip |
Put decrypt result in toolbar, some ui fixes for decrypt
Diffstat (limited to 'OpenKeychain/src/main/res')
14 files changed, 149 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png Binary files differnew file mode 100644 index 000000000..dc8c85cce --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..2839b1352 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png Binary files differnew file mode 100644 index 000000000..4ad9e552d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..f0ff945b8 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png Binary files differnew file mode 100644 index 000000000..c6f0e6b85 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..4b3675766 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png Binary files differnew file mode 100644 index 000000000..081fbec5b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..09d4df6af --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png Binary files differnew file mode 100644 index 000000000..04c07fb56 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png Binary files differnew file mode 100644 index 000000000..0fe15fc05 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml index a6099e25e..41d7c5c95 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml @@ -5,7 +5,7 @@ <include android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone_white" /> + layout="@layout/toolbar_result_decrypt" /> <!-- fitsSystemWindows and layout_marginTop from diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index 635e61621..37e4cd8f1 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/decrypt_result_include" /> + <!--<include layout="@layout/decrypt_result_include" />--> <LinearLayout android:visibility="gone" diff --git a/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml b/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml new file mode 100644 index 000000000..fe421449a --- /dev/null +++ b/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/toolbar_include" + android:elevation="4dp" + android:background="@color/white" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <include + android:id="@+id/toolbar_inner_layout" + layout="@layout/toolbar_inner_layout_white" /> + + <LinearLayout + android:layout_below="@id/toolbar" + android:id="@+id/result_main_layout" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:showIn="@layout/decrypt_text_fragment"> + + <LinearLayout + 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:animateLayoutChanges="true"> + + <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_24dp" + 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:layout_marginLeft="8dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + tools:text="Encryption status text" /> + </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_24dp" + 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:layout_marginLeft="8dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + tools:text="Signature status text" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/result_signature_layout" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:clickable="true" + android:paddingLeft="4dp" + android:paddingRight="4dp" + android:background="?android:selectableItemBackground" + android:orientation="horizontal"> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingRight="4dp" + android:paddingLeft="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" + tools:text="Alice" /> + + <TextView + android:id="@+id/result_signature_email" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + tools:text="alice@example.com" /> + + </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:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:text="Show" + android:drawableRight="@drawable/ic_vpn_key_grey_24dp" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> + + </LinearLayout> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + </LinearLayout> + +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/menu/decrypt_menu.xml b/OpenKeychain/src/main/res/menu/decrypt_menu.xml index c0d7a519f..9e90fc9c7 100644 --- a/OpenKeychain/src/main/res/menu/decrypt_menu.xml +++ b/OpenKeychain/src/main/res/menu/decrypt_menu.xml @@ -5,13 +5,13 @@ <item android:id="@+id/decrypt_copy" android:title="@string/btn_copy_decrypted_text" - android:icon="@drawable/ic_action_encrypt_copy_24dp" + android:icon="@drawable/ic_content_copy_black_24dp" app:showAsAction="ifRoom" /> <item android:id="@+id/decrypt_share" android:title="@string/btn_share_decrypted_text" - android:icon="@drawable/ic_action_encrypt_share_24dp" + android:icon="@drawable/ic_share_black_24dp" app:showAsAction="ifRoom" /> </menu>
\ No newline at end of file |