From 3f69bed95d122bec0bf9652a3f1c608ffb61b8c7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 8 Apr 2022 22:04:57 +0200 Subject: [PATCH] use the new date/time theme picker way --- app/build.gradle | 2 +- .../calendar/pro/activities/EventActivity.kt | 17 ++++++++++------ .../pro/activities/SettingsActivity.kt | 2 +- .../calendar/pro/activities/TaskActivity.kt | 6 ++---- .../dialogs/RepeatLimitTypePickerDialog.kt | 20 ++++++++++--------- .../pro/fragments/DayFragmentsHolder.kt | 6 ++---- .../pro/fragments/MonthDayFragmentsHolder.kt | 2 +- .../pro/fragments/MonthFragmentsHolder.kt | 2 +- .../pro/fragments/WeekFragmentsHolder.kt | 2 +- .../pro/fragments/YearFragmentsHolder.kt | 2 +- 10 files changed, 32 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 262c07e3d..fa53c59c1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,7 +70,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:266b95747d' + implementation 'com.github.SimpleMobileTools:Simple-Commons:b0bdd457be' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt index b8e1c7aed..61c84bc27 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt @@ -62,7 +62,6 @@ class EventActivity : SimpleActivity() { private var mRepeatLimit = 0L private var mRepeatRule = 0 private var mEventTypeId = REGULAR_EVENT_TYPE_ID - private var mDialogTheme = 0 private var mEventOccurrenceTS = 0L private var mLastSavePromptTS = 0L private var mEventCalendarId = STORED_LOCALLY_ONLY @@ -92,7 +91,6 @@ class EventActivity : SimpleActivity() { } val intent = intent ?: return - mDialogTheme = getDialogTheme() mWasContactsPermissionChecked = hasPermission(PERMISSION_READ_CONTACTS) val eventId = intent.getLongExtra(EVENT_ID, 0L) @@ -1306,7 +1304,7 @@ class EventActivity : SimpleActivity() { private fun setupStartDate() { hideKeyboard() val datepicker = DatePickerDialog( - this, mDialogTheme, startDateSetListener, mEventStartDateTime.year, mEventStartDateTime.monthOfYear - 1, + this, getDatePickerDialogTheme(), startDateSetListener, mEventStartDateTime.year, mEventStartDateTime.monthOfYear - 1, mEventStartDateTime.dayOfMonth ) @@ -1318,7 +1316,7 @@ class EventActivity : SimpleActivity() { hideKeyboard() TimePickerDialog( this, - mDialogTheme, + getTimePickerDialogTheme(), startTimeSetListener, mEventStartDateTime.hourOfDay, mEventStartDateTime.minuteOfHour, @@ -1329,7 +1327,7 @@ class EventActivity : SimpleActivity() { private fun setupEndDate() { hideKeyboard() val datepicker = DatePickerDialog( - this, mDialogTheme, endDateSetListener, mEventEndDateTime.year, mEventEndDateTime.monthOfYear - 1, + this, getDatePickerDialogTheme(), endDateSetListener, mEventEndDateTime.year, mEventEndDateTime.monthOfYear - 1, mEventEndDateTime.dayOfMonth ) @@ -1339,7 +1337,14 @@ class EventActivity : SimpleActivity() { private fun setupEndTime() { hideKeyboard() - TimePickerDialog(this, mDialogTheme, endTimeSetListener, mEventEndDateTime.hourOfDay, mEventEndDateTime.minuteOfHour, config.use24HourFormat).show() + TimePickerDialog( + this, + getTimePickerDialogTheme(), + endTimeSetListener, + mEventEndDateTime.hourOfDay, + mEventEndDateTime.minuteOfHour, + config.use24HourFormat + ).show() } private val startDateSetListener = DatePickerDialog.OnDateSetListener { view, year, monthOfYear, dayOfMonth -> diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt index a93e7f144..939929fd3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt @@ -763,7 +763,7 @@ class SettingsActivity : SimpleActivity() { val currentDateTime = DateTime.now() TimePickerDialog( this, - getDialogTheme(), + getTimePickerDialogTheme(), timeListener, currentDateTime.hourOfDay, currentDateTime.minuteOfHour, diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt index 60d53d13a..f4568c696 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt @@ -23,7 +23,6 @@ import org.joda.time.DateTime import java.util.* class TaskActivity : SimpleActivity() { - private var mDialogTheme = 0 private var mEventTypeId = REGULAR_EVENT_TYPE_ID private lateinit var mTaskDateTime: DateTime private lateinit var mTask: Event @@ -37,7 +36,6 @@ class TaskActivity : SimpleActivity() { } val intent = intent ?: return - mDialogTheme = getDialogTheme() updateColors() val taskId = intent.getLongExtra(EVENT_ID, 0L) ensureBackgroundThread { @@ -226,7 +224,7 @@ class TaskActivity : SimpleActivity() { private fun setupDate() { hideKeyboard() val datepicker = DatePickerDialog( - this, mDialogTheme, dateSetListener, mTaskDateTime.year, mTaskDateTime.monthOfYear - 1, mTaskDateTime.dayOfMonth + this, getDatePickerDialogTheme(), dateSetListener, mTaskDateTime.year, mTaskDateTime.monthOfYear - 1, mTaskDateTime.dayOfMonth ) datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY @@ -236,7 +234,7 @@ class TaskActivity : SimpleActivity() { private fun setupTime() { hideKeyboard() TimePickerDialog( - this, mDialogTheme, timeSetListener, mTaskDateTime.hourOfDay, mTaskDateTime.minuteOfHour, config.use24HourFormat + this, getTimePickerDialogTheme(), timeSetListener, mTaskDateTime.hourOfDay, mTaskDateTime.minuteOfHour, config.use24HourFormat ).show() } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatLimitTypePickerDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatLimitTypePickerDialog.kt index 91d73d5bc..ce71629c5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatLimitTypePickerDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/RepeatLimitTypePickerDialog.kt @@ -9,7 +9,7 @@ import com.simplemobiletools.calendar.pro.extensions.config import com.simplemobiletools.calendar.pro.extensions.seconds import com.simplemobiletools.calendar.pro.helpers.Formatter import com.simplemobiletools.calendar.pro.helpers.getNowSeconds -import com.simplemobiletools.commons.extensions.getDialogTheme +import com.simplemobiletools.commons.extensions.getDatePickerDialogTheme import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.value import kotlinx.android.synthetic.main.dialog_repeat_limit_type_picker.view.* @@ -39,13 +39,13 @@ class RepeatLimitTypePickerDialog(val activity: Activity, var repeatLimit: Long, updateRepeatLimitText() dialog = AlertDialog.Builder(activity) - .setPositiveButton(R.string.ok) { dialogInterface, i -> confirmRepetition() } - .setNegativeButton(R.string.cancel, null) - .create().apply { - activity.setupDialogStuff(view, this) { - activity.currentFocus?.clearFocus() - } + .setPositiveButton(R.string.ok) { dialogInterface, i -> confirmRepetition() } + .setNegativeButton(R.string.cancel, null) + .create().apply { + activity.setupDialogStuff(view, this) { + activity.currentFocus?.clearFocus() } + } } private fun getCheckedItem() = when { @@ -84,8 +84,10 @@ class RepeatLimitTypePickerDialog(val activity: Activity, var repeatLimit: Long, private fun showRepetitionLimitDialog() { val repeatLimitDateTime = Formatter.getDateTimeFromTS(if (repeatLimit != 0L) repeatLimit else getNowSeconds()) - val datepicker = DatePickerDialog(activity, activity.getDialogTheme(), repetitionLimitDateSetListener, repeatLimitDateTime.year, - repeatLimitDateTime.monthOfYear - 1, repeatLimitDateTime.dayOfMonth) + val datepicker = DatePickerDialog( + activity, activity.getDatePickerDialogTheme(), repetitionLimitDateSetListener, repeatLimitDateTime.year, + repeatLimitDateTime.monthOfYear - 1, repeatLimitDateTime.dayOfMonth + ) datepicker.datePicker.firstDayOfWeek = if (activity.config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY datepicker.show() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragmentsHolder.kt index 795ac937e..a2d18aaa8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/DayFragmentsHolder.kt @@ -11,19 +11,17 @@ import androidx.viewpager.widget.ViewPager import com.simplemobiletools.calendar.pro.R import com.simplemobiletools.calendar.pro.activities.MainActivity import com.simplemobiletools.calendar.pro.adapters.MyDayPagerAdapter -import com.simplemobiletools.calendar.pro.extensions.config import com.simplemobiletools.calendar.pro.helpers.DAILY_VIEW import com.simplemobiletools.calendar.pro.helpers.DAY_CODE import com.simplemobiletools.calendar.pro.helpers.Formatter import com.simplemobiletools.calendar.pro.interfaces.NavigationListener -import com.simplemobiletools.commons.extensions.getDialogTheme +import com.simplemobiletools.commons.extensions.getDatePickerDialogTheme import com.simplemobiletools.commons.extensions.getProperBackgroundColor import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.updateActionBarTitle import com.simplemobiletools.commons.views.MyViewPager import kotlinx.android.synthetic.main.fragment_days_holder.view.* import org.joda.time.DateTime -import java.util.* class DayFragmentsHolder : MyFragmentHolder(), NavigationListener { private val PREFILLED_DAYS = 251 @@ -108,7 +106,7 @@ class DayFragmentsHolder : MyFragmentHolder(), NavigationListener { } override fun showGoToDateDialog() { - requireActivity().setTheme(requireContext().getDialogTheme()) + requireActivity().setTheme(requireContext().getDatePickerDialogTheme()) val view = layoutInflater.inflate(R.layout.date_picker, null) val datePicker = view.findViewById(R.id.date_picker) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthDayFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthDayFragmentsHolder.kt index 2fadd15e8..31ec754b0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthDayFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthDayFragmentsHolder.kt @@ -105,7 +105,7 @@ class MonthDayFragmentsHolder : MyFragmentHolder(), NavigationListener { } override fun showGoToDateDialog() { - requireActivity().setTheme(requireContext().getDialogTheme()) + requireActivity().setTheme(requireContext().getDatePickerDialogTheme()) val view = layoutInflater.inflate(R.layout.date_picker, null) val datePicker = view.findViewById(R.id.date_picker) datePicker.findViewById(Resources.getSystem().getIdentifier("day", "id", "android")).beGone() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragmentsHolder.kt index 4de2b90fa..2eab2f36c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/MonthFragmentsHolder.kt @@ -106,7 +106,7 @@ class MonthFragmentsHolder : MyFragmentHolder(), NavigationListener { } override fun showGoToDateDialog() { - requireActivity().setTheme(requireContext().getDialogTheme()) + requireActivity().setTheme(requireContext().getDatePickerDialogTheme()) val view = layoutInflater.inflate(R.layout.date_picker, null) val datePicker = view.findViewById(R.id.date_picker) datePicker.findViewById(Resources.getSystem().getIdentifier("day", "id", "android")).beGone() diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt index fa80c2826..7ed1f3b3e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragmentsHolder.kt @@ -178,7 +178,7 @@ class WeekFragmentsHolder : MyFragmentHolder(), WeekFragmentListener { } override fun showGoToDateDialog() { - requireActivity().setTheme(requireContext().getDialogTheme()) + requireActivity().setTheme(requireContext().getDatePickerDialogTheme()) val view = layoutInflater.inflate(R.layout.date_picker, null) val datePicker = view.findViewById(R.id.date_picker) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragmentsHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragmentsHolder.kt index e3f61adc6..6ade900f4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragmentsHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/YearFragmentsHolder.kt @@ -92,7 +92,7 @@ class YearFragmentsHolder : MyFragmentHolder() { } override fun showGoToDateDialog() { - requireActivity().setTheme(requireContext().getDialogTheme()) + requireActivity().setTheme(requireContext().getDatePickerDialogTheme()) val view = layoutInflater.inflate(R.layout.date_picker, null) val datePicker = view.findViewById(R.id.date_picker) datePicker.findViewById(Resources.getSystem().getIdentifier("day", "id", "android")).beGone()