From 81ce075df9e656c662c00c603388e950013c384a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 16 Sep 2015 02:19:23 +0200
Subject: multidecrypt: prepare viewholder for file list

---
 .../src/main/res/layout/decrypt_list_entry.xml     | 109 +++++++++++----------
 1 file changed, 58 insertions(+), 51 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
index 048595dd8..7b9515170 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"
         >
@@ -184,63 +184,70 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/file"
-                android:clickable="true"
-                android:background="?android:selectableItemBackground"
-                >
-
-                <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" />
+                android:id="@+id/file_list">
 
                 <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     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:id="@+id/file"
+                    android:clickable="true"
+                    android:background="?android:selectableItemBackground"
+                    >
+
+                    <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:textColor="?android:attr/textColorTertiary"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textSize="12sp"
-                        android:ellipsize="end"
-                        android:text=""
-                        tools:text="14kb" />
+                        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" />
 
                 </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" />
-
             </LinearLayout>
 
         </LinearLayout>
-- 
cgit v1.2.3


From 24f2a9468c2495d312aa5a8d05273ea644ab6da8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 16 Sep 2015 02:56:14 +0200
Subject: multidecrypt: display all outputUris as individual items

---
 .../src/main/res/layout/decrypt_list_entry.xml     | 65 +---------------------
 .../src/main/res/layout/decrypt_list_file_item.xml | 63 +++++++++++++++++++++
 2 files changed, 66 insertions(+), 62 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
index 7b9515170..e6ee67580 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
@@ -184,69 +184,10 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/file_list">
+                android:id="@+id/file_list"
+                android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/file"
-                    android:clickable="true"
-                    android:background="?android:selectableItemBackground"
-                    >
-
-                    <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" />
-
-                </LinearLayout>
+                <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..b37ac1013
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
@@ -0,0 +1,63 @@
+<?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"
+    >
+
+    <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" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 97c55ee4bb519236027edc973851e7bbc52c97f3 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 16 Sep 2015 17:47:16 +0200
Subject: multidecrypt: context menu per card, not per file

---
 OpenKeychain/src/main/res/layout/decrypt_list_entry.xml     | 12 +++++++++++-
 OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml | 10 +---------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
index e6ee67580..47a8d85c4 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
@@ -78,14 +78,24 @@
 
                 <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:layout_width="wrap_content"
+                    android:layout_height="48dip"
+                    android:clickable="true"
+                    android:background="?android:selectableItemBackground"
+                    android:src="@drawable/ic_menu_moreoverflow_normal_holo_light" />
+
             </LinearLayout>
 
             <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
index b37ac1013..f13a43fd6 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
@@ -6,6 +6,7 @@
     android:id="@+id/file"
     android:clickable="true"
     android:background="?android:selectableItemBackground"
+    android:minHeight="?listPreferredItemHeight"
     >
 
     <ImageView
@@ -51,13 +52,4 @@
 
     </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" />
-
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From ece06b1933c26688d2eb6b7fa8657acbb8833728 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 16 Sep 2015 19:33:43 +0200
Subject: multidecrypt: use bottom sheet for longclick options

---
 OpenKeychain/src/main/res/layout/decrypt_list_entry.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
index 47a8d85c4..577d825b7 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
@@ -131,7 +131,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"
-- 
cgit v1.2.3


From 82ee9d440b804030682f28669d08650b6ade6ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 31 Aug 2015 20:52:00 +0200
Subject: Use material overflow icon in decrypt list

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
---
 OpenKeychain/src/main/res/layout/decrypt_list_entry.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
index 577d825b7..7869b9a8a 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
@@ -90,11 +90,12 @@
 
                 <ImageView
                     android:id="@+id/context_menu"
-                    android:layout_width="wrap_content"
+                    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" />
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:src="@drawable/ic_more_vert_black_24dp" />
 
             </LinearLayout>
 
-- 
cgit v1.2.3