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

Use AppTheme instead of AppThemeSurface for properly transparent widget configuration screens

Browse Source
This commit is contained in:
Ensar Sarajčić
2023-10-05 16:52:27 +02:00
parent 0cfcc9b900
commit 29081b032c
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,10 +10,9 @@ import androidx.activity.viewModels
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
import com.simplemobiletools.commons.compose.alert_dialog.AlertDialogState
import com.simplemobiletools.commons.compose.alert_dialog.rememberAlertDialogState import com.simplemobiletools.commons.compose.alert_dialog.rememberAlertDialogState
import com.simplemobiletools.commons.compose.extensions.enableEdgeToEdgeSimple import com.simplemobiletools.commons.compose.extensions.enableEdgeToEdgeSimple
import com.simplemobiletools.commons.compose.theme.AppThemeSurface import com.simplemobiletools.commons.compose.theme.AppTheme
import com.simplemobiletools.commons.dialogs.ColorPickerAlertDialog import com.simplemobiletools.commons.dialogs.ColorPickerAlertDialog
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
@ -39,7 +38,7 @@ class WidgetBrightDisplayConfigureActivity : ComponentActivity() {
enableEdgeToEdgeSimple() enableEdgeToEdgeSimple()
setContent { setContent {
AppThemeSurface { AppTheme {
val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle() val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle()
val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle() val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle()
@ -78,11 +77,6 @@ class WidgetBrightDisplayConfigureActivity : ComponentActivity() {
} }
} }
override fun onResume() {
super.onResume()
window.decorView.setBackgroundColor(0)
}
private fun saveConfig() { private fun saveConfig() {
config.widgetBgColor = viewModel.widgetColor.value config.widgetBgColor = viewModel.widgetColor.value
requestWidgetUpdate() requestWidgetUpdate()

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

@ -12,7 +12,7 @@ import androidx.compose.runtime.getValue
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.simplemobiletools.commons.compose.alert_dialog.rememberAlertDialogState import com.simplemobiletools.commons.compose.alert_dialog.rememberAlertDialogState
import com.simplemobiletools.commons.compose.extensions.enableEdgeToEdgeSimple import com.simplemobiletools.commons.compose.extensions.enableEdgeToEdgeSimple
import com.simplemobiletools.commons.compose.theme.AppThemeSurface import com.simplemobiletools.commons.compose.theme.AppTheme
import com.simplemobiletools.commons.dialogs.ColorPickerAlertDialog import com.simplemobiletools.commons.dialogs.ColorPickerAlertDialog
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
@ -39,7 +39,7 @@ class WidgetTorchConfigureActivity : ComponentActivity() {
enableEdgeToEdgeSimple() enableEdgeToEdgeSimple()
setContent { setContent {
AppThemeSurface { AppTheme {
val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle() val widgetColor by viewModel.widgetColor.collectAsStateWithLifecycle()
val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle() val widgetAlpha by viewModel.widgetAlpha.collectAsStateWithLifecycle()
@ -77,11 +77,6 @@ class WidgetTorchConfigureActivity : ComponentActivity() {
} }
} }
override fun onResume() {
super.onResume()
window.decorView.setBackgroundColor(0)
}
private fun saveConfig() { private fun saveConfig() {
config.widgetBgColor = viewModel.widgetColor.value config.widgetBgColor = viewModel.widgetColor.value
requestWidgetUpdate() requestWidgetUpdate()