diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt index 74dc185..8885ac8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt @@ -7,9 +7,7 @@ import android.graphics.Color import android.os.Bundle import android.widget.SeekBar import com.simplemobiletools.commons.dialogs.ColorPickerDialog -import com.simplemobiletools.commons.extensions.adjustAlpha -import com.simplemobiletools.commons.extensions.applyColorFilter -import com.simplemobiletools.commons.extensions.setFillWithStroke +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.DEFAULT_WIDGET_BG_COLOR import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS import com.simplemobiletools.flashlight.R @@ -39,6 +37,9 @@ class WidgetBrightDisplayConfigureActivity : SimpleActivity() { config_save.setOnClickListener { saveConfig() } config_widget_color.setOnClickListener { pickBackgroundColor() } + + val primaryColor = getProperPrimaryColor() + config_widget_seekbar.setColors(getProperTextColor(), primaryColor, primaryColor) } private fun initVariables() { @@ -84,7 +85,7 @@ class WidgetBrightDisplayConfigureActivity : SimpleActivity() { private fun updateColors() { mWidgetColor = mWidgetColorWithoutTransparency.adjustAlpha(mWidgetAlpha) - config_widget_color.setFillWithStroke(mWidgetColor, Color.BLACK) + config_widget_color.setFillWithStroke(mWidgetColor, mWidgetColor) config_image.background.mutate().applyColorFilter(mWidgetColor) } diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt index 12888b1..868d34e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt @@ -7,9 +7,7 @@ import android.graphics.Color import android.os.Bundle import android.widget.SeekBar import com.simplemobiletools.commons.dialogs.ColorPickerDialog -import com.simplemobiletools.commons.extensions.adjustAlpha -import com.simplemobiletools.commons.extensions.applyColorFilter -import com.simplemobiletools.commons.extensions.setFillWithStroke +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.DEFAULT_WIDGET_BG_COLOR import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS import com.simplemobiletools.flashlight.R @@ -40,6 +38,9 @@ class WidgetTorchConfigureActivity : SimpleActivity() { config_save.setOnClickListener { saveConfig() } config_widget_color.setOnClickListener { pickBackgroundColor() } + + val primaryColor = getProperPrimaryColor() + config_widget_seekbar.setColors(getProperTextColor(), primaryColor, primaryColor) } private fun initVariables() { @@ -87,7 +88,7 @@ class WidgetTorchConfigureActivity : SimpleActivity() { private fun updateColors() { mWidgetColor = mWidgetColorWithoutTransparency.adjustAlpha(mWidgetAlpha) - config_widget_color.setFillWithStroke(mWidgetColor, Color.BLACK) + config_widget_color.setFillWithStroke(mWidgetColor, mWidgetColor) config_image.background.mutate().applyColorFilter(mWidgetColor) } diff --git a/app/src/main/res/layout/widget_bright_display_config.xml b/app/src/main/res/layout/widget_bright_display_config.xml index c947183..04570b5 100644 --- a/app/src/main/res/layout/widget_bright_display_config.xml +++ b/app/src/main/res/layout/widget_bright_display_config.xml @@ -1,12 +1,13 @@ + android:layout_margin="@dimen/activity_margin"> + android:layout_above="@+id/config_save" + android:layout_margin="@dimen/tiny_margin" /> + android:layout_marginStart="@dimen/medium_margin" + android:layout_toEndOf="@+id/config_widget_color" + android:background="@drawable/widget_config_seekbar_background"> - + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" />