Skip to content

Commit 531f04a

Browse files
authored
Merge pull request #239 from ptkNktq/update/libs
ライブラリ更新
2 parents 30c3cdd + 1e49011 commit 531f04a

File tree

7 files changed

+43
-13
lines changed

7 files changed

+43
-13
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/.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Application.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ internal fun Project.configureApplication(
88
extension: ApplicationExtension
99
) {
1010
extension.apply {
11-
compileSdk = 34
11+
compileSdk = 35
1212
defaultConfig {
1313
minSdk = 30
14-
targetSdk = 34
14+
targetSdk = 35
1515
versionCode = 2
1616
versionName = "1.1"
1717
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Library.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ internal fun Project.configureLibrary(
88
extension: LibraryExtension
99
) {
1010
extension.apply {
11-
compileSdk = 34
11+
compileSdk = 35
1212
defaultConfig {
1313
minSdk = 30
1414
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

AndroidApp/gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[versions]
2-
agp = "8.8.0"
2+
agp = "8.7.3"
33
kotlin = "2.1.10"
44
com-google-devtools-ksp = "2.1.10-1.0.29"
55
com-jaredsburrows-license = "0.9.8"
6-
androidx-core = "1.13.1"
6+
androidx-core = "1.15.0"
77
androidx-appcompat = "1.7.0"
88
androidx-security = "1.1.0-alpha06"
99
androidx-splashscreen = "1.0.1"
1010
androidx-compose-bom = "2025.01.01"
11-
androidx-compose-activity = "1.9.3"
11+
androidx-compose-activity = "1.10.0"
1212
androidx-compose-viewmodel = "2.8.7"
1313
androidx-compose-navigation = "2.8.6"
1414
androidx-compose-screenshot = "0.0.1-alpha08"

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)