From ee8171ceb74b85f07c6ee0092b5d566102b8a5a7 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Thu, 5 Nov 2020 19:44:04 +0100
Subject: Display attachments in a dialog to give the user a chance to cancel
 the upload

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 app/src/main/res/layout/dialog_assignee.xml  | 23 -----------------------
 app/src/main/res/layout/dialog_preview.xml   | 23 +++++++++++++++++++++++
 app/src/main/res/layout/item_filter_user.xml |  2 +-
 app/src/main/res/layout/item_picker_user.xml |  2 +-
 app/src/main/res/values/strings.xml          |  1 +
 5 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/res/layout/dialog_assignee.xml
 create mode 100644 app/src/main/res/layout/dialog_preview.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/dialog_assignee.xml b/app/src/main/res/layout/dialog_assignee.xml
deleted file mode 100644
index 6f7157286..000000000
--- a/app/src/main/res/layout/dialog_assignee.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/avatar"
-        android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:contentDescription="@string/user_avatar"
-        android:scaleType="centerCrop"
-        android:background="@color/bg_info_box" />
-
-    <TextView
-        android:padding="?dialogPreferredPadding"
-        android:id="@+id/displayName"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?attr/textAppearanceHeadline1"
-        tools:text="@tools:sample/full_names" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_preview.xml b/app/src/main/res/layout/dialog_preview.xml
new file mode 100644
index 000000000..5ab35d63e
--- /dev/null
+++ b/app/src/main/res/layout/dialog_preview.xml
@@ -0,0 +1,23 @@
+<?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:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/avatar"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:contentDescription="@string/user_avatar"
+        android:scaleType="centerCrop"
+        android:background="@color/bg_info_box" />
+
+    <TextView
+        android:padding="?dialogPreferredPadding"
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?attr/textAppearanceHeadline1"
+        tools:text="@tools:sample/full_names" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_filter_user.xml b/app/src/main/res/layout/item_filter_user.xml
index 2c29bf5ad..0aced6dc2 100644
--- a/app/src/main/res/layout/item_filter_user.xml
+++ b/app/src/main/res/layout/item_filter_user.xml
@@ -31,7 +31,7 @@
     </FrameLayout>
 
     <TextView
-        android:id="@+id/displayName"
+        android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/item_picker_user.xml b/app/src/main/res/layout/item_picker_user.xml
index 4418bf461..f9a17508e 100644
--- a/app/src/main/res/layout/item_picker_user.xml
+++ b/app/src/main/res/layout/item_picker_user.xml
@@ -41,7 +41,7 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/displayName"
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d27bbae4..d6d9470fe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -326,4 +326,5 @@
     <string name="downloads">Downloads</string>
     <string name="files">Files</string>
     <string name="gallery">Gallery</string>
+    <string name="simple_attach">attach</string>
 </resources>
-- 
cgit v1.2.3