fenix/Simple-Flashlight
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Flashlight.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move colors to parameters of dialog state functions

Browse Source
This commit is contained in:
Ensar Sarajčić
2023-10-13 11:15:15 +02:00
parent d9d3928705
commit 4b7c4350d4
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt
View File

@ -7,6 +7,7 @@ import android.view.WindowManager
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.annotation.ColorInt
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
@ -54,7 +55,8 @@ class BrightDisplayActivity : ComponentActivity() {
enableEdgeToEdgeSimple() enableEdgeToEdgeSimple()
setContent { setContent {
AppThemeSurface { AppThemeSurface {
val colorPickerDialogState = getColorPickerDialogState() val brightDisplayColor by preferences.brightDisplayColorFlow.collectAsStateWithLifecycle(preferences.brightDisplayColor)
val colorPickerDialogState = getColorPickerDialogState(brightDisplayColor)
ScreenContent(colorPickerDialogState::show) ScreenContent(colorPickerDialogState::show)
} }
@ -66,8 +68,10 @@ class BrightDisplayActivity : ComponentActivity() {
} }
@Composable @Composable
private fun getColorPickerDialogState() = rememberAlertDialogState().apply { private fun getColorPickerDialogState(
val brightDisplayColor by preferences.brightDisplayColorFlow.collectAsStateWithLifecycle(preferences.brightDisplayColor) @ColorInt
brightDisplayColor: Int
) = rememberAlertDialogState().apply {
DialogMember { DialogMember {
ColorPickerAlertDialog( ColorPickerAlertDialog(
alertDialogState = this, alertDialogState = this,

11
app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
View File

@ -7,6 +7,7 @@ import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.annotation.ColorInt
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
@ -42,7 +43,7 @@ class WidgetBrightDisplayConfigureActivity : ComponentActivity() {
val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle() val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle()
val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle() val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle()
val colorPickerDialogState = getColorPickerDialogState() val colorPickerDialogState = getColorPickerDialogState(widgetColor)
WidgetConfigureScreen( WidgetConfigureScreen(
widgetDrawable = R.drawable.ic_bright_display_vector, widgetDrawable = R.drawable.ic_bright_display_vector,
@ -60,12 +61,14 @@ class WidgetBrightDisplayConfigureActivity : ComponentActivity() {
} }
@Composable @Composable
private fun getColorPickerDialogState() = rememberAlertDialogState().apply { private fun getColorPickerDialogState(
val brightDisplayColor by viewModel.widgetColor.collectAsStateWithLifecycle() @ColorInt
widgetColor: Int
) = rememberAlertDialogState().apply {
DialogMember { DialogMember {
ColorPickerAlertDialog( ColorPickerAlertDialog(
alertDialogState = this, alertDialogState = this,
color = brightDisplayColor, color = widgetColor,
removeDimmedBackground = true, removeDimmedBackground = true,
onActiveColorChange = {}, onActiveColorChange = {},
onButtonPressed = { wasPositivePressed, color -> onButtonPressed = { wasPositivePressed, color ->

11
app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
View File

@ -7,6 +7,7 @@ import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.annotation.ColorInt
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
@ -43,7 +44,7 @@ class WidgetTorchConfigureActivity : ComponentActivity() {
val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle() val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle()
val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle() val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle()
val colorPickerDialogState = getColorPickerDialogState() val colorPickerDialogState = getColorPickerDialogState(widgetColor)
WidgetConfigureScreen( WidgetConfigureScreen(
widgetDrawable = R.drawable.ic_flashlight_vector, widgetDrawable = R.drawable.ic_flashlight_vector,
@ -60,12 +61,14 @@ class WidgetTorchConfigureActivity : ComponentActivity() {
} }
@Composable @Composable
private fun getColorPickerDialogState() = rememberAlertDialogState().apply { private fun getColorPickerDialogState(
val brightDisplayColor by viewModel.widgetColor.collectAsStateWithLifecycle() @ColorInt
widgetColor: Int
) = rememberAlertDialogState().apply {
DialogMember { DialogMember {
ColorPickerAlertDialog( ColorPickerAlertDialog(
alertDialogState = this, alertDialogState = this,
color = brightDisplayColor, color = widgetColor,
removeDimmedBackground = true, removeDimmedBackground = true,
onActiveColorChange = {}, onActiveColorChange = {},
onButtonPressed = { wasPositivePressed, color -> onButtonPressed = { wasPositivePressed, color ->