From 8e7c4e6199db6ab3ff2a97b2154a4cf481845ffe Mon Sep 17 00:00:00 2001
From: taku <tk.nishi.1018@gmail.com>
Date: Sun, 13 Oct 2024 07:59:26 +0900
Subject: [PATCH 1/6] =?UTF-8?q?Compose=20BOM=E3=81=AE=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AndroidApp/gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidApp/gradle/libs.versions.toml b/AndroidApp/gradle/libs.versions.toml
index 515e0afa..962a3bda 100644
--- a/AndroidApp/gradle/libs.versions.toml
+++ b/AndroidApp/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ androidx-core = "1.13.1"
 androidx-appcompat = "1.7.0"
 androidx-security = "1.1.0-alpha06"
 androidx-splashscreen = "1.0.1"
-androidx-compose-bom = "2024.06.00"
+androidx-compose-bom = "2024.09.03"
 androidx-compose-activity = "1.9.2"
 androidx-compose-viewmodel = "2.8.6"
 androidx-compose-navigation = "2.8.1"

From 16ea207cafa37d6d664a2a95b95047783b216d9a Mon Sep 17 00:00:00 2001
From: taku <tk.nishi.1018@gmail.com>
Date: Sun, 13 Oct 2024 07:59:38 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8?=
 =?UTF-8?q?=E3=83=A9=E3=83=BC=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AndroidApp/.idea/kotlinc.xml                  |  2 +-
 AndroidApp/.idea/other.xml                    | 88 ++++++++++++++++---
 .../notificationnotifier/ui/common/AppList.kt |  4 +-
 .../notificationnotifier/ui/theme/Style.kt    | 31 +------
 4 files changed, 83 insertions(+), 42 deletions(-)

diff --git a/AndroidApp/.idea/kotlinc.xml b/AndroidApp/.idea/kotlinc.xml
index 6d0ee1c2..d4b7accb 100644
--- a/AndroidApp/.idea/kotlinc.xml
+++ b/AndroidApp/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0" />
+    <option name="version" value="2.0.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/AndroidApp/.idea/other.xml b/AndroidApp/.idea/other.xml
index 0d3a1fbb..a76f1180 100644
--- a/AndroidApp/.idea/other.xml
+++ b/AndroidApp/.idea/other.xml
@@ -25,6 +25,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2160" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB370FU" />
+          <option name="id" value="TB370FU" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab P12" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1840" />
+          <option name="screenY" value="2944" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -69,6 +80,28 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="id" value="comet" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="29" />
           <option name="brand" value="samsung" />
@@ -91,6 +124,17 @@
           <option name="screenX" value="1440" />
           <option name="screenY" value="3088" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="id" value="e1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -102,6 +146,17 @@
           <option name="screenX" value="2208" />
           <option name="screenY" value="1840" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -146,6 +201,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1600" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -179,17 +245,6 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q2q" />
-          <option name="id" value="q2q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold3" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1768" />
-          <option name="screenY" value="2208" />
-        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
@@ -246,6 +301,17 @@
           <option name="screenX" value="1600" />
           <option name="screenY" value="2560" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="29" />
           <option name="brand" value="samsung" />
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/AppList.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/AppList.kt
index 568f88f1..0ce248d9 100644
--- a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/AppList.kt
+++ b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/AppList.kt
@@ -9,9 +9,9 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -53,7 +53,7 @@ fun AppListItem(
             .fillMaxWidth()
             .clickable(
                 interactionSource = interactionSource,
-                indication = rememberRipple(bounded = true),
+                indication = ripple(bounded = true),
                 onClick = { onAppSelected(app) }
             )
     ) {
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/theme/Style.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/theme/Style.kt
index a88a63fb..067d915f 100644
--- a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/theme/Style.kt
+++ b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/theme/Style.kt
@@ -1,39 +1,14 @@
 package me.nya_n.notificationnotifier.ui.theme
 
-import androidx.compose.material.ripple.LocalRippleTheme
-import androidx.compose.material.ripple.RippleAlpha
-import androidx.compose.material.ripple.RippleTheme
-import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.graphics.Color
 
 @Composable
 fun AppTheme(
     content: @Composable () -> Unit
 ) {
     MaterialTheme(
-        colorScheme = AppColorScheme
-    ) {
-        CompositionLocalProvider(
-            LocalRippleTheme provides WhiteRippleTheme,
-            content = content
-        )
-    }
+        colorScheme = AppColorScheme,
+        content = content
+    )
 }
-
-object WhiteRippleTheme : RippleTheme {
-    @Composable
-    override fun defaultColor(): Color {
-        return Color.White
-    }
-
-    @Composable
-    override fun rippleAlpha(): RippleAlpha {
-        return RippleTheme.defaultRippleAlpha(
-            contentColor = LocalContentColor.current,
-            lightTheme = false // AppColorSchemeがdarkColorSchemeのみサポートしている
-        )
-    }
-}
\ No newline at end of file

From 87c968c2984dc2fb97b704a5a24cbb9b31222fbf Mon Sep 17 00:00:00 2001
From: taku <tk.nishi.1018@gmail.com>
Date: Sun, 13 Oct 2024 08:06:07 +0900
Subject: [PATCH 3/6] =?UTF-8?q?NavigationBar=E3=81=AE=E8=89=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nya_n/notificationnotifier/ui/screen/main/MainScreen.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/main/MainScreen.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/main/MainScreen.kt
index c909d3a0..a8d4e130 100644
--- a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/main/MainScreen.kt
+++ b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/main/MainScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.material.icons.automirrored.rounded.List
 import androidx.compose.material.icons.outlined.NotificationsActive
 import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.SnackbarHostState
@@ -114,7 +115,9 @@ private fun BottomBar(
     currentPage: Int,
     onTabSelected: (selected: Int) -> Unit
 ) {
-    NavigationBar {
+    NavigationBar(
+        containerColor = MaterialTheme.colorScheme.primary
+    ) {
         items.forEachIndexed { index, item ->
             NavigationBarItem(
                 selected = index == currentPage,

From fd91cf1b7fe8e29a0076c65731ad0636126a7ea3 Mon Sep 17 00:00:00 2001
From: taku <tk.nishi.1018@gmail.com>
Date: Sun, 13 Oct 2024 08:09:17 +0900
Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AAOptIn=E3=81=AE?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nya_n/notificationnotifier/ui/screen/main/MainScreen.kt   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/main/MainScreen.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/main/MainScreen.kt
index a8d4e130..3c36e3b4 100644
--- a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/main/MainScreen.kt
+++ b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/main/MainScreen.kt
@@ -2,7 +2,6 @@ package me.nya_n.notificationnotifier.ui.screen.main
 
 import android.app.Activity
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -38,7 +37,6 @@ import me.nya_n.notificationnotifier.ui.screen.target.TargetScreen
 import me.nya_n.notificationnotifier.ui.theme.AppTheme
 
 /** メイン画面 */
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun MainScreen(navController: NavController) {
     val snackbarHostState = remember { SnackbarHostState() }
@@ -79,7 +77,6 @@ fun MainScreen(navController: NavController) {
 }
 
 /** メイン画面のコンテンツ本体 */
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun MainContent(
     snackbarHostState: SnackbarHostState,
@@ -141,7 +138,6 @@ private data class TabItem(
     }
 )
 
-@OptIn(ExperimentalFoundationApi::class)
 @Preview
 @Composable
 private fun MainPreview() {

From dbe56a9522c9cec8f81755f993440b53656a7c79 Mon Sep 17 00:00:00 2001
From: taku <tk.nishi.1018@gmail.com>
Date: Sun, 13 Oct 2024 08:11:08 +0900
Subject: [PATCH 5/6] =?UTF-8?q?viewModel=E3=81=AEimport=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/main/kotlin/me/nya_n/notificationnotifier/App.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidApp/app/src/main/kotlin/me/nya_n/notificationnotifier/App.kt b/AndroidApp/app/src/main/kotlin/me/nya_n/notificationnotifier/App.kt
index 84786656..3d3811f8 100644
--- a/AndroidApp/app/src/main/kotlin/me/nya_n/notificationnotifier/App.kt
+++ b/AndroidApp/app/src/main/kotlin/me/nya_n/notificationnotifier/App.kt
@@ -41,8 +41,8 @@ import me.nya_n.notificationnotifier.ui.screen.selection.SelectionViewModel
 import me.nya_n.notificationnotifier.ui.screen.settings.SettingsViewModel
 import me.nya_n.notificationnotifier.ui.screen.target.TargetViewModel
 import org.koin.android.ext.koin.androidContext
-import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.context.startKoin
+import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
 
 class App : Application() {

From ecb7b254fca1bbae5edc203c098326334f0a19a1 Mon Sep 17 00:00:00 2001
From: taku <tk.nishi.1018@gmail.com>
Date: Sun, 13 Oct 2024 08:12:39 +0900
Subject: [PATCH 6/6] =?UTF-8?q?LocalLifecycleOwner=E3=81=AEimport=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/nya_n/notificationnotifier/ui/screen/app/AppScreen.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/app/AppScreen.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/app/AppScreen.kt
index 6ab5559b..5bb1902f 100644
--- a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/app/AppScreen.kt
+++ b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/app/AppScreen.kt
@@ -10,9 +10,9 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController