From da5c23b6babb7eed9008678e459704779f6b08de Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 6 Jul 2023 11:07:13 +0200 Subject: [PATCH] Show warning text for paste time in duration dialog --- .../main/java/eu/faircode/email/FragmentDialogDuration.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java index 0969b4ba7d..e37cdd31dc 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java @@ -78,6 +78,9 @@ public class FragmentDialogDuration extends FragmentDialogBase { final TimePicker timePicker = dview.findViewById(R.id.timePicker); final DatePicker datePicker = dview.findViewById(R.id.datePicker); + final int colorWarning = Helper.resolveColor(context, R.attr.colorWarning); + final int textColorSecondary = Helper.resolveColor(context, android.R.attr.textColorSecondary); + if (savedInstanceState == null) { if (time == 0) { cal.setTimeInMillis(new Date().getTime()); @@ -93,6 +96,7 @@ public class FragmentDialogDuration extends FragmentDialogBase { final DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.FULL, SimpleDateFormat.SHORT); tvDuration.setText(DTF.format(cal.getTime())); + tvDuration.setTextColor(cal.getTimeInMillis() < new Date().getTime() ? colorWarning : textColorSecondary); timePicker.setIs24HourView(android.text.format.DateFormat.is24HourFormat(context)); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { @@ -278,6 +282,7 @@ public class FragmentDialogDuration extends FragmentDialogBase { cal.set(Calendar.HOUR_OF_DAY, hour); cal.set(Calendar.MINUTE, minute); tvDuration.setText(DTF.format(cal.getTime())); + tvDuration.setTextColor(cal.getTimeInMillis() < new Date().getTime() ? colorWarning : textColorSecondary); Log.i("Set hour=" + hour + " minute=" + minute + " time=" + new Date(cal.getTimeInMillis())); } @@ -294,6 +299,7 @@ public class FragmentDialogDuration extends FragmentDialogBase { cal.set(Calendar.MONTH, month); cal.set(Calendar.DAY_OF_MONTH, day); tvDuration.setText(DTF.format(cal.getTime())); + tvDuration.setTextColor(cal.getTimeInMillis() < new Date().getTime() ? colorWarning : textColorSecondary); Log.i("Set year=" + year + " month=" + month + " day=" + day + " time=" + new Date(cal.getTimeInMillis())); }