chore(done): Support compact mode

Refs: #1556 Signed-off-by: Stefan Niedermann <info@niedermann.it>
stefan-niedermann · Jan 16, 2024 · b8d1a2a · b8d1a2a
1 parent 8405834
commit b8d1a2a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/DueDateChip.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/DueDateChip.java
@@ -27,39 +27,49 @@
 
 public class DueDateChip extends Chip {
 
-    protected @ColorInt int colorOnSurface;
+    @ColorInt
+    protected final int colorOnSurface;
+    protected final boolean compactMode;
 
     public DueDateChip(Context context) {
-        super(context);
-        initialize();
+        this(context, null);
     }
 
     public DueDateChip(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initialize();
+        this(context, attrs, R.attr.chipStyle);
     }
 
     public DueDateChip(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        initialize();
-    }
 
-    private void initialize() {
+        final var typedValue = new TypedValue();
+        final var theme = getContext().getTheme();
+        theme.resolveAttribute(R.attr.colorOnSurface, typedValue, true);
+        this.colorOnSurface = typedValue.data;
+
+        final var styles = context.obtainStyledAttributes(attrs, R.styleable.DueDateChip, defStyleAttr, 0);
+        this.compactMode = styles.getBoolean(R.styleable.DueDateChip_compactMode, false);
+        styles.recycle();
+
         setEnsureMinTouchTargetSize(false);
         setMinHeight(0);
         setChipMinHeight(0);
         @Px final var padding = DimensionUtil.INSTANCE.dpToPx(getContext(), R.dimen.spacer_1x);
         setPadding(padding, padding, padding, padding);
         setClickable(false);
 
-        final var typedValue = new TypedValue();
-        final var theme = getContext().getTheme();
-        theme.resolveAttribute(R.attr.colorOnSurface, typedValue, true);
-        this.colorOnSurface = typedValue.data;
+        if (compactMode) {
+            setChipEndPadding(0);
+            setTextEndPadding(0);
+        }
     }
 
     public void setDueDate(@NonNull Instant date, boolean isDone) {
-        setText(DateUtil.getRelativeDateTimeString(getContext(), date.toEpochMilli()));
+        if (compactMode) {
+            setText(null);
+        } else {
+            setText(DateUtil.getRelativeDateTimeString(getContext(), date.toEpochMilli()));
+        }
 
         @DrawableRes final int chipIconRes;
         @Nullable @ColorRes final Integer textColorRes;

diff --git a/app/src/main/res/layout/item_card_compact.xml b/app/src/main/res/layout/item_card_compact.xml
@@ -56,6 +56,7 @@
                     android:id="@+id/card_due_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:compactMode="true"
                     tools:chipIcon="@drawable/ic_time_24"
                     tools:text="tomorrow" />
 

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -8,4 +8,7 @@
         <attr name="description" format="string" />
         <attr name="image" format="reference" />
     </declare-styleable>
+    <declare-styleable name="DueDateChip">
+        <attr name="compactMode" format="boolean" />
+    </declare-styleable>
 </resources>