do not set the widget to transparent by default

This commit is contained in:
tibbi 2020-03-23 10:49:58 +01:00
parent 874542e1af
commit 591697e4ec

View File

@ -10,6 +10,7 @@ import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.setFillWithStroke import com.simplemobiletools.commons.extensions.setFillWithStroke
import com.simplemobiletools.commons.helpers.DEFAULT_WIDGET_BG_COLOR
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
import com.simplemobiletools.flashlight.R import com.simplemobiletools.flashlight.R
import com.simplemobiletools.flashlight.extensions.config import com.simplemobiletools.flashlight.extensions.config
@ -42,11 +43,10 @@ class WidgetConfigureActivity : SimpleActivity() {
private fun initVariables() { private fun initVariables() {
mWidgetColor = config.widgetBgColor mWidgetColor = config.widgetBgColor
if (mWidgetColor == 1) { mWidgetAlpha = if (mWidgetColor == DEFAULT_WIDGET_BG_COLOR) {
mWidgetColor = resources.getColor(R.color.color_primary) 1f
mWidgetAlpha = 1f
} else { } else {
mWidgetAlpha = Color.alpha(mWidgetColor) / 255.toFloat() Color.alpha(mWidgetColor) / 255.toFloat()
} }
mWidgetColorWithoutTransparency = Color.rgb(Color.red(mWidgetColor), Color.green(mWidgetColor), Color.blue(mWidgetColor)) mWidgetColorWithoutTransparency = Color.rgb(Color.red(mWidgetColor), Color.green(mWidgetColor), Color.blue(mWidgetColor))