From eaf440751a2dbf48a658dedd6948cf26b4dd27f6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 21 Feb 2021 09:59:43 +0100 Subject: [PATCH] use adjusted primary color instead of primary at the only event type color --- .../calendar/pro/activities/SettingsActivity.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 ebf8f2f56..9e7f352af 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 @@ -28,12 +28,12 @@ class SettingsActivity : SimpleActivity() { private val GET_RINGTONE_URI = 1 private val PICK_IMPORT_SOURCE_INTENT = 2 - private var mStoredPrimaryColor = 0 + private var mStoredAdjustedPrimaryColor = 0 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_settings) - mStoredPrimaryColor = config.primaryColor + mStoredAdjustedPrimaryColor = getAdjustedPrimaryColor() } override fun onResume() { @@ -85,7 +85,7 @@ class SettingsActivity : SimpleActivity() { override fun onPause() { super.onPause() - mStoredPrimaryColor = config.primaryColor + mStoredAdjustedPrimaryColor = getAdjustedPrimaryColor() } override fun onStop() { @@ -113,12 +113,12 @@ class SettingsActivity : SimpleActivity() { } private fun checkPrimaryColor() { - if (config.primaryColor != mStoredPrimaryColor) { + if (getAdjustedPrimaryColor() != mStoredAdjustedPrimaryColor) { ensureBackgroundThread { val eventTypes = eventsHelper.getEventTypesSync() if (eventTypes.filter { it.caldavCalendarId == 0 }.size == 1) { val eventType = eventTypes.first { it.caldavCalendarId == 0 } - eventType.color = config.primaryColor + eventType.color = getAdjustedPrimaryColor() eventsHelper.insertOrUpdateEventTypeSync(eventType) } }