From 198a6d1f632ac647e404115e95c9c565a2b1de0b Mon Sep 17 00:00:00 2001 From: "fossifybot[bot]" <212866877+fossifybot[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2026 00:54:19 +0000 Subject: [PATCH 1/2] chore(deps): bump org.fossify.commons from 6.1.6 to 7.1.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 243ca5d6..d5b2d35a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,7 +22,7 @@ numberpicker = "2.4.13" #Room room = "2.8.5" #Fossify -commons = "6.1.6" +commons = "7.1.0" #Gradle gradlePlugins-agp = "9.4.1" #build From 5099633b9680d8da6f44e6ebe49cd9a96071b0d1 Mon Sep 17 00:00:00 2001 From: Naveen Singh Date: Thu, 8 Oct 2026 07:27:34 +0530 Subject: [PATCH 2/2] fix: migrate to commons 7.1.0 --- app/build.gradle.kts | 1 - app/src/foss/res/values/bools.xml | 3 +-- app/src/gplay/res/values/bools.xml | 3 +-- .../fossify/clock/activities/MainActivity.kt | 4 ++-- .../clock/activities/SettingsActivity.kt | 1 - .../WidgetAnalogueConfigureActivity.kt | 18 ------------------ .../WidgetDigitalConfigureActivity.kt | 18 ------------------ 7 files changed, 4 insertions(+), 44 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cf694d66..a22a1d41 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -85,7 +85,6 @@ android { flavorDimensions.add("variants") productFlavors { - register("core") register("foss") register("gplay") } diff --git a/app/src/foss/res/values/bools.xml b/app/src/foss/res/values/bools.xml index ac02880e..fcdfa946 100644 --- a/app/src/foss/res/values/bools.xml +++ b/app/src/foss/res/values/bools.xml @@ -1,6 +1,5 @@ true - true - true + false diff --git a/app/src/gplay/res/values/bools.xml b/app/src/gplay/res/values/bools.xml index 41c48b21..d89a62c6 100644 --- a/app/src/gplay/res/values/bools.xml +++ b/app/src/gplay/res/values/bools.xml @@ -1,6 +1,5 @@ false - false - true + true diff --git a/app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt index 44d6a7bc..6fe7d9df 100644 --- a/app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/MainActivity.kt @@ -191,7 +191,7 @@ class MainActivity : SimpleActivity() { findItem(R.id.sort).isVisible = binding.viewPager.currentItem == getTabIndex(TAB_ALARM) || binding.viewPager.currentItem == getTabIndex(TAB_TIMER) findItem(R.id.more_apps_from_us).isVisible = - !resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations) + resources.getBoolean(org.fossify.commons.R.bool.is_google_play_build) } } @@ -375,7 +375,7 @@ class MainActivity : SimpleActivity() { ) ) - if (!resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)) { + if (resources.getBoolean(org.fossify.commons.R.bool.is_google_play_build)) { faqItems.add( FAQItem( title = org.fossify.commons.R.string.faq_2_title_commons, diff --git a/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt index 66a10e18..732df0d2 100644 --- a/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt @@ -33,7 +33,6 @@ import org.fossify.commons.extensions.beVisibleIf import org.fossify.commons.extensions.formatMinutesToTimeString import org.fossify.commons.extensions.formatSecondsToTimeString import org.fossify.commons.extensions.getProperPrimaryColor -import org.fossify.commons.extensions.isOrWasThankYouInstalled import org.fossify.commons.extensions.showPickSecondsDialog import org.fossify.commons.extensions.toast import org.fossify.commons.extensions.updateTextColors diff --git a/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt index 2db36cc1..8986cad0 100644 --- a/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/WidgetAnalogueConfigureActivity.kt @@ -10,14 +10,12 @@ import org.fossify.clock.databinding.WidgetConfigAnalogueBinding import org.fossify.clock.extensions.config import org.fossify.clock.helpers.MyAnalogueTimeWidgetProvider import org.fossify.commons.dialogs.ColorPickerDialog -import org.fossify.commons.dialogs.FeatureLockedDialog import org.fossify.commons.extensions.adjustAlpha import org.fossify.commons.extensions.applyColorFilter import org.fossify.commons.extensions.getContrastColor import org.fossify.commons.extensions.getProperPrimaryColor import org.fossify.commons.extensions.getProperTextColor import org.fossify.commons.extensions.isDynamicTheme -import org.fossify.commons.extensions.isOrWasThankYouInstalled import org.fossify.commons.extensions.setFillWithStroke import org.fossify.commons.extensions.viewBinding import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS @@ -27,7 +25,6 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() { private var mWidgetId = 0 private var mBgColor = 0 private var mBgColorWithoutTransparency = 0 - private var mFeatureLockedDialog: FeatureLockedDialog? = null private val binding: WidgetConfigAnalogueBinding by viewBinding(WidgetConfigAnalogueBinding::inflate) public override fun onCreate(savedInstanceState: Bundle?) { @@ -52,21 +49,6 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() { val primaryColor = getProperPrimaryColor() binding.configAnalogueBgSeekbar.setColors(getProperTextColor(), primaryColor, primaryColor) - - if (!isCustomizingColors && !isOrWasThankYouInstalled()) { - mFeatureLockedDialog = FeatureLockedDialog(this) { - if (!isOrWasThankYouInstalled()) { - finish() - } - } - } - } - - override fun onResume() { - super.onResume() - if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) { - mFeatureLockedDialog?.dismissDialog() - } } private fun initVariables() { diff --git a/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt index 392dfdea..cd844e08 100644 --- a/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt +++ b/app/src/main/kotlin/org/fossify/clock/activities/WidgetDigitalConfigureActivity.kt @@ -14,13 +14,11 @@ import org.fossify.clock.helpers.FORMAT_24H import org.fossify.clock.helpers.MyDigitalTimeWidgetProvider import org.fossify.clock.helpers.SIMPLE_PHONE import org.fossify.commons.dialogs.ColorPickerDialog -import org.fossify.commons.dialogs.FeatureLockedDialog import org.fossify.commons.extensions.adjustAlpha import org.fossify.commons.extensions.applyColorFilter import org.fossify.commons.extensions.getContrastColor import org.fossify.commons.extensions.getProperPrimaryColor import org.fossify.commons.extensions.isDynamicTheme -import org.fossify.commons.extensions.isOrWasThankYouInstalled import org.fossify.commons.extensions.setFillWithStroke import org.fossify.commons.extensions.viewBinding import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS @@ -31,7 +29,6 @@ class WidgetDigitalConfigureActivity : SimpleActivity() { private var mBgColor = 0 private var mTextColor = 0 private var mBgColorWithoutTransparency = 0 - private var mFeatureLockedDialog: FeatureLockedDialog? = null private val binding: WidgetConfigDigitalBinding by viewBinding(WidgetConfigDigitalBinding::inflate) public override fun onCreate(savedInstanceState: Bundle?) { @@ -62,21 +59,6 @@ class WidgetDigitalConfigureActivity : SimpleActivity() { val primaryColor = getProperPrimaryColor() binding.configDigitalBgSeekbar.setColors(mTextColor, primaryColor, primaryColor) - - if (!isCustomizingColors && !isOrWasThankYouInstalled()) { - mFeatureLockedDialog = FeatureLockedDialog(this) { - if (!isOrWasThankYouInstalled()) { - finish() - } - } - } - } - - override fun onResume() { - super.onResume() - if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) { - mFeatureLockedDialog?.dismissDialog() - } } private fun initVariables() {