From 4fb690fda116ffe5a0e2a9c4e32ba40895ad31e3 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 23 Apr 2019 13:51:31 -0500
Subject: [PATCH] Create chips programmatically

---
 app/src/main/java/org/tasks/ui/ChipProvider.java  |  6 +++---
 app/src/main/res/layout/chip_task_list.xml        |  7 -------
 app/src/main/res/layout/control_set_tags.xml      |  5 ++++-
 app/src/main/res/layout/task_adapter_row_body.xml | 10 ++++++----
 app/src/main/res/values/dimens.xml                |  2 ++
 app/src/main/res/values/styles.xml                | 11 -----------
 6 files changed, 15 insertions(+), 26 deletions(-)
 delete mode 100644 app/src/main/res/layout/chip_task_list.xml

diff --git a/app/src/main/java/org/tasks/ui/ChipProvider.java b/app/src/main/java/org/tasks/ui/ChipProvider.java
index bef4a760b..af8f63995 100644
--- a/app/src/main/java/org/tasks/ui/ChipProvider.java
+++ b/app/src/main/java/org/tasks/ui/ChipProvider.java
@@ -8,7 +8,6 @@ import static org.tasks.preferences.ResourceResolver.getDimen;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.view.LayoutInflater;
 import com.google.android.material.chip.Chip;
 import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
@@ -93,7 +92,8 @@ public class ChipProvider {
     localBroadcastManager.broadcastRefresh();
   }
 
-  public List<Chip> getChips(Activity activity, String caldav, String googleTask, Iterable<String> tagUuids) {
+  public List<Chip> getChips(
+      Activity activity, String caldav, String googleTask, Iterable<String> tagUuids) {
     assertMainThread();
 
     List<Chip> chips = new ArrayList<>();
@@ -126,7 +126,7 @@ public class ChipProvider {
   }
 
   private Chip newChip(Activity activity, Filter filter) {
-    Chip chip = (Chip) activity.getLayoutInflater().inflate(R.layout.chip_task_list, null);
+    Chip chip = new Chip(activity);
     chip.setTag(filter);
     apply(chip, filter.listingTitle, filter.tint);
     return chip;
diff --git a/app/src/main/res/layout/chip_task_list.xml b/app/src/main/res/layout/chip_task_list.xml
deleted file mode 100644
index ffc1296ed..000000000
--- a/app/src/main/res/layout/chip_task_list.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  style="@style/TaskListChip"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
-  app:closeIconEnabled="false"/>
diff --git a/app/src/main/res/layout/control_set_tags.xml b/app/src/main/res/layout/control_set_tags.xml
index 7d6c139b7..d71c9cf36 100644
--- a/app/src/main/res/layout/control_set_tags.xml
+++ b/app/src/main/res/layout/control_set_tags.xml
@@ -4,6 +4,7 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/tag_row"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -21,5 +22,7 @@
   <com.google.android.material.chip.ChipGroup
     android:id="@+id/chip_group"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
+    android:layout_height="wrap_content"
+    app:chipSpacingVertical="@dimen/chip_spacing"
+    app:chipSpacingHorizontal="@dimen/chip_spacing"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/task_adapter_row_body.xml b/app/src/main/res/layout/task_adapter_row_body.xml
index e53f1dc1d..c9d155ec6 100644
--- a/app/src/main/res/layout/task_adapter_row_body.xml
+++ b/app/src/main/res/layout/task_adapter_row_body.xml
@@ -1,5 +1,6 @@
 <?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"
   android:id="@+id/rowBody"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -92,12 +93,13 @@
     android:id="@+id/chip_group"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="end"
-    android:paddingTop="2dp"
     android:layout_marginStart="@dimen/keyline_first"
+    android:layout_marginEnd="@dimen/keyline_content_inset"
     android:layout_marginLeft="@dimen/keyline_first"
     android:layout_marginRight="@dimen/keyline_content_inset"
-    android:layout_marginEnd="@dimen/keyline_content_inset"
-    android:visibility="gone"/>
+    android:layout_gravity="end"
+    android:visibility="gone"
+    app:chipSpacingVertical="@dimen/chip_spacing"
+    app:chipSpacingHorizontal="@dimen/chip_spacing"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 89992c3f1..9eb24b48b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -37,4 +37,6 @@
   <dimen name="header_gap">8dp</dimen>
   <dimen name="row_gap">1px</dimen>
 
+  <dimen name="chip_spacing">4dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 77d1ac6fd..a843a8d92 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,17 +18,6 @@
     <item name="android:windowCloseOnTouchOutside">false</item>
   </style>
 
-  <style name="TaskListChip" parent="Base.Widget.MaterialComponents.Chip">
-    <item name="closeIconVisible">false</item>
-    <item name="chipMinHeight">28dp</item>
-    <item name="chipCornerRadius">14dp</item>
-    <item name="chipStartPadding">4dp</item>
-    <item name="textStartPadding">6dp</item>
-    <item name="textEndPadding">6dp</item>
-    <item name="chipEndPadding">4dp</item>
-    <item name="enforceTextAppearance">false</item>
-  </style>
-
   <style name="TextBoxText">
     <item name="android:textColor">?attr/asTextColor</item>
   </style>