feat(done): Enhance width of done button

Refs: #1556 Signed-off-by: Stefan Niedermann <[email protected]>
stefan-niedermann · Jan 14, 2024 · a46f70e · a46f70e
1 parent 2694c8e
commit a46f70e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
@@ -27,6 +27,7 @@
 
 import com.google.android.material.chip.Chip;
 import com.google.android.material.snackbar.Snackbar;
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog.OnDateSetListener;
@@ -150,6 +151,11 @@ private void applyTheme(@ColorInt int color) {
                 binding.descriptionEditorWrapper
         ).forEach(utils.material::colorTextInputLayout);
 
+        Stream.of(
+                binding.clearDueDate,
+                binding.descriptionToggle
+        ).forEach(v -> utils.platform.colorImageView(v, ColorRole.SECONDARY));
+
         binding.descriptionEditor.setSearchColor(color);
         binding.descriptionViewer.setSearchColor(color);
 

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/ThemedDatePickerDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/ThemedDatePickerDialog.java
@@ -36,11 +36,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     public void applyTheme(int color) {
         final var scheme = ThemeUtils.createScheme(color, requireContext());
 
-        @ColorInt final int buttonTextColor = scheme.getOnPrimaryContainer();
+        @ColorInt final int buttonTextColor = scheme.getOnSecondaryContainer();
         setOkColor(buttonTextColor);
         setCancelColor(buttonTextColor);
 
-        setAccentColor(Scheme.dark(color).getPrimaryContainer());
+        setAccentColor(Scheme.dark(color).getSecondaryContainer());
     }
 
     /**

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/ThemedTimePickerDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/ThemedTimePickerDialog.java
@@ -36,11 +36,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     public void applyTheme(int color) {
         final var scheme = ThemeUtils.createScheme(color, requireContext());
 
-        @ColorInt final int buttonTextColor = scheme.getOnPrimaryContainer();
+        @ColorInt final int buttonTextColor = scheme.getOnSecondaryContainer();
         setOkColor(buttonTextColor);
         setCancelColor(buttonTextColor);
 
-        setAccentColor(Scheme.dark(color).getPrimaryContainer());
+        setAccentColor(Scheme.dark(color).getSecondaryContainer());
     }
 
     /**

diff --git a/app/src/main/res/layout/fragment_card_edit_tab_details.xml b/app/src/main/res/layout/fragment_card_edit_tab_details.xml
@@ -157,7 +157,6 @@
             app:icon="@drawable/ic_check_white_24dp"
             app:layout_constraintBottom_toTopOf="@id/descriptionWrapper"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/dueDateTimeWrapper"
             app:layout_constraintTop_toBottomOf="@id/dueDateDateWrapper" />
 
         <RelativeLayout