Fix #696 Clicking on the tag label does not select the tag

Signed-off-by: Stefan Niedermann <info@niedermann.it>

5 files changed, 7 insertions, 2 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java
index 6a6ef1c05..d5898334b 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java
@@ -16,6 +16,7 @@ public class ManageLabelsViewHolder extends RecyclerView.ViewHolder {
     public ManageLabelsViewHolder(ItemManageLabelBinding binding) {
         super(binding.getRoot());
         this.binding = binding;
+        this.binding.label.setClickable(false);
     }
 
     public void bind(@NonNull Label label, @NonNull ManageLabelListener listener) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
index ce1643084..047b6c270 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
@@ -47,7 +47,8 @@ public class FilterDialogFragment extends BrandedDialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        indicator = getResources().getDrawable(R.drawable.circle_grey600_8dp);
+        indicator = ContextCompat.getDrawable(requireContext(), R.drawable.circle_grey600_8dp);
+        assert indicator != null;
         indicator.setColorFilter(getResources().getColor(R.color.defaultBrand), PorterDuff.Mode.SRC_ATOP);
 
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
index f72336924..1dbf89d61 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
@@ -73,6 +73,7 @@ public class FilterLabelsAdapter extends RecyclerView.Adapter<FilterLabelsAdapte
         LabelViewHolder(@NonNull ItemFilterLabelBinding binding) {
             super(binding.getRoot());
             this.binding = binding;
+            this.binding.label.setClickable(false);
         }
 
         void bind(final Label label) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java
index 1853d1b88..8980419b9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java
@@ -39,6 +39,7 @@ public class LabelChip extends Chip {
         setTextStartPadding(gutter);
         setTextEndPadding(gutter);
         setChipEndPadding(gutter);
+        setClickable(false);
 
         try {
             int labelColor = label.getColor();
diff --git a/fastlane/metadata/android/en-US/changelogs/1011000.txt b/fastlane/metadata/android/en-US/changelogs/1011000.txt
index e39237a71..4796430eb 100644
--- a/fastlane/metadata/android/en-US/changelogs/1011000.txt
+++ b/fastlane/metadata/android/en-US/changelogs/1011000.txt
@@ -1,3 +1,4 @@
 - ⚙️ Store colors as integer in database (#556)
 - 📦 Allow archiving cards from filtered results only (#663)
-- 👤 New assigned users dialog
\ No newline at end of file
+- 👤 New assigned users dialog
+- 🐞 Clicking on the tag label does not select the tag (#696)
\ No newline at end of file