Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ android {

flavorDimensions.add("variants")
productFlavors {
register("core")
register("foss")
register("gplay")
}
Expand Down
3 changes: 1 addition & 2 deletions app/src/foss/res/values/bools.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="show_donate_in_about">true</bool>
<bool name="hide_google_relations">true</bool>
<bool name="pretend_thank_you_installed">true</bool>
<bool name="is_google_play_build">false</bool>
</resources>
3 changes: 1 addition & 2 deletions app/src/gplay/res/values/bools.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="show_donate_in_about">false</bool>
<bool name="hide_google_relations">false</bool>
<bool name="pretend_thank_you_installed">true</bool>
<bool name="is_google_play_build">true</bool>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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?) {
Expand All @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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?) {
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading