mirror of
https://github.com/SimpleMobileTools/Simple-Calculator.git
synced 2025-04-02 04:30:29 +02:00
updating commons
This commit is contained in:
parent
53cecb1556
commit
61cabe9d40
@ -62,7 +62,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'com.github.SimpleMobileTools:Simple-Commons:faa6a972c2'
|
implementation 'com.github.SimpleMobileTools:Simple-Commons:066c60f8ba'
|
||||||
implementation 'me.grantland:autofittextview:0.2.1'
|
implementation 'me.grantland:autofittextview:0.2.1'
|
||||||
implementation 'net.objecthunter:exp4j:0.4.8'
|
implementation 'net.objecthunter:exp4j:0.4.8'
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ import com.simplemobiletools.calculator.R
|
|||||||
import com.simplemobiletools.calculator.extensions.config
|
import com.simplemobiletools.calculator.extensions.config
|
||||||
import com.simplemobiletools.calculator.helpers.MyWidgetProvider
|
import com.simplemobiletools.calculator.helpers.MyWidgetProvider
|
||||||
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
|
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
|
||||||
import com.simplemobiletools.commons.dialogs.WidgetLockedDialog
|
import com.simplemobiletools.commons.dialogs.FeatureLockedDialog
|
||||||
import com.simplemobiletools.commons.extensions.*
|
import com.simplemobiletools.commons.extensions.*
|
||||||
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
|
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
|
||||||
import kotlinx.android.synthetic.main.activity_main.*
|
import kotlinx.android.synthetic.main.activity_main.*
|
||||||
@ -24,7 +24,7 @@ class WidgetConfigureActivity : SimpleActivity() {
|
|||||||
private var mBgColor = 0
|
private var mBgColor = 0
|
||||||
private var mTextColor = 0
|
private var mTextColor = 0
|
||||||
private var mBgColorWithoutTransparency = 0
|
private var mBgColorWithoutTransparency = 0
|
||||||
private var mWidgetLockedDialog: WidgetLockedDialog? = null
|
private var mFeatureLockedDialog: FeatureLockedDialog? = null
|
||||||
|
|
||||||
public override fun onCreate(savedInstanceState: Bundle?) {
|
public override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
useDynamicTheme = false
|
useDynamicTheme = false
|
||||||
@ -48,7 +48,7 @@ class WidgetConfigureActivity : SimpleActivity() {
|
|||||||
config_bg_seekbar.setColors(mTextColor, primaryColor, primaryColor)
|
config_bg_seekbar.setColors(mTextColor, primaryColor, primaryColor)
|
||||||
|
|
||||||
if (!isCustomizingColors && !isOrWasThankYouInstalled()) {
|
if (!isCustomizingColors && !isOrWasThankYouInstalled()) {
|
||||||
mWidgetLockedDialog = WidgetLockedDialog(this) {
|
mFeatureLockedDialog = FeatureLockedDialog(this) {
|
||||||
if (!isOrWasThankYouInstalled()) {
|
if (!isOrWasThankYouInstalled()) {
|
||||||
finish()
|
finish()
|
||||||
}
|
}
|
||||||
@ -60,8 +60,8 @@ class WidgetConfigureActivity : SimpleActivity() {
|
|||||||
super.onResume()
|
super.onResume()
|
||||||
window.decorView.setBackgroundColor(0)
|
window.decorView.setBackgroundColor(0)
|
||||||
|
|
||||||
if (mWidgetLockedDialog != null && isOrWasThankYouInstalled()) {
|
if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) {
|
||||||
mWidgetLockedDialog?.dismissDialog()
|
mFeatureLockedDialog?.dismissDialog()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user