From 2f1970e2f1f611f9af447b6f5c801a714914d50d Mon Sep 17 00:00:00 2001
From: stefan-niedermann <info@niedermann.it>
Date: Wed, 4 Mar 2020 21:14:51 +0100
Subject: Fix label margins and paddings

---
 .../it/niedermann/nextcloud/deck/ui/card/CardAdapter.java    | 12 ++++++++----
 app/src/main/res/layout/item_card.xml                        |  2 +-
 fastlane/metadata/android/en-US/changelogs/22.txt            |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
index f02538be3..c715a7e2d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
+import android.os.Build;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -209,8 +210,7 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.ItemCardViewHo
             if (i > maxLabelsShown - 1 && labelList.size() > maxLabelsShown) {
                 chip = new Chip(context);
                 chip.setChipIcon(ContextCompat.getDrawable(context, R.drawable.ic_more_horiz_black_24dp));
-                chip.setCloseIconStartPadding(0);
-                chip.setCloseIconEndPadding(0);
+                chip.setEnsureMinTouchTargetSize(false);
                 chip.setTextStartPadding(0);
                 chip.setTextEndPadding(0);
                 labels.addView(chip);
@@ -218,11 +218,15 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.ItemCardViewHo
             }
             Label label = labelList.get(i);
             chip = new Chip(context);
+            chip.setEnsureMinTouchTargetSize(false);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                chip.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+            }
             String labelTitle = label.getTitle();
             if (labelTitle.length() > maxLabelsChars - 1) {
                 chip.setText(labelTitle.substring(0, maxLabelsChars));
             } else {
-                chip.setText(" " + labelTitle.substring(0, 1) + " ");
+                chip.setText(labelTitle.substring(0, 1));
             }
 
             try {
@@ -242,7 +246,7 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.ItemCardViewHo
         if (attachmentsCount > 99) {
             cardCountAttachments.setText(context.getString(R.string.attachment_count_max_value));
         } else if (attachmentsCount > 1) {
-            cardCountAttachments.setText(attachmentsCount + "");
+            cardCountAttachments.setText(String.valueOf(attachmentsCount));
         } else if (attachmentsCount == 1) {
             cardCountAttachments.setText("");
         }
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index 92977d262..83cca30a7 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -112,8 +112,8 @@
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_gravity="center_vertical"
+                android:layout_weight="1"
                 android:gravity="end">
 
                 <androidx.appcompat.widget.AppCompatTextView
diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt
index dedc6053b..d6f73afe6 100644
--- a/fastlane/metadata/android/en-US/changelogs/22.txt
+++ b/fastlane/metadata/android/en-US/changelogs/22.txt
@@ -1,3 +1,4 @@
 - Wrap card title to new line(s) if length exceeds width of screen (#261)
 - Migrate from ButterKnife to ViewBinding (#285)
-- Card context menu is cut off (#290)
\ No newline at end of file
+- Card context menu is cut off (#290)
+- Fix label margins and paddings
\ No newline at end of file
-- 
cgit v1.2.3