From 18f2c14211f027f4a47433cfbb90c828ee87f58f Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 28 Feb 2020 11:49:20 -0600 Subject: [PATCH] Fix custom recurrence dialog issues * Wrong text color * Dialog was duplicated on rotate --- .../java/org/tasks/repeats/CustomRecurrenceDialog.java | 8 +++++--- app/src/main/res/layout/frequency_item.xml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java index 389b66183..baeef61a5 100644 --- a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java +++ b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java @@ -519,9 +519,11 @@ public class CustomRecurrenceDialog extends InjectingDialogFragment { } private void repeatUntilClick() { - long repeatUntil = DateTime.from(rrule.getUntil()).getMillis(); - newDatePicker(this, REQUEST_PICK_DATE, repeatUntil > 0 ? repeatUntil : 0L) - .show(getParentFragmentManager(), FRAG_TAG_DATE_PICKER); + if (getParentFragmentManager().findFragmentByTag(FRAG_TAG_DATE_PICKER) == null) { + long repeatUntil = DateTime.from(rrule.getUntil()).getMillis(); + newDatePicker(this, REQUEST_PICK_DATE, repeatUntil > 0 ? repeatUntil : 0L) + .show(getParentFragmentManager(), FRAG_TAG_DATE_PICKER); + } } private void updateRepeatUntilOptions() { diff --git a/app/src/main/res/layout/frequency_item.xml b/app/src/main/res/layout/frequency_item.xml index fb2b9e05a..3b4022b29 100644 --- a/app/src/main/res/layout/frequency_item.xml +++ b/app/src/main/res/layout/frequency_item.xml @@ -13,4 +13,4 @@ android:ellipsize="end" android:singleLine="true" android:textAlignment="viewStart" - android:textColor="?attr/colorOnPrimary"/> + android:textColor="?attr/colorOnSecondary"/>