Merge branch 'master' into 345-clear-storage-action

# Conflicts:
#	app/src/main/res/layout/item_tip.xml

14 files changed, 74 insertions, 24 deletions

diff --git a/app/src/main/res/layout/activity_archived_cards.xml b/app/src/main/res/layout/activity_archived.xml
index fd03521fd..fd03521fd 100644
--- a/app/src/main/res/layout/activity_archived_cards.xml
+++ b/app/src/main/res/layout/activity_archived.xml
diff --git a/app/src/main/res/layout/item_access_control.xml b/app/src/main/res/layout/item_access_control.xml
index 87a0910b8..ecb05349e 100644
--- a/app/src/main/res/layout/item_access_control.xml
+++ b/app/src/main/res/layout/item_access_control.xml
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_weight="1"
-                android:textSize="16sp"
+                android:textAppearance="?attr/textAppearanceListItem"
                 tools:drawableEnd="@drawable/ic_sync_blue_24dp"
                 tools:text="@tools:sample/full_names" />
 
diff --git a/app/src/main/res/layout/item_access_control_owner.xml b/app/src/main/res/layout/item_access_control_owner.xml
index 1e70e8b50..ff41573ec 100644
--- a/app/src/main/res/layout/item_access_control_owner.xml
+++ b/app/src/main/res/layout/item_access_control_owner.xml
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_weight="1"
-            android:textSize="16sp"
+            android:textAppearance="?attr/textAppearanceListItem"
             tools:text="@tools:sample/full_names" />
 
         <TextView
@@ -38,7 +38,7 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:text="@string/owner"
-            android:textColor="@color/fg_secondary" />
+            android:textAppearance="?attr/textAppearanceListItemSecondary" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml
index b1d467720..81b33eefe 100644
--- a/app/src/main/res/layout/item_activity.xml
+++ b/app/src/main/res/layout/item_activity.xml
@@ -12,9 +12,9 @@
         android:id="@+id/date"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="52dp"
-        android:layout_marginLeft="52dp"
-        android:textColor="@color/fg_secondary"
+        android:layout_marginStart="56dp"
+        android:layout_marginLeft="56dp"
+        android:textAppearance="?attr/textAppearanceListItemSecondary"
         tools:text="4 days ago" />
 
     <LinearLayout
@@ -34,6 +34,7 @@
             android:id="@+id/subject"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textAppearance="?attr/textAppearanceListItem"
             tools:maxLength="150"
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_archived_board.xml b/app/src/main/res/layout/item_archived_board.xml
new file mode 100644
index 000000000..7e32549da
--- /dev/null
+++ b/app/src/main/res/layout/item_archived_board.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="@dimen/spacer_2x">
+
+    <ImageView
+        android:id="@+id/boardIcon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="@dimen/spacer_1hx"
+        android:contentDescription="@null"
+        tools:src="@drawable/circle_grey600_36dp" />
+
+    <TextView
+        android:id="@+id/board_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginLeft="32dp"
+        android:layout_marginTop="@dimen/spacer_1hx"
+        android:layout_weight="1"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:textSize="18sp"
+        tools:ignore="RtlSymmetry"
+        tools:maxLength="40"
+        tools:text="@tools:sample/lorem/random" />
+
+    <ImageView
+        android:id="@+id/board_menu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/label_menu"
+        android:padding="@dimen/spacer_1hx"
+        android:visibility="gone"
+        app:srcCompat="@drawable/ic_menu" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_attachment_default.xml b/app/src/main/res/layout/item_attachment_default.xml
index da3dfc831..61145f0f3 100644
--- a/app/src/main/res/layout/item_attachment_default.xml
+++ b/app/src/main/res/layout/item_attachment_default.xml
@@ -38,7 +38,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_weight="1"
-        android:textSize="@dimen/text_size_attachments" />
+        android:textAppearance="?attr/textAppearanceListItem"
+        tools:maxLength="30"
+        tools:text="@tools:sample/lorem/random" />
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -51,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:textColor="@color/fg_secondary"
+            android:textAppearance="?attr/textAppearanceListItemSecondary"
             tools:text="1.98 MB" />
 
         <TextView
@@ -59,7 +61,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:textColor="@color/fg_secondary"
+            android:textAppearance="?attr/textAppearanceListItemSecondary"
             tools:text="Mar 4" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_autocomplete_user.xml b/app/src/main/res/layout/item_autocomplete_user.xml
index 81eba15ca..ba32c09ef 100644
--- a/app/src/main/res/layout/item_autocomplete_user.xml
+++ b/app/src/main/res/layout/item_autocomplete_user.xml
@@ -24,7 +24,7 @@
         android:paddingLeft="@dimen/spacer_1x"
         android:paddingEnd="@dimen/spacer_2x"
         android:paddingRight="@dimen/spacer_2x"
-        android:textSize="18sp"
+        android:textAppearance="?attr/textAppearanceListItem"
         tools:text="@tools:sample/full_names" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index cb94a69e1..32199805a 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
     android:orientation="horizontal"
     android:padding="@dimen/spacer_2x">
 
@@ -51,15 +52,15 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="16sp"
+                android:textAppearance="?attr/textAppearanceListItem"
                 tools:text="@tools:sample/full_names" />
 
             <TextView
                 android:id="@+id/creationDateTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/fg_secondary"
-                android:textSize="16sp"
+                android:layout_gravity="center"
+                android:textAppearance="?attr/textAppearanceListItemSecondary"
                 tools:text="@tools:sample/date/day_of_week" />
         </LinearLayout>
 
@@ -69,6 +70,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:autofillHints="@null"
+            android:textAppearance="?attr/textAppearanceListItem"
             tools:maxLength="200"
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_prepare_create_account.xml b/app/src/main/res/layout/item_prepare_create_account.xml
index 389aeda72..b9f651557 100644
--- a/app/src/main/res/layout/item_prepare_create_account.xml
+++ b/app/src/main/res/layout/item_prepare_create_account.xml
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_weight="1"
-            android:textSize="16sp"
+            android:textAppearance="?attr/textAppearanceListItem"
             tools:text="@tools:sample/full_names" />
 
         <TextView
@@ -38,8 +38,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_weight="1"
-            android:text="@string/owner"
-            android:textColor="@color/fg_secondary" />
+            android:textAppearance="?attr/textAppearanceListItemSecondary"
+            tools:text="https://example.com/" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_prepare_create_board.xml b/app/src/main/res/layout/item_prepare_create_board.xml
index f846693a8..1ace7d569 100644
--- a/app/src/main/res/layout/item_prepare_create_board.xml
+++ b/app/src/main/res/layout/item_prepare_create_board.xml
@@ -26,7 +26,7 @@
         android:layout_weight="1"
         android:ellipsize="middle"
         android:singleLine="true"
-        android:textSize="16sp"
+        android:textAppearance="?attr/textAppearanceListItem"
         tools:text="@tools:sample/lorem/random" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_prepare_create_stack.xml b/app/src/main/res/layout/item_prepare_create_stack.xml
index 9674eb1cd..494b6ca91 100644
--- a/app/src/main/res/layout/item_prepare_create_stack.xml
+++ b/app/src/main/res/layout/item_prepare_create_stack.xml
@@ -12,6 +12,6 @@
     android:paddingRight="@dimen/spacer_2x"
     android:paddingBottom="@dimen/spacer_2x"
     android:singleLine="true"
-    android:textSize="16sp"
+    android:textAppearance="?attr/textAppearanceListItem"
     tools:text="@tools:sample/full_names" />
 
diff --git a/app/src/main/res/layout/item_tip.xml b/app/src/main/res/layout/item_tip.xml
index 46d199a31..2e186d42e 100644
--- a/app/src/main/res/layout/item_tip.xml
+++ b/app/src/main/res/layout/item_tip.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:drawablePadding="@dimen/spacer_2x"
         android:gravity="start|center"
-        android:textColor="?android:textColorPrimary"
+        android:textAppearance="?attr/textAppearanceListItem"
         app:drawableLeftCompat="@drawable/ic_lightbulb_outline_grey600_24dp"
         app:drawableStartCompat="@drawable/ic_lightbulb_outline_grey600_24dp"
         tools:maxLength="200"
diff --git a/app/src/main/res/layout/widget_color_chooser.xml b/app/src/main/res/layout/widget_color_chooser.xml
index c853d9e49..1d3970119 100644
--- a/app/src/main/res/layout/widget_color_chooser.xml
+++ b/app/src/main/res/layout/widget_color_chooser.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -19,7 +20,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/pick_custom_color"
-            app:srcCompat="@drawable/circle_alpha_colorize_36dp" />
+            app:srcCompat="@drawable/circle_alpha_colorize_36dp"
+            tools:tint="@color/grey600" />
     </com.google.android.flexbox.FlexboxLayout>
 
     <com.skydoves.colorpickerview.ColorPickerView
@@ -30,7 +32,8 @@
         android:layout_marginTop="10dp"
         android:visibility="gone"
         app:palette="@drawable/palette"
-        app:selector="@drawable/wheel" />
+        app:selector="@drawable/wheel"
+        tools:visibility="visible" />
 
     <com.skydoves.colorpickerview.sliders.BrightnessSlideBar
         android:id="@+id/brightnessSlide"
@@ -41,5 +44,6 @@
         android:visibility="gone"
         app:borderColor_BrightnessSlider="@android:color/darker_gray"
         app:borderSize_BrightnessSlider="5"
-        app:selector_BrightnessSlider="@drawable/wheel" />
+        app:selector_BrightnessSlider="@drawable/wheel"
+        tools:visibility="visible" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_empty_content_view.xml b/app/src/main/res/layout/widget_empty_content_view.xml
index 1133b5c7e..1a8f4672f 100644
--- a/app/src/main/res/layout/widget_empty_content_view.xml
+++ b/app/src/main/res/layout/widget_empty_content_view.xml
@@ -26,7 +26,7 @@
         android:paddingBottom="16dp"
         android:textAlignment="center"
         android:textSize="@dimen/empty_content_font_size"
-        hint:text="@string/app_name_short" />
+        hint:text="@string/no_cards" />
 
     <TextView
         android:id="@+id/description"
@@ -39,5 +39,5 @@
         android:paddingEnd="@dimen/spacer_2x"
         android:paddingRight="@dimen/spacer_2x"
         android:textAlignment="center"
-        hint:text="@string/app_name" />
+        hint:text="@string/add_a_new_card_using_the_button" />
 </RelativeLayout>
\ No newline at end of file