From e139fe6186e84b4bd65861812efd04a67eb4f99e Mon Sep 17 00:00:00 2001
From: stefan-niedermann <info@niedermann.it>
Date: Wed, 11 Dec 2019 19:25:37 +0100
Subject: #224 Make reusable component for empty content views

Rename color_chooser to widget_color_chooser
---
 .../deck/ui/helper/colorchooser/ColorChooser.java  |  2 +-
 app/src/main/res/layout/color_chooser.xml          | 15 ---------
 .../layout/fragment_card_edit_tab_attachments.xml  | 37 +++-------------------
 app/src/main/res/layout/widget_color_chooser.xml   | 15 +++++++++
 4 files changed, 21 insertions(+), 48 deletions(-)
 delete mode 100644 app/src/main/res/layout/color_chooser.xml
 create mode 100644 app/src/main/res/layout/widget_color_chooser.xml

(limited to 'app/src')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java
index c80bb127f..bd966681d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java
@@ -40,7 +40,7 @@ public class ColorChooser extends LinearLayout {
 
         LayoutInflater inflater = (LayoutInflater) context
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        inflater.inflate(R.layout.color_chooser, this, true);
+        inflater.inflate(R.layout.widget_color_chooser, this, true);
         ButterKnife.bind(this);
         initDefaultColors();
     }
diff --git a/app/src/main/res/layout/color_chooser.xml b/app/src/main/res/layout/color_chooser.xml
deleted file mode 100644
index 26b28d737..000000000
--- a/app/src/main/res/layout/color_chooser.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/colorPicker"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/standard_margin"
-        app:alignItems="stretch"
-        app:flexWrap="wrap"
-        app:justifyContent="space_between" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml
index a92f933be..42b21612a 100644
--- a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml
+++ b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml
@@ -17,41 +17,14 @@
         tools:listitem="@layout/item_attachment"
         tools:visibility="visible" />
 
-    <RelativeLayout
+    <it.niedermann.nextcloud.deck.ui.helper.emptycontentview.EmptyContentView
         android:id="@+id/no_attachments"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="visible"
-        tools:visibility="gone">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="72dp"
-            android:layout_above="@+id/no_attachments_text"
-            android:layout_gravity="center"
-            android:contentDescription="@null"
-            android:tint="@color/fg_secondary"
-            app:srcCompat="@drawable/ic_attach_file_grey600_24dp" />
-
-        <TextView
-            android:id="@+id/no_attachments_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
-            android:text="@string/attachments"
-            android:textAlignment="center"
-            android:textSize="@dimen/empty_content_font_size" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/no_attachments_text"
-            android:layout_centerHorizontal="true"
-            android:text="@string/no_files_attached_to_this_card" />
-    </RelativeLayout>
+        android:visibility="gone"
+        app:description="@string/no_files_attached_to_this_card"
+        app:image="@drawable/ic_attach_file_grey600_24dp"
+        app:title="@string/attachments" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
diff --git a/app/src/main/res/layout/widget_color_chooser.xml b/app/src/main/res/layout/widget_color_chooser.xml
new file mode 100644
index 000000000..26b28d737
--- /dev/null
+++ b/app/src/main/res/layout/widget_color_chooser.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/colorPicker"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/standard_margin"
+        app:alignItems="stretch"
+        app:flexWrap="wrap"
+        app:justifyContent="space_between" />
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3