Skip to content

Commit 1e49011

Browse files
committed
LocalContext.current as? Activity -> LocalActivity.current
1 parent 90688d3 commit 1e49011

File tree

3 files changed

+36
-6
lines changed

3 files changed

+36
-6
lines changed

AndroidApp/.idea/inspectionProfiles/Project_Default.xml

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/app/AppScreen.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package me.nya_n.notificationnotifier.ui.screen.app
22

3-
import android.app.Activity
43
import android.content.Intent
54
import android.provider.Settings
5+
import androidx.activity.compose.LocalActivity
66
import androidx.compose.animation.slideInHorizontally
77
import androidx.compose.animation.slideOutHorizontally
88
import androidx.compose.runtime.Composable
99
import androidx.compose.runtime.DisposableEffect
1010
import androidx.compose.runtime.collectAsState
1111
import androidx.compose.runtime.getValue
12-
import androidx.compose.ui.platform.LocalContext
1312
import androidx.lifecycle.Lifecycle
1413
import androidx.lifecycle.LifecycleEventObserver
1514
import androidx.lifecycle.compose.LocalLifecycleOwner
@@ -33,7 +32,7 @@ fun AppScreen(
3332
viewModel: AppViewModel = koinViewModel()
3433
) {
3534
val navController = rememberNavController()
36-
val activity = LocalContext.current as? Activity
35+
val activity = LocalActivity.current
3736
val lifecycleOwner = LocalLifecycleOwner.current
3837
val uiState by viewModel.uiState.collectAsState()
3938

AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/main/MainScreen.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.nya_n.notificationnotifier.ui.screen.main
22

3-
import android.app.Activity
43
import androidx.activity.compose.BackHandler
4+
import androidx.activity.compose.LocalActivity
55
import androidx.compose.foundation.layout.Box
66
import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.padding
@@ -23,7 +23,6 @@ import androidx.compose.runtime.remember
2323
import androidx.compose.runtime.rememberCoroutineScope
2424
import androidx.compose.ui.Modifier
2525
import androidx.compose.ui.graphics.vector.ImageVector
26-
import androidx.compose.ui.platform.LocalContext
2726
import androidx.compose.ui.res.stringResource
2827
import androidx.compose.ui.tooling.preview.Preview
2928
import androidx.navigation.NavController
@@ -40,7 +39,7 @@ import me.nya_n.notificationnotifier.ui.theme.AppTheme
4039
@Composable
4140
fun MainScreen(navController: NavController) {
4241
val snackbarHostState = remember { SnackbarHostState() }
43-
val activity = LocalContext.current as? Activity
42+
val activity = LocalActivity.current
4443
val scope = rememberCoroutineScope()
4544
val tabItems = listOf(
4645
TabItem(stringResource(id = R.string.targets), Icons.Outlined.NotificationsActive) {

0 commit comments

Comments
 (0)