From c442d3bd0d3bac96614d3d5c0e833a42cab4706e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 26 Apr 2015 00:33:26 +0200
Subject: Put decrypt result in toolbar, some ui fixes for decrypt

---
 .../keychain/ui/DecryptFragment.java               |  19 +--
 .../keychain/ui/DecryptTextFragment.java           |   6 +-
 .../drawable-hdpi/ic_content_copy_black_24dp.png   | Bin 0 -> 284 bytes
 .../main/res/drawable-hdpi/ic_share_black_24dp.png | Bin 0 -> 499 bytes
 .../drawable-mdpi/ic_content_copy_black_24dp.png   | Bin 0 -> 214 bytes
 .../main/res/drawable-mdpi/ic_share_black_24dp.png | Bin 0 -> 355 bytes
 .../drawable-xhdpi/ic_content_copy_black_24dp.png  | Bin 0 -> 304 bytes
 .../res/drawable-xhdpi/ic_share_black_24dp.png     | Bin 0 -> 614 bytes
 .../drawable-xxhdpi/ic_content_copy_black_24dp.png | Bin 0 -> 397 bytes
 .../res/drawable-xxhdpi/ic_share_black_24dp.png    | Bin 0 -> 804 bytes
 .../ic_content_copy_black_24dp.png                 | Bin 0 -> 480 bytes
 .../res/drawable-xxxhdpi/ic_share_black_24dp.png   | Bin 0 -> 1052 bytes
 .../src/main/res/layout/decrypt_text_activity.xml  |   2 +-
 .../src/main/res/layout/decrypt_text_fragment.xml  |   2 +-
 .../src/main/res/layout/toolbar_result_decrypt.xml | 145 +++++++++++++++++++++
 OpenKeychain/src/main/res/menu/decrypt_menu.xml    |   4 +-
 16 files changed, 162 insertions(+), 16 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml

(limited to 'OpenKeychain')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
index d641f02f9..651b56ab0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
@@ -79,17 +79,18 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        mResultLayout = (LinearLayout) view.findViewById(R.id.result_main_layout);
+        // NOTE: These views are inside the activity!
+        mResultLayout = (LinearLayout) getActivity().findViewById(R.id.result_main_layout);
         mResultLayout.setVisibility(View.GONE);
 
-        mEncryptionIcon = (ImageView) view.findViewById(R.id.result_encryption_icon);
-        mEncryptionText = (TextView) view.findViewById(R.id.result_encryption_text);
-        mSignatureIcon = (ImageView) view.findViewById(R.id.result_signature_icon);
-        mSignatureText = (TextView) view.findViewById(R.id.result_signature_text);
-        mSignatureLayout = view.findViewById(R.id.result_signature_layout);
-        mSignatureName = (TextView) view.findViewById(R.id.result_signature_name);
-        mSignatureEmail = (TextView) view.findViewById(R.id.result_signature_email);
-        mSignatureAction = (TextView) view.findViewById(R.id.result_signature_action);
+        mEncryptionIcon = (ImageView) getActivity().findViewById(R.id.result_encryption_icon);
+        mEncryptionText = (TextView) getActivity().findViewById(R.id.result_encryption_text);
+        mSignatureIcon = (ImageView) getActivity().findViewById(R.id.result_signature_icon);
+        mSignatureText = (TextView) getActivity().findViewById(R.id.result_signature_text);
+        mSignatureLayout = getActivity().findViewById(R.id.result_signature_layout);
+        mSignatureName = (TextView) getActivity().findViewById(R.id.result_signature_name);
+        mSignatureEmail = (TextView) getActivity().findViewById(R.id.result_signature_email);
+        mSignatureAction = (TextView) getActivity().findViewById(R.id.result_signature_action);
 
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
index 1b9ae917f..6f576a112 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
@@ -97,9 +97,9 @@ public class DecryptTextFragment extends DecryptFragment {
     /**
      * Create Intent Chooser but exclude decrypt activites
      */
-    private Intent sendWithChooserExcludingEncrypt(String text) {
+    private Intent sendWithChooserExcludingDecrypt(String text) {
         Intent prototype = createSendIntent(text);
-        String title = getString(R.string.title_share_file);
+        String title = getString(R.string.title_share_message);
 
         // we don't want to decrypt the decrypted, no inception ;)
         String[] blacklist = new String[]{
@@ -147,7 +147,7 @@ public class DecryptTextFragment extends DecryptFragment {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.decrypt_share: {
-                startActivity(sendWithChooserExcludingEncrypt(mText.getText().toString()));
+                startActivity(sendWithChooserExcludingDecrypt(mText.getText().toString()));
                 break;
             }
             case R.id.decrypt_copy: {
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
new file mode 100644
index 000000000..dc8c85cce
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png differ
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
new file mode 100644
index 000000000..2839b1352
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png differ
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
new file mode 100644
index 000000000..4ad9e552d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png differ
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
new file mode 100644
index 000000000..f0ff945b8
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png differ
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
new file mode 100644
index 000000000..c6f0e6b85
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png differ
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
new file mode 100644
index 000000000..4b3675766
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png differ
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
new file mode 100644
index 000000000..081fbec5b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png differ
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
new file mode 100644
index 000000000..09d4df6af
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png differ
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
new file mode 100644
index 000000000..04c07fb56
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png differ
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
new file mode 100644
index 000000000..0fe15fc05
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png differ
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
-- 
cgit v1.2.3