diff --git a/src/main/java/org/tasks/activities/DateAndTimePickerActivity.java b/src/main/java/org/tasks/activities/DateAndTimePickerActivity.java index 2aa9500e1..81fe6bb72 100644 --- a/src/main/java/org/tasks/activities/DateAndTimePickerActivity.java +++ b/src/main/java/org/tasks/activities/DateAndTimePickerActivity.java @@ -7,6 +7,7 @@ import android.os.Bundle; import com.wdullaer.materialdatetimepicker.date.DatePickerDialog; +import org.tasks.R; import org.tasks.dialogs.MyDatePickerDialog; import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.preferences.ActivityPreferences; @@ -48,6 +49,9 @@ public class DateAndTimePickerActivity extends InjectingAppCompatActivity implem if (datePickerDialog == null) { datePickerDialog = new MyDatePickerDialog(); datePickerDialog.initialize(null, initial.getYear(), initial.getMonthOfYear() - 1, initial.getDayOfMonth()); + if (preferences.isDarkTheme()) { + datePickerDialog.setAccentColor(getColor(R.color.black_text_hint)); + } datePickerDialog.show(fragmentManager, FRAG_TAG_DATE_PICKER); } datePickerDialog.setOnCancelListener(this); diff --git a/src/main/java/org/tasks/activities/TimePickerActivity.java b/src/main/java/org/tasks/activities/TimePickerActivity.java index 404c20ce4..67a7ee4da 100644 --- a/src/main/java/org/tasks/activities/TimePickerActivity.java +++ b/src/main/java/org/tasks/activities/TimePickerActivity.java @@ -9,6 +9,7 @@ import android.text.format.DateFormat; import com.wdullaer.materialdatetimepicker.time.RadialPickerLayout; import com.wdullaer.materialdatetimepicker.time.TimePickerDialog; +import org.tasks.R; import org.tasks.dialogs.MyTimePickerDialog; import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.preferences.ActivityPreferences; @@ -43,6 +44,9 @@ public class TimePickerActivity extends InjectingAppCompatActivity implements Ti if (dialog == null) { dialog = new MyTimePickerDialog(); dialog.initialize(null, initial.getHourOfDay(), initial.getMinuteOfHour(), 0, DateFormat.is24HourFormat(this)); + if (preferences.isDarkTheme()) { + dialog.setAccentColor(getColor(R.color.black_text_hint)); + } dialog.show(fragmentManager, FRAG_TAG_TIME_PICKER); } dialog.setOnDismissListener(this); diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java index 04fba401a..b255f3f65 100644 --- a/src/main/java/org/tasks/ui/DeadlineControlSet.java +++ b/src/main/java/org/tasks/ui/DeadlineControlSet.java @@ -299,6 +299,9 @@ public class DeadlineControlSet extends TaskEditControlSetBase { refreshDisplayView(); } }); + if (preferences.isDarkTheme()) { + dialog.setAccentColor(activity.getColor(R.color.black_text_hint)); + } dialog.show(activity.getFragmentManager(), FRAG_TAG_PICK_A_DATE); break; } @@ -352,6 +355,9 @@ public class DeadlineControlSet extends TaskEditControlSetBase { refreshDisplayView(); } }); + if (preferences.isDarkTheme()) { + dialog.setAccentColor(activity.getColor(R.color.black_text_hint)); + } dialog.show(activity.getFragmentManager(), FRAG_TAG_PICK_A_TIME); break; }