From a46f70ece044e65e13933a95009386920c9108ee Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Sun, 14 Jan 2024 12:32:29 +0100 Subject: feat(done): Enhance width of done button Refs: #1556 Signed-off-by: Stefan Niedermann --- .../nextcloud/deck/ui/card/details/CardDetailsFragment.java | 6 ++++++ .../niedermann/nextcloud/deck/ui/theme/ThemedDatePickerDialog.java | 4 ++-- .../niedermann/nextcloud/deck/ui/theme/ThemedTimePickerDialog.java | 4 ++-- app/src/main/res/layout/fragment_card_edit_tab_details.xml | 1 - 4 files changed, 10 insertions(+), 5 deletions(-) (limited to 'app') 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 index 6ab4deaff..d96ffa21f 100644 --- 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 androidx.recyclerview.widget.GridLayoutManager; 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 @@ public class CardDetailsFragment extends Fragment implements OnDateSetListener, 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 index 926a394e4..a78bc972f 100644 --- 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 class ThemedDatePickerDialog extends DatePickerDialog implements Themed { 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 index d835a5723..f9bc8bd13 100644 --- 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 class ThemedTimePickerDialog extends TimePickerDialog implements Themed { 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 index 39daeb4f4..80b107119 100644 --- 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" />