Merge pull request #167 from ptkNktq/fix/material2_to_material3

ptkNktq · web-flow · commit bd39bb10dc4d · 2024-06-06T08:18:39.000+09:00
脱material2
diff --git a/AndroidApp/gradle/libs.versions.toml b/AndroidApp/gradle/libs.versions.toml
@@ -19,7 +19,6 @@ com-google-truth = "1.4.2"
 androidx-test-ext = "1.1.5"
 androidx-test-espresso = "3.5.1"
 androidx-room = "2.6.1"
-com-google-android-material = "1.12.0"
 io-insert-koin = "3.5.6"
 io-insert-koin-compose = "3.5.6"
 com-google-code-gson = "2.11.0"
@@ -46,7 +45,6 @@ androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref =
 # compose
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
-androidx-compose-material = { module = "androidx.compose.material:material" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-material-icons = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-ui-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
@@ -65,15 +63,13 @@ androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core",
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 
 # その他
-com-google-android-material = { module = "com.google.android.material:material", version.ref = "com-google-android-material" }
 io-insert-koin = { module = "io.insert-koin:koin-android", version.ref = "io-insert-koin" }
 io-insert-koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "io-insert-koin-compose" }
 com-google-code-gson = { module = "com.google.code.gson:gson", version.ref = "com-google-code-gson" }
 com-squareup-leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "com-squareup-leakcanary" }
 
 [bundles]
 androidx-compose = [
-    "androidx-compose-material",
     "androidx-compose-material3",
     "androidx-compose-material-icons",
     "androidx-compose-ui-preview",
diff --git a/AndroidApp/model/build.gradle.kts b/AndroidApp/model/build.gradle.kts
@@ -19,7 +19,6 @@ dependencies {
 
     // その他
     api(libs.com.google.code.gson)
-    implementation(libs.com.google.android.material)
 }
 
 val Project.catalog
diff --git a/AndroidApp/model/src/main/kotlin/me/nya_n/notificationnotifier/model/Fab.kt b/AndroidApp/model/src/main/kotlin/me/nya_n/notificationnotifier/model/Fab.kt
diff --git a/AndroidApp/ui/build.gradle.kts b/AndroidApp/ui/build.gradle.kts
@@ -22,7 +22,6 @@ dependencies {
     implementation(libs.bundles.androidx.compose)
 
     // その他
-    implementation(libs.com.google.android.material)
     implementation(libs.io.insert.koin)
     implementation(libs.io.insert.koin.compose)
 }
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
@@ -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.Text
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/AppOutlinedButton.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/AppOutlinedButton.kt
@@ -1,14 +1,16 @@
 package me.nya_n.notificationnotifier.ui.common
 
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.OutlinedButton
-import androidx.compose.material.Text
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import me.nya_n.notificationnotifier.ui.theme.AppTheme
 
 @Composable
@@ -18,8 +20,9 @@ fun AppOutlinedButton(
 ) {
     OutlinedButton(
         onClick = onClick,
+        shape = RoundedCornerShape(4.dp),
         colors = ButtonDefaults.outlinedButtonColors(
-            backgroundColor = MaterialTheme.colorScheme.secondary
+            containerColor = MaterialTheme.colorScheme.secondary
         ),
         modifier = Modifier.fillMaxWidth(),
     ) {
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/Category.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/Category.kt
@@ -6,9 +6,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Divider
-import androidx.compose.material.Text
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -31,7 +31,7 @@ fun Category(name: String) {
             modifier = Modifier.size(24.dp, 24.dp),
             contentAlignment = Alignment.Center
         ) {
-            Divider(color = MaterialTheme.colorScheme.onSecondary)
+            HorizontalDivider(color = MaterialTheme.colorScheme.onSecondary)
         }
         Text(
             text = name,
@@ -44,7 +44,7 @@ fun Category(name: String) {
                 .height(24.dp),
             contentAlignment = Alignment.Center
         ) {
-            Divider(color = MaterialTheme.colorScheme.onSecondary)
+            HorizontalDivider(color = MaterialTheme.colorScheme.onSecondary)
         }
     }
 }
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/EmptyView.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/EmptyView.kt
@@ -2,7 +2,7 @@ package me.nya_n.notificationnotifier.ui.common
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/TopBar.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/common/TopBar.kt
@@ -1,14 +1,17 @@
 package me.nya_n.notificationnotifier.ui.common
 
-import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import me.nya_n.notificationnotifier.ui.R
 import me.nya_n.notificationnotifier.ui.theme.AppTheme
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TopBar() {
     TopAppBar(
@@ -18,7 +21,9 @@ fun TopBar() {
                 color = MaterialTheme.colorScheme.onPrimary
             )
         },
-        backgroundColor = MaterialTheme.colorScheme.primary
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = MaterialTheme.colorScheme.primary
+        ),
     )
 }
 
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/detail/DetailScreen.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/detail/DetailScreen.kt
@@ -11,21 +11,19 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.NotificationsActive
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalFocusManager
@@ -42,6 +40,7 @@ import me.nya_n.notificationnotifier.ui.common.AppScaffold
 import me.nya_n.notificationnotifier.ui.common.Category
 import me.nya_n.notificationnotifier.ui.common.GrayScaleAppIcon
 import me.nya_n.notificationnotifier.ui.common.SnackbarMessage
+import me.nya_n.notificationnotifier.ui.theme.AppColors
 import me.nya_n.notificationnotifier.ui.theme.AppTheme
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
@@ -136,7 +135,6 @@ fun AppInfo(
 /** 通知設定
  *   - 条件
  */
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun NotificationSetting(
     initCondition: String,
@@ -164,11 +162,7 @@ fun NotificationSetting(
             }
         ),
         singleLine = true,
-        colors = TextFieldDefaults.outlinedTextFieldColors(
-            backgroundColor = MaterialTheme.colorScheme.onPrimary,
-            focusedBorderColor = MaterialTheme.colorScheme.primary,
-            cursorColor = MaterialTheme.colorScheme.primary
-        ),
+        colors = AppColors.OutlinedTextFieldColors(),
         leadingIcon = {
             Image(
                 imageVector = Icons.Outlined.NotificationsActive,
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/selection/SelectionScreen.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/selection/SelectionScreen.kt
@@ -6,21 +6,19 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalFocusManager
@@ -33,6 +31,7 @@ import me.nya_n.notificationnotifier.model.InstalledApp
 import me.nya_n.notificationnotifier.ui.R
 import me.nya_n.notificationnotifier.ui.common.AppList
 import me.nya_n.notificationnotifier.ui.common.SnackbarMessage
+import me.nya_n.notificationnotifier.ui.theme.AppColors
 import me.nya_n.notificationnotifier.ui.theme.AppTheme
 import me.nya_n.notificationnotifier.ui.util.Sample
 import org.koin.androidx.compose.koinViewModel
@@ -85,7 +84,6 @@ fun SelectionContent(
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun QueryTextField(
     initQuery: String,
@@ -108,11 +106,7 @@ fun QueryTextField(
             }
         ),
         singleLine = true,
-        colors = TextFieldDefaults.outlinedTextFieldColors(
-            backgroundColor = MaterialTheme.colorScheme.onPrimary,
-            focusedBorderColor = MaterialTheme.colorScheme.primary,
-            cursorColor = MaterialTheme.colorScheme.primary
-        ),
+        colors = AppColors.OutlinedTextFieldColors(),
         leadingIcon = {
             Image(
                 imageVector = Icons.Outlined.Search,
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/settings/SettingsScreen.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/settings/SettingsScreen.kt
@@ -12,25 +12,24 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ReceiptLong
 import androidx.compose.material.icons.outlined.CloudDownload
 import androidx.compose.material.icons.outlined.CloudUpload
 import androidx.compose.material.icons.outlined.Devices
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -50,6 +49,7 @@ import me.nya_n.notificationnotifier.ui.common.AppOutlinedButton
 import me.nya_n.notificationnotifier.ui.common.Category
 import me.nya_n.notificationnotifier.ui.common.SnackbarMessage
 import me.nya_n.notificationnotifier.ui.screen.app.Screen
+import me.nya_n.notificationnotifier.ui.theme.AppColors
 import me.nya_n.notificationnotifier.ui.theme.AppTheme
 import org.koin.androidx.compose.koinViewModel
 
@@ -151,7 +151,6 @@ fun SettingsContent(
  *   - 送信先の入力
  *   - 送信テスト
  */
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun NotifySettings(
     uiState: UiState,
@@ -180,11 +179,7 @@ fun NotifySettings(
             }
         ),
         singleLine = true,
-        colors = TextFieldDefaults.outlinedTextFieldColors(
-            backgroundColor = MaterialTheme.colorScheme.onPrimary,
-            focusedBorderColor = MaterialTheme.colorScheme.primary,
-            cursorColor = MaterialTheme.colorScheme.primary
-        ),
+        colors = AppColors.OutlinedTextFieldColors(),
         leadingIcon = {
             Image(
                 imageVector = Icons.Outlined.Devices,
@@ -242,6 +237,7 @@ fun ClickableBasicItem(
 ) {
     TextButton(
         onClick = onClickListener,
+        shape = RoundedCornerShape(4.dp),
         modifier = Modifier
             .fillMaxWidth()
             .height(54.dp)
diff --git a/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/theme/Colors.kt b/AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/theme/Colors.kt
@@ -1,6 +1,9 @@
 package me.nya_n.notificationnotifier.ui.theme
 
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.darkColorScheme
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 
 object AppColors {
@@ -13,6 +16,15 @@ object AppColors {
     val Red = Color(0xFFB3261E)
 
     val Primary = Brown
+
+    @Composable
+    fun OutlinedTextFieldColors() = OutlinedTextFieldDefaults.colors(
+        focusedTextColor = MaterialTheme.colorScheme.primary,
+        unfocusedTextColor = MaterialTheme.colorScheme.primary,
+        focusedContainerColor = MaterialTheme.colorScheme.onPrimary,
+        unfocusedContainerColor = MaterialTheme.colorScheme.onPrimary,
+        cursorColor = MaterialTheme.colorScheme.primary
+    )
 }
 
 val AppColorScheme = darkColorScheme(
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

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ dependencies {`
`19`	`19`
`20`	`20`	`// その他`
`21`	`21`	`api(libs.com.google.code.gson)`
`22`		`- implementation(libs.com.google.android.material)`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`val Project.catalog`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ dependencies {`
`22`	`22`	`implementation(libs.bundles.androidx.compose)`
`23`	`23`
`24`	`24`	`// その他`
`25`		`- implementation(libs.com.google.android.material)`
`26`	`25`	`implementation(libs.io.insert.koin)`
`27`	`26`	`implementation(libs.io.insert.koin.compose)`
`28`	`27`	`}`