fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-04-23 14:47:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

tweaking some widget config activity code, make it consistent with other apps

Browse Source
This commit is contained in:
tibbi 2020-05-28 18:06:17 +02:00
parent db6946fde1
commit 4d80fb4347
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt
View File

@ -22,10 +22,9 @@ import java.util.*
class WidgetDateTimeConfigureActivity : SimpleActivity() { class WidgetDateTimeConfigureActivity : SimpleActivity() {
private var mBgAlpha = 0f private var mBgAlpha = 0f
private var mWidgetId = 0 private var mWidgetId = 0
private var mBgColorWithoutTransparency = 0
private var mBgColor = 0 private var mBgColor = 0
private var mTextColorWithoutTransparency = 0
private var mTextColor = 0 private var mTextColor = 0
private var mBgColorWithoutTransparency = 0
public override fun onCreate(savedInstanceState: Bundle?) { public override fun onCreate(savedInstanceState: Bundle?) {
useDynamicTheme = false useDynamicTheme = false
@ -55,22 +54,17 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
} }
private fun initVariables() { private fun initVariables() {
mTextColorWithoutTransparency = config.widgetTextColor
updateColors()
mBgColor = config.widgetBgColor mBgColor = config.widgetBgColor
if (mBgColor == 1) {
mBgColor = Color.BLACK
mBgAlpha = .2f
} else {
mBgAlpha = Color.alpha(mBgColor) / 255.toFloat() mBgAlpha = Color.alpha(mBgColor) / 255.toFloat()
}
mBgColorWithoutTransparency = Color.rgb(Color.red(mBgColor), Color.green(mBgColor), Color.blue(mBgColor)) mBgColorWithoutTransparency = Color.rgb(Color.red(mBgColor), Color.green(mBgColor), Color.blue(mBgColor))
config_bg_seekbar.setOnSeekBarChangeListener(bgSeekbarChangeListener) config_bg_seekbar.setOnSeekBarChangeListener(bgSeekbarChangeListener)
config_bg_seekbar.progress = (mBgAlpha * 100).toInt() config_bg_seekbar.progress = (mBgAlpha * 100).toInt()
updateBgColor() updateBackgroundColor()
updateCurrentDateTime() updateCurrentDateTime()
mTextColor = config.widgetTextColor
updateTextColor()
} }
private fun updateCurrentDateTime() { private fun updateCurrentDateTime() {
@ -98,7 +92,7 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
private fun storeWidgetColors() { private fun storeWidgetColors() {
config.apply { config.apply {
widgetBgColor = mBgColor widgetBgColor = mBgColor
widgetTextColor = mTextColorWithoutTransparency widgetTextColor = mTextColor
} }
} }
@ -106,7 +100,7 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
ColorPickerDialog(this, mBgColorWithoutTransparency) { wasPositivePressed, color -> ColorPickerDialog(this, mBgColorWithoutTransparency) { wasPositivePressed, color ->
if (wasPositivePressed) { if (wasPositivePressed) {
mBgColorWithoutTransparency = color mBgColorWithoutTransparency = color
updateBgColor() updateBackgroundColor()
} }
} }
} }
@ -114,8 +108,8 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
private fun pickTextColor() { private fun pickTextColor() {
ColorPickerDialog(this, mTextColor) { wasPositivePressed, color -> ColorPickerDialog(this, mTextColor) { wasPositivePressed, color ->
if (wasPositivePressed) { if (wasPositivePressed) {
mTextColorWithoutTransparency = color mTextColor = color
updateColors() updateTextColor()
} }
} }
} }
@ -127,15 +121,14 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
} }
} }
private fun updateColors() { private fun updateTextColor() {
mTextColor = mTextColorWithoutTransparency
config_text_color.setFillWithStroke(mTextColor, Color.BLACK) config_text_color.setFillWithStroke(mTextColor, Color.BLACK)
config_save.setTextColor(mTextColor) config_save.setTextColor(mTextColor)
config_time.setTextColor(mTextColor) config_time.setTextColor(mTextColor)
config_date.setTextColor(mTextColor) config_date.setTextColor(mTextColor)
} }
private fun updateBgColor() { private fun updateBackgroundColor() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha) mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
config_bg_color.setFillWithStroke(mBgColor, Color.BLACK) config_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
config_save.setBackgroundColor(mBgColor) config_save.setBackgroundColor(mBgColor)
@ -145,15 +138,11 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener { private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
mBgAlpha = progress.toFloat() / 100.toFloat() mBgAlpha = progress.toFloat() / 100.toFloat()
updateBgColor() updateBackgroundColor()
} }
override fun onStartTrackingTouch(seekBar: SeekBar) { override fun onStartTrackingTouch(seekBar: SeekBar) {}
} override fun onStopTrackingTouch(seekBar: SeekBar) {}
override fun onStopTrackingTouch(seekBar: SeekBar) {
}
} }
} }