Skip to content

refactor: replace KeepScreenOn composable with Modifier.keepScreenOn #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
riggaroo merged 1 commit into from
May 29, 2025
Merged

refactor: replace KeepScreenOn composable with Modifier.keepScreenOn #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions core/util/src/main/java/com/android/developers/androidify/util/LayoutUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ package com.android.developers.androidify.util

import android.annotation.SuppressLint
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import androidx.window.WindowSdkExtensions
import androidx.window.core.layout.WindowSizeClass
Expand Down Expand Up @@ -122,14 +120,3 @@ class FoldablePreviewParametersProvider : PreviewParameterProvider<FoldablePrevi

)
}

@Composable
fun KeepScreenOn() {
val currentView = LocalView.current
DisposableEffect(Unit) {
currentView.keepScreenOn = true
onDispose {
currentView.keepScreenOn = false
}
}
}
6 changes: 3 additions & 3 deletions feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.Path
import androidx.compose.ui.graphics.vector.PathParser
import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.keepScreenOn
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringArrayResource
import androidx.compose.ui.res.stringResource
Expand All @@ -72,7 +73,6 @@ import androidx.compose.ui.unit.dp
import com.android.developers.androidify.theme.AndroidifyTheme
import com.android.developers.androidify.theme.components.AndroidifyTopAppBar
import com.android.developers.androidify.theme.components.PrimaryButton
import com.android.developers.androidify.util.KeepScreenOn
import com.android.developers.androidify.util.LargeScreensPreview
import com.android.developers.androidify.util.SmallPhonePreview
import com.android.developers.androidify.util.isAtLeastMedium
Expand All @@ -85,7 +85,6 @@ fun LoadingScreen(
onCancelPress: () -> Unit,
isMediumScreen: Boolean = isAtLeastMedium(),
) {
KeepScreenOn()
Scaffold(
topBar = {
AndroidifyTopAppBar(isMediumWindowSize = isMediumScreen, aboutEnabled = false)
Expand All @@ -108,7 +107,8 @@ fun LoadingScreen(
},
containerColor = MaterialTheme.colorScheme.secondary,
modifier = Modifier
.fillMaxSize(),
.fillMaxSize()
.keepScreenOn(),
) { contentPadding ->
LoadingScreenContents(contentPadding)
}
Expand Down