feat: 让更多组件适配 MD3E

app/src/main/kotlin/cn/super12138/todo/ui/components/ProgressIndicator.kt

@@ -1,47 +0,0 @@
-package cn.super12138.todo.ui.components
-
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.material3.CircularWavyProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.ProgressIndicatorDefaults
-import androidx.compose.material3.WavyProgressIndicatorDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.unit.Dp
-
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
-@Composable
-fun AnimatedCircularWavyProgressIndicator(
-    progress: Float,
-    modifier: Modifier = Modifier,
-    color: Color = WavyProgressIndicatorDefaults.indicatorColor,
-    trackColor: Color = WavyProgressIndicatorDefaults.trackColor,
-    stroke: Stroke = WavyProgressIndicatorDefaults.circularIndicatorStroke,
-    trackStroke: Stroke = WavyProgressIndicatorDefaults.circularTrackStroke,
-    gapSize: Dp = WavyProgressIndicatorDefaults.CircularIndicatorTrackGapSize,
-    amplitude: (progress: Float) -> Float = WavyProgressIndicatorDefaults.indicatorAmplitude,
-    wavelength: Dp = WavyProgressIndicatorDefaults.CircularWavelength,
-    waveSpeed: Dp = wavelength,
-) {
-    val animatedProgress by animateFloatAsState(
-        targetValue = progress,
-        animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec
-    )
-
-    CircularWavyProgressIndicator(
-        progress = { animatedProgress },
-        modifier = modifier,
-        color = color,
-        trackColor = trackColor,
-        stroke = stroke,
-        trackStroke = trackStroke,
-        gapSize = gapSize,
-        amplitude = amplitude,
-        wavelength = wavelength,
-        waveSpeed = waveSpeed,
-    )
-}

app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt

@@ -4,9 +4,8 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
@@ -14,7 +13,6 @@ import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.material3.animateFloatingActionButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -26,9 +24,9 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ModifierLocalBeyondBoundsLayout
 import androidx.compose.ui.res.stringResource
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
-import androidx.window.core.layout.WindowSizeClass
 import cn.super12138.todo.R
 import cn.super12138.todo.constants.Constants
 import cn.super12138.todo.logic.database.TodoEntity
@@ -46,7 +44,7 @@ fun MainPage(
     toTodoEditPage: (TodoEntity?) -> Unit,
     toSettingsPage: () -> Unit,
     sharedTransitionScope: SharedTransitionScope,
-    windowSizeClass: WindowSizeClass = currentWindowAdaptiveInfo().windowSizeClass,
+    // windowSizeClass: WindowSizeClass = currentWindowAdaptiveInfo().windowSizeClass,
 ) {
     val animatedVisibilityScope = LocalNavAnimatedContentScope.current
 
@@ -102,7 +100,7 @@ fun MainPage(
         contentWindowInsets = WindowInsets(0, 0, 0, 0),
         modifier = modifier
     ) { innerPadding ->
-        val isMediumScreen =
+        /*val isMediumScreen =
             windowSizeClass.isWidthAtLeastBreakpoint(WindowSizeClass.WIDTH_DP_MEDIUM_LOWER_BOUND)
         if (isMediumScreen) {
             Row(
@@ -141,44 +139,40 @@ fun MainPage(
                         .fillMaxSize()
                 )
             }
-        } else {
+        } else {*/
-            Column(
+        Column(
-                modifier = Modifier.padding(
+            modifier = Modifier.padding(
-                    top = innerPadding.calculateTopPadding(),
+                top = innerPadding.calculateTopPadding(),
-                    bottom = innerPadding.calculateBottomPadding()
+                bottom = innerPadding.calculateBottomPadding()
-                )
+            )
-            ) {
+        ) {
-                ProgressFragment(
+            ProgressFragment(
-                    totalTasks = totalTasks,
+                totalTasks = totalTasks,
-                    completedTasks = completedTasks,
+                completedTasks = completedTasks,
-                    modifier = Modifier
+                modifier = Modifier.fillMaxWidth()
-                        .weight(2f)
+            )
-                        .fillMaxSize()
+            ManagerFragment(
-                )
+                state = listState,
-                ManagerFragment(
+                list = filteredTodoList,
-                    state = listState,
+                onItemClick = { item ->
-                    list = filteredTodoList,
+                    if (inSelectedMode) {
-                    onItemClick = { item ->
+                        viewModel.toggleTodoSelection(item)
-                        if (inSelectedMode) {
+                    } else {
-                            viewModel.toggleTodoSelection(item)
+                        toTodoEditPage(item)
-                        } else {
+                    }
-                            toTodoEditPage(item)
+                },
-                        }
+                onItemLongClick = { viewModel.toggleTodoSelection(it) },
-                    },
+                onItemChecked = {
-                    onItemLongClick = { viewModel.toggleTodoSelection(it) },
+                    viewModel.updateTodo(it.copy(isCompleted = true))
-                    onItemChecked = {
+                    viewModel.playConfetti()
-                        viewModel.updateTodo(it.copy(isCompleted = true))
+                },
-                        viewModel.playConfetti()
+                selectedTodoIds = selectedTodoIds,
-                    },
+                modifier = Modifier.fillMaxWidth()
-                    selectedTodoIds = selectedTodoIds,
+                // sharedTransitionScope = sharedTransitionScope,
-                    // sharedTransitionScope = sharedTransitionScope,
+                // animatedVisibilityScope = animatedVisibilityScope,
-                    // animatedVisibilityScope = animatedVisibilityScope,
+            )
-                    modifier = Modifier
-                        .weight(3f)
-                        .fillMaxSize()
-                )
-            }
         }
+        /*}*/
         ConfirmDialog(
             visible = showDeleteConfirmDialog,
             icon = Icons.Outlined.Delete,

app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ProgressFragment.kt

@@ -1,13 +1,20 @@
 package cn.super12138.todo.ui.pages.main
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.material3.CircularWavyProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ProgressIndicatorDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
@@ -21,21 +28,21 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import cn.super12138.todo.R
 import cn.super12138.todo.ui.TodoDefaults
-import cn.super12138.todo.ui.components.AnimatedCircularWavyProgressIndicator
 
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun ProgressFragment(
     totalTasks: Int,
     completedTasks: Int,
     modifier: Modifier = Modifier
 ) {
-    val stroke = Stroke(
-        width = with(LocalDensity.current) { TodoDefaults.trackThickness.toPx() },
-        cap = StrokeCap.Round,
-    )
-
     val context = LocalContext.current
 
+    val thickStrokeWidth = with(LocalDensity.current) { TodoDefaults.trackThickness.toPx() }
+    val thickStroke = remember(thickStrokeWidth) {
+        Stroke(width = thickStrokeWidth, cap = StrokeCap.Round)
+    }
+
     val remainTasks = totalTasks - completedTasks
     val progress = if (totalTasks != 0) {
         completedTasks / totalTasks.toFloat()
@@ -45,13 +52,18 @@ fun ProgressFragment(
     }
 
     Box(
-        modifier = modifier,
+        modifier = modifier.padding(20.dp),
         contentAlignment = Alignment.Center
     ) {
-        AnimatedCircularWavyProgressIndicator(
+        val animatedProgress by animateFloatAsState(
-            progress = progress,
+            targetValue = progress,
-            stroke = stroke,
+            animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec
-            trackStroke = stroke,
+        )
+
+        CircularWavyProgressIndicator(
+            progress = { animatedProgress },
+            stroke = thickStroke,
+            trackStroke = thickStroke,
             amplitude = { progress ->
                 if (progress <= 0.1f || progress >= 0.95f) {
                     0f

app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAboutLicence.kt

@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.TopAppBarDefaults
@@ -38,12 +37,7 @@ fun SettingsAboutLicence(
                 .fillMaxSize()
                 .padding(innerPadding)
                 .padding(horizontal = TodoDefaults.screenHorizontalPadding)
-                .clip(
+                .clip(MaterialTheme.shapes.extraLarge)
-                    MaterialTheme.shapes.extraLarge.copy(
-                        bottomEnd = CornerSize(0f),
-                        bottomStart = CornerSize(0f)
-                    )
-                )
         ) {
             val listState = rememberLazyListState()
             LicenceList(

app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsDeveloperOptions.kt

@@ -37,7 +37,7 @@ fun SettingsDeveloperOptions(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(innerPadding)
-                .padding(horizontal = TodoDefaults.screenHorizontalPadding,)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding)
                 .verticalScroll(rememberScrollState())
         ) {
             Settings {

app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsCategory.kt

@@ -22,7 +22,6 @@ fun SettingsCategory(
                 top = TodoDefaults.settingsItemVerticalPadding / 2,
                 start = TodoDefaults.settingsItemHorizontalPadding,
                 end = TodoDefaults.settingsItemHorizontalPadding,
-                bottom = TodoDefaults.settingsItemVerticalPadding / 4,
             )
     ) {
         Text(

app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsContainer.kt

@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -22,9 +21,8 @@ fun Settings(
     Column(
         verticalArrangement = Arrangement.spacedBy(2.dp),
         modifier = modifier
-            .padding(vertical = TodoDefaults.screenVerticalPadding).clip(
+            .padding(vertical = TodoDefaults.screenVerticalPadding)
-            shape = MaterialTheme.shapes.extraLarge
+            .clip(MaterialTheme.shapes.extraLarge),
-        ),
         content = content
     )
 }

app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsDialogs.kt

@@ -1,5 +1,7 @@
 package cn.super12138.todo.ui.pages.settings.components
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -39,7 +41,9 @@ fun SettingsRadioDialog(
         text = {
             // Modifier.selectableGroup() 用来确保无障碍功能运行正确
             Column(
+                verticalArrangement = Arrangement.spacedBy(2.dp),
                 modifier = Modifier
+                    .clip(MaterialTheme.shapes.extraLarge)
                     .selectableGroup()
                     .verticalScroll(rememberScrollState())
             ) {
@@ -72,7 +76,8 @@ fun RadioItem(
         modifier
             .fillMaxWidth()
             .height(56.dp)
-            .clip(MaterialTheme.shapes.large)
+            .clip(MaterialTheme.shapes.small)
+            .background(MaterialTheme.colorScheme.surfaceContainerHighest)
             .selectable(
                 selected = selected,
                 onClick = {

app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceList.kt

@@ -2,6 +2,7 @@ package cn.super12138.todo.ui.pages.settings.components.licence
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
@@ -24,6 +25,7 @@ import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import cn.super12138.todo.R
+import cn.super12138.todo.ui.TodoDefaults
 import cn.super12138.todo.ui.components.BasicDialog
 import cn.super12138.todo.ui.components.LazyColumnCustomScrollBar
 import cn.super12138.todo.utils.VibrationUtils
@@ -47,6 +49,7 @@ fun LicenceList(
         LazyColumn(
             state = state,
             verticalArrangement = Arrangement.spacedBy(2.dp),
+            contentPadding = PaddingValues(vertical = TodoDefaults.screenVerticalPadding),
             modifier = modifier
         ) {
             items(items = libraries?.libraries ?: listOf(), key = { it.artifactId }) { library ->