diff --git a/app/src/androidTest/java/com/estimatefaster/audioforge/ui/NavigationSmokeTest.kt b/app/src/androidTest/java/com/estimatefaster/audioforge/ui/NavigationSmokeTest.kt index 4848b5c..958664c 100644 --- a/app/src/androidTest/java/com/estimatefaster/audioforge/ui/NavigationSmokeTest.kt +++ b/app/src/androidTest/java/com/estimatefaster/audioforge/ui/NavigationSmokeTest.kt @@ -1,11 +1,14 @@ package com.estimatefaster.audioforge.ui import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.assertIsSelected import androidx.compose.ui.test.hasClickAction import androidx.compose.ui.test.hasScrollToNodeAction import androidx.compose.ui.test.hasText import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.compose.ui.test.onAllNodesWithText +import androidx.compose.ui.test.onNodeWithContentDescription +import androidx.compose.ui.test.onFirst import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollToNode @@ -54,37 +57,36 @@ class NavigationSmokeTest { composeRule.onNodeWithText(onboardingTitle).assertIsDisplayed() composeRule.onNodeWithText(skip).assertIsDisplayed().performClick() - waitForText(text(R.string.project_library_title)) - composeRule.onNodeWithText(text(R.string.project_library_title)).assertIsDisplayed() + waitForText(text(R.string.ux2_projects_title)) + assertTextDisplayed(text(R.string.ux2_projects_title)) // 数据库已清空,项目库应稳定落在空态;导入 FAB 始终可见。 - waitForText(text(R.string.project_library_empty_title)) - composeRule.onNodeWithText(text(R.string.project_library_empty_title)).assertIsDisplayed() - composeRule.onNodeWithText(text(R.string.project_library_empty_action)).assertIsDisplayed() - composeRule.onNodeWithText(text(R.string.project_library_import)).assertIsDisplayed() + waitForText(text(R.string.ux2_projects_empty_title)) + assertTextDisplayed(text(R.string.ux2_projects_empty_title)) + assertTextDisplayed(text(R.string.ux2_projects_empty_action)) } @Test fun bottom_navigation_switches_projects_tasks_and_settings() { skipOnboarding() - openTopLevelTab(R.string.nav_tasks) - waitForText(text(R.string.tasks_subtitle)) - composeRule.onNodeWithText(text(R.string.tasks_subtitle)).assertIsDisplayed() + openTopLevelTab(R.string.ux_nav_tab_tasks) + waitForText(text(R.string.ux_tasks_subtitle)) + assertTextDisplayed(text(R.string.ux_tasks_subtitle)) - openTopLevelTab(R.string.nav_settings) + openTopLevelTab(R.string.ux_nav_tab_settings) waitForText(text(R.string.settings_section_api)) - composeRule.onNodeWithText(text(R.string.settings_section_api)).assertIsDisplayed() + assertTextDisplayed(text(R.string.settings_section_api)) - openTopLevelTab(R.string.nav_projects) - waitForText(text(R.string.project_library_title)) - composeRule.onNodeWithText(text(R.string.project_library_title)).assertIsDisplayed() + openTopLevelTab(R.string.ux_nav_tab_library) + waitForText(text(R.string.ux2_projects_title)) + assertTextDisplayed(text(R.string.ux2_projects_title)) } @Test fun settings_opens_storage_and_about_then_returns() { skipOnboarding() - openTopLevelTab(R.string.nav_settings) + openTopLevelTab(R.string.ux_nav_tab_settings) waitForSettingsContent() scrollSettingsTo(text(R.string.settings_action_open_storage)) @@ -92,10 +94,9 @@ class NavigationSmokeTest { .assertIsDisplayed() .performClick() - // 设置页没有「刷新」,它是存储页顶栏的稳定标记。 - waitForText(text(R.string.action_refresh)) - composeRule.onNodeWithText(text(R.string.storage_title)).assertIsDisplayed() - composeRule.onNodeWithText(text(R.string.action_back)).assertIsDisplayed().performClick() + waitForText(text(R.string.storage_title)) + assertTextDisplayed(text(R.string.storage_title)) + composeRule.onNodeWithContentDescription(text(R.string.action_back)).assertIsDisplayed().performClick() waitForSettingsContent() scrollSettingsTo(text(R.string.settings_action_open_about)) @@ -103,13 +104,33 @@ class NavigationSmokeTest { .assertIsDisplayed() .performClick() - // 同上:设置页没有「刷新」,用它判断关于页已经进入且转场结束。 - waitForText(text(R.string.action_refresh)) - composeRule.onNodeWithText(text(R.string.about_title)).assertIsDisplayed() - composeRule.onNodeWithText(text(R.string.action_back)).assertIsDisplayed().performClick() + waitForText(text(R.string.about_title)) + assertTextDisplayed(text(R.string.about_title)) + composeRule.onNodeWithContentDescription(text(R.string.action_back)).assertIsDisplayed().performClick() waitForSettingsContent() } + @Test + fun theme_switch_applies_immediately_and_keeps_navigation() { + skipOnboarding() + openTopLevelTab(R.string.ux_nav_tab_settings) + waitForSettingsContent() + + scrollSettingsTo(text(R.string.settings_theme_dark)) + composeRule.onNodeWithText(text(R.string.settings_theme_dark)).performClick() + composeRule.waitForIdle() + composeRule.onNodeWithText(text(R.string.settings_theme_dark)).assertIsSelected() + + scrollSettingsTo(text(R.string.settings_theme_light)) + composeRule.onNodeWithText(text(R.string.settings_theme_light)).performClick() + composeRule.waitForIdle() + composeRule.onNodeWithText(text(R.string.settings_theme_light)).assertIsSelected() + + openTopLevelTab(R.string.ux_nav_tab_library) + waitForText(text(R.string.ux2_projects_title)) + assertTextDisplayed(text(R.string.ux2_projects_title)) + } + // ------------------------------------------------------------------ // 辅助方法 // ------------------------------------------------------------------ @@ -118,7 +139,7 @@ class NavigationSmokeTest { val skip = text(R.string.onboarding_skip) waitForText(skip) composeRule.onNodeWithText(skip).performClick() - waitForText(text(R.string.project_library_title)) + waitForText(text(R.string.ux2_projects_title)) } private fun openTopLevelTab(labelRes: Int) { @@ -130,6 +151,10 @@ class NavigationSmokeTest { composeRule.onNode(hasScrollToNodeAction()).performScrollToNode(hasText(label)) } + private fun assertTextDisplayed(value: String) { + composeRule.onAllNodesWithText(value).onFirst().assertIsDisplayed() + } + private fun waitForText(value: String) { composeRule.waitUntil(UI_TIMEOUT_MS) { composeRule.onAllNodesWithText(value).fetchSemanticsNodes().isNotEmpty() @@ -144,7 +169,7 @@ class NavigationSmokeTest { * 保证 [scrollSettingsTo] 拿到的是设置页自己的 LazyColumn 而不是上一页面的列表。 */ private fun waitForSettingsContent() { - waitForText(text(R.string.action_save)) + waitForText(text(R.string.settings_title)) composeRule.waitUntil(UI_TIMEOUT_MS) { composeRule.onAllNodes(hasScrollToNodeAction()).fetchSemanticsNodes().isNotEmpty() } diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/about/AboutScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/about/AboutScreen.kt index 77fe51c..dc67b12 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/about/AboutScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/about/AboutScreen.kt @@ -1,54 +1,56 @@ package com.estimatefaster.audioforge.feature.about import android.content.res.Configuration +import androidx.annotation.DrawableRes import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilledTonalButton +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.LinearWavyProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.heading -import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.feature.storage.formatByteSize -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorBanner -import com.estimatefaster.audioforge.ui.components.ErrorState -import com.estimatefaster.audioforge.ui.components.LoadingState -import com.estimatefaster.audioforge.ui.components.SectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeListRow +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing /** - * 关于页(P5-10 / 执行计划 §12.4 S15、§15 P5-10)。 + * 关于页(P5-10 / 执行计划 §12.4 S15、§15 P5-10),Forge Framework v1 重做。 * * 有状态入口:收集 [AboutViewModel.state] 后委托给无状态版本。页面不直接读 * `BuildConfig`、文件系统或 WorkManager;复制与导出只把 @@ -77,19 +79,20 @@ fun AboutScreen( } /** - * 无状态关于页。 + * 无状态关于页(Forge Framework v1)。 * - * 布局: - * - 应用卡:名称、版本(`VERSION_NAME (VERSION_CODE)`)、构建类型、包名、 - * 开源声明与 GitHub 入口(点击回调); - * - 诊断卡:Room(库版本/schema/表数/探针)、FFmpeg(探针版本)、 - * WorkManager(可用性与进行中任务数)、存储占用、最近错误; - * 「复制诊断信息」「导出日志」只回调文本; - * - 许可卡:FFmpegKit / OkHttp / Room / Media3 / Compose / Serialization / - * WorkManager,顺序固定,可展开全文占位; - * - 加载、错误、空态复用 P4-02 组件。 + * 布局严格对齐 `docs/prototype/forge-framework.html` 的 About 页: + * - ForgeTopBar:返回图标、标题、副标题、复制诊断图标操作; + * - 应用 hero:AudioLines logo、应用名、副标题、版本状态胶囊、构建信息、许可声明、 + * GitHub 地址与「图标 + 文案」的打开按钮; + * - 诊断:每行 Lucide leading icon + 标题 + 读数 + 「图标 + 状态」胶囊; + * Room / FFmpeg / WorkManager / 存储占用 / 最近错误; + * - 开源许可:ForgeListRow + 展开/收起图标操作,展开后显示许可全文占位; + * - 复制诊断 / 导出日志:唯一主次操作,禁用条件仍由 [AboutUiState.canShareDiagnostics] 决定; + * - 加载、错误、空态复用 [ForgeLoading] / [ForgeError] / [ForgeEmpty]。 + * + * 所有数据来自 [AboutUiState],本文件不采集诊断、不发网络请求。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun AboutScreen( state: AboutUiState, @@ -101,72 +104,68 @@ fun AboutScreen( onCopyDiagnostics: (String) -> Unit = {}, onExportLogs: (String) -> Unit = {}, ) { + val report = state.report + Scaffold( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - navigationIcon = { - TextButton( - onClick = onBack, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_back)) - } - }, - title = { - Text( - text = stringResource(R.string.about_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - ) - }, + ForgeTopBar( + title = stringResource(R.string.about_title), + subtitle = stringResource(R.string.about_v2_topbar_subtitle), + navigationIcon = ForgeIcons.Back, + navigationDescription = stringResource(R.string.action_back), + onNavigation = onBack, actions = { - TextButton( - onClick = onRefresh, - enabled = !state.isLoadingFirstTime, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_refresh)) + if (state.canShareDiagnostics) { + ForgeIconAction( + icon = ForgeIcons.Copy, + contentDescription = stringResource(R.string.about_copy_diagnostics), + onClick = { onCopyDiagnostics(state.diagnosticText) }, + ) } }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, ) { padding -> - when { - state.isLoadingFirstTime -> LoadingState( - message = stringResource(R.string.about_loading), - modifier = Modifier.padding(padding), - ) + Box( + modifier = Modifier + .fillMaxSize() + .padding(padding), + ) { + when { + report == null && state.loading -> ForgeLoading( + label = stringResource(R.string.about_loading), + ) - state.loadError != null && state.report == null -> Box( - modifier = Modifier - .fillMaxSize() - .padding(padding), - contentAlignment = Alignment.Center, - ) { - ErrorState( + report == null && state.loadError != null -> ForgeError( message = stringResource( R.string.about_load_error, state.loadError.orEmpty(), ), onRetry = onRefresh, + retryLabel = stringResource(R.string.action_retry), ) - } - else -> AboutContent( - state = state, - contentPadding = padding, - onRefresh = onRefresh, - onToggleLicense = onToggleLicense, - onOpenGitHub = onOpenGitHub, - onCopyDiagnostics = onCopyDiagnostics, - onExportLogs = onExportLogs, - ) + report == null -> ForgeEmpty( + icon = ForgeIcons.Info, + title = stringResource(R.string.about_empty_title), + description = stringResource(R.string.about_empty_description), + actionIcon = ForgeIcons.Refresh, + actionLabel = stringResource(R.string.about_empty_action), + onAction = onRefresh, + ) + + else -> AboutContent( + state = state, + report = report, + onRefresh = onRefresh, + onToggleLicense = onToggleLicense, + onOpenGitHub = onOpenGitHub, + onCopyDiagnostics = onCopyDiagnostics, + onExportLogs = onExportLogs, + ) + } } } } @@ -174,30 +173,33 @@ fun AboutScreen( @Composable private fun AboutContent( state: AboutUiState, - contentPadding: PaddingValues, + report: DiagnosticsReport, onRefresh: () -> Unit, onToggleLicense: (String) -> Unit, onOpenGitHub: (String) -> Unit, onCopyDiagnostics: (String) -> Unit, onExportLogs: (String) -> Unit, ) { - val report = state.report + val spacing = MaterialTheme.spacing + val refreshingDescription = stringResource(R.string.about_loading) LazyColumn( - modifier = Modifier - .fillMaxSize() - .padding(contentPadding), - contentPadding = PaddingValues(horizontal = 20.dp, vertical = 16.dp), - verticalArrangement = Arrangement.spacedBy(14.dp), + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(horizontal = spacing.lg, vertical = spacing.md), + verticalArrangement = Arrangement.spacedBy(spacing.md), ) { if (state.isRefreshing) { item(key = "refreshing") { - LinearProgressIndicator(modifier = Modifier.fillMaxWidth()) + LinearWavyProgressIndicator( + modifier = Modifier + .fillMaxWidth() + .semantics { contentDescription = refreshingDescription }, + ) } } if (state.loadError != null) { - item(key = "inline-error") { - ErrorBanner( + item(key = "load-error") { + AboutLoadErrorCard( message = stringResource( R.string.about_load_error, state.loadError.orEmpty(), @@ -206,66 +208,134 @@ private fun AboutContent( ) } } - if (report == null) { - item(key = "empty") { - EmptyState( - title = stringResource(R.string.about_empty_title), - description = stringResource(R.string.about_empty_description), - actionText = stringResource(R.string.about_empty_action), - onAction = onRefresh, - ) - } - } else { - item(key = "app") { - AboutAppCard( - buildInfo = report.buildInfo, - onOpenGitHub = onOpenGitHub, - ) - } - item(key = "diagnostics") { - DiagnosticsCard( - report = report, - canShare = state.canShareDiagnostics, - onCopyDiagnostics = onCopyDiagnostics, - onExportLogs = onExportLogs, - diagnosticText = state.diagnosticText, - ) - } + + item(key = "hero") { + AboutHeroCard( + buildInfo = report.buildInfo, + onOpenGitHub = onOpenGitHub, + ) + } + + item(key = "diagnostics") { + DiagnosticsCard(report = report, onRefresh = onRefresh) + } + + item(key = "licenses-header") { + ForgeSectionHeader( + title = stringResource(R.string.about_licenses_title), + subtitle = stringResource( + R.string.about_licenses_subtitle, + state.licenses.size, + ), + ) + } + items( + items = state.licenses, + key = { entry -> "license-${entry.id}" }, + ) { entry -> + LicenseRow( + entry = entry, + expanded = entry.id == state.expandedLicenseId, + onToggle = { onToggleLicense(entry.id) }, + ) + } + + item(key = "actions") { + ShareDiagnosticsCard( + canShare = state.canShareDiagnostics, + diagnosticText = state.diagnosticText, + onCopyDiagnostics = onCopyDiagnostics, + onExportLogs = onExportLogs, + ) } - item(key = "licenses") { - LicensesCard( - licenses = state.licenses, - expandedLicenseId = state.expandedLicenseId, - onToggleLicense = onToggleLicense, + + item(key = "footer") { + Text( + text = stringResource(R.string.about_v2_footer), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = spacing.lg, vertical = spacing.md), ) } } } +// --------------------------------------------------------------------------- +// 应用 hero +// --------------------------------------------------------------------------- + @Composable -private fun AboutAppCard( - buildInfo: AppBuildInfo?, - onOpenGitHub: (String) -> Unit, -) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { +private fun AboutHeroCard(buildInfo: AppBuildInfo?, onOpenGitHub: (String) -> Unit) { + val spacing = MaterialTheme.spacing + ForgeCard { Column( - modifier = Modifier - .fillMaxWidth() - .padding(18.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(spacing.sm), ) { - SectionHeader( - title = stringResource(R.string.about_app_card_title), - subtitle = stringResource(R.string.about_app_card_subtitle), - ) + Surface( + shape = MaterialTheme.shapes.extraExtraLarge, + color = MaterialTheme.colorScheme.primaryContainer, + modifier = Modifier.size(80.dp), + ) { + Column( + modifier = Modifier.fillMaxSize(), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + ForgeIcon( + icon = ForgeIcons.AudioLines, + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + } + } Text( text = stringResource(R.string.app_name), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.Bold, + style = MaterialTheme.typography.headlineSmallEmphasized, + ) + Text( + text = stringResource(R.string.about_v2_tagline), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, ) + if (buildInfo != null) { + Surface( + shape = CircleShape, + color = MaterialTheme.colorScheme.secondaryContainer, + ) { + Row( + modifier = Modifier.padding( + horizontal = spacing.sm, + vertical = spacing.xxs, + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(spacing.xs), + ) { + ForgeIcon( + icon = ForgeIcons.CheckCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, + ) + Text( + text = stringResource( + R.string.about_v2_version_pill, + buildInfo.versionLabel, + buildInfo.buildTypeLabel, + ), + style = MaterialTheme.typography.labelMediumEmphasized, + color = MaterialTheme.colorScheme.onSecondaryContainer, + ) + } + } + } + + HorizontalDivider() + if (buildInfo == null) { Text( text = stringResource(R.string.about_build_info_missing), @@ -274,200 +344,203 @@ private fun AboutAppCard( ) } else { InfoLine( + icon = ForgeIcons.Info, label = stringResource(R.string.about_version_label), value = buildInfo.versionLabel, ) InfoLine( + icon = ForgeIcons.Shield, label = stringResource(R.string.about_build_type_label), value = buildInfo.buildTypeLabel, ) InfoLine( + icon = ForgeIcons.Smartphone, label = stringResource(R.string.about_package_label), value = buildInfo.packageLabel, ) } + HorizontalDivider() + Text( text = stringResource(R.string.about_license_statement), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, ) Text( text = stringResource(R.string.about_github_url, ABOUT_GITHUB_URL), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary, + textAlign = TextAlign.Center, ) - TextButton( + ForgeSecondaryAction( + icon = ForgeIcons.Globe, + label = stringResource(R.string.about_github_open), onClick = { onOpenGitHub(ABOUT_GITHUB_URL) }, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.about_github_open)) - } + modifier = Modifier.fillMaxWidth(), + ) } } } @Composable -private fun InfoLine(label: String, value: String) { +private fun InfoLine(@DrawableRes icon: Int, label: String, value: String) { Row( modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - Text( - text = label, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.weight(0.35f), - ) - Text( - text = value, - style = MaterialTheme.typography.bodyMedium, - modifier = Modifier.weight(0.65f), + ForgeIcon( + icon = icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, ) + Column(modifier = Modifier.weight(1f)) { + Text( + text = label, + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = value, + style = MaterialTheme.typography.bodyMediumEmphasized, + ) + } } } +// --------------------------------------------------------------------------- +// 诊断 +// --------------------------------------------------------------------------- + @Composable -private fun DiagnosticsCard( - report: DiagnosticsReport, - canShare: Boolean, - onCopyDiagnostics: (String) -> Unit, - onExportLogs: (String) -> Unit, - diagnosticText: String, -) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(18.dp), - verticalArrangement = Arrangement.spacedBy(12.dp), - ) { - SectionHeader( - title = stringResource(R.string.about_diagnostics_title), - subtitle = stringResource(R.string.about_diagnostics_subtitle), +private fun DiagnosticsCard(report: DiagnosticsReport, onRefresh: () -> Unit) { + val spacing = MaterialTheme.spacing + ForgeCard { + ForgeSectionHeader( + title = stringResource(R.string.about_diagnostics_title), + subtitle = stringResource(R.string.about_v2_diag_hint), + actionIcon = ForgeIcons.Refresh, + actionDescription = stringResource(R.string.about_v2_rerun_diagnostics), + onAction = onRefresh, + ) + + val database = report.database + val roomValue = if (database.tableCount == null && database.schemaVersion == null) { + stringResource(R.string.about_database_unavailable) + } else { + val schema = database.schemaVersion + ?.let { stringResource(R.string.about_room_schema_value, it) } + ?: stringResource(R.string.about_value_unknown) + val tables = database.tableCount + ?.let { stringResource(R.string.about_room_table_value, it) } + ?: stringResource(R.string.about_value_unknown) + stringResource( + R.string.about_room_line, + database.libraryVersion, + schema, + tables, ) + } + DiagnosticRow( + icon = ForgeIcons.Database, + label = stringResource(R.string.about_room_label), + status = probeStatus(report.room.state), + value = roomValue, + extra = listOfNotNull(report.room.summary, report.room.detail) + .joinToString(" · ") + .takeIf { it.isNotBlank() }, + errorDetail = report.room.detail + .takeIf { report.room.state == ProbeState.FAILED }, + ) - val database = report.database - val roomValue = if (database.tableCount == null && database.schemaVersion == null) { - stringResource(R.string.about_database_unavailable) + HorizontalDivider() + + DiagnosticRow( + icon = ForgeIcons.AudioLines, + label = stringResource(R.string.about_ffmpeg_label), + status = probeStatus(report.ffmpeg.state), + value = report.ffmpeg.summary ?: stringResource(R.string.about_value_unknown), + extra = report.ffmpeg.detail + .takeIf { report.ffmpeg.state != ProbeState.FAILED }, + errorDetail = report.ffmpeg.detail + .takeIf { report.ffmpeg.state == ProbeState.FAILED }, + ) + + HorizontalDivider() + + val workManager = report.workManager + DiagnosticRow( + icon = ForgeIcons.Timer, + label = stringResource(R.string.about_workmanager_label), + status = workManagerStatus(workManager.state), + value = stringResource( + R.string.about_v2_workmanager_active, + workManager.activeWorkCount, + ), + extra = workManager.detail, + ) + + HorizontalDivider() + + val storage = report.storage + DiagnosticRow( + icon = ForgeIcons.Storage, + label = stringResource(R.string.about_storage_label), + status = if (storage == null) { + DiagStatus( + icon = ForgeIcons.TriangleAlert, + text = stringResource(R.string.about_storage_unavailable), + contentColor = MaterialTheme.colorScheme.onErrorContainer, + containerColor = MaterialTheme.colorScheme.errorContainer, + ) } else { - val schema = database.schemaVersion - ?.let { stringResource(R.string.about_room_schema_value, it) } - ?: stringResource(R.string.about_value_unknown) - val tables = database.tableCount - ?.let { stringResource(R.string.about_room_table_value, it) } - ?: stringResource(R.string.about_value_unknown) + DiagStatus( + icon = ForgeIcons.CheckCircle, + text = stringResource(R.string.about_v2_storage_status_ok), + contentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.secondaryContainer, + ) + }, + value = storage?.let { stringResource( - R.string.about_room_line, - database.libraryVersion, - schema, - tables, + R.string.about_storage_line, + formatByteSize(it.totalBytes), + it.fileCount, ) - } - DiagnosticRow( - label = stringResource(R.string.about_room_label), - probe = report.room, - value = roomValue, - extra = listOfNotNull(report.room.summary, report.room.detail) - .joinToString(" · ") - .takeIf { it.isNotBlank() }, - ) - HorizontalDivider() + }, + extra = storage?.let { + stringResource(R.string.about_storage_usable, formatByteSize(it.usableBytes)) + }, + ) - DiagnosticRow( - label = stringResource(R.string.about_ffmpeg_label), - probe = report.ffmpeg, - value = report.ffmpeg.summary, - extra = report.ffmpeg.detail, - ) - HorizontalDivider() + HorizontalDivider() - val workManager = report.workManager - val workManagerLabel = workManagerStatusLabel(workManager.state) - DiagnosticRow( - label = stringResource(R.string.about_workmanager_label), - probe = null, - value = stringResource( - R.string.about_workmanager_line, - workManagerLabel, - workManager.activeWorkCount, - ), - extra = workManager.detail, - statusText = workManagerLabel, - statusColor = workManagerStatusColor(workManager.state), - ) - HorizontalDivider() - - val storage = report.storage - DiagnosticRow( - label = stringResource(R.string.about_storage_label), - probe = null, - value = if (storage == null) { - stringResource(R.string.about_storage_unavailable) - } else { - stringResource( - R.string.about_storage_line, - formatByteSize(storage.totalBytes), - storage.fileCount, - ) - }, - extra = storage?.let { - stringResource(R.string.about_storage_usable, formatByteSize(it.usableBytes)) - }, + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(spacing.sm), + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, ) - HorizontalDivider() - Text( text = stringResource(R.string.about_recent_errors_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + style = MaterialTheme.typography.titleSmallEmphasized, ) - if (report.recentErrors.isEmpty()) { - Text( - text = stringResource(R.string.about_recent_errors_empty), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } else { - report.recentErrors.forEach { error -> - Text( - text = stringResource( - R.string.about_recent_error_line, - error.projectTitle - ?: stringResource(R.string.about_recent_error_unknown_project), - error.message, - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - } - - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(8.dp), - ) { - FilledTonalButton( - onClick = { onCopyDiagnostics(diagnosticText) }, - enabled = canShare, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.about_copy_diagnostics)) - } - FilledTonalButton( - onClick = { onExportLogs(diagnosticText) }, - enabled = canShare, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.about_export_logs)) - } + } + if (report.recentErrors.isEmpty()) { + Text( + text = stringResource(R.string.about_recent_errors_empty), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } else { + report.recentErrors.forEach { error -> + RecentErrorRow(error = error) } } } @@ -475,89 +548,215 @@ private fun DiagnosticsCard( @Composable private fun DiagnosticRow( + @DrawableRes icon: Int, label: String, - probe: ProbeDiagnostic?, - value: String?, + status: DiagStatus, + value: String? = null, extra: String? = null, - statusText: String? = null, - statusColor: Color? = null, + errorDetail: String? = null, ) { - val resolvedStatus = statusText ?: probeStatusLabel(probe?.state) - val resolvedColor = statusColor ?: probeStatusColor(probe?.state) - Column( + val spacing = MaterialTheme.spacing + Row( modifier = Modifier.fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(4.dp), + horizontalArrangement = Arrangement.spacedBy(spacing.md), + ) { + IconBubble(icon = icon) + Column(modifier = Modifier.weight(1f)) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(spacing.sm), + ) { + Text( + text = label, + style = MaterialTheme.typography.titleSmallEmphasized, + modifier = Modifier.weight(1f), + ) + StatusPill(status = status) + } + if (value != null) { + Text( + text = value, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + if (errorDetail != null) { + Text( + text = stringResource(R.string.about_probe_error, errorDetail), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) + } else if (extra != null) { + Text( + text = extra, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + } +} + +@Composable +private fun RecentErrorRow(error: RecentError) { + Row( + modifier = Modifier + .fillMaxWidth() + .semantics(mergeDescendants = true) {}, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + modifier = Modifier.size(18.dp), + ) + Text( + text = stringResource( + R.string.about_recent_error_line, + error.projectTitle + ?: stringResource(R.string.about_recent_error_unknown_project), + error.message, + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.weight(1f), + ) + } +} + +/** 诊断状态胶囊:Lucide 图标 + 状态文案,颜色由调用方按严重程度给出。 */ +private data class DiagStatus( + @DrawableRes val icon: Int, + val text: String, + val contentColor: Color, + val containerColor: Color, +) + +@Composable +private fun StatusPill(status: DiagStatus) { + Surface( + shape = CircleShape, + color = status.containerColor, ) { Row( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.xxs, + ), verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), ) { - Text( - text = label, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - modifier = Modifier.weight(1f), + ForgeIcon( + icon = status.icon, + contentDescription = null, + tint = status.contentColor, + modifier = Modifier.size(16.dp), ) - Spacer(Modifier.width(8.dp)) Text( - text = resolvedStatus, - style = MaterialTheme.typography.labelMedium, - fontWeight = FontWeight.SemiBold, - color = resolvedColor, - ) - } - if (value != null) { - Text(text = value, style = MaterialTheme.typography.bodyMedium) - } - val failedDetail = probe?.detail - if (probe?.state == ProbeState.FAILED && failedDetail != null) { - Text( - text = stringResource(R.string.about_probe_error, failedDetail), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, - ) - } else if (extra != null) { - Text( - text = extra, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + text = status.text, + style = MaterialTheme.typography.labelMediumEmphasized, + color = status.contentColor, ) } } } @Composable -private fun LicensesCard( - licenses: List, - expandedLicenseId: String?, - onToggleLicense: (String) -> Unit, -) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), +private fun IconBubble(@DrawableRes icon: Int) { + Surface( + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.secondaryContainer, + modifier = Modifier.size(44.dp), ) { Column( - modifier = Modifier - .fillMaxWidth() - .padding(18.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxSize(), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, ) { - SectionHeader( - title = stringResource(R.string.about_licenses_title), - subtitle = stringResource(R.string.about_licenses_subtitle, licenses.size), + ForgeIcon( + icon = icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, ) - licenses.forEachIndexed { index, entry -> - if (index > 0) HorizontalDivider() - LicenseRow( - entry = entry, - expanded = entry.id == expandedLicenseId, - onToggle = { onToggleLicense(entry.id) }, - ) - } } } } +@Composable +private fun probeStatus(state: ProbeState?): DiagStatus = when (state) { + ProbeState.PASSED -> DiagStatus( + icon = ForgeIcons.CheckCircle, + text = stringResource(R.string.about_probe_status_passed), + contentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.secondaryContainer, + ) + + ProbeState.FAILED -> DiagStatus( + icon = ForgeIcons.TriangleAlert, + text = stringResource(R.string.about_probe_status_failed), + contentColor = MaterialTheme.colorScheme.onErrorContainer, + containerColor = MaterialTheme.colorScheme.errorContainer, + ) + + ProbeState.TIMED_OUT -> DiagStatus( + icon = ForgeIcons.TriangleAlert, + text = stringResource(R.string.about_probe_status_timed_out), + contentColor = MaterialTheme.colorScheme.onErrorContainer, + containerColor = MaterialTheme.colorScheme.errorContainer, + ) + + ProbeState.RUNNING -> DiagStatus( + icon = ForgeIcons.Loader, + text = stringResource(R.string.about_probe_status_running), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh, + ) + + ProbeState.IDLE -> DiagStatus( + icon = ForgeIcons.Clock, + text = stringResource(R.string.about_probe_status_idle), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh, + ) + + null -> DiagStatus( + icon = ForgeIcons.Clock, + text = stringResource(R.string.about_probe_status_unknown), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh, + ) +} + +@Composable +private fun workManagerStatus(state: WorkManagerState): DiagStatus = when (state) { + WorkManagerState.AVAILABLE -> DiagStatus( + icon = ForgeIcons.CheckCircle, + text = stringResource(R.string.about_workmanager_available), + contentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.secondaryContainer, + ) + + WorkManagerState.DEGRADED -> DiagStatus( + icon = ForgeIcons.TriangleAlert, + text = stringResource(R.string.about_workmanager_degraded), + contentColor = MaterialTheme.colorScheme.onErrorContainer, + containerColor = MaterialTheme.colorScheme.errorContainer, + ) + + WorkManagerState.UNAVAILABLE -> DiagStatus( + icon = ForgeIcons.Clock, + text = stringResource(R.string.about_workmanager_unavailable), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh, + ) +} + +// --------------------------------------------------------------------------- +// 许可与分享 +// --------------------------------------------------------------------------- + @Composable private fun LicenseRow( entry: LicenseEntry, @@ -566,39 +765,19 @@ private fun LicenseRow( ) { Column( modifier = Modifier.fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(2.dp), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), ) { - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - ) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = stringResource(R.string.about_license_line, entry.name, entry.version), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource(R.string.about_license_type, entry.license), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - TextButton( - onClick = onToggle, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text( - text = stringResource( - if (expanded) { - R.string.about_license_collapse - } else { - R.string.about_license_expand - }, - ), - ) - } - } + ForgeListRow( + icon = ForgeIcons.Shield, + title = stringResource(R.string.about_license_line, entry.name, entry.version), + subtitle = stringResource(R.string.about_license_type, entry.license), + trailingIcon = if (expanded) ForgeIcons.ChevronUp else ForgeIcons.ChevronDown, + trailingDescription = stringResource( + R.string.about_v2_license_toggle, + entry.name, + ), + onTrailingClick = onToggle, + ) if (expanded) { Text( text = stringResource( @@ -608,44 +787,85 @@ private fun LicenseRow( ), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(horizontal = MaterialTheme.spacing.lg), ) } } } @Composable -private fun probeStatusLabel(state: ProbeState?): String = when (state) { - null -> stringResource(R.string.about_probe_status_unknown) - ProbeState.IDLE -> stringResource(R.string.about_probe_status_idle) - ProbeState.RUNNING -> stringResource(R.string.about_probe_status_running) - ProbeState.PASSED -> stringResource(R.string.about_probe_status_passed) - ProbeState.FAILED -> stringResource(R.string.about_probe_status_failed) - ProbeState.TIMED_OUT -> stringResource(R.string.about_probe_status_timed_out) -} - -@Composable -private fun probeStatusColor(state: ProbeState?): Color = when (state) { - ProbeState.PASSED -> MaterialTheme.colorScheme.primary - ProbeState.FAILED, ProbeState.TIMED_OUT -> MaterialTheme.colorScheme.error - else -> MaterialTheme.colorScheme.onSurfaceVariant -} - -@Composable -private fun workManagerStatusLabel(state: WorkManagerState): String = when (state) { - WorkManagerState.AVAILABLE -> stringResource(R.string.about_workmanager_available) - WorkManagerState.UNAVAILABLE -> stringResource(R.string.about_workmanager_unavailable) - WorkManagerState.DEGRADED -> stringResource(R.string.about_workmanager_degraded) +private fun ShareDiagnosticsCard( + canShare: Boolean, + diagnosticText: String, + onCopyDiagnostics: (String) -> Unit, + onExportLogs: (String) -> Unit, +) { + val spacing = MaterialTheme.spacing + ForgeCard { + ForgePrimaryAction( + icon = ForgeIcons.Copy, + label = stringResource(R.string.about_copy_diagnostics), + onClick = { onCopyDiagnostics(diagnosticText) }, + modifier = Modifier.fillMaxWidth(), + enabled = canShare, + ) + ForgeSecondaryAction( + icon = ForgeIcons.Download, + label = stringResource(R.string.about_export_logs), + onClick = { onExportLogs(diagnosticText) }, + modifier = Modifier.fillMaxWidth(), + enabled = canShare, + ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(spacing.sm), + ) { + ForgeIcon( + icon = ForgeIcons.Shield, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = stringResource(R.string.about_v2_share_hint), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.weight(1f), + ) + } + } } @Composable -private fun workManagerStatusColor(state: WorkManagerState): Color = when (state) { - WorkManagerState.AVAILABLE -> MaterialTheme.colorScheme.primary - WorkManagerState.DEGRADED -> MaterialTheme.colorScheme.error - WorkManagerState.UNAVAILABLE -> MaterialTheme.colorScheme.onSurfaceVariant +private fun AboutLoadErrorCard(message: String, onRetry: () -> Unit) { + val spacing = MaterialTheme.spacing + ForgeCard { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(spacing.md), + ) { + ForgeIcon( + icon = ForgeIcons.TriangleAlert, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + Text( + text = message, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + modifier = Modifier.weight(1f), + ) + } + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.action_retry), + onClick = onRetry, + modifier = Modifier.fillMaxWidth(), + ) + } } // --------------------------------------------------------------------------- -// Preview:正常 / 加载 / 错误 / 空态(暗色 200%)。文案全部来自 strings.xml。 +// Preview:正常 / 加载 / 错误 / 空态(暗色 200%)。文案全部来自 strings。 // --------------------------------------------------------------------------- private fun previewBuildInfo(): AppBuildInfo = AppBuildInfo( @@ -690,7 +910,7 @@ private fun previewReport(): DiagnosticsReport = DiagnosticsReport( private fun previewState(): AboutUiState = AboutUiState().withReport(previewReport()) -@Preview(name = "About Normal", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview(name = "About Forge Normal", showBackground = true, backgroundColor = 0xFFF7F8FC) @Composable private fun AboutNormalPreview() { AudioForgeTheme(darkTheme = false, dynamicColor = false) { @@ -698,7 +918,7 @@ private fun AboutNormalPreview() { } } -@Preview(name = "About Loading", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview(name = "About Forge Loading", showBackground = true, backgroundColor = 0xFFF7F8FC) @Composable private fun AboutLoadingPreview() { AudioForgeTheme(darkTheme = false, dynamicColor = false) { @@ -706,7 +926,7 @@ private fun AboutLoadingPreview() { } } -@Preview(name = "About Error", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview(name = "About Forge Error", showBackground = true, backgroundColor = 0xFFF7F8FC) @Composable private fun AboutErrorPreview() { AudioForgeTheme(darkTheme = false, dynamicColor = false) { @@ -720,7 +940,7 @@ private fun AboutErrorPreview() { } @Preview( - name = "About Empty Dark 200%", + name = "About Forge Empty Dark 200%", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES, fontScale = 2f, diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/characters/CharactersScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/characters/CharactersScreen.kt index c0cc202..d818a52 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/characters/CharactersScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/characters/CharactersScreen.kt @@ -1,53 +1,42 @@ +@file:OptIn(androidx.compose.foundation.layout.ExperimentalLayoutApi::class) + package com.estimatefaster.audioforge.feature.characters import android.content.res.Configuration -import androidx.compose.foundation.combinedClickable -import androidx.compose.foundation.horizontalScroll +import androidx.annotation.StringRes import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilterChip +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember 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.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.heading -import androidx.compose.ui.semantics.contentDescription -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -56,17 +45,27 @@ import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.core.model.Gender import com.estimatefaster.audioforge.core.model.Importance import com.estimatefaster.audioforge.data.db.CharacterEntity -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorState import com.estimatefaster.audioforge.ui.components.RoleAvatar +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing /** - * 人物音色页(P5-04 / 执行计划 §12.4 S08)。 + * 人物音色页(Forge Framework v1)。 * * 有状态入口:收集 [CharactersViewModel.state] 后委托给无状态版本。 - * 页面本身不写库:点击角色换音色(P5-05 Sheet)、长按/“更多”的重命名、 - * 编辑别名、排除角色都通过回调交给宿主。 + * 页面本身不写库:点击角色换音色(VoicePicker Sheet)、重命名 / 编辑别名 / + * 排除角色 / 调参都通过回调交给宿主。 */ @Composable fun CharactersScreen( @@ -102,13 +101,10 @@ fun CharactersScreen( /** * 无状态人物音色页。 * - * - 顶部:返回、标题、“已用角色数 / 总数”; - * - 搜索(名字/别名)+ 性别/重要性筛选(AND 组合); - * - 角色卡:头像、名字、别名、性别/重要性标签、音色类别、当前音色、锁定标记; - * - 点击整卡换音色;长按或“更多”打开重命名/编辑别名/排除菜单; - * - 空态、筛选无结果、首屏加载、错误态复用 P4-02 组件。 + * 结构对齐 prototype 的 Characters:topbar → 搜索 → 性别/重要性 chips → + * “角色与音色”列表 → 锁定说明。搜索 + 两维筛选仍是 AND 组合,空态区分 + * “本书无角色”和“筛选无结果”。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun CharactersScreen( state: CharactersUiState, @@ -127,181 +123,225 @@ fun CharactersScreen( onParseNovel: (() -> Unit)? = null, ) { val loadError = state.loadError + val searchFocus = remember { FocusRequester() } + val hasSearchField = !state.isInitialLoading && loadError == null && !state.isEmpty + Scaffold( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - navigationIcon = { - TextButton( - onClick = onBack, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_back)) - } + ForgeTopBar( + title = stringResource(R.string.ux2_characters_title), + subtitle = if (state.totalCount == 0) { + null + } else { + stringResource( + R.string.ux2_characters_subtitle, + state.totalCount, + state.usedCount, + ) }, - title = { - Column { - Text( - text = stringResource(R.string.characters_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis, + navigationIcon = ForgeIcons.Back, + navigationDescription = stringResource(R.string.ux2_characters_back), + onNavigation = onBack, + actions = { + if (hasSearchField) { + ForgeIconAction( + icon = ForgeIcons.Search, + contentDescription = stringResource(R.string.ux2_characters_search), + onClick = { searchFocus.requestFocus() }, + container = false, ) - if (state.totalCount > 0) { - Text( - text = stringResource( - R.string.characters_count, - state.usedCount, - state.totalCount, - ), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } } }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, ) { padding -> - Column( + Box( modifier = Modifier .fillMaxSize() .padding(padding), ) { - if (state.allCharacters.isNotEmpty()) { - OutlinedTextField( - value = state.query, - onValueChange = onQueryChange, - modifier = Modifier - .fillMaxWidth() - .padding(start = 20.dp, end = 20.dp, top = 4.dp), - label = { Text(stringResource(R.string.characters_search_label)) }, - placeholder = { - Text(stringResource(R.string.characters_search_placeholder)) + when { + state.isInitialLoading -> ForgeLoading( + label = stringResource(R.string.ux2_characters_loading), + modifier = Modifier.fillMaxSize(), + ) + + loadError != null -> ForgeError( + message = stringResource(R.string.ux2_characters_load_error, loadError), + onRetry = onRetry, + ) + + state.isEmpty -> ForgeEmpty( + icon = ForgeIcons.Users, + title = stringResource(R.string.ux2_characters_empty_title), + description = stringResource(R.string.ux2_characters_empty_description), + actionIcon = if (onParseNovel != null) { + ForgeIcons.Wand + } else { + ForgeIcons.Refresh }, - singleLine = true, - trailingIcon = { - if (state.query.isNotEmpty()) { - TextButton( - onClick = { onQueryChange("") }, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.characters_search_clear)) - } - } + actionLabel = if (onParseNovel != null) { + stringResource(R.string.ux2_characters_parse) + } else { + stringResource(R.string.ux2_characters_reload) }, + onAction = onParseNovel ?: onRetry, ) - CharacterGenderFilterRow( - selected = state.genderFilter, - onSelect = onGenderFilterChange, - ) - CharacterImportanceFilterRow( - selected = state.importanceFilter, - onSelect = onImportanceFilterChange, + + else -> CharactersContent( + state = state, + searchFocus = searchFocus, + onQueryChange = onQueryChange, + onGenderFilterChange = onGenderFilterChange, + onImportanceFilterChange = onImportanceFilterChange, + onClearFilters = onClearFilters, + onVoiceClick = onVoiceClick, + onRenameCharacter = onRenameCharacter, + onEditAliases = onEditAliases, + onExcludeCharacter = onExcludeCharacter, + onTuneCharacter = onTuneCharacter, ) - if (state.hasActiveFilters) { - Text( - text = stringResource( - R.string.characters_count_filtered, - state.visibleCount, - state.totalCount, - ), - modifier = Modifier.padding(horizontal = 20.dp, vertical = 2.dp), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } } + } + } +} - Box( - modifier = Modifier - .fillMaxWidth() - .weight(1f), - ) { - when { - state.isInitialLoading -> CharactersLoading( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 24.dp), +@Composable +private fun CharactersContent( + state: CharactersUiState, + searchFocus: FocusRequester, + onQueryChange: (String) -> Unit, + onGenderFilterChange: (Gender?) -> Unit, + onImportanceFilterChange: (Importance?) -> Unit, + onClearFilters: () -> Unit, + onVoiceClick: (String) -> Unit, + onRenameCharacter: (String) -> Unit, + onEditAliases: (String) -> Unit, + onExcludeCharacter: (String) -> Unit, + onTuneCharacter: (String) -> Unit, +) { + Column(modifier = Modifier.fillMaxSize()) { + CharacterSearchField( + state = state, + focusRequester = searchFocus, + onQueryChange = onQueryChange, + modifier = Modifier.padding( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + top = MaterialTheme.spacing.sm, + ), + ) + LazyColumn( + modifier = Modifier + .fillMaxWidth() + .weight(1f), + contentPadding = PaddingValues( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + top = MaterialTheme.spacing.xs, + bottom = MaterialTheme.spacing.xl, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + item(key = "gender-filter") { + CharacterFilterGroup( + label = stringResource(R.string.ux2_characters_filter_gender), + ) { + ForgeChip( + label = filterLabel( + label = stringResource(R.string.ux2_characters_filter_all), + count = state.totalCount, + ), + selected = state.genderFilter == null, + onClick = { onGenderFilterChange(null) }, + icon = ForgeIcons.Users, ) - - loadError != null -> Box( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - ErrorState( - message = stringResource(R.string.characters_load_error, loadError), - onRetry = onRetry, + Gender.entries.forEach { gender -> + ForgeChip( + label = filterLabel( + label = stringResource(gender.labelRes()), + count = state.allCharacters.count { it.gender == gender }, + ), + selected = state.genderFilter == gender, + onClick = { onGenderFilterChange(gender) }, + icon = ForgeIcons.UserRound, ) } - - state.isEmpty -> Box( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource(R.string.characters_empty_title), - description = stringResource(R.string.characters_empty_description), - actionText = if (onParseNovel != null) { - stringResource(R.string.characters_empty_action_parse) - } else { - null - }, - onAction = onParseNovel, + } + } + item(key = "importance-filter") { + CharacterFilterGroup( + label = stringResource(R.string.ux2_characters_filter_importance), + ) { + ForgeChip( + label = filterLabel( + label = stringResource(R.string.ux2_characters_filter_all), + count = state.totalCount, + ), + selected = state.importanceFilter == null, + onClick = { onImportanceFilterChange(null) }, + icon = ForgeIcons.Users, + ) + Importance.entries.forEach { importance -> + ForgeChip( + label = filterLabel( + label = stringResource(importance.labelRes()), + count = state.allCharacters.count { it.importance == importance }, + ), + selected = state.importanceFilter == importance, + onClick = { onImportanceFilterChange(importance) }, + icon = ForgeIcons.UserRound, ) } + } + } + item(key = "section") { + ForgeSectionHeader( + title = stringResource(R.string.ux2_characters_section_title), + subtitle = stringResource( + R.string.ux2_characters_section_count, + state.visibleCount, + ), + modifier = Modifier.padding(top = MaterialTheme.spacing.xs), + ) + } - state.isFilteredEmpty -> Box( + if (state.isFilteredEmpty) { + item(key = "filtered-empty") { + ForgeEmpty( + icon = ForgeIcons.Search, + title = stringResource(R.string.ux2_characters_filtered_title), + description = stringResource(R.string.ux2_characters_filtered_description), modifier = Modifier - .fillMaxSize() - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource(R.string.characters_filtered_empty_title), - description = stringResource( - R.string.characters_filtered_empty_description, - ), - actionText = stringResource(R.string.characters_filtered_empty_action), - onAction = onClearFilters, - ) - } + .fillMaxWidth() + .heightIn(min = 320.dp), + actionIcon = ForgeIcons.Refresh, + actionLabel = stringResource(R.string.ux2_characters_clear_filters), + onAction = onClearFilters, + ) + } + } else { + items( + items = state.visibleCharacters, + key = { character -> character.key }, + contentType = { _ -> "character" }, + ) { character -> + CharacterCard( + character = character, + onVoiceClick = { onVoiceClick(character.roleId) }, + onRename = { onRenameCharacter(character.roleId) }, + onEditAliases = { onEditAliases(character.roleId) }, + onExclude = { onExcludeCharacter(character.roleId) }, + onTune = { onTuneCharacter(character.roleId) }, + ) + } + } - else -> LazyColumn( - modifier = Modifier.fillMaxSize(), - contentPadding = PaddingValues( - start = 20.dp, - end = 20.dp, - top = 8.dp, - bottom = 24.dp, - ), - verticalArrangement = Arrangement.spacedBy(8.dp), - ) { - items( - items = state.visibleCharacters, - key = { character -> character.key }, - contentType = { _ -> "character" }, - ) { character -> - CharacterCard( - character = character, - onVoiceClick = { onVoiceClick(character.roleId) }, - onRename = { onRenameCharacter(character.roleId) }, - onEditAliases = { onEditAliases(character.roleId) }, - onExclude = { onExcludeCharacter(character.roleId) }, - onTune = { onTuneCharacter(character.roleId) }, - ) - } - } + if (state.allCharacters.isNotEmpty()) { + item(key = "lock-note") { + CharacterLockNote() } } } @@ -309,71 +349,75 @@ fun CharactersScreen( } @Composable -private fun CharacterGenderFilterRow( - selected: Gender?, - onSelect: (Gender?) -> Unit, -) { - CharacterFilterChipRow( - label = stringResource(R.string.characters_filter_gender), - options = listOf>( - null to stringResource(R.string.characters_filter_all), - Gender.Male to stringResource(R.string.characters_gender_male), - Gender.Female to stringResource(R.string.characters_gender_female), - Gender.Unknown to stringResource(R.string.characters_gender_unknown), - ), - selected = selected, - onSelect = onSelect, - ) -} - -@Composable -private fun CharacterImportanceFilterRow( - selected: Importance?, - onSelect: (Importance?) -> Unit, +private fun CharacterSearchField( + state: CharactersUiState, + focusRequester: FocusRequester, + onQueryChange: (String) -> Unit, + modifier: Modifier = Modifier, ) { - CharacterFilterChipRow( - label = stringResource(R.string.characters_filter_importance), - options = listOf>( - null to stringResource(R.string.characters_filter_all), - Importance.Protagonist to stringResource(R.string.characters_importance_protagonist), - Importance.Supporting to stringResource(R.string.characters_importance_supporting), - Importance.Minor to stringResource(R.string.characters_importance_minor), - ), - selected = selected, - onSelect = onSelect, + OutlinedTextField( + value = state.query, + onValueChange = onQueryChange, + modifier = modifier + .fillMaxWidth() + .focusRequester(focusRequester), + singleLine = true, + shape = MaterialTheme.shapes.extraLarge, + leadingIcon = { + ForgeIcon( + icon = ForgeIcons.Search, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + }, + trailingIcon = if (state.query.isNotEmpty()) { + { + IconButton( + onClick = { onQueryChange("") }, + modifier = Modifier.size(48.dp), + ) { + ForgeIcon( + icon = ForgeIcons.Close, + contentDescription = stringResource(R.string.ux2_characters_search_clear), + ) + } + } + } else { + null + }, + placeholder = { + Text( + text = stringResource(R.string.ux2_characters_search_hint), + style = MaterialTheme.typography.bodyMedium, + ) + }, ) } @Composable -private fun CharacterFilterChipRow( +private fun CharacterFilterGroup( label: String, - options: List>, - selected: T?, - onSelect: (T?) -> Unit, + chips: @Composable () -> Unit, ) { - Row( - modifier = Modifier - .fillMaxWidth() - .horizontalScroll(rememberScrollState()) - .padding(horizontal = 20.dp, vertical = 2.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalAlignment = Alignment.CenterVertically, - ) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs)) { Text( text = label, style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - options.forEach { (value, text) -> - FilterChip( - selected = selected == value, - onClick = { onSelect(value) }, - label = { Text(text) }, - ) + FlowRow( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + chips() } } } +@Composable +private fun filterLabel(label: String, count: Int): String = + stringResource(R.string.ux2_characters_filter_count, label, count) + @Composable private fun CharacterCard( character: CharacterUi, @@ -384,67 +428,77 @@ private fun CharacterCard( onTune: () -> Unit, ) { var menuExpanded by rememberSaveable(character.key) { mutableStateOf(false) } - val shape = MaterialTheme.shapes.medium val displayName = character.displayName.ifBlank { - stringResource(R.string.role_avatar_unknown) + stringResource(R.string.ux2_characters_unknown_name) } - val clickLabel = stringResource(R.string.characters_voice_change_content_description) - val moreDescription = stringResource( - R.string.characters_more_content_description, - displayName, - ) val voiceName = character.voiceLabel ?: character.category.takeIf { it.isNotEmpty() } - ?: stringResource(R.string.characters_voice_unassigned) + ?: stringResource(R.string.ux2_characters_voice_unassigned) + val tuneDescription = stringResource(R.string.ux2_characters_tune, displayName) + val moreDescription = stringResource(R.string.ux2_characters_more, displayName) - Card( - modifier = Modifier - .fillMaxWidth() - .clip(shape) - .combinedClickable( - onClickLabel = clickLabel, - onLongClickLabel = stringResource(R.string.action_more), - onLongClick = { menuExpanded = true }, - onClick = onVoiceClick, - ), - shape = shape, - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surface, - ), + ForgeCard( + modifier = Modifier.fillMaxWidth(), + onClick = onVoiceClick, + contentPadding = PaddingValues(MaterialTheme.spacing.md), ) { Row( - modifier = Modifier.padding(start = 16.dp, end = 8.dp, top = 12.dp, bottom = 12.dp), verticalAlignment = Alignment.Top, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - // 名字在右侧可见,头像只做装饰,避免 TalkBack 把同一人物读两遍。 - RoleAvatar(name = displayName, size = 48.dp, decorative = true) - Spacer(Modifier.width(12.dp)) - Column(modifier = Modifier.weight(1f)) { - Row(verticalAlignment = Alignment.CenterVertically) { - Text( - text = displayName, - modifier = Modifier.weight(1f), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) + RoleAvatar(name = displayName, size = 56.dp, decorative = true) + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + Text( + text = displayName, + style = MaterialTheme.typography.titleMediumEmphasized, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ImportanceTag(importance = character.importance) if (character.locked) { - Spacer(Modifier.width(6.dp)) CharacterTag( - text = stringResource(R.string.characters_locked), - container = MaterialTheme.colorScheme.secondaryContainer, - content = MaterialTheme.colorScheme.onSecondaryContainer, + text = stringResource(R.string.ux2_characters_locked), + container = MaterialTheme.colorScheme.tertiaryContainer, + content = MaterialTheme.colorScheme.onTertiaryContainer, + icon = ForgeIcons.Lock, ) } } + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIcon( + icon = ForgeIcons.AudioLines, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource( + R.string.ux2_characters_voice_line, + voiceName, + stringResource(character.gender.labelRes()), + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + } if (character.aliases.isNotEmpty()) { - Spacer(Modifier.height(2.dp)) Text( text = stringResource( - R.string.characters_alias, + R.string.ux2_characters_aliases, character.aliases.joinToString( - stringResource(R.string.characters_alias_separator), + stringResource(R.string.ux2_characters_alias_separator), ), ), style = MaterialTheme.typography.bodySmall, @@ -453,48 +507,7 @@ private fun CharacterCard( overflow = TextOverflow.Ellipsis, ) } - Spacer(Modifier.height(6.dp)) - Row( - horizontalArrangement = Arrangement.spacedBy(6.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - CharacterTag( - text = stringResource(character.gender.labelRes()), - container = MaterialTheme.colorScheme.surfaceVariant, - content = MaterialTheme.colorScheme.onSurfaceVariant, - ) - CharacterTag( - text = stringResource(character.importance.labelRes()), - container = MaterialTheme.colorScheme.surfaceVariant, - content = MaterialTheme.colorScheme.onSurfaceVariant, - ) - if (character.category.isNotEmpty()) { - Text( - text = stringResource( - R.string.characters_category, - character.category, - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - } - } - Spacer(Modifier.height(6.dp)) - Text( - text = stringResource(R.string.characters_voice_current, voiceName), - style = MaterialTheme.typography.bodySmall, - color = if (character.hasVoice) { - MaterialTheme.colorScheme.primary - } else { - MaterialTheme.colorScheme.onSurfaceVariant - }, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) if (character.note.isNotEmpty()) { - Spacer(Modifier.height(2.dp)) Text( text = character.note, style = MaterialTheme.typography.bodySmall, @@ -503,84 +516,116 @@ private fun CharacterCard( overflow = TextOverflow.Ellipsis, ) } + if (character.category.isNotEmpty()) { + CharacterTag( + text = character.category, + container = MaterialTheme.colorScheme.surfaceContainerHigh, + content = MaterialTheme.colorScheme.onSurfaceVariant, + icon = ForgeIcons.Tag, + ) + } } - Column(horizontalAlignment = Alignment.End) { - TextButton( - onClick = onVoiceClick, - modifier = Modifier.heightIn(min = 48.dp), + Box { + ForgeIconAction( + icon = ForgeIcons.More, + contentDescription = moreDescription, + onClick = { menuExpanded = true }, + container = false, + ) + DropdownMenu( + expanded = menuExpanded, + onDismissRequest = { menuExpanded = false }, ) { - Text(stringResource(R.string.characters_voice_change)) - } - Box { - TextButton( - onClick = { menuExpanded = true }, - modifier = Modifier - .heightIn(min = 48.dp) - .semantics { contentDescription = moreDescription }, - ) { - Text(stringResource(R.string.action_more)) - } - CharacterMenu( - expanded = menuExpanded, - onDismiss = { menuExpanded = false }, - onRename = { + DropdownMenuItem( + text = { Text(stringResource(R.string.ux2_characters_menu_rename)) }, + onClick = { menuExpanded = false onRename() }, - onEditAliases = { + leadingIcon = { + ForgeIcon(ForgeIcons.Edit, contentDescription = null) + }, + ) + DropdownMenuItem( + text = { Text(stringResource(R.string.ux2_characters_menu_alias)) }, + onClick = { menuExpanded = false onEditAliases() }, - onTune = { + leadingIcon = { + ForgeIcon(ForgeIcons.Tag, contentDescription = null) + }, + ) + DropdownMenuItem( + text = { Text(stringResource(R.string.ux2_characters_menu_tune)) }, + onClick = { menuExpanded = false onTune() }, - onExclude = { + leadingIcon = { + ForgeIcon(ForgeIcons.Sliders, contentDescription = null) + }, + ) + DropdownMenuItem( + text = { + Text( + text = stringResource(R.string.ux2_characters_menu_exclude), + color = MaterialTheme.colorScheme.error, + ) + }, + onClick = { menuExpanded = false onExclude() }, + leadingIcon = { + ForgeIcon( + icon = ForgeIcons.Trash, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + }, ) } } } + + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgePrimaryAction( + icon = ForgeIcons.AudioLines, + label = stringResource(R.string.ux2_characters_voice_change), + onClick = onVoiceClick, + modifier = Modifier.weight(1f), + ) + ForgeIconAction( + icon = ForgeIcons.Sliders, + contentDescription = tuneDescription, + onClick = onTune, + container = true, + ) + } } } @Composable -private fun CharacterMenu( - expanded: Boolean, - onDismiss: () -> Unit, - onRename: () -> Unit, - onEditAliases: () -> Unit, - onTune: () -> Unit, - onExclude: () -> Unit, -) { - DropdownMenu( - expanded = expanded, - onDismissRequest = onDismiss, - ) { - DropdownMenuItem( - text = { Text(stringResource(R.string.action_rename)) }, - onClick = onRename, - ) - DropdownMenuItem( - text = { Text(stringResource(R.string.characters_action_edit_alias)) }, - onClick = onEditAliases, - ) - DropdownMenuItem( - text = { Text(stringResource(R.string.characters_action_tune)) }, - onClick = onTune, - ) - DropdownMenuItem( - text = { - Text( - text = stringResource(R.string.characters_action_exclude), - color = MaterialTheme.colorScheme.error, - ) - }, - onClick = onExclude, - ) +private fun ImportanceTag(importance: Importance) { + val container = when (importance) { + Importance.Protagonist -> MaterialTheme.colorScheme.primaryContainer + Importance.Supporting -> MaterialTheme.colorScheme.secondaryContainer + Importance.Minor -> MaterialTheme.colorScheme.surfaceContainerHigh + } + val content = when (importance) { + Importance.Protagonist -> MaterialTheme.colorScheme.onPrimaryContainer + Importance.Supporting -> MaterialTheme.colorScheme.onSecondaryContainer + Importance.Minor -> MaterialTheme.colorScheme.onSurfaceVariant } + CharacterTag( + text = stringResource(importance.labelRes()), + container = container, + content = content, + ) } @Composable @@ -588,54 +633,76 @@ private fun CharacterTag( text: String, container: Color, content: Color, + icon: Int? = null, ) { Surface( - shape = RoundedCornerShape(percent = 50), + shape = MaterialTheme.shapes.small, color = container, ) { - Text( - text = text, - modifier = Modifier.padding(horizontal = 8.dp, vertical = 2.dp), - style = MaterialTheme.typography.labelSmall, - color = content, - maxLines = 1, - ) + Row( + modifier = Modifier.padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.xxs, + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { + if (icon != null) { + ForgeIcon( + icon = icon, + contentDescription = null, + modifier = Modifier.size(12.dp), + tint = content, + ) + } + Text( + text = text, + style = MaterialTheme.typography.labelSmall, + color = content, + maxLines = 1, + ) + } } } @Composable -private fun CharactersLoading(modifier: Modifier = Modifier) { - Column( - modifier = modifier, - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center, - ) { - CircularProgressIndicator() - Spacer(Modifier.height(12.dp)) - Text( - text = stringResource(R.string.characters_loading), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) +private fun CharacterLockNote() { + ForgeCard(containerColor = MaterialTheme.colorScheme.tertiaryContainer) { + Row( + verticalAlignment = Alignment.Top, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeIcon( + icon = ForgeIcons.Lock, + contentDescription = null, + modifier = Modifier.size(16.dp), + tint = MaterialTheme.colorScheme.onTertiaryContainer, + ) + Text( + text = stringResource(R.string.ux2_characters_lock_note), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onTertiaryContainer, + ) + } } } -@Composable +@StringRes private fun Gender.labelRes(): Int = when (this) { - Gender.Male -> R.string.characters_gender_male - Gender.Female -> R.string.characters_gender_female - Gender.Unknown -> R.string.characters_gender_unknown + Gender.Male -> R.string.ux2_characters_gender_male + Gender.Female -> R.string.ux2_characters_gender_female + Gender.Unknown -> R.string.ux2_characters_gender_unknown } -@Composable +@StringRes private fun Importance.labelRes(): Int = when (this) { - Importance.Protagonist -> R.string.characters_importance_protagonist - Importance.Supporting -> R.string.characters_importance_supporting - Importance.Minor -> R.string.characters_importance_minor + Importance.Protagonist -> R.string.ux2_characters_importance_protagonist + Importance.Supporting -> R.string.ux2_characters_importance_supporting + Importance.Minor -> R.string.ux2_characters_importance_minor } // --------------------------------------------------------------------------- -// Preview 数据:只用固定非动态色,分别检查正常列表与空态。 +// Preview:正常列表 / 空态(深色 200%)。数据只是固定夹具。 // --------------------------------------------------------------------------- private val previewVoiceLabels: Map = mapOf( @@ -702,9 +769,9 @@ private fun previewCharactersState(): CharactersUiState { ) } -@Preview(name = "Characters", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview(name = "Characters Forge", showBackground = true, backgroundColor = 0xFFF7F9F8) @Composable -private fun CharactersPreview() { +private fun CharactersForgePreview() { AudioForgeTheme(dynamicColor = false) { CharactersScreen( state = previewCharactersState(), @@ -713,20 +780,6 @@ private fun CharactersPreview() { } } -@Preview(name = "Characters Filtered Empty", showBackground = true, backgroundColor = 0xFFF7F8FC) -@Composable -private fun CharactersFilteredEmptyPreview() { - AudioForgeTheme(dynamicColor = false) { - CharactersScreen( - state = previewCharactersState().copy( - query = "不存在的人物", - genderFilter = Gender.Female, - importanceFilter = Importance.Minor, - ), - ) - } -} - @Preview( name = "Characters Empty Dark 200%", showBackground = true, diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/characters/VoicePickerSheet.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/characters/VoicePickerSheet.kt index f85b57e..fe95bc8 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/characters/VoicePickerSheet.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/characters/VoicePickerSheet.kt @@ -1,40 +1,34 @@ +@file:OptIn( + androidx.compose.material3.ExperimentalMaterial3Api::class, + androidx.compose.foundation.layout.ExperimentalLayoutApi::class, +) + package com.estimatefaster.audioforge.feature.characters import android.content.res.Configuration -import androidx.compose.foundation.horizontalScroll +import androidx.annotation.DrawableRes import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.selection.selectable -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilterChip +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.RadioButton import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -42,35 +36,37 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.LiveRegionMode -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.semantics.heading -import androidx.compose.ui.semantics.liveRegion -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R -import com.estimatefaster.audioforge.ui.components.EmptyState +import com.estimatefaster.audioforge.ui.components.RoleAvatar +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeListRow +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSheetHeader import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing +import java.util.Locale /** - * 音色选择 Sheet(P5-05 / 执行计划 §12.4 S09)。 + * 音色选择 Sheet(Forge Framework v1)。 * * 有状态入口:收集 [VoicePickerViewModel.state],把一次性事件转成宿主回调: * - `Assigned` → `onAssigned(roleId, category, voiceId)`,随后关闭 Sheet; * - `Cancelled` → `onDismiss`。 * - * 保存/失败重试/取消/锁定二次确认全部委托给 ViewModel;Composable 不访问数据库。 - * * @param onDismiss 用户取消/下滑/返回时关闭 Sheet * @param onAssigned 保存成功;宿主要据此刷新角色卡 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun VoicePickerSheet( viewModel: VoicePickerViewModel, @@ -116,11 +112,10 @@ fun VoicePickerSheet( } /** - * 无状态 Sheet 内容;Preview 与后续 UI 测试直接渲染它。 + * 无状态 Sheet 内容;Preview 与 UI 测试直接渲染它。 * - * 布局:标题 → 当前音色/锁定提示 → 搜索 → 档位 FilterChip → 按 - * “语言 · 性别”分组的音色列表 → 保存错误 → 取消/保存。 - * 搜索和档位只做内存过滤;locked 角色保存时弹二次确认。 + * 布局对齐 prototype 的 Voice Sheet:固定 Sheet 头 + 角色 hero + 搜索 + 档位 chips + + * 按“语言 · 性别”分组的音色行(ForgeListRow)+ 固定保存栏。锁定角色保存时二次确认。 */ @Composable fun VoicePickerSheetContent( @@ -136,97 +131,129 @@ fun VoicePickerSheetContent( onConfirmLockedSave: () -> Unit = {}, onDismissLockedConfirm: () -> Unit = {}, ) { - LazyColumn( + Column( modifier = modifier .fillMaxWidth() .fillMaxHeight(0.92f) .imePadding() .navigationBarsPadding(), - contentPadding = PaddingValues( - start = 24.dp, - end = 24.dp, - top = 8.dp, - bottom = 24.dp, - ), - verticalArrangement = Arrangement.spacedBy(8.dp), ) { - item(key = "header") { - VoicePickerHeader(state = state, onCancel = onCancel) - } - item(key = "summary") { - CurrentVoiceSummary(state = state) + ForgeSheetHeader( + icon = ForgeIcons.AudioLines, + title = stringResource(R.string.ux2_voice_title), + onClose = onCancel, + subtitle = stringResource(R.string.ux2_voice_subtitle), + modifier = Modifier.padding( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.sm, + top = MaterialTheme.spacing.sm, + bottom = MaterialTheme.spacing.xs, + ), + ) + + VoiceHero( + state = state, + modifier = Modifier.padding( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + bottom = MaterialTheme.spacing.sm, + ), + ) + + if (state.locked) { + VoiceLockNote( + modifier = Modifier.padding( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + bottom = MaterialTheme.spacing.xs, + ), + ) } if (state.hasNoVoices) { - item(key = "empty") { - EmptyState( - title = stringResource(R.string.voice_picker_empty_title), - description = stringResource(R.string.voice_picker_empty_description), - actionText = stringResource(R.string.action_dismiss), + Box( + modifier = Modifier + .fillMaxWidth() + .weight(1f), + ) { + ForgeEmpty( + icon = ForgeIcons.Inbox, + title = stringResource(R.string.ux2_voice_empty_title), + description = stringResource(R.string.ux2_voice_empty_description), + actionIcon = ForgeIcons.Close, + actionLabel = stringResource(R.string.ux2_voice_empty_action), onAction = onCancel, ) } } else { - item(key = "search") { - VoiceSearchField(state = state, onQueryChange = onQueryChange) - } - item(key = "filters") { - VoiceGroupFilterRow( - state = state, - onGenderFilterChange = onGenderFilterChange, - ) - } + VoiceSearchField( + state = state, + onQueryChange = onQueryChange, + modifier = Modifier.padding(horizontal = MaterialTheme.spacing.lg), + ) + VoiceGroupFilters( + state = state, + onGenderFilterChange = onGenderFilterChange, + modifier = Modifier.padding( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + top = MaterialTheme.spacing.sm, + ), + ) - if (state.isFilteredEmpty) { - item(key = "filtered-empty") { - EmptyState( - title = stringResource(R.string.voice_picker_filtered_empty_title), - description = stringResource( - R.string.voice_picker_filtered_empty_description, - ), - actionText = stringResource(R.string.voice_picker_filtered_empty_action), + Box( + modifier = Modifier + .fillMaxWidth() + .weight(1f), + ) { + if (state.isFilteredEmpty) { + ForgeEmpty( + icon = ForgeIcons.Search, + title = stringResource(R.string.ux2_voice_filtered_title), + description = stringResource(R.string.ux2_voice_filtered_description), + actionIcon = ForgeIcons.Refresh, + actionLabel = stringResource(R.string.ux2_voice_filtered_action), onAction = onClearFilters, ) - } - } else { - state.visibleSections.forEach { section -> - item(key = "section:${section.key}") { - VoiceSectionHeader(section = section) - } - items( - items = section.voices, - key = { voice -> voice.category }, - contentType = { _ -> "voice" }, - ) { voice -> - VoiceRow( - voice = voice, - selected = voice.category == state.selectedCategory, - current = voice.category == state.currentCategory, - enabled = !state.saving, - onSelect = { onSelectVoice(voice.category) }, - ) + } else { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + top = MaterialTheme.spacing.xs, + bottom = MaterialTheme.spacing.sm, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + state.visibleSections.forEach { section -> + item(key = "section:${section.key}") { + VoiceSectionHeader(section = section) + } + items( + items = section.voices, + key = { voice -> voice.category }, + contentType = { _ -> "voice" }, + ) { voice -> + VoiceRow( + voice = voice, + selected = voice.category == state.selectedCategory, + current = voice.category == state.currentCategory, + enabled = !state.saving, + onSelect = { onSelectVoice(voice.category) }, + ) + } + } } } } } - state.saveError?.let { message -> - item(key = "save-error") { - VoiceSaveError( - message = message, - enabled = !state.saving, - onRetry = onRetry, - ) - } - } - - item(key = "actions") { - VoiceActions( - state = state, - onCancel = onCancel, - onSave = onSave, - ) - } + VoiceFooter( + state = state, + onSave = onSave, + onRetry = onRetry, + ) } if (state.pendingLockedConfirm) { @@ -239,171 +266,164 @@ fun VoicePickerSheetContent( } @Composable -private fun VoicePickerHeader( +private fun VoiceHero( state: VoicePickerUiState, - onCancel: () -> Unit, + modifier: Modifier = Modifier, ) { val roleName = state.roleName.ifBlank { state.roleId } - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - ) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = stringResource(R.string.voice_picker_title), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource( - R.string.voice_picker_subtitle, - roleName, - state.totalVoiceCount, - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - TextButton( - onClick = onCancel, - enabled = !state.saving, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_cancel)) - } + val currentName = state.currentDisplayName.ifBlank { + stringResource(R.string.ux2_voice_unknown) } -} - -@Composable -private fun CurrentVoiceSummary(state: VoicePickerUiState) { - val rawCurrentName = state.currentDisplayName - val currentName = if (rawCurrentName.isBlank()) { - stringResource(R.string.characters_voice_unassigned) - } else { - rawCurrentName - } - val rawCurrentCategory = state.currentCategory - val currentCategory = if (rawCurrentCategory.isBlank()) { - stringResource(R.string.characters_voice_unassigned) - } else { - rawCurrentCategory - } - val rawCurrentVoiceId = state.currentDisplayVoiceId - val currentVoiceId = if (rawCurrentVoiceId.isBlank()) { - stringResource(R.string.voice_picker_unknown_voice_id) - } else { - rawCurrentVoiceId + val currentCategory = state.currentCategory.ifBlank { + stringResource(R.string.ux2_voice_unknown) } - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surfaceVariant, - ), + ForgeCard( + modifier = modifier.fillMaxWidth(), + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh, ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - Row(verticalAlignment = Alignment.CenterVertically) { + RoleAvatar(name = roleName, size = 48.dp, decorative = true) + Column(modifier = Modifier.weight(1f)) { Text( - text = stringResource(R.string.voice_picker_current, currentName), - modifier = Modifier.weight(1f), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + text = stringResource(R.string.ux2_voice_hero_title, roleName), + style = MaterialTheme.typography.titleSmallEmphasized, maxLines = 2, overflow = TextOverflow.Ellipsis, ) - if (state.locked) { - Spacer(Modifier.width(8.dp)) - VoiceTag( - text = stringResource(R.string.characters_locked), - container = MaterialTheme.colorScheme.secondaryContainer, - content = MaterialTheme.colorScheme.onSecondaryContainer, - ) - } - } - Text( - text = stringResource(R.string.characters_category, currentCategory), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Text( - text = stringResource(R.string.voice_picker_voice_id, currentVoiceId), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - fontFamily = FontFamily.Monospace, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - if (state.locked) { Text( - text = stringResource(R.string.voice_picker_locked_warning), + text = stringResource( + R.string.ux2_voice_hero_subtitle, + currentName, + currentCategory, + ), style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + } + if (state.locked) { + VoiceTag( + text = stringResource(R.string.ux2_voice_locked), + container = MaterialTheme.colorScheme.tertiaryContainer, + content = MaterialTheme.colorScheme.onTertiaryContainer, + icon = ForgeIcons.Lock, + ) + } else { + VoiceTag( + text = stringResource(R.string.ux2_voice_unlocked), + container = MaterialTheme.colorScheme.primaryContainer, + content = MaterialTheme.colorScheme.onPrimaryContainer, + icon = ForgeIcons.Check, ) } } } } +@Composable +private fun VoiceLockNote(modifier: Modifier = Modifier) { + Row( + modifier = modifier + .fillMaxWidth() + .padding(vertical = MaterialTheme.spacing.xs), + verticalAlignment = Alignment.Top, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIcon( + icon = ForgeIcons.Lock, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = MaterialTheme.colorScheme.tertiary, + ) + Text( + text = stringResource(R.string.ux2_voice_locked_note), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } +} + @Composable private fun VoiceSearchField( state: VoicePickerUiState, onQueryChange: (String) -> Unit, + modifier: Modifier = Modifier, ) { OutlinedTextField( value = state.query, onValueChange = onQueryChange, - modifier = Modifier.fillMaxWidth(), + modifier = modifier.fillMaxWidth(), enabled = !state.saving, - label = { Text(stringResource(R.string.voice_picker_search_label)) }, - placeholder = { Text(stringResource(R.string.voice_picker_search_placeholder)) }, singleLine = true, - trailingIcon = { - if (state.query.isNotEmpty()) { - TextButton( + shape = MaterialTheme.shapes.extraLarge, + leadingIcon = { + ForgeIcon( + icon = ForgeIcons.Search, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + }, + trailingIcon = if (state.query.isNotEmpty()) { + { + IconButton( onClick = { onQueryChange("") }, enabled = !state.saving, - modifier = Modifier.heightIn(min = 48.dp), + modifier = Modifier.size(48.dp), ) { - Text(stringResource(R.string.voice_picker_search_clear)) + ForgeIcon( + icon = ForgeIcons.Close, + contentDescription = stringResource(R.string.ux2_voice_search_clear), + ) } } + } else { + null + }, + placeholder = { + Text( + text = stringResource(R.string.ux2_voice_search_hint), + style = MaterialTheme.typography.bodyMedium, + ) }, ) } @Composable -private fun VoiceGroupFilterRow( +private fun VoiceGroupFilters( state: VoicePickerUiState, onGenderFilterChange: (VoiceGenderGroup?) -> Unit, + modifier: Modifier = Modifier, ) { - Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Column( + modifier = modifier, + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { Text( - text = stringResource(R.string.voice_picker_group_label), + text = stringResource(R.string.ux2_voice_group_label), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - Row( - modifier = Modifier - .fillMaxWidth() - .horizontalScroll(rememberScrollState()), - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalAlignment = Alignment.CenterVertically, + FlowRow( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - FilterChip( + ForgeChip( + label = stringResource(R.string.ux2_voice_group_all), selected = state.genderFilter == null, - onClick = { onGenderFilterChange(null) }, - enabled = !state.saving, - label = { Text(stringResource(R.string.voice_picker_group_all)) }, + onClick = { if (!state.saving) onGenderFilterChange(null) }, + icon = ForgeIcons.AudioLines, ) state.availableGroups.forEach { group -> - FilterChip( + ForgeChip( + label = group.label(), selected = state.genderFilter == group, - onClick = { onGenderFilterChange(group) }, - enabled = !state.saving, - label = { Text(group.label()) }, + onClick = { if (!state.saving) onGenderFilterChange(group) }, + icon = group.icon(), ) } } @@ -412,18 +432,28 @@ private fun VoiceGroupFilterRow( @Composable private fun VoiceSectionHeader(section: VoiceSectionUi) { - Text( - text = stringResource( - R.string.voice_picker_section_header, - localeLabel(section.locale), - section.gender.label(), - ), + Row( modifier = Modifier - .padding(top = 8.dp) - .semantics { heading() }, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) + .fillMaxWidth() + .padding(top = MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIcon( + icon = ForgeIcons.Mic, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource( + R.string.ux2_voice_section_header, + localeLabel(section.locale), + section.gender.label(), + ), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + } } @Composable @@ -434,103 +464,88 @@ private fun VoiceRow( enabled: Boolean, onSelect: () -> Unit, ) { - val rawLabel = voice.displayLabel - val label = if (rawLabel.isBlank()) { - stringResource(R.string.voice_picker_unknown_label) - } else { - rawLabel + val label = voice.displayLabel.ifBlank { + stringResource(R.string.ux2_voice_unknown) } - val rawVoiceId = voice.displayVoiceId - val voiceId = if (rawVoiceId.isBlank()) { - stringResource(R.string.voice_picker_unknown_voice_id) - } else { - rawVoiceId + val selectionDescription = stringResource( + if (selected) R.string.ux2_voice_selected else R.string.ux2_voice_select, + label, + ) + + ForgeListRow( + icon = ForgeIcons.AudioLines, + title = label, + subtitle = voiceSubtitle(voice), + trailingText = if (current) stringResource(R.string.ux2_voice_current) else null, + trailingIcon = if (selected) ForgeIcons.Check else ForgeIcons.Circle, + trailingDescription = selectionDescription, + onTrailingClick = { if (enabled) onSelect() }, + onClick = { if (enabled) onSelect() }, + ) +} + +@Composable +private fun voiceSubtitle(voice: VoiceCategoryUi): String { + val voiceId = voice.displayVoiceId.ifBlank { + stringResource(R.string.ux2_voice_unknown_id) } val note = voice.note?.trim().orEmpty() + val speed = voice.speed?.let { value -> + stringResource(R.string.ux2_voice_speed, formatSpeed(value)) + } + val extra = note.ifBlank { speed.orEmpty() } + return if (extra.isBlank()) { + voiceId + } else { + stringResource(R.string.ux2_voice_row_subtitle, voiceId, extra) + } +} - Card( +@Composable +private fun VoiceFooter( + state: VoicePickerUiState, + onSave: () -> Unit, + onRetry: () -> Unit, +) { + Column( modifier = Modifier .fillMaxWidth() - .selectable( - selected = selected, - enabled = enabled, - role = Role.RadioButton, - onClick = onSelect, + .padding( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + top = MaterialTheme.spacing.sm, + bottom = MaterialTheme.spacing.lg, ), - colors = CardDefaults.cardColors( - containerColor = if (selected) { - MaterialTheme.colorScheme.secondaryContainer - } else { - MaterialTheme.colorScheme.surface - }, - ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - Row( - modifier = Modifier.padding(start = 8.dp, end = 12.dp, top = 8.dp, bottom = 8.dp), - verticalAlignment = Alignment.Top, - ) { - RadioButton( - selected = selected, - onClick = null, - enabled = enabled, + state.saveError?.let { message -> + VoiceSaveError( + message = message, + enabled = !state.saving, + onRetry = onRetry, + ) + } + if (state.hasSelection && state.isSameAsCurrent) { + Text( + text = stringResource(R.string.ux2_voice_same), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) - Spacer(Modifier.width(4.dp)) - Column( - modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.spacedBy(2.dp), - ) { - Row(verticalAlignment = Alignment.CenterVertically) { - Text( - text = label, - modifier = Modifier.weight(1f), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - if (current) { - Spacer(Modifier.width(6.dp)) - VoiceTag( - text = stringResource(R.string.voice_picker_current_badge), - container = MaterialTheme.colorScheme.primaryContainer, - content = MaterialTheme.colorScheme.onPrimaryContainer, - ) - } - } - Text( - text = voice.category, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - fontFamily = FontFamily.Monospace, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - Text( - text = stringResource(R.string.voice_picker_voice_id, voiceId), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - fontFamily = FontFamily.Monospace, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - if (note.isNotEmpty()) { - Text( - text = note, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - } - voice.speed?.let { speed -> - Text( - text = stringResource(R.string.voice_picker_speed, speed), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - } } + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = stringResource( + when { + state.saving -> R.string.ux2_voice_saving + state.saveError != null -> R.string.ux2_voice_retry + else -> R.string.ux2_voice_save + }, + ), + onClick = onSave, + modifier = Modifier.fillMaxWidth(), + enabled = state.canSave, + loading = state.saving, + ) } } @@ -540,84 +555,21 @@ private fun VoiceSaveError( enabled: Boolean, onRetry: () -> Unit, ) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer, - ), + ForgeCard( + containerColor = MaterialTheme.colorScheme.errorContainer, + contentPadding = PaddingValues(MaterialTheme.spacing.md), ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), - ) { - Text( - text = stringResource(R.string.action_save_error, message), - modifier = Modifier.semantics { - liveRegion = LiveRegionMode.Polite - }, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onErrorContainer, - ) - TextButton( - onClick = onRetry, - enabled = enabled, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_retry)) - } - } - } -} - -@Composable -private fun VoiceActions( - state: VoicePickerUiState, - onCancel: () -> Unit, - onSave: () -> Unit, -) { - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - if (state.hasSelection && state.isSameAsCurrent) { - Text( - text = stringResource(R.string.voice_picker_same_as_current), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { - OutlinedButton( - onClick = onCancel, - enabled = !state.saving, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_cancel)) - } - Button( - onClick = onSave, - enabled = state.canSave, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - if (state.saving) { - CircularProgressIndicator( - modifier = Modifier.size(18.dp), - strokeWidth = 2.dp, - ) - Spacer(Modifier.width(8.dp)) - Text(stringResource(R.string.action_saving)) - } else { - Text( - text = if (state.saveError != null) { - stringResource(R.string.action_retry) - } else { - stringResource(R.string.voice_picker_save) - }, - ) - } - } - } + Text( + text = stringResource(R.string.ux2_voice_save_error, message), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.ux2_voice_retry), + onClick = onRetry, + enabled = enabled, + ) } } @@ -628,24 +580,32 @@ private fun LockedVoiceConfirmDialog( onDismiss: () -> Unit, ) { AlertDialog( - onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.voice_picker_locked_confirm_title)) }, - text = { Text(stringResource(R.string.voice_picker_locked_confirm_message)) }, + onDismissRequest = { if (!saving) onDismiss() }, + shape = MaterialTheme.shapes.extraLarge, + icon = { + ForgeIcon( + icon = ForgeIcons.Lock, + contentDescription = null, + tint = MaterialTheme.colorScheme.tertiary, + ) + }, + title = { Text(stringResource(R.string.ux2_voice_locked_confirm_title)) }, + text = { Text(stringResource(R.string.ux2_voice_locked_confirm_message)) }, confirmButton = { - TextButton( + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = stringResource(R.string.ux2_voice_locked_confirm_action), onClick = onConfirm, enabled = !saving, - ) { - Text(stringResource(R.string.voice_picker_locked_confirm_action)) - } + ) }, dismissButton = { - TextButton( + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.ux2_voice_cancel), onClick = onDismiss, enabled = !saving, - ) { - Text(stringResource(R.string.action_cancel)) - } + ) }, ) } @@ -653,42 +613,69 @@ private fun LockedVoiceConfirmDialog( @Composable private fun VoiceTag( text: String, - container: androidx.compose.ui.graphics.Color, - content: androidx.compose.ui.graphics.Color, + container: Color, + content: Color, + @DrawableRes icon: Int? = null, ) { Surface( - shape = RoundedCornerShape(percent = 50), + shape = MaterialTheme.shapes.small, color = container, ) { - Text( - text = text, - modifier = Modifier.padding(horizontal = 8.dp, vertical = 2.dp), - style = MaterialTheme.typography.labelSmall, - color = content, - maxLines = 1, - ) + Row( + modifier = Modifier.padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.xxs, + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { + if (icon != null) { + ForgeIcon( + icon = icon, + contentDescription = null, + modifier = Modifier.size(12.dp), + tint = content, + ) + } + Text( + text = text, + style = MaterialTheme.typography.labelSmall, + color = content, + maxLines = 1, + ) + } } } @Composable private fun localeLabel(locale: String): String = when (locale.trim().lowercase()) { - "zh", "zh-cn", "zh_cn" -> stringResource(R.string.voice_picker_locale_zh_cn) + "zh", "zh-cn", "zh_cn" -> stringResource(R.string.ux2_voice_locale_zh) else -> locale } @Composable private fun VoiceGenderGroup.label(): String = stringResource( when (this) { - VoiceGenderGroup.Narrator -> R.string.voice_picker_group_narrator - VoiceGenderGroup.Male -> R.string.voice_picker_group_male - VoiceGenderGroup.Female -> R.string.voice_picker_group_female - VoiceGenderGroup.Other -> R.string.voice_picker_group_other + VoiceGenderGroup.Narrator -> R.string.ux2_voice_group_narrator + VoiceGenderGroup.Male -> R.string.ux2_voice_group_male + VoiceGenderGroup.Female -> R.string.ux2_voice_group_female + VoiceGenderGroup.Other -> R.string.ux2_voice_group_other }, ) +@DrawableRes +private fun VoiceGenderGroup.icon(): Int = when (this) { + VoiceGenderGroup.Narrator -> ForgeIcons.BookOpen + VoiceGenderGroup.Male -> ForgeIcons.UserRound + VoiceGenderGroup.Female -> ForgeIcons.UserRound + VoiceGenderGroup.Other -> ForgeIcons.Mic +} + +private fun formatSpeed(value: Double): String = + String.format(Locale.ROOT, "%.2f", value).trimEnd('0').trimEnd('.') + // --------------------------------------------------------------------------- -// Preview:正常(未锁定)/ 已锁定 / 搜索无结果 / 深色 200%。 -// 预览数据只是固定夹具;所有 UI 文案来自 strings.xml。 +// Preview:正常(未锁定)/ 已锁定 / 搜索无结果(深色 200%)。 // --------------------------------------------------------------------------- private fun previewVoices(): List = listOf( @@ -709,11 +696,6 @@ private fun previewVoices(): List = listOf( note = "样音语速偏慢,已默认按 1.15 倍速合成", speed = 1.15, ), - VoiceCategoryUi( - category = "male_villain", - label = "【反派】中年·阴狠威压", - voiceId = "voice-male-villain", - ), VoiceCategoryUi( category = "female_lead_gentle", label = "【女主】清冷温柔", @@ -724,11 +706,6 @@ private fun previewVoices(): List = listOf( label = "【女配/女主】青年女性·傲娇知性", voiceId = "voice-female-young", ), - VoiceCategoryUi( - category = "female_child_1", - label = "【女童】明亮清脆", - voiceId = "voice-female-child", - ), VoiceCategoryUi( category = "male_elder", label = "【老年】苍劲·不限身份", @@ -736,7 +713,7 @@ private fun previewVoices(): List = listOf( ), ) -private fun previewState( +private fun previewVoiceState( locked: Boolean = false, query: String = "", selectedCategory: String? = "male_brother", @@ -752,68 +729,39 @@ private fun previewState( selectedCategory = selectedCategory, ).copy(pendingLockedConfirm = pendingLockedConfirm) -@Preview(name = "VoicePicker Normal", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview(name = "VoicePicker Forge", showBackground = true, backgroundColor = 0xFFF7F9F8) @Composable -private fun VoicePickerNormalPreview() { +private fun VoicePickerForgePreview() { AudioForgeTheme(dynamicColor = false) { Surface { - VoicePickerSheetContent(state = previewState()) + VoicePickerSheetContent(state = previewVoiceState()) } } } -@Preview(name = "VoicePicker Locked", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview( + name = "VoicePicker Locked Dark 200%", + showBackground = true, + uiMode = Configuration.UI_MODE_NIGHT_YES, + fontScale = 2f, +) @Composable private fun VoicePickerLockedPreview() { - AudioForgeTheme(dynamicColor = false) { + AudioForgeTheme(darkTheme = true, dynamicColor = false) { Surface { - VoicePickerSheetContent(state = previewState(locked = true)) + VoicePickerSheetContent(state = previewVoiceState(locked = true)) } } } -@Preview(name = "VoicePicker Locked Confirm", showBackground = true, backgroundColor = 0xFFF7F8FC) -@Composable -private fun VoicePickerLockedConfirmPreview() { - AudioForgeTheme(dynamicColor = false) { - Surface { - VoicePickerSheetContent( - state = previewState(locked = true, pendingLockedConfirm = true), - ) - } - } -} - -@Preview( - name = "VoicePicker No Results", - showBackground = true, - backgroundColor = 0xFFF7F8FC, -) +@Preview(name = "VoicePicker No Results", showBackground = true, backgroundColor = 0xFFF7F9F8) @Composable private fun VoicePickerNoResultsPreview() { AudioForgeTheme(dynamicColor = false) { Surface { VoicePickerSheetContent( - state = previewState( - query = "不存在的声音", - selectedCategory = null, - ), + state = previewVoiceState(query = "不存在的声音", selectedCategory = null), ) } } } - -@Preview( - name = "VoicePicker Dark 200%", - showBackground = true, - uiMode = Configuration.UI_MODE_NIGHT_YES, - fontScale = 2f, -) -@Composable -private fun VoicePickerDarkPreview() { - AudioForgeTheme(darkTheme = true, dynamicColor = false) { - Surface { - VoicePickerSheetContent(state = previewState()) - } - } -} diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/export/ExportSheet.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/export/ExportSheet.kt index 539bf33..e5e3333 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/export/ExportSheet.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/export/ExportSheet.kt @@ -1,38 +1,33 @@ +@file:OptIn( + androidx.compose.foundation.layout.ExperimentalLayoutApi::class, + androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class, +) + package com.estimatefaster.audioforge.feature.export import android.net.Uri +import androidx.annotation.DrawableRes import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.Checkbox -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.SegmentedButton -import androidx.compose.material3.SegmentedButtonDefaults import androidx.compose.material3.SheetValue -import androidx.compose.material3.SingleChoiceSegmentedButtonRow import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -42,12 +37,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.LiveRegionMode -import androidx.compose.ui.semantics.clearAndSetSemantics +import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.liveRegion -import androidx.compose.ui.semantics.selected import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.stateDescription -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview @@ -55,13 +47,24 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.ui.components.AdaptiveFieldRow -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorState -import com.estimatefaster.audioforge.ui.components.SectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeSheetHeader +import com.estimatefaster.audioforge.ui.forge.ForgeWavyProgress import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing +import kotlin.math.roundToInt /** - * 导出/分享 Sheet(P5-11 / 执行计划 §12.4 S13、§15 P5-11)。 + * 导出/分享 Sheet(P5-11 / 执行计划 §12.4 S13、§15 P5-11,UX v2 重设计)。 * * 有状态入口:收集 [ExportViewModel.state] 后委托给 [ExportSheetContent]。导出中禁止 * 下滑/返回关闭([ExportViewModel.cancel] 是唯一出口,避免半途丢进度);完成后把成功 @@ -117,12 +120,13 @@ fun ExportSheet( /** * 无状态 Sheet 内容;Preview 与 UI 测试直接渲染它。 * - * 布局按阶段切换: - * - 选择:范围控件 → 起止章输入(仅起止范围)→ 章节列表(时长/体积)→ 汇总 → 开始; - * - 导出中:进度条 x/y → 当前章名 → 成功/失败计数 → 取消; - * - 结果:成功列表 → 失败列表与重试 → 分享/完成。 + * 布局对应 `docs/prototype/forge-framework.html` 的 Export Sheet: + * - 选择:导出范围 chips → 起止章输入(仅起止范围)→ 章节列表 → 预估 → 开始导出; + * - 导出中:Wavy 进度 → 百分比 / 当前章 / 成功失败计数 → 取消; + * - 结果:成功文件 / 失败列表与重试 → 完成 / 分享。 * - * 加载、加载失败与“无已完成章节”空态优先于阶段内容;文案全部来自 `strings.xml`。 + * 加载、加载失败与“无已完成章节”空态优先于阶段内容;文案全部来自字符串资源。 + * 所有按钮都是「Lucide 图标 + 文案」或纯图标操作,没有无图标可点击文字。 */ @Composable fun ExportSheetContent( @@ -144,26 +148,40 @@ fun ExportSheetContent( .fillMaxWidth() .navigationBarsPadding() .verticalScroll(rememberScrollState()) - .padding(horizontal = 24.dp) - .padding(top = 8.dp, bottom = 24.dp), - verticalArrangement = Arrangement.spacedBy(16.dp), + .padding(horizontal = MaterialTheme.spacing.xl) + .padding(top = MaterialTheme.spacing.sm, bottom = MaterialTheme.spacing.xl), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.lg), ) { - ExportHeader() + ForgeSheetHeader( + icon = ForgeIcons.Download, + title = stringResource(R.string.export_sheet_title), + subtitle = stringResource(R.string.export_sheet_subtitle), + onClose = onDismiss, + ) when { - state.loading -> ExportLoading() - loadError != null -> ErrorState( - message = stringResource(R.string.export_load_error, loadError), - retryText = stringResource(R.string.export_action_retry_load), - onRetry = onRetryLoad, - ) + state.loading -> SheetStateBox { + ForgeLoading(label = stringResource(R.string.export_loading)) + } - state.isEmpty -> EmptyState( - title = stringResource(R.string.export_empty_title), - description = stringResource(R.string.export_empty_description), - actionText = stringResource(R.string.export_action_retry_load), - onAction = onRetryLoad, - ) + loadError != null -> SheetStateBox { + ForgeError( + message = stringResource(R.string.export_load_error, loadError), + onRetry = onRetryLoad, + retryLabel = stringResource(R.string.export_action_retry_load), + ) + } + + state.isEmpty -> SheetStateBox { + ForgeEmpty( + icon = ForgeIcons.Inbox, + title = stringResource(R.string.export_empty_title), + description = stringResource(R.string.export_empty_description), + actionIcon = ForgeIcons.Refresh, + actionLabel = stringResource(R.string.export_action_retry_load), + onAction = onRetryLoad, + ) + } else -> when (state.phase) { ExportPhase.Selection -> SelectionSection( @@ -191,42 +209,19 @@ fun ExportSheetContent( } } +/** 空/载入/错误态在可滚动 Sheet 里给一个稳定的最小高度,避免居中内容塌陷。 */ @Composable -private fun ExportHeader() { - Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text( - text = stringResource(R.string.export_sheet_title), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource(R.string.export_sheet_subtitle), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } -} - -@Composable -private fun ExportLoading() { - Row( +private fun SheetStateBox(content: @Composable () -> Unit) { + Box( modifier = Modifier .fillMaxWidth() - .padding(vertical = 24.dp), - horizontalArrangement = Arrangement.Center, - verticalAlignment = Alignment.CenterVertically, + .heightIn(min = 280.dp), + contentAlignment = Alignment.Center, ) { - CircularProgressIndicator() - Spacer(Modifier.width(12.dp)) - Text( - text = stringResource(R.string.export_loading), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) + content() } } -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun SelectionSection( state: ExportUiState, @@ -236,7 +231,7 @@ private fun SelectionSection( onStart: () -> Unit, onDismiss: () -> Unit, ) { - SectionHeader( + ForgeSectionHeader( title = stringResource(R.string.export_range_title), subtitle = stringResource(R.string.export_range_subtitle), ) @@ -256,12 +251,10 @@ private fun SelectionSection( selectionError != ExportValidationError.NoChapters && selectionError != ExportValidationError.NoCompleted ) { - ValidationCard( - message = selectionMessage(selectionError, state.chapters.size), - ) + ValidationCard(message = selectionMessage(selectionError, state.chapters.size)) } - SectionHeader( + ForgeSectionHeader( title = stringResource(R.string.export_list_title), subtitle = stringResource( R.string.export_list_subtitle, @@ -270,11 +263,16 @@ private fun SelectionSection( ), ) val selectedIds = state.selectedChapters.map { it.chapterIdx }.toSet() - state.chapters.take(MAX_LIST_ROWS).forEach { chapter -> - ChapterRow( - chapter = chapter, - selected = chapter.chapterIdx in selectedIds, - ) + ForgeCard( + modifier = Modifier.fillMaxWidth(), + contentPadding = PaddingValues(MaterialTheme.spacing.sm), + ) { + state.chapters.take(MAX_LIST_ROWS).forEach { chapter -> + ChapterRow( + chapter = chapter, + selected = chapter.chapterIdx in selectedIds, + ) + } } if (state.chapters.size > MAX_LIST_ROWS) { Text( @@ -290,47 +288,42 @@ private fun SelectionSection( ExportSummaryCard(state) - Button( + val startLabel = if (state.selectedCount > 0) { + stringResource(R.string.export_action_start_count, state.selectedCount) + } else { + stringResource(R.string.export_action_start) + } + ForgePrimaryAction( + icon = ForgeIcons.Download, + label = startLabel, onClick = onStart, + modifier = Modifier.fillMaxWidth(), enabled = state.canStart, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text( - text = if (state.selectedCount > 0) { - stringResource(R.string.export_action_start_count, state.selectedCount) - } else { - stringResource(R.string.export_action_start) - }, - ) - } - TextButton( + ) + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.export_action_close), onClick = onDismiss, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.export_action_close)) - } + modifier = Modifier.fillMaxWidth(), + ) } -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun RangeSelector( range: ExportRange, onRangeChange: (ExportRange) -> Unit, ) { - SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth()) { - ExportRange.entries.forEachIndexed { index, candidate -> - SegmentedButton( + FlowRow( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ExportRange.entries.forEach { candidate -> + ForgeChip( + label = stringResource(candidate.labelRes()), selected = range == candidate, onClick = { onRangeChange(candidate) }, - shape = SegmentedButtonDefaults.itemShape( - index = index, - count = ExportRange.entries.size, - ), - label = { Text(stringResource(candidate.labelRes())) }, + icon = candidate.iconRes(), ) } } @@ -348,7 +341,7 @@ private fun RangeFields( val endInvalid = error == ExportValidationError.InvalidEnd || error == ExportValidationError.StartAfterEnd - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { AdaptiveFieldRow( { OutlinedTextField( @@ -356,6 +349,7 @@ private fun RangeFields( onValueChange = onStartTextChange, label = { Text(stringResource(R.string.export_range_start)) }, singleLine = true, + shape = MaterialTheme.shapes.large, isError = startInvalid, keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), modifier = Modifier.fillMaxWidth(), @@ -367,6 +361,7 @@ private fun RangeFields( onValueChange = onEndTextChange, label = { Text(stringResource(R.string.export_range_end)) }, singleLine = true, + shape = MaterialTheme.shapes.large, isError = endInvalid, keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), modifier = Modifier.fillMaxWidth(), @@ -397,25 +392,42 @@ private fun ChapterRow( stringResource(R.string.export_value_unknown) } val notReadyLabel = stringResource(R.string.export_chapter_not_ready) + val selectedLabel = stringResource(R.string.ux_v2_export_chapter_selected) + val leadingColor = if (selected) { + MaterialTheme.colorScheme.secondaryContainer + } else { + MaterialTheme.colorScheme.surfaceContainerHigh + } + val leadingTint = if (selected) { + MaterialTheme.colorScheme.onSecondaryContainer + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } Row( modifier = Modifier .fillMaxWidth() - .padding(vertical = 4.dp) - .semantics(mergeDescendants = true) { - this.selected = selected - if (!chapter.audioDone) { - stateDescription = notReadyLabel - } - }, + .padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.sm, + ), verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(8.dp), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - Checkbox( - checked = selected, - onCheckedChange = null, - modifier = Modifier.clearAndSetSemantics { }, - ) + Surface( + modifier = Modifier.size(40.dp), + shape = MaterialTheme.shapes.medium, + color = leadingColor, + contentColor = leadingTint, + ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon( + icon = if (chapter.audioDone) ForgeIcons.FileText else ForgeIcons.Clock, + contentDescription = null, + tint = leadingTint, + ) + } + } Column(modifier = Modifier.weight(1f)) { Text( text = chapter.title, @@ -424,69 +436,107 @@ private fun ChapterRow( overflow = TextOverflow.Ellipsis, ) Text( - text = stringResource(R.string.export_chapter_meta, chapter.number, duration, size), + text = stringResource( + R.string.export_chapter_meta, + chapter.number, + duration, + size, + ), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) } if (!chapter.audioDone) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) Text( text = notReadyLabel, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.error, ) + } else if (selected) { + ForgeIcon( + icon = ForgeIcons.CheckCircle, + contentDescription = selectedLabel, + tint = MaterialTheme.colorScheme.primary, + ) } } } @Composable private fun ExportSummaryCard(state: ExportUiState) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surface, - ), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + ForgeCard(modifier = Modifier.fillMaxWidth()) { + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + verticalAlignment = Alignment.Top, ) { - Text( - text = stringResource(R.string.export_summary_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = if (state.selectedCount > 0) { - stringResource( - R.string.export_summary, - state.selectedCount, - formatExportDuration(state.selectedDurationMs), - formatExportFileSize(state.selectedSizeBytes), + Surface( + modifier = Modifier.size(44.dp), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.tertiaryContainer, + contentColor = MaterialTheme.colorScheme.onTertiaryContainer, + ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon( + icon = ForgeIcons.Storage, + contentDescription = null, + tint = MaterialTheme.colorScheme.onTertiaryContainer, ) - } else { - stringResource(R.string.export_summary_empty) - }, - style = MaterialTheme.typography.bodyMedium, - ) + } + } + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { + Text( + text = stringResource(R.string.export_summary_title), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + Text( + text = if (state.selectedCount > 0) { + stringResource( + R.string.export_summary, + state.selectedCount, + formatExportDuration(state.selectedDurationMs), + formatExportFileSize(state.selectedSizeBytes), + ) + } else { + stringResource(R.string.export_summary_empty) + }, + style = MaterialTheme.typography.bodyMedium, + ) + } } } } @Composable private fun ValidationCard(message: String) { - Card( + ForgeCard( modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer, - ), + containerColor = MaterialTheme.colorScheme.errorContainer, + contentPadding = PaddingValues(MaterialTheme.spacing.md), ) { - Text( - text = message, - modifier = Modifier.padding(16.dp), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onErrorContainer, - ) + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) + Text( + text = message, + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + } } } @@ -495,7 +545,7 @@ private fun ExportingSection( state: ExportUiState, onCancel: () -> Unit, ) { - SectionHeader( + ForgeSectionHeader( title = stringResource(R.string.export_progress_title), subtitle = stringResource( R.string.export_progress_count, @@ -503,46 +553,107 @@ private fun ExportingSection( state.total, ), ) - LinearProgressIndicator( - progress = { state.progress }, - modifier = Modifier - .fillMaxWidth() - .height(6.dp) - .semantics { liveRegion = LiveRegionMode.Polite }, + val percentLabel = stringResource( + R.string.ux_v2_export_progress_percent, + (state.progress * 100).roundToInt(), ) - val currentTitle = state.currentChapterTitle - if (currentTitle != null) { - Text( - text = stringResource(R.string.export_progress_current, currentTitle), - style = MaterialTheme.typography.bodyMedium, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - } - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { - Text( - text = stringResource(R.string.export_progress_succeeded, state.succeeded.size), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Text( - text = stringResource(R.string.export_progress_failed, state.failures.size), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + ForgeCard(modifier = Modifier.fillMaxWidth()) { + FlowRow( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + Text( + text = percentLabel, + style = MaterialTheme.typography.headlineSmallEmphasized, + color = MaterialTheme.colorScheme.primary, + ) + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + verticalAlignment = Alignment.CenterVertically, + ) { + CountLabel( + icon = ForgeIcons.CheckCircle, + text = stringResource(R.string.export_progress_succeeded, state.succeeded.size), + tint = MaterialTheme.colorScheme.primary, + ) + CountLabel( + icon = ForgeIcons.AlertCircle, + text = stringResource(R.string.export_progress_failed, state.failures.size), + tint = MaterialTheme.colorScheme.error, + ) + } + } + ForgeWavyProgress( + progress = state.progress, + modifier = Modifier + .fillMaxWidth() + .semantics { + contentDescription = percentLabel + liveRegion = LiveRegionMode.Polite + }, ) + val currentTitle = state.currentChapterTitle + if (currentTitle != null) { + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.AudioLines, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource(R.string.export_progress_current, currentTitle), + style = MaterialTheme.typography.bodyMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + } + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, + ) { + ForgeIcon( + icon = ForgeIcons.Info, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = stringResource(R.string.export_cancel_note), + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } - Text( - text = stringResource(R.string.export_cancel_note), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - OutlinedButton( + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.export_action_cancel_export), onClick = onCancel, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), + modifier = Modifier.fillMaxWidth(), + danger = true, + ) +} + +@Composable +private fun CountLabel( + @DrawableRes icon: Int, + text: String, + tint: androidx.compose.ui.graphics.Color, +) { + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + verticalAlignment = Alignment.CenterVertically, ) { - Text(stringResource(R.string.export_action_cancel_export)) + ForgeIcon(icon = icon, contentDescription = null, tint = tint) + Text( + text = text, + style = MaterialTheme.typography.labelMedium, + color = tint, + ) } } @@ -553,7 +664,7 @@ private fun ResultSection( onShare: (List) -> Unit, onDismiss: () -> Unit, ) { - SectionHeader( + ForgeSectionHeader( title = stringResource(R.string.export_result_title), subtitle = stringResource( R.string.export_result_summary, @@ -563,26 +674,52 @@ private fun ResultSection( ) if (state.cancelled) { - Card( + ForgeCard( modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.secondaryContainer, - ), + containerColor = MaterialTheme.colorScheme.secondaryContainer, + contentPadding = PaddingValues(MaterialTheme.spacing.md), ) { - Text( - text = stringResource(R.string.export_result_cancelled), - modifier = Modifier.padding(16.dp), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSecondaryContainer, - ) + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.Info, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, + ) + Text( + text = stringResource(R.string.export_result_cancelled), + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSecondaryContainer, + ) + } } } - Text( - text = stringResource(R.string.export_result_success_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.CheckCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource(R.string.export_result_success_title), + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + Text( + text = stringResource(R.string.ux_v2_export_result_files_count, state.succeeded.size), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + if (state.succeeded.isEmpty()) { Text( text = stringResource(R.string.export_result_no_success), @@ -590,8 +727,13 @@ private fun ResultSection( color = MaterialTheme.colorScheme.onSurfaceVariant, ) } else { - state.succeeded.take(MAX_LIST_ROWS).forEach { file -> - ExportedFileRow(file) + ForgeCard( + modifier = Modifier.fillMaxWidth(), + contentPadding = PaddingValues(MaterialTheme.spacing.sm), + ) { + state.succeeded.take(MAX_LIST_ROWS).forEach { file -> + ExportedFileRow(file = file) + } } if (state.succeeded.size > MAX_LIST_ROWS) { Text( @@ -607,80 +749,131 @@ private fun ResultSection( } if (state.failures.isNotEmpty()) { - HorizontalDivider() - Text( - text = stringResource(R.string.export_result_failure_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - state.failures.take(MAX_LIST_ROWS).forEach { failure -> + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) Text( - text = stringResource( - R.string.export_result_failure_line, - failure.title, - failure.message, - ), - style = MaterialTheme.typography.bodySmall, + text = stringResource(R.string.export_result_failure_title), + style = MaterialTheme.typography.titleSmallEmphasized, color = MaterialTheme.colorScheme.error, ) } - OutlinedButton( - onClick = onRetryFailed, - enabled = state.canRetryFailed, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), + ForgeCard( + modifier = Modifier.fillMaxWidth(), + containerColor = MaterialTheme.colorScheme.errorContainer, + contentPadding = PaddingValues(MaterialTheme.spacing.sm), ) { - Text(stringResource(R.string.export_action_retry_failed)) + state.failures.take(MAX_LIST_ROWS).forEach { failure -> + Row( + modifier = Modifier + .fillMaxWidth() + .padding(MaterialTheme.spacing.sm), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) + Text( + text = stringResource( + R.string.export_result_failure_line, + failure.title, + failure.message, + ), + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + } + } } + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.export_action_retry_failed), + onClick = onRetryFailed, + modifier = Modifier.fillMaxWidth(), + enabled = state.canRetryFailed, + ) } - Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { - OutlinedButton( + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + ForgeSecondaryAction( + icon = ForgeIcons.Check, + label = stringResource(R.string.export_action_done), onClick = onDismiss, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.export_action_done)) - } - Button( + modifier = Modifier.weight(1f), + ) + ForgePrimaryAction( + icon = ForgeIcons.Share, + label = stringResource(R.string.export_action_share), onClick = { onShare(state.shareUris.map { uri -> Uri.parse(uri) }) }, + modifier = Modifier.weight(1f), enabled = state.canShare, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.export_action_share)) - } + ) + } + + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, + ) { + ForgeIcon( + icon = ForgeIcons.Info, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = stringResource(R.string.export_result_share_hint), + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } - Text( - text = stringResource(R.string.export_result_share_hint), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) } @Composable private fun ExportedFileRow(file: ExportedFile) { - Column( + Row( modifier = Modifier .fillMaxWidth() - .padding(vertical = 4.dp), + .padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.sm, + ), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, ) { - Text( - text = file.displayName, - style = MaterialTheme.typography.bodyMedium, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - Text( - text = file.title, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 1, - overflow = TextOverflow.Ellipsis, + ForgeIcon( + icon = ForgeIcons.FileText, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, ) + Column(modifier = Modifier.weight(1f)) { + Text( + text = file.displayName, + style = MaterialTheme.typography.bodyMedium, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + Text( + text = file.title, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } } } @@ -719,6 +912,13 @@ private fun ExportRange.labelRes(): Int = when (this) { ExportRange.ChapterRange -> R.string.export_range_custom } +@DrawableRes +private fun ExportRange.iconRes(): Int = when (this) { + ExportRange.AllCompleted -> ForgeIcons.BookOpen + ExportRange.CurrentChapter -> ForgeIcons.FileText + ExportRange.ChapterRange -> ForgeIcons.List +} + private const val MAX_LIST_ROWS = 50 // --------------------------------------------------------------------------- diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/onboarding/OnboardingScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/onboarding/OnboardingScreen.kt index a5d17f9..808dd0c 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/onboarding/OnboardingScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/onboarding/OnboardingScreen.kt @@ -1,62 +1,77 @@ +@file:OptIn( + androidx.compose.foundation.layout.ExperimentalLayoutApi::class, + androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class, +) + package com.estimatefaster.audioforge.feature.onboarding import android.content.res.Configuration +import androidx.annotation.DrawableRes import androidx.annotation.StringRes +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.navigationBarsPadding +import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.LoadingIndicator +import androidx.compose.material3.MaterialShapes import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.toShape import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.rotate +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.LiveRegionMode import androidx.compose.ui.semantics.clearAndSetSemantics +import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.liveRegion import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R -import com.estimatefaster.audioforge.ui.components.ErrorBanner -import com.estimatefaster.audioforge.ui.components.SectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing /** - * 首次引导页(P4-10 / 执行计划 §12.4 S01)。 + * 首次引导页(P4-10 / 执行计划 §12.4 S01,UX v2 重设计)。 * * 有状态入口:从 [OnboardingViewModel.state] 收集状态后委托给无状态版本。 * [onFinished] / [onSkipped] 只在状态机真正写完 `onboarding_completed` 后触发, @@ -93,12 +108,14 @@ fun OnboardingScreen( } /** - * 无状态引导页:3 步水平切换(欢迎 / Key / 权限说明)。 + * 无状态引导页:3 步(欢迎 / Key / 权限)。 * - * 所有用户可见文案来自 `strings.xml`;第 3 步只解释通知与电池优化,不主动申请 - * 任何权限(申请入口留给真正需要它的生成/任务页)。 + * 布局对应 `docs/prototype/forge-framework.html` 的 Onboarding: + * 顶栏品牌 + 跳过、分段步骤条、MaterialShapes 大 hero、Lucide 图标功能卡、 + * 唯一主操作底栏。所有按钮都是「Lucide 图标 + 文案」或纯图标操作。 + * + * 状态机、字段校验与保存/跳过回调保持原样:本文案层不改变任何业务判断。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun OnboardingScreen( state: OnboardingUiState, @@ -117,27 +134,20 @@ fun OnboardingScreen( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - title = { - Text( - text = stringResource(R.string.onboarding_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - ) - }, + ForgeTopBar( + title = stringResource(R.string.onboarding_title), + subtitle = stringResource( + R.string.ux_v2_onboarding_topbar_subtitle, + stringResource(R.string.app_name), + ), actions = { - TextButton( + ForgeSecondaryAction( + icon = ForgeIcons.ChevronRight, + label = stringResource(R.string.onboarding_skip), onClick = onSkip, enabled = state.canSkip, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.onboarding_skip)) - } + ) }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, bottomBar = { @@ -153,23 +163,32 @@ fun OnboardingScreen( Column( modifier = Modifier .fillMaxSize() - .padding(padding) - .padding(horizontal = 20.dp), + .padding(padding), ) { - StepProgress(step = state.step) + StepRail( + step = state.step, + modifier = Modifier.padding( + start = MaterialTheme.spacing.xl, + top = MaterialTheme.spacing.md, + end = MaterialTheme.spacing.xl, + ), + ) Column( modifier = Modifier .weight(1f) .verticalScroll(rememberScrollState()) - .padding(top = 16.dp, bottom = 20.dp), - verticalArrangement = Arrangement.spacedBy(16.dp), + .padding(horizontal = MaterialTheme.spacing.xl) + .padding(top = MaterialTheme.spacing.lg, bottom = MaterialTheme.spacing.xl), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.lg), ) { // 保存失败可能发生在任意步骤;放在内容顶部,避免被长表单挤出屏幕。 if (state.saveError != null) { SaveErrorBanner(error = state.saveError) } + OnboardingHero(step = state.step) + when (state.step) { OnboardingStep.Welcome -> WelcomeStep() OnboardingStep.Keys -> KeysStep( @@ -187,12 +206,58 @@ fun OnboardingScreen( } // --------------------------------------------------------------------------- -// 步骤内容 +// 步骤进度与 hero // --------------------------------------------------------------------------- @Composable -private fun StepProgress(step: OnboardingStep) { - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { +private fun StepRail( + step: OnboardingStep, + modifier: Modifier = Modifier, +) { + val railDescription = stringResource( + R.string.ux_v2_onboarding_step_rail_description, + step.number, + OnboardingStep.entries.size, + ) + val inactiveShape = MaterialShapes.Pill.toShape() + Row( + modifier = modifier + .fillMaxWidth() + // 整条进度轨只暴露一句“步骤 x / y”,内部色条不单独进入读屏。 + .clearAndSetSemantics { contentDescription = railDescription }, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + OnboardingStep.entries.forEach { entry -> + val current = entry == step + val railHeight by animateDpAsState( + targetValue = if (current) 10.dp else 6.dp, + label = "onboardingStepRailHeight", + ) + val railColor = if (entry.ordinal <= step.ordinal) { + MaterialTheme.colorScheme.primary + } else { + MaterialTheme.colorScheme.surfaceContainerHighest + } + Surface( + modifier = Modifier + .weight(1f) + .height(railHeight), + shape = if (current) MaterialShapes.Cookie4Sided.toShape() else inactiveShape, + color = railColor, + ) {} + } + } +} + +@Composable +private fun OnboardingHero(step: OnboardingStep) { + val onContainer = MaterialTheme.colorScheme.onPrimaryContainer + ForgeCard( + modifier = Modifier.fillMaxWidth(), + containerColor = MaterialTheme.colorScheme.primaryContainer, + contentPadding = PaddingValues(MaterialTheme.spacing.lg), + ) { + HeroArtwork(step = step) Text( text = stringResource( R.string.onboarding_step_indicator, @@ -200,50 +265,216 @@ private fun StepProgress(step: OnboardingStep) { OnboardingStep.entries.size, ), style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, + color = onContainer.copy(alpha = 0.7f), ) - Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) { - OnboardingStep.entries.forEach { entry -> - Box( - modifier = Modifier - .weight(1f) - .height(4.dp) - // 步骤文字已说明第几步;色条只是视觉辅助,不单独进入读屏。 - .clearAndSetSemantics { } - .background( - color = if (entry.ordinal <= step.ordinal) { - MaterialTheme.colorScheme.primary - } else { - MaterialTheme.colorScheme.surfaceVariant - }, - shape = CircleShape, - ), - ) - } + Text( + text = stringResource(step.taglineRes()), + style = MaterialTheme.typography.labelLarge, + color = onContainer.copy(alpha = 0.75f), + ) + Text( + text = stringResource(step.titleRes()), + modifier = Modifier.semantics { heading() }, + style = MaterialTheme.typography.headlineSmallEmphasized, + color = onContainer, + ) + Text( + text = stringResource(step.subtitleRes()), + style = MaterialTheme.typography.bodyMedium, + color = onContainer.copy(alpha = 0.82f), + ) + } +} + +/** + * 大 hero:有机 MaterialShapes 主图标 + 4 个浮动 Lucide 图标。 + * 纯装饰,整体 `clearAndSetSemantics`;步骤与标题由外层文本提供。 + */ +@Composable +private fun HeroArtwork(step: OnboardingStep) { + val mainShape = MaterialShapes.Cookie9Sided.toShape(startAngle = 8) + val glowShape = MaterialShapes.Cookie12Sided.toShape() + val badgeShape = MaterialShapes.Cookie4Sided.toShape() + val pillShape = MaterialShapes.Pill.toShape() + val gradient = Brush.linearGradient( + colors = listOf( + MaterialTheme.colorScheme.primary, + MaterialTheme.colorScheme.secondary, + ), + ) + val icons = step.floatIcons() + val floatTints = listOf( + MaterialTheme.colorScheme.primary, + MaterialTheme.colorScheme.tertiary, + MaterialTheme.colorScheme.secondary, + MaterialTheme.colorScheme.primary, + ) + + Box( + modifier = Modifier + .fillMaxWidth() + .height(212.dp) + .clearAndSetSemantics { }, + ) { + Box( + modifier = Modifier + .align(Alignment.Center) + .size(188.dp) + .clip(glowShape) + .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.14f)), + ) + Box( + modifier = Modifier + .align(Alignment.Center) + .size(136.dp) + .clip(mainShape) + .background(gradient), + contentAlignment = Alignment.Center, + ) { + Icon( + painter = painterResource(step.heroIcon()), + contentDescription = null, + modifier = Modifier.size(56.dp), + tint = MaterialTheme.colorScheme.onPrimary, + ) + } + + FloatBadge( + icon = icons[0], + shape = badgeShape, + tint = floatTints[0], + rotation = -8f, + modifier = Modifier + .align(Alignment.TopStart) + .offset(x = 40.dp, y = 16.dp), + ) + FloatBadge( + icon = icons[1], + shape = pillShape, + tint = floatTints[1], + rotation = 7f, + modifier = Modifier + .align(Alignment.TopEnd) + .offset(x = (-40).dp, y = 42.dp), + ) + FloatBadge( + icon = icons[2], + shape = badgeShape, + tint = floatTints[2], + rotation = 5f, + modifier = Modifier + .align(Alignment.BottomStart) + .offset(x = 34.dp, y = (-20).dp), + ) + FloatBadge( + icon = icons[3], + shape = pillShape, + tint = floatTints[3], + rotation = -6f, + modifier = Modifier + .align(Alignment.BottomEnd) + .offset(x = (-30).dp, y = (-12).dp), + ) + } +} + +@Composable +private fun FloatBadge( + @DrawableRes icon: Int, + shape: Shape, + tint: Color, + rotation: Float, + modifier: Modifier = Modifier, +) { + Surface( + modifier = modifier + .size(44.dp) + .rotate(rotation), + shape = shape, + color = MaterialTheme.colorScheme.surfaceContainerLowest, + contentColor = tint, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant), + ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon(icon = icon, contentDescription = null, tint = tint) } } } +@DrawableRes +private fun OnboardingStep.heroIcon(): Int = when (this) { + OnboardingStep.Welcome -> ForgeIcons.Sparkles + OnboardingStep.Keys -> ForgeIcons.Key + OnboardingStep.Permissions -> ForgeIcons.Shield +} + +private fun OnboardingStep.floatIcons(): List = when (this) { + OnboardingStep.Welcome -> listOf( + ForgeIcons.Users, + ForgeIcons.Headphones, + ForgeIcons.Shield, + ForgeIcons.BookOpen, + ) + + OnboardingStep.Keys -> listOf( + ForgeIcons.Lock, + ForgeIcons.Shield, + ForgeIcons.Zap, + ForgeIcons.Globe, + ) + + OnboardingStep.Permissions -> listOf( + ForgeIcons.Bell, + ForgeIcons.Battery, + ForgeIcons.Storage, + ForgeIcons.Wifi, + ) +} + +@StringRes +private fun OnboardingStep.titleRes(): Int = when (this) { + OnboardingStep.Welcome -> R.string.onboarding_welcome_title + OnboardingStep.Keys -> R.string.onboarding_keys_title + OnboardingStep.Permissions -> R.string.onboarding_permissions_title +} + +@StringRes +private fun OnboardingStep.subtitleRes(): Int = when (this) { + OnboardingStep.Welcome -> R.string.onboarding_welcome_subtitle + OnboardingStep.Keys -> R.string.onboarding_keys_subtitle + OnboardingStep.Permissions -> R.string.onboarding_permissions_subtitle +} + +@StringRes +private fun OnboardingStep.taglineRes(): Int = when (this) { + OnboardingStep.Welcome -> R.string.ux_v2_onboarding_hero_tagline_welcome + OnboardingStep.Keys -> R.string.ux_v2_onboarding_hero_tagline_keys + OnboardingStep.Permissions -> R.string.ux_v2_onboarding_hero_tagline_permissions +} + +// --------------------------------------------------------------------------- +// 步骤内容 +// --------------------------------------------------------------------------- + @Composable private fun WelcomeStep() { - StepTitle( - title = stringResource(R.string.onboarding_welcome_title), - subtitle = stringResource(R.string.onboarding_welcome_subtitle), - ) Text( text = stringResource(R.string.onboarding_welcome_intro), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) FeatureCard( + icon = ForgeIcons.Key, title = stringResource(R.string.onboarding_feature_byok_title), body = stringResource(R.string.onboarding_feature_byok_body), ) FeatureCard( + icon = ForgeIcons.CloudDownload, title = stringResource(R.string.onboarding_feature_sideload_title), body = stringResource(R.string.onboarding_feature_sideload_body), ) FeatureCard( + icon = ForgeIcons.Lock, title = stringResource(R.string.onboarding_feature_local_title), body = stringResource(R.string.onboarding_feature_local_body), ) @@ -257,11 +488,6 @@ private fun KeysStep( onModelChange: (OnboardingKeyKind, String) -> Unit, onTestKey: (OnboardingKeyKind) -> Unit, ) { - StepTitle( - title = stringResource(R.string.onboarding_keys_title), - subtitle = stringResource(R.string.onboarding_keys_subtitle), - ) - ProviderKeyCard( kind = OnboardingKeyKind.Llm, state = state, @@ -293,18 +519,21 @@ private fun KeysStep( @Composable private fun PermissionsStep() { - StepTitle( - title = stringResource(R.string.onboarding_permissions_title), - subtitle = stringResource(R.string.onboarding_permissions_subtitle), - ) FeatureCard( + icon = ForgeIcons.Bell, title = stringResource(R.string.onboarding_notifications_title), body = stringResource(R.string.onboarding_notifications_body), ) FeatureCard( + icon = ForgeIcons.Battery, title = stringResource(R.string.onboarding_battery_title), body = stringResource(R.string.onboarding_battery_body), ) + FeatureCard( + icon = ForgeIcons.Storage, + title = stringResource(R.string.ux_v2_onboarding_storage_title), + body = stringResource(R.string.ux_v2_onboarding_storage_body), + ) Text( text = stringResource(R.string.onboarding_permissions_note), style = MaterialTheme.typography.bodySmall, @@ -317,44 +546,41 @@ private fun PermissionsStep() { // --------------------------------------------------------------------------- @Composable -private fun StepTitle(title: String, subtitle: String) { - Column( - modifier = Modifier.semantics { heading() }, - verticalArrangement = Arrangement.spacedBy(6.dp), - ) { - Text( - text = title, - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = subtitle, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } -} - -@Composable -private fun FeatureCard(title: String, body: String) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), +private fun FeatureCard( + @DrawableRes icon: Int, + title: String, + body: String, +) { + ForgeCard { + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + verticalAlignment = Alignment.Top, ) { - Text( - text = title, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = body, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) + Surface( + modifier = Modifier.size(48.dp), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.secondaryContainer, + contentColor = MaterialTheme.colorScheme.onSecondaryContainer, + ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon( + icon = icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, + ) + } + } + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { + Text(title, style = MaterialTheme.typography.titleSmallEmphasized) + Text( + text = body, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } } } @@ -376,6 +602,10 @@ private fun ProviderKeyCard( OnboardingKeyKind.Llm -> R.string.onboarding_llm_subtitle OnboardingKeyKind.Fish -> R.string.onboarding_fish_subtitle } + val providerIcon = when (kind) { + OnboardingKeyKind.Llm -> ForgeIcons.Key + OnboardingKeyKind.Fish -> ForgeIcons.AudioLines + } val urlError = state.urlErrorFor(kind) val modelError = state.modelErrorFor(kind) @@ -394,89 +624,107 @@ private fun ProviderKeyCard( null } - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), + ForgeCard { + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + verticalAlignment = Alignment.Top, ) { - SectionHeader( - title = stringResource(titleRes), - subtitle = stringResource(subtitleRes), - ) + Surface( + modifier = Modifier.size(48.dp), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.primaryContainer, + contentColor = MaterialTheme.colorScheme.onPrimaryContainer, + ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon( + icon = providerIcon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + } + } + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { + Text(stringResource(titleRes), style = MaterialTheme.typography.titleMediumEmphasized) + Text( + text = stringResource(subtitleRes), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } - OutlinedTextField( - value = state.keyFor(kind), - onValueChange = { value -> onKeyChange(kind, value) }, - modifier = Modifier.fillMaxWidth(), - label = { Text(stringResource(R.string.onboarding_api_key)) }, - placeholder = { - Text(stringResource(R.string.onboarding_api_key_placeholder)) - }, - singleLine = true, - enabled = !state.saving, - visualTransformation = PasswordVisualTransformation(), - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), - ) + OutlinedTextField( + value = state.keyFor(kind), + onValueChange = { value -> onKeyChange(kind, value) }, + modifier = Modifier.fillMaxWidth(), + shape = MaterialTheme.shapes.large, + label = { Text(stringResource(R.string.onboarding_api_key)) }, + placeholder = { + Text(stringResource(R.string.onboarding_api_key_placeholder)) + }, + singleLine = true, + enabled = !state.saving, + visualTransformation = PasswordVisualTransformation(), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), + ) - OutlinedTextField( - value = state.baseUrlFor(kind), - onValueChange = { value -> onBaseUrlChange(kind, value) }, - modifier = Modifier.fillMaxWidth(), - label = { Text(stringResource(R.string.onboarding_base_url)) }, - singleLine = true, - enabled = !state.saving, - isError = urlError != null, - supportingText = urlSupportingText, - ) + OutlinedTextField( + value = state.baseUrlFor(kind), + onValueChange = { value -> onBaseUrlChange(kind, value) }, + modifier = Modifier.fillMaxWidth(), + shape = MaterialTheme.shapes.large, + label = { Text(stringResource(R.string.onboarding_base_url)) }, + singleLine = true, + enabled = !state.saving, + isError = urlError != null, + supportingText = urlSupportingText, + ) - OutlinedTextField( - value = state.modelFor(kind), - onValueChange = { value -> onModelChange(kind, value) }, - modifier = Modifier.fillMaxWidth(), - label = { Text(stringResource(R.string.onboarding_model)) }, - singleLine = true, - enabled = !state.saving, - isError = modelError != null, - supportingText = modelSupportingText, - ) + OutlinedTextField( + value = state.modelFor(kind), + onValueChange = { value -> onModelChange(kind, value) }, + modifier = Modifier.fillMaxWidth(), + shape = MaterialTheme.shapes.large, + label = { Text(stringResource(R.string.onboarding_model)) }, + singleLine = true, + enabled = !state.saving, + isError = modelError != null, + supportingText = modelSupportingText, + ) - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(12.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - OutlinedButton( - onClick = { onTestKey(kind) }, - enabled = !state.saving && testState != OnboardingTestState.Testing, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.onboarding_test_connection)) - } - TestStatus(state = testState) - } + FlowRow( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeSecondaryAction( + icon = ForgeIcons.Zap, + label = stringResource(R.string.onboarding_test_connection), + onClick = { onTestKey(kind) }, + enabled = !state.saving && testState != OnboardingTestState.Testing, + ) + TestStatus(state = testState) } } } @Composable private fun TestStatus(state: OnboardingTestState) { + val liveModifier = Modifier.semantics(mergeDescendants = true) { + liveRegion = LiveRegionMode.Polite + } when (state) { OnboardingTestState.Idle -> Unit OnboardingTestState.Testing -> Row( - modifier = Modifier.semantics { - liveRegion = LiveRegionMode.Polite - }, - horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = liveModifier, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), verticalAlignment = Alignment.CenterVertically, ) { - CircularProgressIndicator( - modifier = Modifier.size(16.dp), - strokeWidth = 2.dp, - ) + LoadingIndicator(modifier = Modifier.size(16.dp)) Text( text = stringResource(R.string.onboarding_testing), style = MaterialTheme.typography.bodySmall, @@ -484,14 +732,22 @@ private fun TestStatus(state: OnboardingTestState) { ) } - OnboardingTestState.Ok -> Text( - text = stringResource(R.string.onboarding_test_passed), - modifier = Modifier.semantics { - liveRegion = LiveRegionMode.Polite - }, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.primary, - ) + OnboardingTestState.Ok -> Row( + modifier = liveModifier, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.CheckCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource(R.string.onboarding_test_passed), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.primary, + ) + } is OnboardingTestState.Failed -> { val message = if (state.fieldError != null) { @@ -499,14 +755,22 @@ private fun TestStatus(state: OnboardingTestState) { } else { stringResource(R.string.onboarding_test_failed) } - Text( - text = message, - modifier = Modifier.semantics { - liveRegion = LiveRegionMode.Polite - }, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, - ) + Row( + modifier = liveModifier, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + Text( + text = message, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) + } } } } @@ -519,7 +783,28 @@ private fun SaveErrorBanner(error: OnboardingSaveError) { is OnboardingSaveError.PersistFailed -> stringResource(R.string.onboarding_save_failed) } - ErrorBanner(message = message) + ForgeCard( + modifier = Modifier.fillMaxWidth(), + containerColor = MaterialTheme.colorScheme.errorContainer, + contentPadding = PaddingValues(MaterialTheme.spacing.md), + ) { + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) + Text( + text = message, + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + } + } } @Composable @@ -530,81 +815,79 @@ private fun OnboardingBottomBar( onSaveAndContinue: () -> Unit, onFinish: () -> Unit, ) { - Surface(tonalElevation = 3.dp) { + val primaryLabel = when (state.step) { + OnboardingStep.Welcome -> stringResource(R.string.ux_v2_onboarding_primary_start) + OnboardingStep.Keys -> if (state.saving) { + stringResource(R.string.action_saving) + } else { + stringResource(R.string.onboarding_action_save_and_continue) + } + + OnboardingStep.Permissions -> if (state.saving) { + stringResource(R.string.onboarding_action_finishing) + } else { + stringResource(R.string.ux_v2_onboarding_primary_finish) + } + } + val primaryIcon = when (state.step) { + OnboardingStep.Welcome -> ForgeIcons.ChevronRight + OnboardingStep.Keys -> ForgeIcons.Check + OnboardingStep.Permissions -> ForgeIcons.Check + } + val primaryAction = when (state.step) { + OnboardingStep.Welcome -> onNext + OnboardingStep.Keys -> onSaveAndContinue + OnboardingStep.Permissions -> onFinish + } + val showBack = !state.step.isFirst + val showLater = state.step == OnboardingStep.Keys + + Surface(color = MaterialTheme.colorScheme.surfaceContainerLow) { Column( modifier = Modifier .fillMaxWidth() .navigationBarsPadding() - .padding(horizontal = 20.dp, vertical = 12.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + .padding(MaterialTheme.spacing.lg), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(12.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - if (!state.step.isFirst) { - OutlinedButton( - onClick = onBack, - enabled = state.canSkip, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.onboarding_action_back)) - } - } - Spacer(Modifier.weight(1f)) - - when (state.step) { - OnboardingStep.Welcome -> Button( - onClick = onNext, - enabled = state.canAdvance, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.onboarding_action_start)) - } - - OnboardingStep.Keys -> Button( - onClick = onSaveAndContinue, - enabled = state.canAdvance, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text( - text = if (state.saving) { - stringResource(R.string.action_saving) - } else { - stringResource(R.string.onboarding_action_save_and_continue) - }, + if (showBack || showLater) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + if (showBack) { + ForgeSecondaryAction( + icon = ForgeIcons.Back, + label = stringResource(R.string.onboarding_action_back), + onClick = onBack, + enabled = state.canSkip, ) + } else { + Spacer(Modifier.weight(1f)) } - - OnboardingStep.Permissions -> Button( - onClick = onFinish, - enabled = state.canFinish, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text( - text = if (state.saving) { - stringResource(R.string.onboarding_action_finishing) - } else { - stringResource(R.string.onboarding_action_finish) - }, + if (showLater) { + // “稍后设置”只跳过 Key 填写,不结束引导;不会清空已输入内容。 + ForgeSecondaryAction( + icon = ForgeIcons.Clock, + label = stringResource(R.string.onboarding_action_later), + onClick = onNext, + enabled = state.canAdvance, ) + } else { + Spacer(Modifier.weight(1f)) } } } - // “稍后设置”只跳过 Key 填写,不结束引导;它不会清空已输入内容。 - if (state.step == OnboardingStep.Keys) { - TextButton( - onClick = onNext, - enabled = state.canAdvance, - modifier = Modifier - .align(Alignment.End) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.onboarding_action_later)) - } - } + ForgePrimaryAction( + icon = primaryIcon, + label = primaryLabel, + onClick = primaryAction, + modifier = Modifier.fillMaxWidth(), + enabled = state.canAdvance, + loading = state.saving, + ) } } } @@ -619,7 +902,7 @@ private fun OnboardingFieldError.messageRes(): Int = when (this) { } // --------------------------------------------------------------------------- -// Preview:欢迎 / Key 填写(含测试结果)/ 权限说明(深色) +// Preview:欢迎 / Key 填写(含测试结果)/ 权限说明(深色 200%) // --------------------------------------------------------------------------- private fun previewKeysState(): OnboardingUiState = OnboardingUiState( @@ -655,10 +938,11 @@ private fun OnboardingKeysPreview() { } @Preview( - name = "Onboarding · 权限(深色)", + name = "Onboarding · 权限(深色 200%)", showBackground = true, backgroundColor = 0xFF0F1220, uiMode = Configuration.UI_MODE_NIGHT_YES, + fontScale = 2f, ) @Composable private fun OnboardingPermissionsPreview() { diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/player/PlayerScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/player/PlayerScreen.kt index 044b24d..f2cf77f 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/player/PlayerScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/player/PlayerScreen.kt @@ -1,41 +1,38 @@ +@file:OptIn( + androidx.compose.foundation.layout.ExperimentalLayoutApi::class, + androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class, +) + package com.estimatefaster.audioforge.feature.player import android.content.res.Configuration +import androidx.annotation.DrawableRes import androidx.compose.foundation.background -import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilledTonalButton -import androidx.compose.material3.FilterChip -import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialShapes import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Scaffold import androidx.compose.material3.Slider +import androidx.compose.material3.SliderDefaults +import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.toShape import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -43,16 +40,20 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.rotate import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.disabled import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.selected import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.stateDescription -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview @@ -60,12 +61,21 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.core.model.NARRATOR_ROLE_ID -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorState +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar +import com.estimatefaster.audioforge.ui.forge.ForgeWavyProgress import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing /** - * 播放器页(P5-07 / 执行计划 §15 P5-07)。 + * 播放器页(P5-07 / 执行计划 §15 P5-07,UX v2 重设计)。 * * 有状态入口:收集 [PlayerViewModel.state] 后委托给无状态版本。页面不直接访问播放器、 * 仓库或数据库;播放/暂停/seek/切章/切句/倍速/睡眠定时都只是 ViewModel 回调。 @@ -96,19 +106,19 @@ fun PlayerScreen( } /** - * 无状态播放器页。 + * 无状态播放器页(视觉对应 `docs/prototype/forge-framework.html` 的 Player)。 * * 布局: - * - 顶部:返回 + 书名; - * - 大封面占位(书名首字 + 主题渐变)、书名、当前章节标题; - * - 当前段文本(角色名 + 台词); - * - 可拖动进度条、当前/总时长; - * - 播放/暂停、上一章/下一章、上一句/下一句; - * - 倍速 chips、睡眠定时 chips(选中后显示剩余); - * - 底部可折叠章节列表,当前章高亮,点击直接跳转; - * - 加载/错误/无音频空态复用 P4-02 组件。 + * - 顶栏:返回 + 「正在播放」+ 当前章副标题 + 章节列表图标开关; + * - 大封面:MaterialShapes 有机形状 + 渐变 + 首字 + Lucide 耳机角标; + * - 书名 / 章节 / 第 N 句,当前台词卡; + * - Wavy 进度 + 透明 Slider 拖动 + 时间; + * - 播放控制全部使用 [ForgeIconAction](Play/Pause/Skip); + * - 倍速 / 睡眠 chips(Lucide 图标 + 文案); + * - 可展开章节列表:整行是图标+文字的可点击操作。 + * + * 加载 / 错误 / 无音频空态复用 `ui/forge` 的 ForgeLoading / ForgeError / ForgeEmpty。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun PlayerScreen( state: PlayerUiState, @@ -127,71 +137,69 @@ fun PlayerScreen( onRetry: () -> Unit = {}, ) { val loadError = state.loadError + val chapterTitle = state.currentChapter?.title?.takeIf { it.isNotBlank() } + val topBarSubtitle = chapterTitle?.let { title -> + stringResource(R.string.ux_v2_player_topbar_subtitle, title) + } + val chaptersToggleLabel = stringResource( + if (state.chaptersExpanded) { + R.string.player_chapters_collapse + } else { + R.string.player_chapters_expand + }, + ) + Scaffold( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - navigationIcon = { - TextButton( - onClick = onBack, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_back)) + ForgeTopBar( + title = stringResource(R.string.ux_v2_player_topbar_title), + subtitle = topBarSubtitle, + navigationIcon = ForgeIcons.Back, + navigationDescription = stringResource(R.string.action_back), + onNavigation = onBack, + actions = { + if (state.chapters.isNotEmpty()) { + ForgeIconAction( + icon = ForgeIcons.List, + contentDescription = chaptersToggleLabel, + onClick = onToggleChapters, + container = false, + ) } }, - title = { - val bookTitle = state.bookTitle.takeIf { it.isNotBlank() } - ?: stringResource(R.string.player_book_untitled) - Text( - text = bookTitle, - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, ) { padding -> when { - state.isInitialLoading -> PlayerLoading( + state.isInitialLoading -> ForgeLoading( + label = stringResource(R.string.player_loading), modifier = Modifier .fillMaxSize() .padding(padding), ) - loadError != null -> Box( + loadError != null -> ForgeError( + message = stringResource(R.string.player_load_error, loadError), modifier = Modifier .fillMaxSize() - .padding(padding) - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - ErrorState( - message = stringResource(R.string.player_load_error, loadError), - onRetry = onRetry, - ) - } + .padding(padding), + onRetry = onRetry, + retryLabel = stringResource(R.string.action_retry), + ) - state.isEmpty -> Box( + state.isEmpty -> ForgeEmpty( + icon = ForgeIcons.Headphones, + title = stringResource(R.string.player_empty_title), + description = stringResource(R.string.player_empty_description), modifier = Modifier .fillMaxSize() - .padding(padding) - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource(R.string.player_empty_title), - description = stringResource(R.string.player_empty_description), - actionText = stringResource(R.string.player_empty_action), - onAction = onBack, - ) - } + .padding(padding), + actionIcon = ForgeIcons.ChevronLeft, + actionLabel = stringResource(R.string.player_empty_action), + onAction = onBack, + ) else -> PlayerReadyContent( state = state, @@ -228,64 +236,32 @@ private fun PlayerReadyContent( onChapterClick: (Long) -> Unit, onToggleChapters: () -> Unit, ) { - Column(modifier = modifier) { - Column( - modifier = Modifier - .weight(1f) - .verticalScroll(rememberScrollState()) - .padding(start = 20.dp, end = 20.dp, top = 8.dp, bottom = 16.dp), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - PlayerCover(bookTitle = state.bookTitle) - Spacer(Modifier.height(16.dp)) - - val bookTitle = state.bookTitle.takeIf { it.isNotBlank() } - ?: stringResource(R.string.player_book_untitled) - Text( - text = bookTitle, - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.SemiBold, - textAlign = TextAlign.Center, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - Spacer(Modifier.height(4.dp)) - - val chapterTitle = state.currentChapter?.title?.takeIf { it.isNotBlank() } - ?: stringResource(R.string.player_chapter_untitled) - Text( - text = chapterTitle, - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - textAlign = TextAlign.Center, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - - Spacer(Modifier.height(20.dp)) - PlayerSegmentCard(state = state) - Spacer(Modifier.height(16.dp)) - PlayerProgress(state = state, onSeek = onSeek) - Spacer(Modifier.height(8.dp)) - PlayerControls( - state = state, - onPlayPause = onPlayPause, - onPreviousChapter = onPreviousChapter, - onNextChapter = onNextChapter, - onPreviousSegment = onPreviousSegment, - onNextSegment = onNextSegment, - ) - Spacer(Modifier.height(24.dp)) - PlayerSpeedSelector(state = state, onSpeedChange = onSpeedChange) - Spacer(Modifier.height(16.dp)) - PlayerSleepSelector(state = state, onSleepTimerChange = onSleepTimerChange) - Spacer(Modifier.height(16.dp)) - PlayerChapterHeader(state = state, onToggleChapters = onToggleChapters) - } - + Column( + modifier = modifier + .verticalScroll(rememberScrollState()) + .padding( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.md, + ), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.lg), + ) { + PlayerCover(bookTitle = state.bookTitle) + PlayerTitleBlock(state = state) + PlayerSegmentCard(state = state) + PlayerProgress(state = state, onSeek = onSeek) + PlayerTransport( + state = state, + onPlayPause = onPlayPause, + onPreviousChapter = onPreviousChapter, + onNextChapter = onNextChapter, + onPreviousSegment = onPreviousSegment, + onNextSegment = onNextSegment, + ) + PlayerSpeedCard(state = state, onSpeedChange = onSpeedChange) + PlayerSleepCard(state = state, onSleepTimerChange = onSleepTimerChange) + PlayerChapterHeader(state = state, onToggleChapters = onToggleChapters) if (state.chaptersExpanded) { - HorizontalDivider() PlayerChapterList(state = state, onChapterClick = onChapterClick) } } @@ -293,6 +269,8 @@ private fun PlayerReadyContent( @Composable private fun PlayerCover(bookTitle: String) { + val coverShape = MaterialShapes.Cookie9Sided.toShape(startAngle = 12) + val badgeShape = MaterialShapes.Pill.toShape() val gradient = Brush.linearGradient( colors = listOf( MaterialTheme.colorScheme.primaryContainer, @@ -308,19 +286,85 @@ private fun PlayerCover(bookTitle: String) { } Box( modifier = Modifier - .fillMaxWidth() - .height(180.dp) - .clip(RoundedCornerShape(28.dp)) - .background(gradient) + .fillMaxWidth(0.7f) + .widthIn(max = 260.dp) + .aspectRatio(1f) + // 封面是装饰性视觉,书名与章节已经由下方文本朗读。 .clearAndSetSemantics { }, - contentAlignment = Alignment.Center, ) { + Box( + modifier = Modifier + .fillMaxSize() + .clip(coverShape) + .background(gradient), + ) Text( text = letter, + modifier = Modifier.align(Alignment.Center), style = MaterialTheme.typography.displayLarge, - fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onPrimaryContainer, ) + Surface( + modifier = Modifier + .align(Alignment.BottomEnd) + .padding(MaterialTheme.spacing.lg) + .size(44.dp), + shape = badgeShape, + color = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary, + ) { + Box(contentAlignment = Alignment.Center) { + Icon( + painter = painterResource(ForgeIcons.Headphones), + contentDescription = null, + modifier = Modifier.size(24.dp), + tint = MaterialTheme.colorScheme.onPrimary, + ) + } + } + } +} + +@Composable +private fun PlayerTitleBlock(state: PlayerUiState) { + val bookTitle = state.bookTitle.takeIf { it.isNotBlank() } + ?: stringResource(R.string.player_book_untitled) + val chapterTitle = state.currentChapter?.title?.takeIf { it.isNotBlank() } + ?: stringResource(R.string.player_chapter_untitled) + val playable = state.currentChapter?.playableSegments.orEmpty() + val position = playable.indexOfFirst { it.index == state.currentSegmentIndex } + + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { + Text( + text = bookTitle, + modifier = Modifier.semantics { heading() }, + style = MaterialTheme.typography.headlineSmallEmphasized, + textAlign = TextAlign.Center, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + Text( + text = chapterTitle, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + if (position >= 0) { + Text( + text = stringResource( + R.string.ux_v2_player_segment_indicator, + position + 1, + playable.size, + ), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } } @@ -335,33 +379,29 @@ private fun PlayerSegmentCard(state: PlayerUiState) { val roleName = segment?.roleName?.takeIf { it.isNotBlank() } ?: fallbackRole val text = segment?.text?.takeIf { it.isNotBlank() } ?: stringResource(R.string.player_no_segment) - Card( + + ForgeCard( modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surfaceVariant, + contentPadding = PaddingValues( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.md, ), ) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 16.dp, vertical = 14.dp), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - Text( - text = roleName, - style = MaterialTheme.typography.labelLarge, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.primary, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - Spacer(Modifier.height(8.dp)) - Text( - text = text, - style = MaterialTheme.typography.bodyLarge, - textAlign = TextAlign.Center, - ) - } + Text( + text = roleName, + modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.labelLargeEmphasized, + color = MaterialTheme.colorScheme.primary, + textAlign = TextAlign.Center, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + Text( + text = text, + modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.bodyLarge, + textAlign = TextAlign.Center, + ) } } @@ -374,6 +414,7 @@ private fun PlayerProgress( var dragFraction by remember(state.currentChapterIndex, state.currentSegmentIndex) { mutableStateOf(null) } + val displayedFraction = dragFraction ?: state.progress val displayedPosition = dragFraction ?.let { fraction -> seekTargetMs(fraction, state.durationMs) } ?: state.positionMs @@ -385,41 +426,64 @@ private fun PlayerProgress( positionText, durationText, ) - Slider( - value = dragFraction ?: state.progress, - onValueChange = { dragFraction = it }, - onValueChangeFinished = { - dragFraction?.let(onSeek) - dragFraction = null - }, - enabled = state.durationMs > 0L, - modifier = Modifier - .fillMaxWidth() - .semantics { - contentDescription = progressLabel - stateDescription = progressState - }, - ) - Row( + + Column( modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), ) { - Text( - text = positionText, - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Text( - text = durationText, - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) + Box( + modifier = Modifier + .fillMaxWidth() + .heightIn(min = 48.dp), + contentAlignment = Alignment.Center, + ) { + ForgeWavyProgress( + progress = displayedFraction, + modifier = Modifier + .fillMaxWidth() + .clearAndSetSemantics { }, + ) + Slider( + value = displayedFraction, + onValueChange = { dragFraction = it }, + onValueChangeFinished = { + dragFraction?.let(onSeek) + dragFraction = null + }, + enabled = state.durationMs > 0L, + modifier = Modifier + .fillMaxWidth() + .semantics { + contentDescription = progressLabel + stateDescription = progressState + }, + colors = SliderDefaults.colors( + thumbColor = MaterialTheme.colorScheme.primary, + activeTrackColor = Color.Transparent, + inactiveTrackColor = Color.Transparent, + ), + ) + } + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Text( + text = positionText, + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = durationText, + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } } -@OptIn(ExperimentalLayoutApi::class) @Composable -private fun PlayerControls( +private fun PlayerTransport( state: PlayerUiState, onPlayPause: () -> Unit, onPreviousChapter: () -> Unit, @@ -427,92 +491,97 @@ private fun PlayerControls( onPreviousSegment: () -> Unit, onNextSegment: () -> Unit, ) { - // 200% 字体下按钮会换行而不是被挤出屏幕;正常字体仍是单行居中。 - FlowRow( + Row( modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally), - verticalArrangement = Arrangement.spacedBy(8.dp), + horizontalArrangement = Arrangement.SpaceEvenly, + verticalAlignment = Alignment.CenterVertically, ) { - TextButton( - onClick = onPreviousChapter, + TransportIconAction( + icon = ForgeIcons.SkipPrevious, + contentDescription = stringResource(R.string.player_previous_segment), + enabled = state.previousSegmentIndex() != null, + onClick = onPreviousSegment, + ) + TransportIconAction( + icon = ForgeIcons.ChevronLeft, + contentDescription = stringResource(R.string.player_previous_chapter), enabled = state.previousChapterIndex() != null, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.player_previous_chapter)) - } - FilledTonalButton( - onClick = onPlayPause, + onClick = onPreviousChapter, + ) + TransportIconAction( + icon = if (state.isPlaying) ForgeIcons.Pause else ForgeIcons.Play, + contentDescription = stringResource( + if (state.isPlaying) R.string.player_pause else R.string.player_play, + ), enabled = state.hasPlayableAudio, - modifier = Modifier.heightIn(min = 56.dp), - ) { - Text( - stringResource( - if (state.isPlaying) R.string.player_pause else R.string.player_play, - ), - ) - } - TextButton( - onClick = onNextChapter, + onClick = onPlayPause, + container = true, + ) + TransportIconAction( + icon = ForgeIcons.ChevronRight, + contentDescription = stringResource(R.string.player_next_chapter), enabled = state.nextChapterIndex() != null, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.player_next_chapter)) - } - } - Spacer(Modifier.height(4.dp)) - FlowRow( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally), - verticalArrangement = Arrangement.spacedBy(8.dp), - ) { - OutlinedButton( - onClick = onPreviousSegment, - enabled = state.previousSegmentIndex() != null, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.player_previous_segment)) - } - OutlinedButton( - onClick = onNextSegment, + onClick = onNextChapter, + ) + TransportIconAction( + icon = ForgeIcons.SkipNext, + contentDescription = stringResource(R.string.player_next_segment), enabled = state.nextSegmentIndex() != null, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.player_next_segment)) - } + onClick = onNextSegment, + ) } } +/** + * 播放控制统一入口:始终是 [ForgeIconAction](纯图标 + contentDescription)。 + * + * [ForgeIconAction] 没有 enabled 参数,因此禁用时降透明度、标记 disabled 语义, + * 并在 onClick 内兜底拦截,保持原状态机“不可用按钮不触发回调”的行为。 + */ +@Composable +private fun TransportIconAction( + @DrawableRes icon: Int, + contentDescription: String, + enabled: Boolean, + onClick: () -> Unit, + modifier: Modifier = Modifier, + container: Boolean = false, +) { + ForgeIconAction( + icon = icon, + contentDescription = contentDescription, + onClick = { if (enabled) onClick() }, + modifier = modifier + .alpha(if (enabled) 1f else DISABLED_ALPHA) + .semantics { if (!enabled) disabled() }, + container = container, + ) +} + @Composable -private fun PlayerSpeedSelector( +private fun PlayerSpeedCard( state: PlayerUiState, onSpeedChange: (PlayerSpeed) -> Unit, ) { - Column(modifier = Modifier.fillMaxWidth()) { + ForgeCard(modifier = Modifier.fillMaxWidth()) { Text( text = stringResource(R.string.player_speed_title), modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + style = MaterialTheme.typography.titleSmallEmphasized, ) - Spacer(Modifier.height(6.dp)) - Row( - modifier = Modifier - .fillMaxWidth() - .horizontalScroll(rememberScrollState()), - horizontalArrangement = Arrangement.spacedBy(8.dp), + FlowRow( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { PlayerSpeed.options.forEach { option -> - FilterChip( + ForgeChip( + label = stringResource( + R.string.player_speed_option, + formatSpeedMultiplier(option.multiplier), + ), selected = state.speed == option, onClick = { onSpeedChange(option) }, - label = { - Text( - stringResource( - R.string.player_speed_option, - formatSpeedMultiplier(option.multiplier), - ), - ) - }, + icon = ForgeIcons.Gauge, ) } } @@ -520,63 +589,66 @@ private fun PlayerSpeedSelector( } @Composable -private fun PlayerSleepSelector( +private fun PlayerSleepCard( state: PlayerUiState, onSleepTimerChange: (SleepTimerOption) -> Unit, ) { - Column(modifier = Modifier.fillMaxWidth()) { + ForgeCard(modifier = Modifier.fillMaxWidth()) { Row( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { Text( text = stringResource(R.string.player_sleep_title), modifier = Modifier .weight(1f) .semantics { heading() }, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + style = MaterialTheme.typography.titleSmallEmphasized, ) val remaining = state.sleepRemainingMs if (remaining != null) { - Text( - text = stringResource( - R.string.player_sleep_remaining, - formatPlaybackTime(remaining), - ), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.primary, - ) + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.Clock, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource( + R.string.player_sleep_remaining, + formatPlaybackTime(remaining), + ), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.primary, + ) + } } } - Spacer(Modifier.height(6.dp)) - Row( - modifier = Modifier - .fillMaxWidth() - .horizontalScroll(rememberScrollState()), - horizontalArrangement = Arrangement.spacedBy(8.dp), + FlowRow( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { SleepTimerOption.options.forEach { option -> - FilterChip( + val minutes = option.minutes + ForgeChip( + label = if (minutes == null) { + stringResource(R.string.player_sleep_off) + } else { + stringResource(R.string.player_sleep_minutes, minutes) + }, selected = state.sleepTimer == option, onClick = { onSleepTimerChange(option) }, - label = { Text(sleepOptionLabel(option)) }, + icon = if (option.isEnabled) ForgeIcons.Timer else ForgeIcons.Moon, ) } } } } -@Composable -private fun sleepOptionLabel(option: SleepTimerOption): String { - val minutes = option.minutes - return if (minutes == null) { - stringResource(R.string.player_sleep_off) - } else { - stringResource(R.string.player_sleep_minutes, minutes) - } -} - @Composable private fun PlayerChapterHeader( state: PlayerUiState, @@ -585,13 +657,13 @@ private fun PlayerChapterHeader( Row( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { Column(modifier = Modifier.weight(1f)) { Text( text = stringResource(R.string.player_chapters_title), modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + style = MaterialTheme.typography.titleSmallEmphasized, ) Text( text = stringResource(R.string.player_chapters_count, state.chapters.size), @@ -599,20 +671,19 @@ private fun PlayerChapterHeader( color = MaterialTheme.colorScheme.onSurfaceVariant, ) } - TextButton( + ForgeIconAction( + icon = ForgeIcons.ChevronDown, + contentDescription = stringResource( + if (state.chaptersExpanded) { + R.string.player_chapters_collapse + } else { + R.string.player_chapters_expand + }, + ), onClick = onToggleChapters, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text( - stringResource( - if (state.chaptersExpanded) { - R.string.player_chapters_collapse - } else { - R.string.player_chapters_expand - }, - ), - ) - } + modifier = Modifier.rotate(if (state.chaptersExpanded) 180f else 0f), + container = false, + ) } } @@ -621,17 +692,15 @@ private fun PlayerChapterList( state: PlayerUiState, onChapterClick: (Long) -> Unit, ) { - LazyColumn( - modifier = Modifier - .fillMaxWidth() - .heightIn(max = 280.dp), - contentPadding = PaddingValues(start = 20.dp, end = 20.dp, top = 8.dp, bottom = 12.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + ForgeCard( + modifier = Modifier.fillMaxWidth(), + contentPadding = PaddingValues(MaterialTheme.spacing.sm), ) { - items(items = state.chapters, key = { chapter -> chapter.key }) { chapter -> + state.chapters.forEach { chapter -> PlayerChapterRow( chapter = chapter, isCurrent = state.isCurrentChapter(chapter), + isPlaying = state.isPlaying, onClick = { onChapterClick(chapter.chapterId) }, ) } @@ -642,79 +711,120 @@ private fun PlayerChapterList( private fun PlayerChapterRow( chapter: PlayerChapterUi, isCurrent: Boolean, + isPlaying: Boolean, onClick: () -> Unit, ) { + val title = chapter.title.takeIf { it.isNotBlank() } + ?: stringResource(R.string.player_chapter_untitled) + val notReadyLabel = stringResource(R.string.player_chapter_no_audio) + val currentLabel = stringResource(R.string.player_chapter_current) val container = if (isCurrent) { MaterialTheme.colorScheme.primaryContainer } else { - MaterialTheme.colorScheme.surface + Color.Transparent } - val title = chapter.title.takeIf { it.isNotBlank() } - ?: stringResource(R.string.player_chapter_untitled) - Card( - onClick = onClick, - enabled = chapter.hasAudio, + val leadingColor = if (isCurrent) { + MaterialTheme.colorScheme.primary + } else { + MaterialTheme.colorScheme.surfaceContainerHighest + } + val leadingTint = if (isCurrent) { + MaterialTheme.colorScheme.onPrimary + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } + + Row( modifier = Modifier .fillMaxWidth() - .semantics { selected = isCurrent }, - colors = CardDefaults.cardColors(containerColor = container), + .clip(MaterialTheme.shapes.large) + .background(container) + .clickable( + enabled = chapter.hasAudio, + role = androidx.compose.ui.semantics.Role.Button, + onClick = onClick, + ) + .semantics(mergeDescendants = true) { + selected = isCurrent + if (!chapter.hasAudio) { + stateDescription = notReadyLabel + } + } + .padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.sm, + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - Row( - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp) - .padding(horizontal = 16.dp, vertical = 10.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(10.dp), + Surface( + modifier = Modifier.size(40.dp), + shape = MaterialTheme.shapes.medium, + color = leadingColor, + contentColor = leadingTint, ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon( + icon = if (isCurrent) ForgeIcons.AudioLines else ForgeIcons.Music, + contentDescription = null, + tint = leadingTint, + ) + } + } + Column(modifier = Modifier.weight(1f)) { Text( - text = (chapter.index + 1).toString(), - style = MaterialTheme.typography.labelMedium, + text = title, + style = MaterialTheme.typography.bodyLarge, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + Text( + text = stringResource( + R.string.ux_v2_player_chapter_meta, + chapter.playableSegments.size, + formatPlaybackTime(chapter.durationMs), + ), + style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - Column(modifier = Modifier.weight(1f)) { + } + when { + isCurrent -> Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = if (isPlaying) ForgeIcons.Pause else ForgeIcons.CheckCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) Text( - text = title, - style = MaterialTheme.typography.bodyLarge, - maxLines = 2, - overflow = TextOverflow.Ellipsis, + text = currentLabel, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.primary, ) - if (!chapter.hasAudio) { - Text( - text = stringResource(R.string.player_chapter_no_audio), - style = MaterialTheme.typography.labelSmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } } - if (isCurrent) { + + !chapter.hasAudio -> Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgeIcon( + icon = ForgeIcons.Clock, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) Text( - text = stringResource(R.string.player_chapter_current), + text = notReadyLabel, style = MaterialTheme.typography.labelSmall, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onPrimaryContainer, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } } } -@Composable -private fun PlayerLoading(modifier: Modifier = Modifier) { - Column( - modifier = modifier, - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center, - ) { - CircularProgressIndicator() - Spacer(Modifier.height(14.dp)) - Text( - text = stringResource(R.string.player_loading), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } -} +private const val DISABLED_ALPHA = 0.38f // --------------------------------------------------------------------------- // Preview:播放中(含睡眠定时)/ 暂停 / 无音频空态 / 错误态(深色 200%)。 diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/project/BatchSheet.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/project/BatchSheet.kt index 0ff4f48..331e33d 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/project/BatchSheet.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/project/BatchSheet.kt @@ -1,32 +1,37 @@ +@file:OptIn( + androidx.compose.material3.ExperimentalMaterial3Api::class, + androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class, +) + package com.estimatefaster.audioforge.feature.project +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.SegmentedButton -import androidx.compose.material3.SegmentedButtonDefaults -import androidx.compose.material3.SingleChoiceSegmentedButtonRow -import androidx.compose.material3.Slider import androidx.compose.material3.Surface import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -34,20 +39,26 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role -import androidx.compose.ui.semantics.contentDescription -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.domain.jobs.BatchParams -import com.estimatefaster.audioforge.ui.components.AdaptiveFieldRow +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSheetHeader import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme -import kotlin.math.roundToInt +import com.estimatefaster.audioforge.ui.theme.spacing /** * 批次设置 Sheet(P4-06 / 执行计划 §12.4 S05)。 @@ -65,7 +76,6 @@ import kotlin.math.roundToInt * @param hasFishKey 调用方当前是否已配置 Fish Audio Key * @param onOpenSettings 无 Key 时“去设置”入口 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun BatchSheet( viewModel: BatchViewModel, @@ -118,10 +128,13 @@ fun BatchSheet( /** * 无状态 Sheet 内容;Preview 与后续 UI 测试直接渲染它。 * - * 布局:标题 → 模式 → 起止范围 → 强制重跑 → 并发 → 估算 → 校验/Key/状态 → 操作。 - * 所有用户文案来自 `strings.xml`;状态中的错误枚举在这里映射成中文。 + * 结构对齐 Forge Framework 的批量生成 Sheet: + * SheetHeader → 生成范围(chips + 起止章)→ 处理模式(chips)→ 选项(强制重跑 / + * 并发 stepper)→ 估算 → 校验 / Key / 状态 → 唯一主操作 + 次级停止。 + * + * 校验、Key 拦截与开始/停止状态机仍由 [BatchUiState] 的派生属性决定, + * 这里只把枚举映射成新文案,不复制业务判断。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun BatchSheetContent( state: BatchUiState, @@ -143,158 +156,146 @@ fun BatchSheetContent( .fillMaxWidth() .navigationBarsPadding() .verticalScroll(rememberScrollState()) - .padding(horizontal = 24.dp) - .padding(top = 8.dp, bottom = 24.dp), - verticalArrangement = Arrangement.spacedBy(16.dp), + .padding(horizontal = MaterialTheme.spacing.lg) + .padding(top = MaterialTheme.spacing.xs, bottom = MaterialTheme.spacing.lg), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.lg), ) { - Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text( - text = stringResource(R.string.batch_sheet_title), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource(R.string.batch_sheet_subtitle), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } + ForgeSheetHeader( + icon = ForgeIcons.Sparkles, + title = stringResource(R.string.ux2_batch_title), + onClose = onDismiss, + subtitle = stringResource(R.string.ux2_batch_subtitle), + ) - ModeSelector(mode = state.mode, onModeChange = onModeChange) - RangeFields( + BatchRangeSection( state = state, onStartChange = onStartChange, onEndChange = onEndChange, onSelectUnfinished = onSelectUnfinished, onSelectAll = onSelectAll, ) - ForceSwitch(force = state.force, onForceChange = onForceChange) - ConcurrencyField( - concurrency = state.concurrency, + + BatchModeSection( + mode = state.mode, + onModeChange = onModeChange, + ) + + BatchOptionsSection( + state = state, + onForceChange = onForceChange, onConcurrencyChange = onConcurrencyChange, ) - EstimateCard(state = state) + + BatchEstimateCard(state = state) if (state.validationErrors.isNotEmpty()) { - ValidationCard(state = state) + BatchValidationCard(state = state) } if (state.missingKeys.isNotEmpty()) { - MissingKeysCard( + BatchMissingKeysCard( missingKeys = state.missingKeys, onOpenSettings = onOpenSettings, ) } BatchStatusCard(state = state) - Button( + ForgePrimaryAction( + icon = ForgeIcons.Sparkles, + label = stringResource(R.string.ux2_batch_action_start), onClick = onStart, + modifier = Modifier.fillMaxWidth(), enabled = state.canStart, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.batch_action_start)) - } - Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { - OutlinedButton( - onClick = onStop, - enabled = state.canStop, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.batch_action_stop)) - } - TextButton( - onClick = onDismiss, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_cancel)) - } - } - } -} - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -private fun ModeSelector( - mode: BatchMode, - onModeChange: (BatchMode) -> Unit, -) { - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + loading = state.starting, + ) + ForgeSecondaryAction( + icon = ForgeIcons.Square, + label = stringResource(R.string.batch_action_stop), + onClick = onStop, + modifier = Modifier.fillMaxWidth(), + enabled = state.canStop, + ) Text( - text = stringResource(R.string.batch_mode_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + text = stringResource(R.string.ux2_batch_note), + modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, ) - SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth()) { - BatchMode.entries.forEachIndexed { index, candidate -> - SegmentedButton( - selected = mode == candidate, - onClick = { onModeChange(candidate) }, - shape = SegmentedButtonDefaults.itemShape( - index = index, - count = BatchMode.entries.size, - ), - label = { Text(stringResource(candidate.labelRes())) }, - ) - } - } } } @Composable -private fun RangeFields( +private fun BatchRangeSection( state: BatchUiState, onStartChange: (String) -> Unit, onEndChange: (String) -> Unit, onSelectUnfinished: () -> Unit, onSelectAll: () -> Unit, ) { + val allSelected = state.chapterCount > 0 && + state.startChapter == 1 && + state.endChapter == state.chapterCount + val unfinished = state.chapters.filterNot { it.isComplete } + val unfinishedFirst = unfinished.minOfOrNull { it.number } + val unfinishedLast = unfinished.maxOfOrNull { it.number } + val unfinishedSelected = !allSelected && + unfinishedFirst != null && + unfinishedLast != null && + state.startChapter == unfinishedFirst && + state.endChapter == unfinishedLast val rangeInvalid = state.validationErrors.any { it == BatchValidationError.InvalidStart || it == BatchValidationError.InvalidEnd || it == BatchValidationError.StartAfterEnd } - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - Text( - text = stringResource(R.string.batch_range_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - AdaptiveFieldRow( - { - OutlinedTextField( - value = state.startText, - onValueChange = onStartChange, - label = { Text(stringResource(R.string.batch_range_start)) }, - singleLine = true, - isError = rangeInvalid, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), - modifier = Modifier.fillMaxWidth(), - ) - }, - { - OutlinedTextField( - value = state.endText, - onValueChange = onEndChange, - label = { Text(stringResource(R.string.batch_range_end)) }, - singleLine = true, - isError = rangeInvalid, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), - modifier = Modifier.fillMaxWidth(), - ) - }, - ) - Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) { - TextButton(onClick = onSelectUnfinished) { - Text(stringResource(R.string.batch_action_select_unfinished)) - } - TextButton(onClick = onSelectAll) { - Text(stringResource(R.string.batch_action_select_all)) - } + + BatchSection( + icon = ForgeIcons.List, + title = stringResource(R.string.ux2_batch_section_range), + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeChip( + label = stringResource(R.string.ux2_batch_range_all), + selected = allSelected, + onClick = onSelectAll, + icon = ForgeIcons.List, + ) + ForgeChip( + label = stringResource(R.string.ux2_batch_range_unfinished), + selected = unfinishedSelected, + onClick = onSelectUnfinished, + icon = ForgeIcons.Clock, + ) + } + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + OutlinedTextField( + value = state.startText, + onValueChange = onStartChange, + label = { Text(stringResource(R.string.batch_range_start)) }, + singleLine = true, + isError = rangeInvalid, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + shape = MaterialTheme.shapes.large, + modifier = Modifier.weight(1f), + ) + OutlinedTextField( + value = state.endText, + onValueChange = onEndChange, + label = { Text(stringResource(R.string.batch_range_end)) }, + singleLine = true, + isError = rangeInvalid, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + shape = MaterialTheme.shapes.large, + modifier = Modifier.weight(1f), + ) } Text( text = stringResource( @@ -306,190 +307,281 @@ private fun RangeFields( color = MaterialTheme.colorScheme.onSurfaceVariant, ) Text( - text = stringResource(R.string.batch_range_default_hint), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + text = stringResource(R.string.ux2_batch_selected_count, state.selectedChapterCount), + style = MaterialTheme.typography.labelMediumEmphasized, + color = MaterialTheme.colorScheme.primary, ) } } @Composable -private fun ForceSwitch( - force: Boolean, - onForceChange: (Boolean) -> Unit, +private fun BatchModeSection( + mode: BatchMode, + onModeChange: (BatchMode) -> Unit, ) { - Row( - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp) - .toggleable( - value = force, - role = Role.Switch, - onValueChange = onForceChange, - ) - .padding(vertical = 4.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp), + BatchSection( + icon = ForgeIcons.Sparkles, + title = stringResource(R.string.ux2_batch_section_mode), ) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = stringResource(R.string.batch_force_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource(R.string.batch_force_description), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + BatchMode.entries.forEach { candidate -> + ForgeChip( + label = stringResource(candidate.labelRes()), + selected = mode == candidate, + onClick = { onModeChange(candidate) }, + icon = candidate.iconRes(), + ) + } } - Switch( - checked = force, - onCheckedChange = null, + Text( + text = stringResource(mode.hintRes()), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } @Composable -private fun ConcurrencyField( - concurrency: Int, +private fun BatchOptionsSection( + state: BatchUiState, + onForceChange: (Boolean) -> Unit, onConcurrencyChange: (Int) -> Unit, ) { - Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { - Row(verticalAlignment = Alignment.CenterVertically) { - Text( - text = stringResource(R.string.batch_concurrency_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - modifier = Modifier.weight(1f), - ) - Text( - text = stringResource(R.string.batch_concurrency_value, concurrency), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.primary, - ) + BatchSection( + icon = ForgeIcons.Sliders, + title = stringResource(R.string.ux2_batch_section_options), + ) { + ForgeCard(contentPadding = PaddingValues(MaterialTheme.spacing.md)) { + Row( + modifier = Modifier + .fillMaxWidth() + .heightIn(min = 56.dp) + .toggleable( + value = state.force, + role = Role.Switch, + onValueChange = onForceChange, + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + OptionIcon(icon = ForgeIcons.Refresh) + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { + Text( + text = stringResource(R.string.ux2_batch_force_title), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + Text( + text = stringResource(R.string.ux2_batch_force_description), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + Switch(checked = state.force, onCheckedChange = null) + } + HorizontalDivider(modifier = Modifier.padding(vertical = MaterialTheme.spacing.sm)) + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + OptionIcon(icon = ForgeIcons.Gauge) + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { + Text( + text = stringResource(R.string.ux2_batch_concurrency_title), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + Text( + text = stringResource(R.string.ux2_batch_concurrency_description), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.End, + ) { + ForgeIconAction( + icon = ForgeIcons.Minus, + contentDescription = stringResource(R.string.ux2_batch_concurrency_decrease), + onClick = { + if (state.concurrency > 1) { + onConcurrencyChange(state.concurrency - 1) + } + }, + ) + Text( + text = stringResource(R.string.batch_concurrency_value, state.concurrency), + modifier = Modifier.widthIn(min = 48.dp), + style = MaterialTheme.typography.titleMediumEmphasized, + textAlign = TextAlign.Center, + ) + ForgeIconAction( + icon = ForgeIcons.Plus, + contentDescription = stringResource(R.string.ux2_batch_concurrency_increase), + onClick = { + if (state.concurrency < BatchParams.MAX_CONCURRENCY) { + onConcurrencyChange(state.concurrency + 1) + } + }, + ) + } } - val sliderDescription = stringResource( - R.string.batch_concurrency_content_description, - concurrency, - ) - Slider( - value = concurrency.coerceIn(1, BatchParams.MAX_CONCURRENCY).toFloat(), - onValueChange = { onConcurrencyChange(it.roundToInt()) }, - modifier = Modifier.semantics { contentDescription = sliderDescription }, - valueRange = 1f..BatchParams.MAX_CONCURRENCY.toFloat(), - steps = BatchParams.MAX_CONCURRENCY - 2, - ) - Text( - text = stringResource( - R.string.batch_concurrency_hint, - BatchParams.MAX_CONCURRENCY, - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) } } @Composable -private fun EstimateCard(state: BatchUiState) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surface, - ), +private fun OptionIcon(@DrawableRes icon: Int) { + Surface( + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.secondaryContainer, + modifier = Modifier.size(40.dp), ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + ForgeIcon( + icon = icon, + contentDescription = null, + modifier = Modifier.size(20.dp), + tint = MaterialTheme.colorScheme.onSecondaryContainer, + ) + } + } +} + +@Composable +private fun BatchEstimateCard(state: BatchUiState) { + ForgeCard(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, ) { - Text( - text = stringResource(R.string.batch_estimate_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + ForgeIcon( + icon = ForgeIcons.Clock, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, ) - if (state.hasEstimate) { - Text( - text = stringResource( - R.string.batch_estimate_detail, - state.selectedChapterCount, - state.estimatedMinutes, - state.estimatedCostText, - ), - style = MaterialTheme.typography.bodyMedium, - ) - } else { + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { Text( - text = stringResource(R.string.batch_estimate_empty), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, + text = stringResource(R.string.batch_estimate_title), + style = MaterialTheme.typography.titleSmallEmphasized, ) + if (state.hasEstimate) { + Text( + text = stringResource( + R.string.batch_estimate_detail, + state.selectedChapterCount, + state.estimatedMinutes, + state.estimatedCostText, + ), + style = MaterialTheme.typography.bodySmall, + ) + Text( + text = stringResource(R.string.ux2_batch_estimate_note), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } else { + Text( + text = stringResource(R.string.batch_estimate_empty), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } } } } @Composable -private fun ValidationCard(state: BatchUiState) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer, - ), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), +private fun BatchValidationCard(state: BatchUiState) { + ForgeCard(containerColor = MaterialTheme.colorScheme.errorContainer) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, ) { - Text( - text = stringResource(R.string.batch_validation_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onErrorContainer, + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, ) - state.validationErrors.distinct().forEach { error -> + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { Text( - text = validationMessage(error, state.chapterCount), - style = MaterialTheme.typography.bodySmall, + text = stringResource(R.string.batch_validation_title), + style = MaterialTheme.typography.titleSmallEmphasized, color = MaterialTheme.colorScheme.onErrorContainer, ) + state.validationErrors.distinct().forEach { error -> + Text( + text = validationMessage(error, state.chapterCount), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + } } } } } @Composable -private fun MissingKeysCard( +private fun BatchMissingKeysCard( missingKeys: List, onOpenSettings: () -> Unit, ) { + val separator = stringResource(R.string.ux2_batch_missing_keys_separator) val labels = missingKeys.map { stringResource(it.labelRes()) } - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.secondaryContainer, - ), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + ForgeCard(containerColor = MaterialTheme.colorScheme.secondaryContainer) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, ) { - Text( - text = stringResource(R.string.batch_missing_keys_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onSecondaryContainer, - ) - Text( - text = stringResource( - R.string.batch_missing_keys_message, - labels.joinToString(separator = "、"), - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSecondaryContainer, + ForgeIcon( + icon = ForgeIcons.Key, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, ) - TextButton(onClick = onOpenSettings) { - Text(stringResource(R.string.batch_action_open_settings)) + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + Text( + text = stringResource(R.string.batch_missing_keys_title), + style = MaterialTheme.typography.titleSmallEmphasized, + color = MaterialTheme.colorScheme.onSecondaryContainer, + ) + Text( + text = stringResource( + R.string.batch_missing_keys_message, + labels.joinToString(separator = separator), + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSecondaryContainer, + ) + ForgeSecondaryAction( + icon = ForgeIcons.Settings, + label = stringResource(R.string.batch_action_open_settings), + onClick = onOpenSettings, + ) } } } @@ -500,97 +592,139 @@ private fun BatchStatusCard(state: BatchUiState) { val stopStatus = state.stopStatus val startStatus = state.startStatus when { - stopStatus != null -> StopStatusCard(stopStatus) - startStatus != null -> StartStatusCard(startStatus) + stopStatus != null -> BatchStopStatusCard(status = stopStatus) + startStatus != null -> BatchStartStatusCard(status = startStatus) } } @Composable -private fun StartStatusCard(status: BatchStartStatus) { +private fun BatchStartStatusCard(status: BatchStartStatus) { val isError = status is BatchStartStatus.Failure - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = when { - isError -> MaterialTheme.colorScheme.errorContainer - status is BatchStartStatus.Started -> MaterialTheme.colorScheme.primaryContainer - else -> MaterialTheme.colorScheme.secondaryContainer - }, - ), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + val icon = when (status) { + BatchStartStatus.Starting -> ForgeIcons.Loader + is BatchStartStatus.Started -> ForgeIcons.CheckCircle + is BatchStartStatus.AlreadyRunning -> ForgeIcons.AlertCircle + is BatchStartStatus.Failure -> ForgeIcons.ErrorCircle + } + val container = when { + isError -> MaterialTheme.colorScheme.errorContainer + status is BatchStartStatus.Started -> MaterialTheme.colorScheme.primaryContainer + else -> MaterialTheme.colorScheme.secondaryContainer + } + val content = when { + isError -> MaterialTheme.colorScheme.onErrorContainer + status is BatchStartStatus.Started -> MaterialTheme.colorScheme.onPrimaryContainer + else -> MaterialTheme.colorScheme.onSecondaryContainer + } + BatchStatusRow( + icon = icon, + container = container, + content = content, + message = when (status) { + BatchStartStatus.Starting -> stringResource(R.string.batch_status_starting) + is BatchStartStatus.Started -> stringResource(R.string.batch_status_started, status.jobId) + is BatchStartStatus.AlreadyRunning -> { + stringResource(R.string.batch_status_already_running, status.jobId) + } + is BatchStartStatus.Failure -> stringResource(R.string.batch_status_failure, status.reason) + }, + ) +} + +@Composable +private fun BatchStopStatusCard(status: BatchStopStatus) { + val isError = status is BatchStopStatus.Failure + val icon = when (status) { + BatchStopStatus.Requesting -> ForgeIcons.Loader + is BatchStopStatus.Stopping -> ForgeIcons.Square + is BatchStopStatus.NotRunning -> ForgeIcons.Info + is BatchStopStatus.Failure -> ForgeIcons.ErrorCircle + } + val container = if (isError) { + MaterialTheme.colorScheme.errorContainer + } else { + MaterialTheme.colorScheme.secondaryContainer + } + val content = if (isError) { + MaterialTheme.colorScheme.onErrorContainer + } else { + MaterialTheme.colorScheme.onSecondaryContainer + } + BatchStatusRow( + icon = icon, + container = container, + content = content, + message = when (status) { + BatchStopStatus.Requesting -> stringResource(R.string.batch_status_requesting_stop) + is BatchStopStatus.Stopping -> stringResource(R.string.batch_status_stopping, status.jobId) + is BatchStopStatus.NotRunning -> stringResource(R.string.batch_status_not_running) + is BatchStopStatus.Failure -> { + stringResource(R.string.batch_status_stop_failure, status.reason) + } + }, + ) +} + +@Composable +private fun BatchStatusRow( + @DrawableRes icon: Int, + container: Color, + content: Color, + message: String, +) { + ForgeCard(containerColor = container) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, ) { - Text( - text = stringResource(R.string.batch_status_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = when (status) { - BatchStartStatus.Starting -> stringResource(R.string.batch_status_starting) - is BatchStartStatus.Started -> stringResource( - R.string.batch_status_started, - status.jobId, - ) - is BatchStartStatus.AlreadyRunning -> stringResource( - R.string.batch_status_already_running, - status.jobId, - ) - is BatchStartStatus.Failure -> stringResource( - R.string.batch_status_failure, - status.reason, - ) - }, - style = MaterialTheme.typography.bodyMedium, + ForgeIcon( + icon = icon, + contentDescription = null, + tint = content, ) + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { + Text( + text = stringResource(R.string.batch_status_title), + style = MaterialTheme.typography.titleSmallEmphasized, + color = content, + ) + Text( + text = message, + style = MaterialTheme.typography.bodySmall, + color = content, + ) + } } } } @Composable -private fun StopStatusCard(status: BatchStopStatus) { - val isError = status is BatchStopStatus.Failure - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = if (isError) { - MaterialTheme.colorScheme.errorContainer - } else { - MaterialTheme.colorScheme.secondaryContainer - }, - ), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), +private fun BatchSection( + @DrawableRes icon: Int, + title: String, + content: @Composable ColumnScope.() -> Unit, +) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), ) { - Text( - text = stringResource(R.string.batch_status_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + ForgeIcon( + icon = icon, + contentDescription = null, + modifier = Modifier.size(16.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( - text = when (status) { - BatchStopStatus.Requesting -> stringResource( - R.string.batch_status_requesting_stop, - ) - is BatchStopStatus.Stopping -> stringResource( - R.string.batch_status_stopping, - status.jobId, - ) - is BatchStopStatus.NotRunning -> stringResource( - R.string.batch_status_not_running, - ) - is BatchStopStatus.Failure -> stringResource( - R.string.batch_status_stop_failure, - status.reason, - ) - }, - style = MaterialTheme.typography.bodyMedium, + text = title, + style = MaterialTheme.typography.titleSmallEmphasized, ) } + content() } } @@ -617,10 +751,25 @@ private fun validationMessage(error: BatchValidationError, chapterCount: Int): S ) } +@StringRes private fun BatchMode.labelRes(): Int = when (this) { - BatchMode.Full -> R.string.batch_mode_full - BatchMode.Parse -> R.string.batch_mode_parse - BatchMode.Render -> R.string.batch_mode_render + BatchMode.Full -> R.string.ux2_batch_mode_full + BatchMode.Parse -> R.string.ux2_batch_mode_parse + BatchMode.Render -> R.string.ux2_batch_mode_render +} + +@DrawableRes +private fun BatchMode.iconRes(): Int = when (this) { + BatchMode.Full -> ForgeIcons.Sparkles + BatchMode.Parse -> ForgeIcons.FileText + BatchMode.Render -> ForgeIcons.AudioLines +} + +@StringRes +private fun BatchMode.hintRes(): Int = when (this) { + BatchMode.Full -> R.string.ux2_batch_mode_full_hint + BatchMode.Parse -> R.string.ux2_batch_mode_parse_hint + BatchMode.Render -> R.string.ux2_batch_mode_render_hint } private fun BatchKeyKind.labelRes(): Int = when (this) { @@ -629,7 +778,7 @@ private fun BatchKeyKind.labelRes(): Int = when (this) { } // --------------------------------------------------------------------------- -// Preview +// Preview:正常 / 缺 Key / 校验错误。示例数据只在 Preview 区使用。 // --------------------------------------------------------------------------- private fun previewChapters(): List = listOf( diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/project/ChapterListScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/project/ChapterListScreen.kt index ef6ffed..c22bc2f 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/project/ChapterListScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/project/ChapterListScreen.kt @@ -1,45 +1,33 @@ +@file:OptIn(androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class) + package com.estimatefaster.audioforge.feature.project import android.content.res.Configuration +import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import androidx.compose.foundation.Canvas -import androidx.compose.foundation.background -import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.sizeIn -import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilterChip -import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -49,29 +37,30 @@ import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.graphics.Path -import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.heading -import androidx.compose.ui.semantics.LiveRegionMode -import androidx.compose.ui.semantics.contentDescription -import androidx.compose.ui.semantics.liveRegion -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorBanner -import com.estimatefaster.audioforge.ui.components.ErrorState -import com.estimatefaster.audioforge.ui.components.StatusKind -import com.estimatefaster.audioforge.ui.components.StatusPill +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar +import com.estimatefaster.audioforge.ui.forge.ForgeWavyProgress import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing import kotlinx.coroutines.flow.distinctUntilChanged +import kotlin.math.roundToInt /** * 章节列表(P4-07 / 执行计划 §12.4 S04 的章节区)。 @@ -108,12 +97,13 @@ fun ChapterListScreen( /** * 无状态章节列表。 * - * - 顶部:返回 + 标题“章节”; - * - 搜索框(标题)+ 状态筛选(全部/解析中/解析失败/音频完成/未完成); - * - `LazyColumn` 稳定 key(章节主键),接近底部由 `LaunchedEffect` 触发加载更多; - * - 空态/首屏错误/加载态复用 P4-02 的 [EmptyState]/[ErrorState]。 + * 结构对齐 Forge Framework 的 Chapters 部分: + * ForgeTopBar(刷新)→ 搜索框 → 状态筛选 chips → 分区标题 → 章节行(数字、状态、 + * 分段进度、打开剧本 / 更多两个图标操作)→ 分页 footer。 + * + * 行内标题文字不可点击;进入剧本走行内明确的图标入口或「更多 → 打开剧本」。 + * 分页仍是接近底部自动加载,失败后改为手动重试,行为与旧实现一致。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ChapterListScreen( state: ChapterListUiState, @@ -130,30 +120,25 @@ fun ChapterListScreen( onRerender: (Long) -> Unit = {}, ) { val loadError = state.loadError + Scaffold( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - navigationIcon = { - TextButton( - onClick = onBack, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_back)) - } - }, - title = { - Text( - text = stringResource(R.string.chapter_list_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, + ForgeTopBar( + title = stringResource(R.string.ux2_chapter_title), + subtitle = stringResource(R.string.ux2_chapter_section_loaded, state.loadedCount), + navigationIcon = ForgeIcons.Back, + navigationDescription = stringResource(R.string.action_back), + onNavigation = onBack, + actions = { + ForgeIconAction( + icon = ForgeIcons.Refresh, + contentDescription = stringResource(R.string.action_refresh), + onClick = onRetry, + container = false, ) }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, ) { padding -> @@ -167,23 +152,35 @@ fun ChapterListScreen( onValueChange = onQueryChange, modifier = Modifier .fillMaxWidth() - .padding(start = 20.dp, end = 20.dp, top = 8.dp), + .padding( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + top = MaterialTheme.spacing.sm, + ), label = { Text(stringResource(R.string.chapter_list_search_label)) }, placeholder = { Text(stringResource(R.string.chapter_list_search_placeholder)) }, - singleLine = true, + leadingIcon = { + ForgeIcon( + icon = ForgeIcons.Search, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + }, trailingIcon = { if (state.query.isNotEmpty()) { - TextButton( + ForgeIconAction( + icon = ForgeIcons.Close, + contentDescription = stringResource(R.string.chapter_list_search_clear), onClick = { onQueryChange("") }, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.chapter_list_search_clear)) - } + container = false, + ) } }, + singleLine = true, + shape = MaterialTheme.shapes.large, ) ChapterFilterRow( - selected = state.filter, + state = state, onFilterChange = onFilterChange, ) Box( @@ -192,25 +189,17 @@ fun ChapterListScreen( .weight(1f), ) { when { - state.isInitialLoading -> ChapterListLoading( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 24.dp), + state.isInitialLoading -> ForgeLoading( + label = stringResource(R.string.chapter_list_loading), ) - loadError != null -> Box( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - ErrorState( - message = stringResource(R.string.chapter_list_load_error, loadError), - onRetry = onRetry, - ) - } + loadError != null -> ForgeError( + message = stringResource(R.string.chapter_list_load_error, loadError), + onRetry = onRetry, + retryLabel = stringResource(R.string.action_retry), + ) - state.isEmpty -> ChapterListEmpty( + state.isEmpty -> ChapterEmptyState( filtered = state.hasActiveFilters, onBack = onBack, onClearFilters = onClearFilters, @@ -230,80 +219,69 @@ fun ChapterListScreen( } } +private val chapterFilterOrder: List = listOf( + ChapterFilter.All, + ChapterFilter.AudioDone, + ChapterFilter.Parsing, + ChapterFilter.Incomplete, + ChapterFilter.ParseFailed, +) + @Composable private fun ChapterFilterRow( - selected: ChapterFilter, + state: ChapterListUiState, onFilterChange: (ChapterFilter) -> Unit, ) { Row( modifier = Modifier .fillMaxWidth() .horizontalScroll(rememberScrollState()) - .padding(horizontal = 20.dp, vertical = 4.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), + .padding( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.sm, + ), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, ) { - ChapterFilter.entries.forEach { filter -> - FilterChip( - selected = filter == selected, + chapterFilterOrder.forEach { filter -> + val count = state.chapters.count { chapter -> chapter.matchesFilter(filter) } + ForgeChip( + label = stringResource( + R.string.ux2_chapter_filter_count, + stringResource(filter.labelRes()), + count, + ), + selected = state.filter == filter, onClick = { onFilterChange(filter) }, - label = { Text(stringResource(filter.labelRes())) }, + icon = filter.iconRes(), ) } } } @Composable -private fun ChapterListEmpty( +private fun ChapterEmptyState( filtered: Boolean, onBack: () -> Unit, onClearFilters: () -> Unit, ) { - Box( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource( - if (filtered) { - R.string.chapter_list_filtered_empty_title - } else { - R.string.chapter_list_empty_title - }, - ), - description = stringResource( - if (filtered) { - R.string.chapter_list_filtered_empty_description - } else { - R.string.chapter_list_empty_description - }, - ), - actionText = stringResource( - if (filtered) { - R.string.chapter_list_filtered_empty_action - } else { - R.string.chapter_list_empty_action - }, - ), - onAction = if (filtered) onClearFilters else onBack, + if (filtered) { + ForgeEmpty( + icon = ForgeIcons.Search, + title = stringResource(R.string.chapter_list_filtered_empty_title), + description = stringResource(R.string.chapter_list_filtered_empty_description), + actionIcon = ForgeIcons.Refresh, + actionLabel = stringResource(R.string.chapter_list_filtered_empty_action), + onAction = onClearFilters, ) - } -} - -@Composable -private fun ChapterListLoading(modifier: Modifier = Modifier) { - Column( - modifier = modifier, - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center, - ) { - CircularProgressIndicator() - Spacer(Modifier.height(14.dp)) - Text( - text = stringResource(R.string.chapter_list_loading), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, + } else { + ForgeEmpty( + icon = ForgeIcons.List, + title = stringResource(R.string.chapter_list_empty_title), + description = stringResource(R.string.chapter_list_empty_description), + actionIcon = ForgeIcons.Back, + actionLabel = stringResource(R.string.chapter_list_empty_action), + onAction = onBack, ) } } @@ -344,28 +322,47 @@ private fun ChapterList( } } - LazyColumn( - state = listState, - modifier = Modifier - .fillMaxSize() - .padding(top = 4.dp), - contentPadding = PaddingValues(horizontal = 20.dp, vertical = 12.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), - ) { - items( - items = state.chapters, - key = { chapter -> chapter.key }, - contentType = { "chapter" }, - ) { chapter -> - ChapterRow( - chapter = chapter, - onOpenScript = onOpenScript, - onQuickParse = onQuickParse, - onRerender = onRerender, - ) - } - item(key = "footer", contentType = "footer") { - ChapterListFooter(state = state, onRetryLoadMore = onRetryLoadMore) + Column(modifier = Modifier.fillMaxSize()) { + ForgeSectionHeader( + title = stringResource( + if (state.hasActiveFilters) { + R.string.ux2_chapter_section_filtered + } else { + R.string.ux2_chapter_section_all + }, + ), + subtitle = stringResource(R.string.ux2_chapter_section_loaded, state.loadedCount), + modifier = Modifier.padding( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.sm, + ), + ) + LazyColumn( + state = listState, + modifier = Modifier + .fillMaxWidth() + .weight(1f), + contentPadding = PaddingValues( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.xs, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + items( + items = state.chapters, + key = { chapter -> chapter.key }, + contentType = { "chapter" }, + ) { chapter -> + ChapterRow( + chapter = chapter, + onOpenScript = onOpenScript, + onQuickParse = onQuickParse, + onRerender = onRerender, + ) + } + item(key = "footer", contentType = "footer") { + ChapterListFooter(state = state, onRetryLoadMore = onRetryLoadMore) + } } } } @@ -378,170 +375,235 @@ private fun ChapterRow( onRerender: (Long) -> Unit, ) { var menuExpanded by rememberSaveable(chapter.id) { mutableStateOf(false) } - val cardShape = MaterialTheme.shapes.medium - val openScriptLabel = stringResource(R.string.chapter_list_action_open_script) - val moreLabel = stringResource(R.string.action_more) - val moreDescription = stringResource( - R.string.chapter_list_item_more_content_description, - chapter.number, - ) + val percentage = (chapter.segmentProgress * 100f).roundToInt() - Card( - modifier = Modifier - .fillMaxWidth() - .clip(cardShape) - .combinedClickable( - onClickLabel = openScriptLabel, - onLongClickLabel = moreLabel, - onLongClick = { menuExpanded = true }, - onClick = { onOpenScript(chapter.id) }, - ), - shape = cardShape, - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { + ForgeCard(contentPadding = PaddingValues(MaterialTheme.spacing.md)) { Row( - modifier = Modifier.padding(horizontal = 14.dp, vertical = 12.dp), + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), verticalAlignment = Alignment.Top, ) { ChapterNumberBadge(number = chapter.number) - Spacer(Modifier.width(12.dp)) Column( modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.spacedBy(6.dp), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - Row(verticalAlignment = Alignment.CenterVertically) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { Text( text = chapter.title, modifier = Modifier.weight(1f), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - maxLines = 3, + style = MaterialTheme.typography.titleSmallEmphasized, + maxLines = 2, overflow = TextOverflow.Ellipsis, ) if (chapter.hasWarning) { - Spacer(Modifier.width(6.dp)) - WarningIcon() + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = stringResource(R.string.chapter_list_item_warning), + modifier = Modifier.size(16.dp), + tint = MaterialTheme.colorScheme.tertiary, + ) } } Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - StatusPill(kind = StatusKind.Parse, status = chapter.parseStatus) - StatusPill(kind = StatusKind.Audio, status = chapter.audioStatus) - } - if (chapter.hasSegments) { + ChapterStatusPill(chapter = chapter) Text( - text = stringResource( - R.string.chapter_list_item_segments, - chapter.segmentDone, - chapter.segmentTotal, - ), + text = if (chapter.hasSegments) { + stringResource( + R.string.ux2_chapter_segments, + chapter.segmentDone, + chapter.segmentTotal, + ) + } else { + stringResource(R.string.ux2_chapter_no_segments) + }, style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - LinearProgressIndicator( - progress = { chapter.segmentProgress }, - modifier = Modifier - .fillMaxWidth() - .height(4.dp), + maxLines = 1, + overflow = TextOverflow.Ellipsis, ) } - } - Box { - TextButton( - onClick = { menuExpanded = true }, - modifier = Modifier - .heightIn(min = 48.dp) - .semantics { contentDescription = moreDescription }, - ) { - Text(moreLabel) + if (chapter.hasSegments) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeWavyProgress( + progress = chapter.segmentProgress, + modifier = Modifier.weight(1f), + ) + Text( + text = stringResource( + R.string.ux2_chapter_progress_percent, + percentage, + ), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } - DropdownMenu( - expanded = menuExpanded, - onDismissRequest = { menuExpanded = false }, - ) { - DropdownMenuItem( - text = { Text(stringResource(R.string.chapter_list_action_quick_parse)) }, - onClick = { + } + Row(verticalAlignment = Alignment.Top) { + ForgeIconAction( + icon = ForgeIcons.FileText, + contentDescription = stringResource(R.string.chapter_list_action_open_script), + onClick = { onOpenScript(chapter.id) }, + container = false, + ) + Box { + ForgeIconAction( + icon = ForgeIcons.More, + contentDescription = stringResource( + R.string.chapter_list_item_more_content_description, + chapter.number, + ), + onClick = { menuExpanded = true }, + container = false, + ) + DropdownMenu( + expanded = menuExpanded, + onDismissRequest = { menuExpanded = false }, + ) { + ChapterMenuItem( + icon = ForgeIcons.Sparkles, + label = stringResource(R.string.chapter_list_action_quick_parse), + ) { menuExpanded = false onQuickParse(chapter.id) - }, - ) - DropdownMenuItem( - text = { Text(stringResource(R.string.chapter_list_action_rerender)) }, - onClick = { + } + ChapterMenuItem( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.chapter_list_action_rerender), + ) { menuExpanded = false onRerender(chapter.id) - }, - ) - DropdownMenuItem( - text = { Text(stringResource(R.string.chapter_list_action_open_script)) }, - onClick = { + } + ChapterMenuItem( + icon = ForgeIcons.FileText, + label = stringResource(R.string.chapter_list_action_open_script), + ) { menuExpanded = false onOpenScript(chapter.id) - }, - ) + } + } } } } } } +@Composable +private fun ChapterMenuItem( + @DrawableRes icon: Int, + label: String, + onClick: () -> Unit, +) { + DropdownMenuItem( + text = { Text(label) }, + onClick = onClick, + leadingIcon = { + ForgeIcon( + icon = icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + }, + ) +} + @Composable private fun ChapterNumberBadge(number: Int) { - Box( - modifier = Modifier - .sizeIn(minWidth = 36.dp, minHeight = 36.dp) - .clip(RoundedCornerShape(12.dp)) - .background(MaterialTheme.colorScheme.surfaceVariant) - .padding(horizontal = 6.dp, vertical = 4.dp), - contentAlignment = Alignment.Center, + Surface( + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.surfaceContainerHigh, + modifier = Modifier.size(40.dp), ) { - Text( - text = number.toString(), - style = MaterialTheme.typography.labelLarge, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 1, - ) + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text( + text = number.toString().padStart(2, '0'), + style = MaterialTheme.typography.labelMediumEmphasized, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + ) + } } } -/** 解析告警图标:琥珀三角 + 感叹号,不依赖 material-icons-extended。 */ @Composable -private fun WarningIcon() { - val description = stringResource(R.string.chapter_list_item_warning) - val fill = MaterialTheme.colorScheme.secondary - val mark = MaterialTheme.colorScheme.onSecondary - Canvas( - modifier = Modifier - .size(18.dp) - .semantics { contentDescription = description }, - ) { - val path = Path().apply { - moveTo(size.width / 2f, size.height * 0.06f) - lineTo(size.width * 0.98f, size.height * 0.92f) - lineTo(size.width * 0.02f, size.height * 0.92f) - close() - } - drawPath(path = path, color = fill) - val stroke = size.width * 0.075f - drawLine( - color = mark, - start = Offset(size.width / 2f, size.height * 0.36f), - end = Offset(size.width / 2f, size.height * 0.66f), - strokeWidth = stroke, - cap = StrokeCap.Round, +private fun ChapterStatusPill(chapter: ChapterListItemUi) { + val audioFailed = chapter.audioStatus.isWireStatus("error") + val audioRunning = chapter.audioStatus.isWireStatus("running") + + val visual = when { + chapter.isAudioDone -> ChapterStatusVisual( + icon = ForgeIcons.CheckCircle, + labelRes = R.string.ux2_status_done, + container = MaterialTheme.colorScheme.primaryContainer, + content = MaterialTheme.colorScheme.onPrimaryContainer, + ) + + chapter.isParseFailed || audioFailed -> ChapterStatusVisual( + icon = ForgeIcons.AlertCircle, + labelRes = R.string.ux2_status_error, + container = MaterialTheme.colorScheme.errorContainer, + content = MaterialTheme.colorScheme.onErrorContainer, + ) + + chapter.isParseRunning || audioRunning -> ChapterStatusVisual( + icon = ForgeIcons.Loader, + labelRes = R.string.ux2_status_running, + container = MaterialTheme.colorScheme.secondaryContainer, + content = MaterialTheme.colorScheme.onSecondaryContainer, ) - drawCircle( - color = mark, - radius = stroke * 0.7f, - center = Offset(size.width / 2f, size.height * 0.79f), + + else -> ChapterStatusVisual( + icon = ForgeIcons.Clock, + labelRes = R.string.ux2_status_pending, + container = MaterialTheme.colorScheme.surfaceContainerHigh, + content = MaterialTheme.colorScheme.onSurfaceVariant, ) } + + Surface( + shape = CircleShape, + color = visual.container, + contentColor = visual.content, + ) { + Row( + modifier = Modifier.padding(horizontal = MaterialTheme.spacing.sm, vertical = 3.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIcon( + icon = visual.icon, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = visual.content, + ) + Text( + text = stringResource(visual.labelRes), + style = MaterialTheme.typography.labelSmallEmphasized, + ) + } + } } +private data class ChapterStatusVisual( + @DrawableRes val icon: Int, + @StringRes val labelRes: Int, + val container: Color, + val content: Color, +) + @Composable private fun ChapterListFooter( state: ChapterListUiState, @@ -551,41 +613,61 @@ private fun ChapterListFooter( Box( modifier = Modifier .fillMaxWidth() - .padding(vertical = 8.dp), + .padding(vertical = MaterialTheme.spacing.sm), contentAlignment = Alignment.Center, ) { - if (loadMoreError != null) { - ErrorBanner( - message = stringResource(R.string.chapter_list_load_more_error, loadMoreError), - onRetry = onRetryLoadMore, - ) - } else if (state.loadingMore) { - Row( - modifier = Modifier.semantics { liveRegion = LiveRegionMode.Polite }, - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(8.dp), + when { + loadMoreError != null -> ForgeCard( + containerColor = MaterialTheme.colorScheme.errorContainer, ) { - CircularProgressIndicator( - modifier = Modifier.size(18.dp), - strokeWidth = 2.dp, + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) + Text( + text = stringResource(R.string.chapter_list_load_more_error, loadMoreError), + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + } + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.action_retry), + onClick = onRetryLoadMore, + modifier = Modifier.fillMaxWidth(), ) + } + + state.loadingMore -> Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + LoadingIndicator(modifier = Modifier.size(20.dp)) Text( text = stringResource(R.string.chapter_list_loading_more), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) } - } else if (state.isComplete) { - Text( + + state.isComplete -> Text( text = stringResource(R.string.chapter_list_all_loaded, state.loadedCount), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - } else if (state.hasMore) { - Text( + + state.hasMore -> Text( text = stringResource(R.string.chapter_list_load_more_hint), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, ) } } @@ -595,13 +677,25 @@ private fun ChapterListFooter( private fun ChapterFilter.labelRes(): Int = when (this) { ChapterFilter.All -> R.string.chapter_list_filter_all ChapterFilter.Parsing -> R.string.chapter_list_filter_parsing - ChapterFilter.ParseFailed -> R.string.chapter_list_filter_parse_failed - ChapterFilter.AudioDone -> R.string.chapter_list_filter_audio_done + ChapterFilter.ParseFailed -> R.string.ux2_chapter_filter_failed + ChapterFilter.AudioDone -> R.string.ux2_chapter_filter_done ChapterFilter.Incomplete -> R.string.chapter_list_filter_incomplete } +@DrawableRes +private fun ChapterFilter.iconRes(): Int = when (this) { + ChapterFilter.All -> ForgeIcons.List + ChapterFilter.Parsing -> ForgeIcons.Loader + ChapterFilter.ParseFailed -> ForgeIcons.AlertCircle + ChapterFilter.AudioDone -> ForgeIcons.CheckCircle + ChapterFilter.Incomplete -> ForgeIcons.Clock +} + +private fun String.isWireStatus(expected: String): Boolean = + trim().equals(expected, ignoreCase = true) + // --------------------------------------------------------------------------- -// Preview:正常列表 / 筛选空结果 / 加载 / 错误。所有文案来自 strings.xml。 +// Preview:正常列表 / 筛选空结果 / 加载 / 错误。示例数据只在 Preview 区使用。 // --------------------------------------------------------------------------- private fun previewChapter( diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/project/ProjectScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/project/ProjectScreen.kt index de3b4ac..2a28551 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/project/ProjectScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/project/ProjectScreen.kt @@ -1,5 +1,9 @@ +@file:OptIn(androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class) + package com.estimatefaster.audioforge.feature.project +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes import androidx.compose.foundation.background import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement @@ -11,32 +15,22 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -45,12 +39,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.heading -import androidx.compose.ui.semantics.clearAndSetSemantics -import androidx.compose.ui.semantics.contentDescription -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -59,21 +51,28 @@ import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.data.db.ChapterBrief import com.estimatefaster.audioforge.data.db.CharacterEntity import com.estimatefaster.audioforge.data.db.ProjectSummary -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorState -import com.estimatefaster.audioforge.ui.components.ProgressRing -import com.estimatefaster.audioforge.ui.components.RoleAvatar -import com.estimatefaster.audioforge.ui.components.SectionHeader -import com.estimatefaster.audioforge.ui.components.StatusKind -import com.estimatefaster.audioforge.ui.components.StatusPill -import com.estimatefaster.audioforge.ui.components.StatusTone +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeDialog +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeListRow +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar +import com.estimatefaster.audioforge.ui.forge.ForgeWavyProgress import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing /** * 项目详情页(P4-05 / 执行计划 §12.4 S04)。 * - * 有状态入口:从 [ProjectViewModel.state] 收集状态后委托给无状态版本, - * 方便 Preview 与后续导航层复用。 + * 有状态入口:从 [ProjectViewModel.state] 收集状态后委托给无状态版本。 + * Forge Framework 重写只改变呈现,公开回调、加载/空/错误分支保持不变。 */ @Composable fun ProjectScreen( @@ -115,14 +114,14 @@ fun ProjectScreen( /** * 无状态项目详情页。 * - * - 顶部:书名、来源、字符数、更多(重命名/删除); - * - 摘要/进度/控制/告警/人物条; - * - 加载/错误/空态复用 P4-02 组件。 + * 结构对齐 `docs/prototype/forge-framework.html` 的项目详情: + * 顶部 ForgeTopBar(播放全书 / 更多)→ 封面 hero → 整体进度(Wavy)→ + * 告警 → 人物条 → 章节入口 → 底部固定 action dock。 * - * 批次执行尚未接入(P3-04):[batchRunnerAvailable] 为 false 时开始/停止禁用, + * 正常态只有「继续生成」一个实心主操作;运行中额外提供次级「停止生成」。 + * 批次执行尚未接入(P3-04):[batchRunnerAvailable] 为 false 时主操作禁用, * 并显示“任务模块接入后可开始”。回调只做 UI 解耦,不直接访问仓库。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ProjectScreen( state: ProjectUiState, @@ -148,174 +147,155 @@ fun ProjectScreen( val project = state.project val loadError = state.loadError + val stats = state.chapterStats Scaffold( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - navigationIcon = { - TextButton( - onClick = onBack, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_back)) - } - }, - title = { - Column { - Text( - text = project?.title - ?: stringResource(R.string.project_screen_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - if (project != null) { - Text( - text = stringResource( - R.string.project_header_meta, - project.sourceName, - project.charCount, - ), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) - } - } + ForgeTopBar( + title = stringResource(R.string.ux2_project_title), + subtitle = project?.let { + stringResource(R.string.ux2_project_topbar_subtitle, it.title, stats.total) }, + navigationIcon = ForgeIcons.Back, + navigationDescription = stringResource(R.string.action_back), + onNavigation = onBack, actions = { if (project != null) { + ForgeIconAction( + icon = ForgeIcons.Headphones, + contentDescription = stringResource(R.string.ux2_project_play_all), + onClick = onOpenPlayer, + container = false, + ) Box { - TextButton( + ForgeIconAction( + icon = ForgeIcons.More, + contentDescription = stringResource(R.string.ux2_project_more), onClick = { menuExpanded = true }, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_more)) - } + container = false, + ) DropdownMenu( expanded = menuExpanded, onDismissRequest = { menuExpanded = false }, ) { - DropdownMenuItem( - text = { Text(stringResource(R.string.project_more_chapters)) }, - onClick = { - menuExpanded = false - onOpenChapters() - }, - ) - DropdownMenuItem( - text = { - Text(stringResource(R.string.project_more_characters)) - }, - onClick = { - menuExpanded = false - onOpenCharacters() - }, - ) - DropdownMenuItem( - text = { Text(stringResource(R.string.project_more_player)) }, - onClick = { - menuExpanded = false - onOpenPlayer() - }, - ) - DropdownMenuItem( - text = { Text(stringResource(R.string.project_more_export)) }, - onClick = { - menuExpanded = false - onOpenExport() - }, - ) - DropdownMenuItem( - text = { Text(stringResource(R.string.project_more_storage)) }, - onClick = { - menuExpanded = false - onOpenStorage() - }, - ) - DropdownMenuItem( - text = { Text(stringResource(R.string.project_more_about)) }, - onClick = { - menuExpanded = false - onOpenAbout() - }, - ) - DropdownMenuItem( - text = { Text(stringResource(R.string.action_rename)) }, - onClick = { - menuExpanded = false - renameText = project.title - showRenameDialog = true - }, - ) - DropdownMenuItem( - text = { - Text( - text = stringResource(R.string.action_delete), - color = MaterialTheme.colorScheme.error, - ) - }, - onClick = { - menuExpanded = false - showDeleteDialog = true - }, - ) + ProjectMenuItem( + icon = ForgeIcons.List, + label = stringResource(R.string.project_more_chapters), + ) { + menuExpanded = false + onOpenChapters() + } + ProjectMenuItem( + icon = ForgeIcons.Users, + label = stringResource(R.string.project_more_characters), + ) { + menuExpanded = false + onOpenCharacters() + } + ProjectMenuItem( + icon = ForgeIcons.Headphones, + label = stringResource(R.string.project_more_player), + ) { + menuExpanded = false + onOpenPlayer() + } + ProjectMenuItem( + icon = ForgeIcons.Download, + label = stringResource(R.string.project_more_export), + ) { + menuExpanded = false + onOpenExport() + } + ProjectMenuItem( + icon = ForgeIcons.Storage, + label = stringResource(R.string.project_more_storage), + ) { + menuExpanded = false + onOpenStorage() + } + ProjectMenuItem( + icon = ForgeIcons.Info, + label = stringResource(R.string.project_more_about), + ) { + menuExpanded = false + onOpenAbout() + } + ProjectMenuItem( + icon = ForgeIcons.Edit, + label = stringResource(R.string.action_rename), + ) { + menuExpanded = false + renameText = project.title + showRenameDialog = true + } + ProjectMenuItem( + icon = ForgeIcons.Trash, + label = stringResource(R.string.action_delete), + danger = true, + ) { + menuExpanded = false + showDeleteDialog = true + } } } } }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, + bottomBar = { + if (state.hasChapters) { + ContinueDock( + stats = stats, + batchRunnerAvailable = batchRunnerAvailable, + onStartBatch = onStartBatch, + onStopBatch = onStopBatch, + ) + } + }, ) { padding -> when { - state.loading -> LoadingContent(modifier = Modifier.padding(padding)) + state.loading -> ForgeLoading( + label = stringResource(R.string.project_loading), + modifier = Modifier.padding(padding), + ) - loadError != null -> CenteredError( + loadError != null -> ForgeError( message = stringResource(R.string.project_load_error, loadError), - onRetry = onRetry, modifier = Modifier.padding(padding), + onRetry = onRetry, + retryLabel = stringResource(R.string.action_retry), ) - state.isMissing -> CenteredError( + state.isMissing -> ForgeError( message = stringResource(R.string.project_missing_message), - onRetry = onRetry, modifier = Modifier.padding(padding), + onRetry = onRetry, + retryLabel = stringResource(R.string.action_retry), ) - state.isEmpty -> Box( - modifier = Modifier - .fillMaxSize() - .padding(padding), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource(R.string.project_empty_title), - description = stringResource(R.string.project_empty_description), - actionText = stringResource(R.string.project_empty_action), - onAction = onBack, - ) - } + state.isEmpty -> ForgeEmpty( + icon = ForgeIcons.BookOpen, + title = stringResource(R.string.ux2_project_empty_title), + description = stringResource(R.string.ux2_project_empty_description), + modifier = Modifier.padding(padding), + actionIcon = ForgeIcons.Back, + actionLabel = stringResource(R.string.project_empty_action), + onAction = onBack, + ) else -> ProjectContent( state = state, contentPadding = padding, - batchRunnerAvailable = batchRunnerAvailable, - onStartBatch = onStartBatch, - onStopBatch = onStopBatch, + onOpenChapters = onOpenChapters, + onOpenCharacters = onOpenCharacters, ) } } if (showRenameDialog && project != null) { - RenameDialog( + RenameProjectDialog( title = project.title, value = renameText, onValueChange = { renameText = it }, @@ -328,81 +308,79 @@ fun ProjectScreen( } if (showDeleteDialog && project != null) { - DeleteDialog( - title = project.title, - onDismiss = { showDeleteDialog = false }, + ForgeDialog( + title = stringResource(R.string.project_delete_title), + message = stringResource(R.string.project_delete_message, project.title), + confirmLabel = stringResource(R.string.action_delete), onConfirm = { showDeleteDialog = false onDelete() }, + onDismiss = { showDeleteDialog = false }, + icon = ForgeIcons.Trash, + danger = true, ) } } @Composable -private fun LoadingContent(modifier: Modifier = Modifier) { - Column( - modifier = modifier.fillMaxSize(), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center, - ) { - CircularProgressIndicator() - Spacer(Modifier.height(14.dp)) - Text( - text = stringResource(R.string.project_loading), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } -} - -@Composable -private fun CenteredError( - message: String, - onRetry: () -> Unit, - modifier: Modifier = Modifier, +private fun ProjectMenuItem( + @DrawableRes icon: Int, + label: String, + danger: Boolean = false, + onClick: () -> Unit, ) { - Box( - modifier = modifier.fillMaxSize(), - contentAlignment = Alignment.Center, - ) { - ErrorState(message = message, onRetry = onRetry) - } + DropdownMenuItem( + text = { + Text( + text = label, + color = if (danger) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurface, + ) + }, + onClick = onClick, + leadingIcon = { + ForgeIcon( + icon = icon, + contentDescription = null, + tint = if (danger) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurfaceVariant, + ) + }, + ) } @Composable private fun ProjectContent( state: ProjectUiState, contentPadding: PaddingValues, - batchRunnerAvailable: Boolean, - onStartBatch: () -> Unit, - onStopBatch: () -> Unit, + onOpenChapters: () -> Unit, + onOpenCharacters: () -> Unit, ) { + val project = state.project ?: return val stats = state.chapterStats + val characterCount = state.characters.size + state.hiddenCharacterCount + LazyColumn( modifier = Modifier .fillMaxSize() .padding(contentPadding), - contentPadding = PaddingValues(horizontal = 20.dp, vertical = 16.dp), - verticalArrangement = Arrangement.spacedBy(14.dp), + contentPadding = PaddingValues( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.md, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - item(key = "summary") { - SummaryRow(stats = stats) + item(key = "hero") { + ProjectHero(project = project, stats = stats, characterCount = characterCount) } item(key = "progress") { - ProgressCard(stats = stats) - } - item(key = "control") { - ControlCard( - batchRunnerAvailable = batchRunnerAvailable, - running = stats.running > 0, - onStartBatch = onStartBatch, - onStopBatch = onStopBatch, - ) + ProgressCard(stats = stats, characterCount = characterCount) } if (state.warnings.hasWarnings || stats.error > 0) { - item(key = "warnings") { - WarningBanner(warnings = state.warnings, errorCount = stats.error) + item(key = "warning") { + WarningCard( + warnings = state.warnings, + errorCount = stats.error, + ) } } if (state.characters.isNotEmpty()) { @@ -410,110 +388,86 @@ private fun ProjectContent( CharacterStrip( characters = state.characters, hiddenCount = state.hiddenCharacterCount, + onOpenCharacters = onOpenCharacters, ) } } + item(key = "chapters") { + ChapterEntry( + stats = stats, + onOpenChapters = onOpenChapters, + ) + } + item(key = "bottom-space") { + Spacer(Modifier.height(MaterialTheme.spacing.sm)) + } } } @Composable -private fun SummaryRow(stats: ChapterStatsUi) { - Row( - modifier = Modifier.horizontalScroll(rememberScrollState()), - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - StatusPill( - text = stringResource(R.string.project_chapter_total, stats.total), - tone = StatusTone.Neutral, - ) - StatusPill( - kind = StatusKind.Parse, - status = stats.parseAggregateStatus(), - ) - StatusPill( - kind = StatusKind.Audio, - status = stats.audioAggregateStatus(), - ) - } -} - -@Composable -private fun ProgressCard(stats: ChapterStatsUi) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column( - modifier = Modifier.padding(18.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), +private fun ProjectHero( + project: ProjectHeaderUi, + stats: ChapterStatsUi, + characterCount: Int, +) { + ForgeCard(contentPadding = PaddingValues(MaterialTheme.spacing.md)) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + verticalAlignment = Alignment.Top, ) { - SectionHeader(title = stringResource(R.string.project_progress_title)) - Row(verticalAlignment = Alignment.CenterVertically) { - ProgressRing( - progress = stats.progress, - label = stringResource(R.string.project_progress_ring_label), - diameter = 104.dp, - strokeWidth = 9.dp, + ProjectCover(title = project.title) + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ProjectStatusPill(stats = stats) + Text( + text = project.title, + style = MaterialTheme.typography.headlineSmallEmphasized, + maxLines = 2, + overflow = TextOverflow.Ellipsis, ) - Spacer(Modifier.width(18.dp)) - Column( - modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.spacedBy(8.dp), + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), ) { - Text( - text = stringResource( - R.string.project_progress_chapters, - stats.done, - stats.total, - ), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, + ForgeIcon( + icon = ForgeIcons.FileText, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, ) Text( text = stringResource( - R.string.project_progress_segments, - stats.segmentsDone, - stats.segmentsTotal, + R.string.ux2_project_hero_source, + project.sourceName, + project.charCount, ), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + HeroTag( + icon = ForgeIcons.BookOpen, + label = stringResource(R.string.ux2_project_tag_chapters, stats.total), + ) + HeroTag( + icon = ForgeIcons.Users, + label = stringResource(R.string.ux2_project_tag_characters, characterCount), + ) + HeroTag( + icon = ForgeIcons.Sparkles, + label = stringResource(R.string.ux2_project_tag_multi_voice), ) - Row( - modifier = Modifier.horizontalScroll(rememberScrollState()), - horizontalArrangement = Arrangement.spacedBy(8.dp), - ) { - StatusPill( - text = stringResource( - R.string.project_chapter_stat_done, - stats.done, - ), - tone = StatusTone.Success, - ) - StatusPill( - text = stringResource( - R.string.project_chapter_stat_running, - stats.running, - ), - tone = StatusTone.Running, - ) - StatusPill( - text = stringResource( - R.string.project_chapter_stat_error, - stats.error, - ), - tone = StatusTone.Danger, - ) - if (stats.pending > 0) { - StatusPill( - text = stringResource( - R.string.project_chapter_stat_pending, - stats.pending, - ), - tone = StatusTone.Neutral, - ) - } - } } } } @@ -521,97 +475,236 @@ private fun ProgressCard(stats: ChapterStatsUi) { } @Composable -private fun ControlCard( - batchRunnerAvailable: Boolean, - running: Boolean, - onStartBatch: () -> Unit, - onStopBatch: () -> Unit, +private fun ProjectCover(title: String) { + val colors = listOf( + MaterialTheme.colorScheme.primary, + MaterialTheme.colorScheme.secondary, + ) + Box( + modifier = Modifier + .size(width = 84.dp, height = 112.dp) + .clip(MaterialTheme.shapes.large) + .background(Brush.linearGradient(colors)), + contentAlignment = Alignment.Center, + ) { + ForgeIcon( + icon = ForgeIcons.BookOpen, + contentDescription = null, + modifier = Modifier.size(32.dp), + tint = MaterialTheme.colorScheme.onPrimary, + ) + Text( + text = title.take(1), + modifier = Modifier + .align(Alignment.BottomStart) + .padding(MaterialTheme.spacing.sm), + style = MaterialTheme.typography.displaySmallEmphasized, + color = MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.28f), + ) + } +} + +@Composable +private fun HeroTag( + @DrawableRes icon: Int, + label: String, ) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), + Surface( + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceContainerHigh, + contentColor = MaterialTheme.colorScheme.onSurfaceVariant, ) { - Column( - modifier = Modifier.padding(18.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), + Row( + modifier = Modifier.padding(horizontal = MaterialTheme.spacing.sm, vertical = 3.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), ) { - SectionHeader(title = stringResource(R.string.project_control_title)) + ForgeIcon( + icon = icon, + contentDescription = null, + modifier = Modifier.size(12.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text(text = label, style = MaterialTheme.typography.labelSmall) + } + } +} + +@Composable +private fun ProjectStatusPill(stats: ChapterStatsUi) { + val visual = when { + stats.running > 0 -> ProjectStatusVisual( + icon = ForgeIcons.Loader, + labelRes = R.string.ux2_project_status_running, + container = MaterialTheme.colorScheme.secondaryContainer, + content = MaterialTheme.colorScheme.onSecondaryContainer, + ) + + stats.error > 0 -> ProjectStatusVisual( + icon = ForgeIcons.AlertCircle, + labelRes = R.string.ux2_project_status_error, + container = MaterialTheme.colorScheme.errorContainer, + content = MaterialTheme.colorScheme.onErrorContainer, + ) + + stats.total > 0 && stats.done >= stats.total -> ProjectStatusVisual( + icon = ForgeIcons.CheckCircle, + labelRes = R.string.ux2_project_status_done, + container = MaterialTheme.colorScheme.primaryContainer, + content = MaterialTheme.colorScheme.onPrimaryContainer, + ) + + else -> ProjectStatusVisual( + icon = ForgeIcons.Clock, + labelRes = R.string.ux2_project_status_pending, + container = MaterialTheme.colorScheme.surfaceContainerHigh, + content = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + Surface( + shape = CircleShape, + color = visual.container, + contentColor = visual.content, + ) { + Row( + modifier = Modifier.padding(horizontal = MaterialTheme.spacing.sm, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIcon( + icon = visual.icon, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = visual.content, + ) Text( - text = stringResource(R.string.project_control_description), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + text = stringResource(visual.labelRes), + style = MaterialTheme.typography.labelMediumEmphasized, + ) + } + } +} + +private data class ProjectStatusVisual( + @DrawableRes val icon: Int, + @StringRes val labelRes: Int, + val container: Color, + val content: Color, +) + +@Composable +private fun ProgressCard( + stats: ChapterStatsUi, + characterCount: Int, +) { + ForgeCard { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + Text( + text = stringResource(R.string.ux2_project_progress_title), + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.titleMediumEmphasized, + ) + Text( + text = stringResource(R.string.ux2_project_progress_percent, stats.percent), + style = MaterialTheme.typography.headlineSmallEmphasized, + color = MaterialTheme.colorScheme.primary, + ) + } + ForgeWavyProgress(progress = stats.progress) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + StatCell( + value = stringResource( + R.string.ux2_project_stat_ratio, + stats.done, + stats.total, + ), + label = stringResource(R.string.ux2_project_stat_chapters), + modifier = Modifier.weight(1f), + ) + StatCell( + value = stringResource( + R.string.ux2_project_stat_ratio, + stats.segmentsDone, + stats.segmentsTotal, + ), + label = stringResource(R.string.ux2_project_stat_segments), + modifier = Modifier.weight(1f), + ) + StatCell( + value = stringResource(R.string.ux2_project_stat_value, characterCount), + label = stringResource(R.string.ux2_project_stat_characters), + modifier = Modifier.weight(1f), ) - Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { - FilledTonalButton( - onClick = onStartBatch, - enabled = batchRunnerAvailable && !running, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.project_action_start)) - } - OutlinedButton( - onClick = onStopBatch, - enabled = batchRunnerAvailable && running, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.project_action_stop)) - } - } - if (!batchRunnerAvailable) { - Text( - text = stringResource(R.string.project_control_unavailable), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } else if (running) { - Text( - text = stringResource(R.string.project_control_running), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } } } } @Composable -private fun WarningBanner( +private fun StatCell( + value: String, + label: String, + modifier: Modifier = Modifier, +) { + Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text(text = value, style = MaterialTheme.typography.titleMediumEmphasized) + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } +} + +@Composable +private fun WarningCard( warnings: WarningSummaryUi, errorCount: Int, ) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.secondaryContainer, - ), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(6.dp), + ForgeCard(containerColor = MaterialTheme.colorScheme.errorContainer) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, ) { - Text( - text = stringResource(R.string.project_warning_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onSecondaryContainer, + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, ) - if (warnings.hasWarnings) { - Text( - text = stringResource( - R.string.project_warning_summary, - warnings.warningCount, - warnings.summary, - ), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSecondaryContainer, - ) - } - if (errorCount > 0) { + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { Text( - text = stringResource(R.string.project_error_summary, errorCount), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSecondaryContainer, + text = stringResource(R.string.project_warning_title), + style = MaterialTheme.typography.titleSmallEmphasized, + color = MaterialTheme.colorScheme.onErrorContainer, ) + if (warnings.hasWarnings) { + Text( + text = stringResource( + R.string.project_warning_summary, + warnings.warningCount, + warnings.summary, + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + } + if (errorCount > 0) { + Text( + text = stringResource(R.string.project_error_summary, errorCount), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + } } } } @@ -621,25 +714,29 @@ private fun WarningBanner( private fun CharacterStrip( characters: List, hiddenCount: Int, + onOpenCharacters: () -> Unit, ) { - Column { - SectionHeader( + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + ForgeSectionHeader( title = stringResource(R.string.project_characters_title), subtitle = stringResource( R.string.project_characters_subtitle, characters.size + hiddenCount, ), + actionIcon = ForgeIcons.ChevronRight, + actionDescription = stringResource(R.string.ux2_project_characters_manage), + onAction = onOpenCharacters, ) LazyRow( - horizontalArrangement = Arrangement.spacedBy(14.dp), - contentPadding = PaddingValues(vertical = 4.dp), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + contentPadding = PaddingValues(vertical = MaterialTheme.spacing.xs), ) { items(items = characters, key = { it.roleId }) { character -> - CharacterItem(character = character) + CharacterCard(name = character.name, onClick = onOpenCharacters) } if (hiddenCount > 0) { item(key = "hidden-characters") { - MoreCharactersBadge(count = hiddenCount) + CharacterMoreCard(count = hiddenCount, onClick = onOpenCharacters) } } } @@ -647,61 +744,170 @@ private fun CharacterStrip( } @Composable -private fun CharacterItem(character: CharacterUi) { - Column( - modifier = Modifier - .widthIn(min = 64.dp, max = 88.dp) - .semantics(mergeDescendants = true) {}, - horizontalAlignment = Alignment.CenterHorizontally, +private fun CharacterCard( + name: String, + onClick: () -> Unit, +) { + ForgeCard( + modifier = Modifier.width(92.dp), + onClick = onClick, + contentPadding = PaddingValues(MaterialTheme.spacing.md), ) { - // 头像旁已有可见名字,装饰化以避免同一个人物被读两遍。 - RoleAvatar(name = character.name, decorative = true) - Spacer(Modifier.height(4.dp)) + Surface( + shape = CircleShape, + color = MaterialTheme.colorScheme.primaryContainer, + modifier = Modifier + .size(44.dp) + .align(Alignment.CenterHorizontally), + ) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + ForgeIcon( + icon = ForgeIcons.UserRound, + contentDescription = null, + modifier = Modifier.size(22.dp), + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + } + } Text( - text = character.name, - style = MaterialTheme.typography.labelMedium, - maxLines = 2, + text = name, + modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.labelMediumEmphasized, + textAlign = TextAlign.Center, + maxLines = 1, overflow = TextOverflow.Ellipsis, ) } } @Composable -private fun MoreCharactersBadge(count: Int) { - val description = stringResource(R.string.project_characters_more_content_description, count) - Column( - modifier = Modifier.widthIn(min = 64.dp), - horizontalAlignment = Alignment.CenterHorizontally, +private fun CharacterMoreCard( + count: Int, + onClick: () -> Unit, +) { + ForgeCard( + modifier = Modifier.width(92.dp), + onClick = onClick, + contentPadding = PaddingValues(MaterialTheme.spacing.md), ) { - Box( + Surface( + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceContainerHigh, modifier = Modifier - .size(48.dp) - .clip(CircleShape) - .background(MaterialTheme.colorScheme.surfaceVariant) - .clearAndSetSemantics { contentDescription = description }, - contentAlignment = Alignment.Center, + .size(44.dp) + .align(Alignment.CenterHorizontally), ) { - Text( - text = stringResource(R.string.project_characters_more_badge, count), - style = MaterialTheme.typography.labelLarge, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 1, - ) + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + ForgeIcon( + icon = ForgeIcons.More, + contentDescription = null, + modifier = Modifier.size(22.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } - Spacer(Modifier.height(4.dp)) Text( text = stringResource(R.string.project_characters_more, count), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 1, + modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.labelSmall, + textAlign = TextAlign.Center, + maxLines = 2, overflow = TextOverflow.Ellipsis, ) } } @Composable -private fun RenameDialog( +private fun ChapterEntry( + stats: ChapterStatsUi, + onOpenChapters: () -> Unit, +) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + ForgeSectionHeader( + title = stringResource(R.string.project_more_chapters), + subtitle = stringResource( + R.string.ux2_project_chapters_subtitle, + stats.total, + stats.pending, + ), + actionIcon = ForgeIcons.ChevronRight, + actionDescription = stringResource(R.string.ux2_project_chapters_manage), + onAction = onOpenChapters, + ) + ForgeListRow( + icon = ForgeIcons.List, + title = stringResource(R.string.ux2_project_chapter_row_title), + subtitle = stringResource( + R.string.ux2_project_chapter_row_summary, + stats.done, + stats.running, + stats.pending, + ), + onClick = onOpenChapters, + trailingIcon = ForgeIcons.ChevronRight, + trailingDescription = stringResource(R.string.ux2_project_chapters_manage), + onTrailingClick = onOpenChapters, + ) + } +} + +@Composable +private fun ContinueDock( + stats: ChapterStatsUi, + batchRunnerAvailable: Boolean, + onStartBatch: () -> Unit, + onStopBatch: () -> Unit, +) { + val hint = when { + !batchRunnerAvailable -> stringResource(R.string.project_control_unavailable) + stats.running > 0 -> stringResource(R.string.ux2_project_continue_running) + stats.pending <= 0 && stats.total > 0 -> { + stringResource(R.string.ux2_project_continue_hint_done) + } + else -> stringResource(R.string.ux2_project_continue_hint, stats.pending) + } + + Surface(color = MaterialTheme.colorScheme.surface) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.sm, + ), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgePrimaryAction( + icon = ForgeIcons.Wand, + label = stringResource(R.string.ux2_project_continue), + onClick = onStartBatch, + modifier = Modifier.fillMaxWidth(), + enabled = batchRunnerAvailable && stats.running == 0, + ) + if (stats.running > 0) { + ForgeSecondaryAction( + icon = ForgeIcons.Square, + label = stringResource(R.string.ux2_project_stop), + onClick = onStopBatch, + modifier = Modifier.fillMaxWidth(), + enabled = batchRunnerAvailable, + danger = true, + ) + } + Text( + text = hint, + modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + ) + } + } +} + +@Composable +private fun RenameProjectDialog( title: String, value: String, onValueChange: (String) -> Unit, @@ -711,9 +917,21 @@ private fun RenameDialog( val trimmed = value.trim() AlertDialog( onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.project_rename_title)) }, + icon = { + ForgeIcon( + icon = ForgeIcons.Edit, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) + }, + title = { + Text( + text = stringResource(R.string.project_rename_title), + style = MaterialTheme.typography.titleLargeEmphasized, + ) + }, text = { - Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { OutlinedTextField( value = value, onValueChange = onValueChange, @@ -722,14 +940,14 @@ private fun RenameDialog( isError = trimmed.isEmpty(), modifier = Modifier.fillMaxWidth(), ) - if (trimmed.isEmpty()) { - Text( + when { + trimmed.isEmpty() -> Text( text = stringResource(R.string.project_rename_empty_error), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error, ) - } else if (trimmed != title) { - Text( + + trimmed != title -> Text( text = stringResource(R.string.project_rename_hint), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, @@ -738,49 +956,25 @@ private fun RenameDialog( } }, confirmButton = { - TextButton( + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = stringResource(R.string.action_save), onClick = { onConfirm(trimmed) }, enabled = trimmed.isNotEmpty(), - ) { - Text(stringResource(R.string.action_save)) - } - }, - dismissButton = { - TextButton(onClick = onDismiss) { - Text(stringResource(R.string.action_cancel)) - } - }, - ) -} - -@Composable -private fun DeleteDialog( - title: String, - onDismiss: () -> Unit, - onConfirm: () -> Unit, -) { - AlertDialog( - onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.project_delete_title)) }, - text = { Text(stringResource(R.string.project_delete_message, title)) }, - confirmButton = { - TextButton(onClick = onConfirm) { - Text( - text = stringResource(R.string.action_delete), - color = MaterialTheme.colorScheme.error, - ) - } + ) }, dismissButton = { - TextButton(onClick = onDismiss) { - Text(stringResource(R.string.action_cancel)) - } + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.action_cancel), + onClick = onDismiss, + ) }, ) } // --------------------------------------------------------------------------- -// Preview:正常 / 空项目 / 错误态。所有文案来自 strings.xml。 +// Preview:正常 / 空项目 / 错误态。示例数据只在 Preview 区使用。 // --------------------------------------------------------------------------- private fun previewProject( @@ -794,10 +988,10 @@ private fun previewProject( charCount = charCount, createdAt = 0L, lastOpenedAt = null, - chapterCount = 0, - chapterDoneCount = 0, - segmentCount = 0, - segmentDoneCount = 0, + chapterCount = 8, + chapterDoneCount = 5, + segmentCount = 150, + segmentDoneCount = 96, ) private fun previewChapter( @@ -820,8 +1014,9 @@ private fun previewChapter( private fun previewCharacters(): List = listOf( CharacterEntity(id = 1, novelId = 1, roleId = "narrator", name = "旁白"), - CharacterEntity(id = 2, novelId = 1, roleId = "role_0002", name = "林黛玉"), - CharacterEntity(id = 3, novelId = 1, roleId = "role_0003", name = "贾宝玉"), + CharacterEntity(id = 2, novelId = 1, roleId = "role_0002", name = "沈砚"), + CharacterEntity(id = 3, novelId = 1, roleId = "role_0003", name = "苏晚"), + CharacterEntity(id = 4, novelId = 1, roleId = "role_0004", name = "老船夫"), ) private fun previewNormalState(): ProjectUiState = buildProjectUiState( diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/project/TuningSheet.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/project/TuningSheet.kt index 790f331..e1a1c50 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/project/TuningSheet.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/project/TuningSheet.kt @@ -1,29 +1,32 @@ +@file:OptIn( + androidx.compose.material3.ExperimentalMaterial3Api::class, + androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class, +) + package com.estimatefaster.audioforge.feature.project import android.content.res.Configuration +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Slider import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -31,19 +34,29 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.data.repository.TuningDefaults import com.estimatefaster.audioforge.data.repository.TuningRanges -import com.estimatefaster.audioforge.ui.components.ErrorState -import com.estimatefaster.audioforge.ui.components.SectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeSheetHeader import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing /** * 角色微调 Sheet(P5-06 / 执行计划 §12.4 S09、§15 P5-06)。 @@ -58,7 +71,6 @@ import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme * @param onDismiss 取消/下滑/返回时关闭 Sheet(不写库) * @param onSaved 保存成功后的回调(通常关闭 Sheet 并刷新角色卡) */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun TuningSheet( viewModel: TuningViewModel, @@ -98,8 +110,12 @@ fun TuningSheet( /** * 无状态 Sheet 内容;Preview 与 UI 测试直接渲染它。 * - * 布局:标题/角色/音色 → 三个滑杆 + 当前值 + 范围 + “跟随全局”提示 → 恢复默认 - * → 校验/保存错误 → 取消/保存。文案全部来自 `strings.xml`。 + * 结构对齐 Forge Framework 的调参 Sheet: + * SheetHeader → 角色 hero → 三个滑杆(值 / 跟随全局 / 范围提示)→ 恢复默认 + * → 校验 / 保存错误 → 唯一主操作“保存参数”。 + * + * 校验、脏标记、可保存与否仍由 [TuningUiState] 的派生属性决定;滑杆输入继续走 + * [snapTuningValue],保存仍由 ViewModel 写仓库。文案全部来自资源文件。 */ @Composable fun TuningSheetContent( @@ -121,17 +137,34 @@ fun TuningSheetContent( .fillMaxWidth() .navigationBarsPadding() .verticalScroll(rememberScrollState()) - .padding(horizontal = 24.dp) - .padding(top = 8.dp, bottom = 24.dp), - verticalArrangement = Arrangement.spacedBy(16.dp), + .padding(horizontal = MaterialTheme.spacing.lg) + .padding(top = MaterialTheme.spacing.xs, bottom = MaterialTheme.spacing.lg), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.lg), ) { - TuningHeader(state) + ForgeSheetHeader( + icon = ForgeIcons.Sliders, + title = stringResource(R.string.ux2_tuning_title), + onClose = onDismiss, + subtitle = stringResource(R.string.ux2_tuning_subtitle), + ) + + TuningRoleCard(state = state) when { - state.loading -> TuningLoading() - loadError != null -> ErrorState( + state.loading -> ForgeLoading( + label = stringResource(R.string.tuning_loading), + modifier = Modifier + .fillMaxWidth() + .heightIn(min = 180.dp), + ) + + loadError != null -> ForgeError( message = stringResource(R.string.tuning_load_error, loadError), + modifier = Modifier + .fillMaxWidth() + .heightIn(min = 220.dp), onRetry = onRetryLoad, + retryLabel = stringResource(R.string.action_retry), ) else -> { @@ -140,67 +173,92 @@ fun TuningSheetContent( onSpeedChange = onSpeedChange, onVolumeChange = onVolumeChange, onPitchChange = onPitchChange, - onReset = onReset, + ) + + ForgeSecondaryAction( + icon = ForgeIcons.RotateCcw, + label = stringResource(R.string.tuning_action_reset), + onClick = onReset, + modifier = Modifier.fillMaxWidth(), + enabled = state.canReset, ) if (state.validationErrors.isNotEmpty()) { - TuningValidationCard(state) + TuningValidationCard(state = state) } if (saveError != null) { TuningSaveErrorCard(message = saveError, onRetry = onSave) } - Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { - OutlinedButton( - onClick = onDismiss, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_cancel)) - } - Button( - onClick = onSave, - enabled = state.canSave, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text( - text = if (state.saving) { - stringResource(R.string.action_saving) - } else { - stringResource(R.string.action_save) - }, - ) - } - } + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = if (state.saving) { + stringResource(R.string.action_saving) + } else { + stringResource(R.string.ux2_tuning_save) + }, + onClick = onSave, + modifier = Modifier.fillMaxWidth(), + enabled = state.canSave, + loading = state.saving, + ) + Text( + text = stringResource(R.string.ux2_tuning_save_hint), + modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + ) } } } } @Composable -private fun TuningHeader(state: TuningUiState) { - Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text( - text = stringResource(R.string.tuning_sheet_title), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource(R.string.tuning_character, state.displayName), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource( - R.string.tuning_voice, - state.voiceLabel ?: stringResource(R.string.tuning_voice_unassigned), - ), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) +private fun TuningRoleCard(state: TuningUiState) { + ForgeCard(contentPadding = PaddingValues(MaterialTheme.spacing.md)) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + Surface( + shape = MaterialTheme.shapes.extraLarge, + color = MaterialTheme.colorScheme.primaryContainer, + modifier = Modifier.size(56.dp), + ) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + ForgeIcon( + icon = ForgeIcons.UserRound, + contentDescription = null, + modifier = Modifier.size(28.dp), + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + } + } + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { + Text( + text = state.displayName, + style = MaterialTheme.typography.titleMediumEmphasized, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + Text( + text = stringResource( + R.string.tuning_voice, + state.voiceLabel ?: stringResource(R.string.tuning_voice_unassigned), + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + TuningStatusPill(state = state) + } if (state.unknownRole) { Text( text = stringResource(R.string.tuning_role_unknown), @@ -212,125 +270,177 @@ private fun TuningHeader(state: TuningUiState) { } @Composable -private fun TuningLoading() { - Row( - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 24.dp), - horizontalArrangement = Arrangement.Center, - verticalAlignment = Alignment.CenterVertically, - ) { - CircularProgressIndicator() - Spacer(Modifier.width(12.dp)) - Text( - text = stringResource(R.string.tuning_loading), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, +private fun TuningStatusPill(state: TuningUiState) { + val visual = when { + state.unknownRole -> TuningStatusVisual( + icon = ForgeIcons.AlertCircle, + labelRes = R.string.ux2_tuning_status_unknown, + container = MaterialTheme.colorScheme.errorContainer, + content = MaterialTheme.colorScheme.onErrorContainer, ) + + state.isDirty -> TuningStatusVisual( + icon = ForgeIcons.Edit, + labelRes = R.string.ux2_tuning_status_dirty, + container = MaterialTheme.colorScheme.primaryContainer, + content = MaterialTheme.colorScheme.onPrimaryContainer, + ) + + state.draft.followsGlobal -> TuningStatusVisual( + icon = ForgeIcons.Globe, + labelRes = R.string.ux2_tuning_status_global, + container = MaterialTheme.colorScheme.surfaceContainerHigh, + content = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + else -> TuningStatusVisual( + icon = ForgeIcons.CheckCircle, + labelRes = R.string.ux2_tuning_status_clean, + container = MaterialTheme.colorScheme.secondaryContainer, + content = MaterialTheme.colorScheme.onSecondaryContainer, + ) + } + Surface( + shape = MaterialTheme.shapes.large, + color = visual.container, + contentColor = visual.content, + ) { + Row( + modifier = Modifier.padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.xs, + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIcon( + icon = visual.icon, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = visual.content, + ) + Text( + text = stringResource(visual.labelRes), + style = MaterialTheme.typography.labelSmallEmphasized, + ) + } } } +private data class TuningStatusVisual( + @DrawableRes val icon: Int, + @StringRes val labelRes: Int, + val container: Color, + val content: Color, +) + @Composable private fun TuningSliders( state: TuningUiState, onSpeedChange: (Double) -> Unit, onVolumeChange: (Double) -> Unit, onPitchChange: (Double) -> Unit, - onReset: () -> Unit, ) { val enabled = !state.saving - SectionHeader( - title = stringResource(R.string.tuning_section_title), - subtitle = stringResource(R.string.tuning_section_subtitle), - actionText = if (state.canReset) stringResource(R.string.tuning_action_reset) else null, - onAction = if (state.canReset) onReset else null, - ) - - TuningSlider( - label = stringResource(R.string.tuning_speed_label), - valueText = formatTuningValue(TuningField.Speed, state.speed), - rangeText = stringResource(R.string.tuning_speed_range), - followsGlobal = state.followsGlobal(TuningField.Speed), - value = state.speed.toFloat(), - valueRange = TuningRanges.SPEED.toFloatRange(), - enabled = enabled, - onValueChange = { - onSpeedChange(snapTuningValue(TuningField.Speed, it.toDouble())) - }, - ) - TuningSlider( - label = stringResource(R.string.tuning_volume_label), - valueText = formatTuningValue(TuningField.Volume, state.volume), - rangeText = stringResource(R.string.tuning_volume_range), - followsGlobal = state.followsGlobal(TuningField.Volume), - value = state.volume.toFloat(), - valueRange = TuningRanges.VOLUME.toFloatRange(), - enabled = enabled, - onValueChange = { - onVolumeChange(snapTuningValue(TuningField.Volume, it.toDouble())) - }, - ) - TuningSlider( - label = stringResource(R.string.tuning_pitch_label), - valueText = formatTuningValue(TuningField.Pitch, state.pitch), - rangeText = stringResource(R.string.tuning_pitch_range), - followsGlobal = state.followsGlobal(TuningField.Pitch), - value = state.pitch.toFloat(), - valueRange = TuningRanges.PITCH.toFloatRange(), - enabled = enabled, - onValueChange = { - onPitchChange(snapTuningValue(TuningField.Pitch, it.toDouble())) - }, - ) - - Text( - text = stringResource(R.string.tuning_section_footer), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + ForgeSectionHeader( + title = stringResource(R.string.ux2_tuning_section_title), + subtitle = stringResource(R.string.ux2_tuning_section_hint), + ) + ForgeCard(contentPadding = PaddingValues(MaterialTheme.spacing.md)) { + TuningSliderRow( + label = stringResource(R.string.tuning_speed_label), + valueText = formatTuningValue(TuningField.Speed, state.speed), + followsGlobal = state.followsGlobal(TuningField.Speed), + lowLabel = stringResource(R.string.ux2_tuning_speed_low), + highLabel = stringResource(R.string.ux2_tuning_speed_high), + value = state.speed.toFloat(), + valueRange = TuningRanges.SPEED.toFloatRange(), + enabled = enabled, + onValueChange = { + onSpeedChange(snapTuningValue(TuningField.Speed, it.toDouble())) + }, + ) + HorizontalDivider(modifier = Modifier.padding(vertical = MaterialTheme.spacing.sm)) + TuningSliderRow( + label = stringResource(R.string.tuning_volume_label), + valueText = formatTuningValue(TuningField.Volume, state.volume), + followsGlobal = state.followsGlobal(TuningField.Volume), + lowLabel = stringResource(R.string.ux2_tuning_volume_low), + highLabel = stringResource(R.string.ux2_tuning_volume_high), + value = state.volume.toFloat(), + valueRange = TuningRanges.VOLUME.toFloatRange(), + enabled = enabled, + onValueChange = { + onVolumeChange(snapTuningValue(TuningField.Volume, it.toDouble())) + }, + ) + HorizontalDivider(modifier = Modifier.padding(vertical = MaterialTheme.spacing.sm)) + TuningSliderRow( + label = stringResource(R.string.tuning_pitch_label), + valueText = formatTuningValue(TuningField.Pitch, state.pitch), + followsGlobal = state.followsGlobal(TuningField.Pitch), + lowLabel = stringResource(R.string.ux2_tuning_pitch_low), + highLabel = stringResource(R.string.ux2_tuning_pitch_high), + value = state.pitch.toFloat(), + valueRange = TuningRanges.PITCH.toFloatRange(), + enabled = enabled, + onValueChange = { + onPitchChange(snapTuningValue(TuningField.Pitch, it.toDouble())) + }, + ) + } + } } @Composable -private fun TuningSlider( +private fun TuningSliderRow( label: String, valueText: String, - rangeText: String, followsGlobal: Boolean, + lowLabel: String, + highLabel: String, value: Float, valueRange: ClosedFloatingPointRange, enabled: Boolean, onValueChange: (Float) -> Unit, ) { - val description = stringResource( + val rangeText = stringResource(R.string.ux2_tuning_range_hint, lowLabel, highLabel) + val sliderDescription = stringResource( R.string.tuning_slider_content_description, label, valueText, rangeText, ) - Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { - Row(verticalAlignment = Alignment.CenterVertically) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs)) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + ) { Text( text = label, modifier = Modifier.weight(1f), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + style = MaterialTheme.typography.titleSmallEmphasized, ) Text( text = valueText, - style = MaterialTheme.typography.titleMedium, + style = MaterialTheme.typography.titleMediumEmphasized, color = MaterialTheme.colorScheme.primary, ) } Slider( value = value.coerceIn(valueRange.start, valueRange.endInclusive), onValueChange = onValueChange, - modifier = Modifier.semantics { contentDescription = description }, + modifier = Modifier.semantics { contentDescription = sliderDescription }, enabled = enabled, valueRange = valueRange, ) - Row(verticalAlignment = Alignment.CenterVertically) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + ) { Text( - text = rangeText, + text = lowLabel, modifier = Modifier.weight(1f), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, @@ -338,71 +448,88 @@ private fun TuningSlider( if (followsGlobal) { Text( text = stringResource(R.string.tuning_follow_global), - style = MaterialTheme.typography.bodySmall, + style = MaterialTheme.typography.labelSmallEmphasized, color = MaterialTheme.colorScheme.primary, ) } + Text( + text = highLabel, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } } } @Composable private fun TuningValidationCard(state: TuningUiState) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer, - ), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + ForgeCard(containerColor = MaterialTheme.colorScheme.errorContainer) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, ) { - Text( - text = stringResource(R.string.tuning_validation_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onErrorContainer, + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, ) - state.validationErrors.forEach { field -> + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { Text( - text = validationMessage(field), - style = MaterialTheme.typography.bodySmall, + text = stringResource(R.string.tuning_validation_title), + style = MaterialTheme.typography.titleSmallEmphasized, color = MaterialTheme.colorScheme.onErrorContainer, ) + state.validationErrors.forEach { field -> + Text( + text = validationMessage(field), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + } } } } } @Composable -private fun TuningSaveErrorCard(message: String, onRetry: () -> Unit) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer, - ), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), +private fun TuningSaveErrorCard( + message: String, + onRetry: () -> Unit, +) { + ForgeCard(containerColor = MaterialTheme.colorScheme.errorContainer) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalAlignment = Alignment.Top, ) { - Text( - text = stringResource(R.string.tuning_save_error_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onErrorContainer, - ) - Text( - text = stringResource(R.string.action_save_error, message), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onErrorContainer, + ForgeIcon( + icon = ForgeIcons.ErrorCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, ) - TextButton( - onClick = onRetry, - modifier = Modifier.heightIn(min = 48.dp), + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), ) { - Text(stringResource(R.string.action_retry)) + Text( + text = stringResource(R.string.tuning_save_error_title), + style = MaterialTheme.typography.titleSmallEmphasized, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + Text( + text = stringResource(R.string.action_save_error, message), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.action_retry), + onClick = onRetry, + ) } } } @@ -419,7 +546,7 @@ private fun ClosedFloatingPointRange.toFloatRange(): ClosedFloatingPoint start.toFloat()..endInclusive.toFloat() // --------------------------------------------------------------------------- -// Preview:正常、未知角色(深色/200%)、越界校验。 +// Preview:正常、未知角色(深色/200%)、越界校验。示例数据只在 Preview 区使用。 // --------------------------------------------------------------------------- @Preview(name = "Tuning Sheet", showBackground = true, backgroundColor = 0xFFF7F8FC) @@ -432,8 +559,8 @@ private fun TuningSheetPreview() { state = TuningUiState( novelId = 1L, roleId = "role_0001", - roleName = "林黛玉", - voiceLabel = "【女主】温柔清亮", + roleName = "沈砚", + voiceLabel = "【男主】沉稳磁性", defaults = defaults, initial = TuningDraft(speed = 1.25, pitch = 2.0), draft = TuningDraft(speed = 1.25, pitch = 2.0), @@ -478,8 +605,8 @@ private fun TuningValidationPreview() { state = TuningUiState( novelId = 1L, roleId = "role_0002", - roleName = "贾宝玉", - voiceLabel = "【男主】沉稳磁性", + roleName = "苏晚", + voiceLabel = "【女主】温柔清亮", defaults = TuningDefaults(), initial = TuningDraft(), draft = TuningDraft(speed = 2.4, volume = -0.5, pitch = 14.0), diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/projects/ImportSheet.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/projects/ImportSheet.kt index b8ed6f7..88d8326 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/projects/ImportSheet.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/projects/ImportSheet.kt @@ -1,27 +1,31 @@ +@file:OptIn(androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class) + package com.estimatefaster.audioforge.feature.projects import android.content.res.Configuration import android.text.format.Formatter import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts +import androidx.annotation.DrawableRes import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -30,34 +34,39 @@ import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.LiveRegionMode import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.contentDescription -import androidx.compose.ui.semantics.liveRegion +import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeListRow +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSheetHeader +import com.estimatefaster.audioforge.ui.forge.ForgeWavyProgress import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing /** - * 导入 Sheet 的有状态入口(P4-04 / 执行计划 §12.4 S03)。 + * 导入 Sheet 的有状态入口(Forge Framework v1 · Import)。 * - * 只负责: + * 保留原状态机与全部回调: * 1. 创建 SAF `OpenDocument("text/plain")` launcher,把选中的 uri 交给 * [ImportViewModel.onFilePicked]; * 2. 收集 [ImportViewModel.events]:成功 → `onImported(novelId)`;重名选「打开已有」 * → `onOpenExisting(id)`,两者都会关闭 Sheet; * 3. 关闭(下滑/取消/成功)时取消在途导入,用例负责清理半成品文件。 * - * 集成提示:`ProjectLibraryScreen` 的 FAB `onImport` 目前只是回调;接入时在该页 - * 用 `if (showImport) ImportSheet(viewModel, onDismiss = { showImport = false }, - * onImported = onOpenProject, onOpenExisting = onOpenProject)` 即可。 - * * @param onDismiss 关闭 Sheet(由调用方控制可见性) * @param onImported 导入成功后进入新项目 * @param onOpenExisting 重名时打开已有项目 @@ -120,16 +129,11 @@ fun ImportSheet( } /** - * 无状态 Sheet 内容;Preview 与将来 UI 测试都直接渲染它。 + * 无状态 Sheet 内容;Preview 与 UI 测试直接渲染它。 * - * 状态 → 布局: - * - `Idle`:选择文件入口; - * - `Selected`:文件卡 + 导入; - * - `Importing`:文件卡 + 进度条/百分比 + 取消; - * - `NeedsEncoding`:候选编码按钮,选中后重开源流重试; - * - `Duplicate`:AlertDialog「打开已有项目 / 取消」; - * - `Error`:可读原因 + 重试(仅用例失败/源打不开)+ 重新选择; - * - `Success`:成功占位(正常路径会立即通过事件关闭)。 + * 对齐 `forge-framework.html` 的 Import Sheet:Sheet 头(Lucide 图标 + 标题 + + * 关闭)→ 选择文件 → 分阶段内容(导入 / 编码 / 重名 / 错误 / 成功)→ 本机导入说明。 + * 所有操作均为 Lucide icon + 文案或纯图标;正文与说明文字不可点击。 */ @Composable fun ImportSheetContent( @@ -147,122 +151,160 @@ fun ImportSheetContent( modifier = modifier .fillMaxWidth() .navigationBarsPadding() - .padding(horizontal = 24.dp) - .padding(top = 8.dp, bottom = 24.dp), - verticalArrangement = Arrangement.spacedBy(16.dp), + .verticalScroll(rememberScrollState()) + .padding(horizontal = 20.dp) + .padding(top = 4.dp, bottom = 24.dp), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.lg), ) { - Text( - text = stringResource(R.string.import_sheet_title), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.SemiBold, + ForgeSheetHeader( + icon = ForgeIcons.Upload, + title = stringResource(R.string.ux2_import_title), + subtitle = stringResource(R.string.ux2_import_subtitle), + onClose = onCancel, ) - Text( - text = stringResource(R.string.import_sheet_subtitle), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, + + ImportSectionHeader( + icon = ForgeIcons.FileText, + title = stringResource(R.string.ux2_import_step_file), ) - state.selection?.let { selection -> SelectedFileCard(selection = selection) } + val selection = state.selection + if (selection == null) { + PickFileCard(onPickFile = onPickFile) + } else { + SelectedFileCard( + selection = selection, + canReselect = state.phase != ImportPhase.Importing, + onReselect = onPickFile, + ) + } when (state.phase) { - ImportPhase.Idle -> { - Text( - text = stringResource(R.string.import_file_type_hint), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Button( - onClick = onPickFile, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.import_pick_file)) - } - } + ImportPhase.Idle -> Unit ImportPhase.Selected -> { - Text( - text = stringResource(R.string.import_file_type_hint), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Button( + ForgePrimaryAction( + icon = ForgeIcons.Upload, + label = stringResource(R.string.ux2_import_start), onClick = onStartImport, + modifier = Modifier.fillMaxWidth(), enabled = state.canStartImport, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.import_action_start)) - } - TextButton( + ) + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.ux2_import_reselect), onClick = onPickFile, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.import_pick_again)) - } + modifier = Modifier.fillMaxWidth(), + ) } ImportPhase.Importing -> { ImportProgress(state = state) - TextButton( + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.ux2_import_cancel), onClick = onCancel, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.import_action_cancel)) - } + modifier = Modifier.fillMaxWidth(), + ) } ImportPhase.NeedsEncoding -> { - EncodingChooser(state = state, onChooseEncoding = onChooseEncoding) - TextButton( - onClick = onCancel, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.import_action_cancel)) + ImportSectionHeader( + icon = ForgeIcons.Globe, + title = stringResource(R.string.ux2_import_step_encoding), + ) + Text( + text = stringResource(R.string.ux2_import_encoding_title), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + Text( + text = stringResource(R.string.ux2_import_encoding_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + if (state.encodingCandidates.isEmpty()) { + Text( + text = stringResource(R.string.ux2_import_error_unknown), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.error, + ) + } else { + state.encodingCandidates.forEach { encoding -> + ForgeChip( + label = stringResource(R.string.ux2_import_encoding_action, encoding), + selected = state.selectedEncoding == encoding, + onClick = { onChooseEncoding(encoding) }, + icon = if (encoding.startsWith("UTF", ignoreCase = true)) { + ForgeIcons.Globe + } else { + ForgeIcons.FileText + }, + modifier = Modifier.fillMaxWidth(), + ) + } } + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.ux2_import_cancel), + onClick = onCancel, + modifier = Modifier.fillMaxWidth(), + ) } ImportPhase.Duplicate -> { - // 具体动作在下方 AlertDialog 里;这里保留说明,避免用户只看到弹窗。 Text( - text = stringResource(R.string.import_duplicate_note), + text = stringResource(R.string.ux2_import_duplicate_note), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.ux2_import_cancel), + onClick = onCancel, + modifier = Modifier.fillMaxWidth(), + ) } ImportPhase.Error -> { - ImportErrorPanel( - state = state, - onRetry = onRetry, - onPickFile = onPickFile, - ) - TextButton( - onClick = onCancel, + ForgeError( + message = stringResource( + R.string.ux2_import_error_message, + state.error.errorMessage(), + ), modifier = Modifier .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.import_action_cancel)) - } + .heightIn(min = 300.dp), + onRetry = if (state.canRetry) onRetry else null, + retryLabel = stringResource(R.string.ux2_import_retry), + ) + ForgeSecondaryAction( + icon = ForgeIcons.Upload, + label = stringResource(R.string.ux2_import_reselect), + onClick = onPickFile, + modifier = Modifier.fillMaxWidth(), + ) + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.ux2_import_cancel), + onClick = onCancel, + modifier = Modifier.fillMaxWidth(), + ) } ImportPhase.Success -> { - Text( - text = stringResource(R.string.import_success), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, + ForgeListRow( + icon = ForgeIcons.CheckCircle, + title = stringResource(R.string.ux2_import_success), + subtitle = stringResource(R.string.ux2_import_success_hint), ) } } + + Text( + text = stringResource(R.string.ux2_import_note), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } if (state.phase == ImportPhase.Duplicate) { @@ -274,69 +316,105 @@ fun ImportSheetContent( } } +// --------------------------------------------------------------------------- +// 选择文件 +// --------------------------------------------------------------------------- + @Composable -private fun SelectedFileCard( - selection: ImportFileSelection, +private fun PickFileCard( + onPickFile: () -> Unit, modifier: Modifier = Modifier, ) { - val context = LocalContext.current - val sizeText = selection.sizeBytes - ?.takeIf { it >= 0L } - ?.let { bytes -> Formatter.formatFileSize(context, bytes) } - ?: stringResource(R.string.import_size_unknown) - - Card( - modifier = modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surfaceVariant, - ), + ForgeCard( + modifier = modifier, + onClick = onPickFile, + contentPadding = androidx.compose.foundation.layout.PaddingValues(MaterialTheme.spacing.md), ) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - Text( - text = stringResource(R.string.import_selected_file), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Text( - text = selection.displayName, - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - maxLines = 3, - overflow = TextOverflow.Ellipsis, - ) - Text( - text = stringResource(R.string.import_file_size, sizeText), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + Surface( + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.primaryContainer, + modifier = Modifier.size(48.dp), + ) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + ForgeIcon( + icon = ForgeIcons.Upload, + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + } + } + Column(modifier = Modifier.weight(1f)) { + Text( + text = stringResource(R.string.ux2_import_pick_title), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + Text( + text = stringResource(R.string.ux2_import_pick_hint), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + ForgeIcon( + icon = ForgeIcons.ChevronRight, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, ) } } } +@Composable +private fun SelectedFileCard( + selection: ImportFileSelection, + canReselect: Boolean, + onReselect: () -> Unit, + modifier: Modifier = Modifier, +) { + val context = LocalContext.current + val sizeText = selection.sizeBytes + ?.takeIf { bytes -> bytes >= 0L } + ?.let { bytes -> Formatter.formatFileSize(context, bytes) } + ?: stringResource(R.string.ux2_import_size_unknown) + + ForgeListRow( + icon = ForgeIcons.FileText, + title = selection.displayName, + subtitle = stringResource(R.string.ux2_import_file_size, sizeText), + trailingText = stringResource(R.string.ux2_import_file_desc), + trailingIcon = if (canReselect) ForgeIcons.Refresh else null, + trailingDescription = stringResource(R.string.ux2_import_file_reselect), + onTrailingClick = if (canReselect) onReselect else null, + modifier = modifier, + ) +} + +// --------------------------------------------------------------------------- +// 导入进度 / 编码 / 错误 / 重名 +// --------------------------------------------------------------------------- + @Composable private fun ImportProgress( state: ImportUiState, modifier: Modifier = Modifier, ) { + val progressDescription = stringResource(R.string.ux2_import_importing) Column( modifier = modifier.fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(8.dp), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { Row(verticalAlignment = Alignment.CenterVertically) { Text( - text = stringResource(R.string.import_importing_title), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + text = progressDescription, + style = MaterialTheme.typography.titleSmallEmphasized, modifier = Modifier.weight(1f), ) if (state.isProgressDeterminate) { Text( - text = stringResource(R.string.progress_percent, state.percent), + text = stringResource(R.string.ux2_import_progress_percent, state.percent), // 百分比只做视觉提示;进度条自身会向 TalkBack 播报数值。 modifier = Modifier.clearAndSetSemantics { }, style = MaterialTheme.typography.labelLarge, @@ -344,103 +422,52 @@ private fun ImportProgress( ) } } - val progressDescription = stringResource(R.string.import_importing_title) if (state.isProgressDeterminate) { - LinearProgressIndicator( - progress = { state.safeProgress }, + ForgeWavyProgress( + progress = state.safeProgress, modifier = Modifier .fillMaxWidth() - .heightIn(min = 4.dp) .semantics { contentDescription = progressDescription }, ) } else { - // SAF 未提供 SIZE:用不确定进度,绝不伪造百分比。 - LinearProgressIndicator( - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 4.dp) - .semantics { contentDescription = progressDescription }, - ) - } - } -} - -@Composable -private fun EncodingChooser( - state: ImportUiState, - onChooseEncoding: (String) -> Unit, - modifier: Modifier = Modifier, -) { - Column( - modifier = modifier.fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(8.dp), - ) { - Text( - text = stringResource(R.string.import_encoding_title), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource(R.string.import_encoding_description), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - state.encodingCandidates.forEach { encoding -> - OutlinedButton( - onClick = { onChooseEncoding(encoding) }, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), + // SAF 未提供 SIZE:不伪造百分比,用加载指示 + 文案说明。 + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - Text(stringResource(R.string.import_encoding_action, encoding)) + LoadingIndicator(modifier = Modifier.size(20.dp)) + Text( + text = stringResource(R.string.ux2_import_progress_unknown), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } } } } @Composable -private fun ImportErrorPanel( - state: ImportUiState, - onRetry: () -> Unit, - onPickFile: () -> Unit, +private fun ImportSectionHeader( + @DrawableRes icon: Int, + title: String, modifier: Modifier = Modifier, ) { - Column( + Row( modifier = modifier.fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(8.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - Text( - text = stringResource(R.string.import_error_title), - modifier = Modifier.semantics { - liveRegion = LiveRegionMode.Polite - }, - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.error, + Icon( + painter = painterResource(icon), + contentDescription = null, + modifier = Modifier.size(18.dp), + tint = MaterialTheme.colorScheme.primary, ) Text( - text = state.error.errorMessage(), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurface, + text = title, + style = MaterialTheme.typography.titleSmallEmphasized, + modifier = Modifier.semantics { heading() }, ) - if (state.canRetry) { - Button( - onClick = onRetry, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_retry)) - } - } - OutlinedButton( - onClick = onPickFile, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.import_action_reselect)) - } } } @@ -452,31 +479,41 @@ private fun DuplicateDialog( ) { AlertDialog( onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.import_duplicate_title)) }, + icon = { ForgeIcon(ForgeIcons.Library, contentDescription = null) }, + title = { + Text( + text = stringResource(R.string.ux2_import_duplicate_title), + style = MaterialTheme.typography.titleLargeEmphasized, + ) + }, text = { - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { Text( text = stringResource( - R.string.import_duplicate_message, + R.string.ux2_import_duplicate_message, duplicate?.title.orEmpty(), ), ) Text( - text = stringResource(R.string.import_duplicate_note), + text = stringResource(R.string.ux2_import_duplicate_note), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) } }, confirmButton = { - TextButton(onClick = onOpenExisting) { - Text(stringResource(R.string.import_action_open_existing)) - } + ForgePrimaryAction( + icon = ForgeIcons.BookOpen, + label = stringResource(R.string.ux2_import_duplicate_open), + onClick = onOpenExisting, + ) }, dismissButton = { - TextButton(onClick = onDismiss) { - Text(stringResource(R.string.action_cancel)) - } + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.ux2_import_duplicate_dismiss), + onClick = onDismiss, + ) }, ) } @@ -485,20 +522,20 @@ private fun DuplicateDialog( @Composable private fun ImportError?.errorMessage(): String = when (this) { is ImportError.Validation -> stringResource(reason.messageRes()) - ImportError.SourceUnavailable -> stringResource(R.string.import_error_unreadable) + ImportError.SourceUnavailable -> stringResource(R.string.ux2_import_error_unreadable) is ImportError.ImportFailed -> message - null -> stringResource(R.string.import_error_title) + null -> stringResource(R.string.ux2_import_error_unknown) } private fun ImportValidationError.messageRes(): Int = when (this) { - ImportValidationError.NotTxt -> R.string.import_error_not_txt - ImportValidationError.EmptyFile -> R.string.import_error_empty - ImportValidationError.TooLarge -> R.string.import_error_too_large - ImportValidationError.InvalidSize -> R.string.import_error_invalid_size + ImportValidationError.NotTxt -> R.string.ux2_import_error_not_txt + ImportValidationError.EmptyFile -> R.string.ux2_import_error_empty + ImportValidationError.TooLarge -> R.string.ux2_import_error_too_large + ImportValidationError.InvalidSize -> R.string.ux2_import_error_invalid_size } // --------------------------------------------------------------------------- -// Preview:已选择 / 导入中 / 错误 / 编码重试 / 重名(至少 3 个场景)。 +// Preview:空 / 已选 / 导入中 / 编码 / 错误 / 重名 / 深色 200%。 // --------------------------------------------------------------------------- private fun previewSelection( @@ -511,7 +548,7 @@ private fun previewSelection( ) @Preview( - name = "ImportSheet Idle", + name = "Import Idle", showBackground = true, backgroundColor = 0xFFF7F8FC, ) @@ -525,7 +562,7 @@ private fun ImportSheetIdlePreview() { } @Preview( - name = "ImportSheet Selected", + name = "Import Selected", showBackground = true, backgroundColor = 0xFFF7F8FC, ) @@ -544,7 +581,7 @@ private fun ImportSheetSelectedPreview() { } @Preview( - name = "ImportSheet Importing", + name = "Import Importing", showBackground = true, backgroundColor = 0xFFF7F8FC, ) @@ -564,7 +601,7 @@ private fun ImportSheetImportingPreview() { } @Preview( - name = "ImportSheet NeedsEncoding", + name = "Import NeedsEncoding", showBackground = true, backgroundColor = 0xFFF7F8FC, ) @@ -584,7 +621,7 @@ private fun ImportSheetNeedsEncodingPreview() { } @Preview( - name = "ImportSheet Error", + name = "Import Error", showBackground = true, backgroundColor = 0xFFF7F8FC, ) @@ -597,7 +634,7 @@ private fun ImportSheetErrorPreview() { phase = ImportPhase.Error, selection = previewSelection(), error = ImportError.ImportFailed( - stringResource(R.string.import_error_preview), + stringResource(R.string.ux2_import_error_unreadable), ), ), ) @@ -606,7 +643,7 @@ private fun ImportSheetErrorPreview() { } @Preview( - name = "ImportSheet Duplicate", + name = "Import Duplicate", showBackground = true, backgroundColor = 0xFFF7F8FC, ) @@ -626,7 +663,7 @@ private fun ImportSheetDuplicatePreview() { } @Preview( - name = "ImportSheet Dark 200%", + name = "Import Dark 200%", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES, fontScale = 2f, diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/projects/ProjectLibraryScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/projects/ProjectLibraryScreen.kt index 5460f52..1db78c2 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/projects/ProjectLibraryScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/projects/ProjectLibraryScreen.kt @@ -1,7 +1,10 @@ +@file:OptIn(androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class) + package com.estimatefaster.audioforge.feature.projects import android.content.res.Configuration -import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.background +import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -11,27 +14,26 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.lazy.grid.rememberLazyGridState +import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -39,38 +41,52 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue +import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.heading -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.data.db.ProjectSummary -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorState -import com.estimatefaster.audioforge.ui.components.ProgressRing -import com.estimatefaster.audioforge.ui.components.StatusKind -import com.estimatefaster.audioforge.ui.components.StatusPill +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeExtendedFab +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar +import com.estimatefaster.audioforge.ui.forge.ForgeWavyProgress import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing +import kotlin.math.roundToInt /** 未选中任何项目的哨兵值;项目 id 由 Room 自增,从 1 开始。 */ private const val NO_PROJECT_ID = -1L +/** 书架网格里搜索框的 item 下标:0 = 总览卡,1 = 搜索。 */ +private const val SEARCH_ITEM_INDEX = 1 + /** - * 项目库有状态入口(P4-03 / §12.4 S02)。 + * 书架(Forge Framework v1 · Projects)有状态入口。 * * 只负责从 [ProjectLibraryViewModel] 收集状态并把用户操作转成回调; - * 实际布局在无状态重载里,方便 Preview/测试。 - * - * 集成说明:`AppNavHost` 的 `Route.Projects` 目前仍是占位页;接入时把 - * `ProjectsPlaceholderScreen` 换成本函数,并在 `AppViewModelFactory` 注册 - * `ProjectLibraryViewModel(container.projectRepository)` 即可。 + * 布局在无状态重载里,方便 Preview/测试。 */ @Composable fun ProjectLibraryScreen( @@ -94,13 +110,12 @@ fun ProjectLibraryScreen( } /** - * 无状态项目库。 - * - * 结构:`Large` 标题 → 搜索框 → `LazyColumn` 项目卡;FAB 固定「导入」。 - * 空库/搜索无匹配/加载/错误各自独立,删除确认与重命名用 AlertDialog。 + * 无状态书架。 * - * 性能:列表只渲染 [ProjectCardUi] 的聚合字段,`items` 使用稳定 key - * ([ProjectCardUi.stableKey]),项目更新时不会整表重组。 + * 结构严格对齐 `forge-framework.html` 的 Projects: + * `ForgeTopBar`(搜索/更多)→ 总览卡 → 搜索 → 状态 chips → 全部项目 → + * 2 列项目卡(200% 字号降为 1 列)→ 导入 FAB。 + * 空库 / 搜索或筛选无匹配 / 加载 / 错误分别渲染对应的 Forge 三态。 */ @Composable fun ProjectLibraryScreen( @@ -118,10 +133,18 @@ fun ProjectLibraryScreen( var renameTargetId by rememberSaveable { mutableStateOf(NO_PROJECT_ID) } var renameText by rememberSaveable { mutableStateOf("") } var deleteTargetId by rememberSaveable { mutableStateOf(NO_PROJECT_ID) } + var shelfMenuExpanded by rememberSaveable { mutableStateOf(false) } + var filterName by rememberSaveable { mutableStateOf(ProjectFilter.All.name) } + + val filter = remember(filterName) { ProjectFilter.fromName(filterName) } + val visibleProjects = remember(state.projects, filter) { + state.projects.filter(filter::matches) + } + val totals = remember(state.allProjects) { state.allProjects.toLibraryTotals() } val snackbarHostState = remember { SnackbarHostState() } val actionErrorMessage = state.actionError?.let { message -> - stringResource(R.string.action_failed, message) + stringResource(R.string.ux2_projects_action_failed, message) } LaunchedEffect(actionErrorMessage) { if (actionErrorMessage != null) { @@ -130,138 +153,202 @@ fun ProjectLibraryScreen( } } + val focusRequester = remember { FocusRequester() } + val keyboardController = LocalSoftwareKeyboardController.current + val gridState = rememberLazyGridState() + var searchFocusRequested by remember { mutableStateOf(false) } + val columns = if (LocalDensity.current.fontScale >= 1.5f) 1 else 2 + + // 搜索框在 LazyVerticalGrid 里可能被滚出组合;先滚回搜索 item,再等一帧请求焦点, + // 避免 FocusRequester 未挂载时抛出异常。 + LaunchedEffect(searchFocusRequested) { + if (!searchFocusRequested) return@LaunchedEffect + gridState.scrollToItem(SEARCH_ITEM_INDEX) + withFrameNanos { } + focusRequester.requestFocus() + keyboardController?.show() + searchFocusRequested = false + } + val loadError = state.loadError Scaffold( modifier = modifier.fillMaxSize(), containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - title = { - Column { - Text( - text = stringResource(R.string.project_library_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, + val canSearch = !state.loading && loadError == null && state.allProjects.isNotEmpty() + ForgeTopBar( + title = stringResource(R.string.ux2_projects_title), + subtitle = stringResource(R.string.ux2_projects_subtitle), + actions = { + if (canSearch) { + ForgeIconAction( + icon = ForgeIcons.Search, + contentDescription = stringResource(R.string.ux2_projects_search_focus), + onClick = { + searchFocusRequested = true + }, + container = false, ) - Text( - text = stringResource(R.string.project_library_subtitle), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, + } + Box { + ForgeIconAction( + icon = ForgeIcons.More, + contentDescription = stringResource(R.string.ux2_projects_more), + onClick = { shelfMenuExpanded = true }, + container = false, ) + DropdownMenu( + expanded = shelfMenuExpanded, + onDismissRequest = { shelfMenuExpanded = false }, + ) { + DropdownMenuItem( + text = { Text(stringResource(R.string.ux2_projects_menu_import)) }, + onClick = { + shelfMenuExpanded = false + onImport() + }, + leadingIcon = { ForgeIcon(ForgeIcons.Upload, contentDescription = null) }, + ) + DropdownMenuItem( + text = { Text(stringResource(R.string.ux2_projects_menu_refresh)) }, + onClick = { + shelfMenuExpanded = false + onRetry() + }, + leadingIcon = { ForgeIcon(ForgeIcons.Refresh, contentDescription = null) }, + ) + } } }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, floatingActionButton = { - // Material3 1.5 的扩展 FAB 使用内容槽(RowScope),不再接收 text/icon 参数。 - ExtendedFloatingActionButton(onClick = onImport) { - Text(stringResource(R.string.project_library_import)) + if (!state.loading && loadError == null && state.allProjects.isNotEmpty()) { + ForgeExtendedFab( + icon = ForgeIcons.Plus, + label = stringResource(R.string.ux2_projects_import), + onClick = onImport, + ) } }, snackbarHost = { SnackbarHost(snackbarHostState) }, ) { padding -> - Column( - modifier = Modifier - .fillMaxSize() - .padding(padding), - ) { - OutlinedTextField( - value = state.query, - onValueChange = onQueryChange, - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 20.dp, vertical = 8.dp), - singleLine = true, - label = { Text(stringResource(R.string.project_library_search_label)) }, - placeholder = { Text(stringResource(R.string.project_library_search_placeholder)) }, + val contentModifier = Modifier + .fillMaxSize() + .padding(padding) + + when { + state.loading -> ForgeLoading( + label = stringResource(R.string.ux2_projects_loading), + modifier = contentModifier, ) - Box( - modifier = Modifier - .fillMaxSize() - .weight(1f), + loadError != null -> ForgeError( + message = stringResource(R.string.ux2_projects_load_error, loadError), + modifier = contentModifier, + onRetry = onRetry, + retryLabel = stringResource(R.string.ux2_projects_retry), + ) + + state.allProjects.isEmpty() -> ForgeEmpty( + icon = ForgeIcons.Library, + title = stringResource(R.string.ux2_projects_empty_title), + description = stringResource(R.string.ux2_projects_empty_desc), + modifier = contentModifier, + actionIcon = ForgeIcons.Upload, + actionLabel = stringResource(R.string.ux2_projects_empty_action), + onAction = onImport, + ) + + else -> LazyVerticalGrid( + columns = GridCells.Fixed(columns), + state = gridState, + modifier = contentModifier, + contentPadding = PaddingValues( + start = 20.dp, + end = 20.dp, + top = 8.dp, + // 给扩展 FAB 留出空间,最后一行不被遮挡。 + bottom = 104.dp, + ), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - when { - state.loading -> LibraryLoading() - - loadError != null -> Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center, - ) { - ErrorState( - message = stringResource(R.string.project_load_error, loadError), - onRetry = onRetry, - ) - } + item(span = { GridItemSpan(maxLineSpan) }) { + LibraryStats(totals = totals) + } - state.isEmpty -> Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource(R.string.project_library_empty_title), - description = stringResource(R.string.project_library_empty_description), - actionText = stringResource(R.string.project_library_empty_action), - onAction = onImport, - ) - } + item(span = { GridItemSpan(maxLineSpan) }) { + LibrarySearchField( + value = state.query, + onValueChange = onQueryChange, + focusRequester = focusRequester, + ) + } - state.isNoSearchResult -> Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource(R.string.project_library_no_result_title), - description = stringResource( - R.string.project_library_no_result_description, - state.query.trim(), - ), - actionText = stringResource(R.string.project_library_no_result_action), - onAction = { onQueryChange("") }, - ) - } + item(span = { GridItemSpan(maxLineSpan) }) { + LibraryFilters( + selected = filter, + onSelect = { selected -> + filterName = selected.name + }, + ) + } - else -> LazyColumn( - modifier = Modifier.fillMaxSize(), - contentPadding = PaddingValues( - start = 20.dp, - end = 20.dp, - top = 8.dp, - // 给 FAB 留出空间,最后一张卡不被遮挡。 - bottom = 104.dp, + item(span = { GridItemSpan(maxLineSpan) }) { + ForgeSectionHeader( + title = stringResource(R.string.ux2_projects_all_title), + subtitle = stringResource( + R.string.ux2_projects_all_count, + visibleProjects.size, + state.allProjects.size, ), - verticalArrangement = Arrangement.spacedBy(12.dp), - ) { - items( - items = state.projects, - key = { card -> card.stableKey }, - ) { card -> - ProjectLibraryCard( - card = card, - menuExpanded = menuProjectId == card.id, - onOpen = { onOpenProject(card.id) }, - onMenuOpen = { menuProjectId = card.id }, - onMenuDismiss = { - if (menuProjectId == card.id) { - menuProjectId = NO_PROJECT_ID - } - }, - onRename = { - menuProjectId = NO_PROJECT_ID - renameText = card.title - renameTargetId = card.id - }, - onDelete = { - menuProjectId = NO_PROJECT_ID - deleteTargetId = card.id + ) + } + + if (visibleProjects.isEmpty()) { + item(span = { GridItemSpan(maxLineSpan) }) { + Box(modifier = Modifier.fillMaxWidth().height(300.dp)) { + ForgeEmpty( + icon = ForgeIcons.Search, + title = stringResource(R.string.ux2_projects_no_result_title), + description = stringResource(R.string.ux2_projects_no_result_desc), + actionIcon = ForgeIcons.Refresh, + actionLabel = stringResource(R.string.ux2_projects_no_result_action), + onAction = { + filterName = ProjectFilter.All.name + onQueryChange("") }, ) } } + } else { + items( + items = visibleProjects, + key = { card -> card.stableKey }, + ) { card -> + ProjectLibraryCard( + card = card, + coverHeight = if (columns == 1) 160.dp else 112.dp, + menuExpanded = menuProjectId == card.id, + onOpen = { onOpenProject(card.id) }, + onMenuOpen = { menuProjectId = card.id }, + onMenuDismiss = { + if (menuProjectId == card.id) { + menuProjectId = NO_PROJECT_ID + } + }, + onRename = { + menuProjectId = NO_PROJECT_ID + renameText = card.title + renameTargetId = card.id + }, + onDelete = { + menuProjectId = NO_PROJECT_ID + deleteTargetId = card.id + }, + ) + } } } } @@ -295,32 +382,228 @@ fun ProjectLibraryScreen( } } +// --------------------------------------------------------------------------- +// 总览 / 搜索 / 筛选 +// --------------------------------------------------------------------------- + +private data class LibraryTotals( + val projects: Int, + val chapters: Int, + val doneChapters: Int, + val segments: Int, + val doneSegments: Int, +) { + val progress: Float + get() = if (chapters <= 0) 0f else doneChapters.toFloat() / chapters +} + +private fun List.toLibraryTotals(): LibraryTotals = LibraryTotals( + projects = size, + chapters = sumOf { card -> card.chapterCount }, + doneChapters = sumOf { card -> card.chapterDoneCount }, + segments = sumOf { card -> card.segmentCount }, + doneSegments = sumOf { card -> card.segmentDoneCount }, +) + @Composable -private fun LibraryLoading(modifier: Modifier = Modifier) { - Column( - modifier = modifier.fillMaxSize(), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center, +private fun LibraryStats( + totals: LibraryTotals, + modifier: Modifier = Modifier, +) { + ForgeCard( + modifier = modifier, + contentPadding = PaddingValues(MaterialTheme.spacing.lg), ) { - CircularProgressIndicator() - Spacer(Modifier.height(14.dp)) - Text( - text = stringResource(R.string.project_loading), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) + Row(verticalAlignment = Alignment.CenterVertically) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = stringResource(R.string.ux2_projects_stats_title), + style = MaterialTheme.typography.titleMediumEmphasized, + ) + Text( + text = stringResource( + R.string.ux2_projects_stats_subtitle, + totals.projects, + totals.doneChapters, + totals.chapters, + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + Text( + text = stringResource( + R.string.ux2_projects_percent, + (totals.progress * 100f).roundToInt(), + ), + style = MaterialTheme.typography.titleLargeEmphasized, + color = MaterialTheme.colorScheme.primary, + ) + } + ForgeWavyProgress(progress = totals.progress) + Row(horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md)) { + StatItem( + icon = ForgeIcons.Library, + value = totals.projects.toString(), + label = stringResource(R.string.ux2_projects_stats_projects), + modifier = Modifier.weight(1f), + ) + StatItem( + icon = ForgeIcons.FileText, + value = totals.chapters.toString(), + label = stringResource(R.string.ux2_projects_stats_chapters), + modifier = Modifier.weight(1f), + ) + StatItem( + icon = ForgeIcons.AudioLines, + value = stringResource( + R.string.ux2_projects_stats_segment_value, + totals.doneSegments, + totals.segments, + ), + label = stringResource(R.string.ux2_projects_stats_segments), + modifier = Modifier.weight(1f), + ) + } } } -/** - * 项目卡:标题/来源/字符数 + 聚合进度 + 音频状态。 - * - * 整卡可点(打开项目),长按或在「更多」按钮打开重命名/删除菜单; - * 子按钮会消费点击,不会误触打开项目。 - */ +@Composable +private fun StatItem( + icon: Int, + value: String, + label: String, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + Surface( + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.secondaryContainer, + modifier = Modifier.size(36.dp), + ) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Icon( + painter = painterResource(icon), + contentDescription = null, + modifier = Modifier.size(18.dp), + tint = MaterialTheme.colorScheme.onSecondaryContainer, + ) + } + } + Column { + Text(text = value, style = MaterialTheme.typography.titleSmallEmphasized) + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } +} + +@Composable +private fun LibrarySearchField( + value: String, + onValueChange: (String) -> Unit, + focusRequester: FocusRequester, + modifier: Modifier = Modifier, +) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + modifier = modifier + .fillMaxWidth() + .focusRequester(focusRequester), + singleLine = true, + shape = MaterialTheme.shapes.large, + placeholder = { Text(stringResource(R.string.ux2_projects_search_placeholder)) }, + leadingIcon = { ForgeIcon(ForgeIcons.Search, contentDescription = null) }, + trailingIcon = if (value.isNotEmpty()) { + { + ForgeIconAction( + icon = ForgeIcons.Close, + contentDescription = stringResource(R.string.ux2_projects_search_clear), + onClick = { onValueChange("") }, + container = false, + ) + } + } else { + null + }, + ) +} + +@Composable +private fun LibraryFilters( + selected: ProjectFilter, + onSelect: (ProjectFilter) -> Unit, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ProjectFilter.entries.forEach { filter -> + ForgeChip( + label = stringResource(filter.labelRes), + selected = selected == filter, + onClick = { onSelect(filter) }, + icon = filter.iconRes, + ) + } + } +} + +private enum class ProjectFilter { + All, + Running, + Done, + Pending, + ; + + fun matches(card: ProjectCardUi): Boolean = when (this) { + All -> true + Running -> card.audioStatus == "running" + Done -> card.audioStatus == "done" + Pending -> card.audioStatus == "pending" + } + + val labelRes: Int + get() = when (this) { + All -> R.string.ux2_projects_filter_all + Running -> R.string.ux2_projects_filter_running + Done -> R.string.ux2_projects_filter_done + Pending -> R.string.ux2_projects_filter_pending + } + + val iconRes: Int + get() = when (this) { + All -> ForgeIcons.Library + Running -> ForgeIcons.Loader + Done -> ForgeIcons.CheckCircle + Pending -> ForgeIcons.Clock + } + + companion object { + fun fromName(name: String): ProjectFilter = + entries.firstOrNull { filter -> filter.name == name } ?: All + } +} + +// --------------------------------------------------------------------------- +// 项目卡 +// --------------------------------------------------------------------------- + @Composable private fun ProjectLibraryCard( card: ProjectCardUi, + coverHeight: Dp, menuExpanded: Boolean, onOpen: () -> Unit, onMenuOpen: () -> Unit, @@ -329,115 +612,175 @@ private fun ProjectLibraryCard( onDelete: () -> Unit, modifier: Modifier = Modifier, ) { - val openLabel = stringResource(R.string.project_library_open) - val moreLabel = stringResource(R.string.action_more) - Card( - modifier = modifier - .fillMaxWidth() - .combinedClickable( - onClickLabel = openLabel, - onLongClickLabel = moreLabel, - role = Role.Button, - onLongClick = onMenuOpen, - onClick = onOpen, - ), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), + val moreDescription = stringResource(R.string.ux2_projects_card_more, card.title) + val openDescription = stringResource(R.string.ux2_projects_card_open, card.title) + val sourceName = card.sourceName.ifBlank { stringResource(R.string.ux2_projects_source_fallback) } + + ForgeCard( + modifier = modifier, + onClick = onOpen, + contentPadding = PaddingValues(8.dp), ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), + Box( + modifier = Modifier + .fillMaxWidth() + .height(coverHeight) + .background( + brush = Brush.linearGradient( + colors = listOf( + MaterialTheme.colorScheme.primaryContainer, + MaterialTheme.colorScheme.tertiaryContainer, + ), + ), + shape = MaterialTheme.shapes.large, + ), ) { - Row(verticalAlignment = Alignment.Top) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = card.title, - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - Spacer(Modifier.height(2.dp)) - Text( - text = stringResource(R.string.project_library_source, card.sourceName), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 1, - overflow = TextOverflow.Ellipsis, + Icon( + painter = painterResource(ForgeIcons.BookOpen), + contentDescription = null, + modifier = Modifier + .align(Alignment.Center) + .size(36.dp), + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + Box(modifier = Modifier.align(Alignment.TopEnd)) { + ForgeIconAction( + icon = ForgeIcons.More, + contentDescription = moreDescription, + onClick = onMenuOpen, + container = false, + ) + DropdownMenu( + expanded = menuExpanded, + onDismissRequest = onMenuDismiss, + ) { + DropdownMenuItem( + text = { Text(stringResource(R.string.ux2_projects_menu_rename)) }, + onClick = onRename, + leadingIcon = { ForgeIcon(ForgeIcons.Edit, contentDescription = null) }, ) - Text( - text = stringResource( - R.string.project_library_char_count, - card.charCountText, - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + DropdownMenuItem( + text = { + Text( + text = stringResource(R.string.ux2_projects_menu_delete), + color = MaterialTheme.colorScheme.error, + ) + }, + onClick = onDelete, + leadingIcon = { + ForgeIcon( + icon = ForgeIcons.Trash, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + }, ) } - Box { - TextButton( - onClick = onMenuOpen, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(moreLabel) - } - DropdownMenu( - expanded = menuExpanded, - onDismissRequest = onMenuDismiss, - ) { - DropdownMenuItem( - text = { Text(stringResource(R.string.action_rename)) }, - onClick = onRename, - ) - DropdownMenuItem( - text = { - Text( - text = stringResource(R.string.action_delete), - color = MaterialTheme.colorScheme.error, - ) - }, - onClick = onDelete, - ) - } - } } + } + Column( + modifier = Modifier.padding(horizontal = 4.dp), + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + Text( + text = card.title, + style = MaterialTheme.typography.titleSmallEmphasized, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + Text( + text = stringResource( + R.string.ux2_projects_card_meta, + sourceName, + card.charCountText, + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) Row(verticalAlignment = Alignment.CenterVertically) { - ProgressRing( - progress = card.progress, - label = stringResource(R.string.project_library_progress_label), - diameter = 72.dp, - strokeWidth = 8.dp, + ForgeWavyProgress(progress = card.progress, modifier = Modifier.weight(1f)) + Spacer(Modifier.width(MaterialTheme.spacing.xs)) + Text( + text = stringResource(R.string.ux2_projects_percent, card.percent), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) - Spacer(Modifier.width(16.dp)) - Column( - modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.spacedBy(6.dp), - ) { - Text( - text = stringResource( - R.string.project_library_chapter_stats, - card.chapterCount, - card.chapterDoneCount, - ), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource( - R.string.project_library_segment_stats, - card.segmentDoneCount, - card.segmentCount, - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - StatusPill(kind = StatusKind.Audio, status = card.audioStatus) - } } + Row(verticalAlignment = Alignment.CenterVertically) { + ProjectStatus(status = card.audioStatus) + Spacer(Modifier.weight(1f)) + ForgeIconAction( + icon = ForgeIcons.ChevronRight, + contentDescription = openDescription, + onClick = onOpen, + container = false, + ) + } + } + } +} + +@Composable +private fun ProjectStatus( + status: String, + modifier: Modifier = Modifier, +) { + val icon: Int + val label: String + val containerColor: androidx.compose.ui.graphics.Color + val contentColor: androidx.compose.ui.graphics.Color + when (status) { + "done" -> { + icon = ForgeIcons.CheckCircle + label = stringResource(R.string.ux2_projects_status_done) + containerColor = MaterialTheme.colorScheme.secondaryContainer + contentColor = MaterialTheme.colorScheme.onSecondaryContainer + } + + "running" -> { + icon = ForgeIcons.Loader + label = stringResource(R.string.ux2_projects_status_running) + containerColor = MaterialTheme.colorScheme.tertiaryContainer + contentColor = MaterialTheme.colorScheme.onTertiaryContainer + } + + else -> { + icon = ForgeIcons.Clock + label = stringResource(R.string.ux2_projects_status_pending) + containerColor = MaterialTheme.colorScheme.surfaceContainerHighest + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + } + } + + Surface( + modifier = modifier, + shape = MaterialTheme.shapes.large, + color = containerColor, + contentColor = contentColor, + ) { + Row( + modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { + Icon( + painter = painterResource(icon), + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = contentColor, + ) + Text(text = label, style = MaterialTheme.typography.labelSmall, maxLines = 1) } } } +// --------------------------------------------------------------------------- +// 重命名 / 删除(所有操作均为 Lucide icon + 文案,或纯图标) +// --------------------------------------------------------------------------- + @Composable private fun RenameProjectDialog( value: String, @@ -448,44 +791,54 @@ private fun RenameProjectDialog( val trimmed = value.trim() AlertDialog( onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.project_rename_title)) }, + icon = { ForgeIcon(ForgeIcons.Edit, contentDescription = null) }, + title = { + Text( + text = stringResource(R.string.ux2_projects_rename_title), + style = MaterialTheme.typography.titleLargeEmphasized, + ) + }, text = { - Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { OutlinedTextField( value = value, onValueChange = onValueChange, - label = { Text(stringResource(R.string.project_rename_label)) }, + label = { Text(stringResource(R.string.ux2_projects_rename_label)) }, singleLine = true, isError = trimmed.isEmpty(), + shape = MaterialTheme.shapes.large, + leadingIcon = { ForgeIcon(ForgeIcons.Edit, contentDescription = null) }, modifier = Modifier.fillMaxWidth(), ) - if (trimmed.isEmpty()) { - Text( - text = stringResource(R.string.project_rename_empty_error), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, - ) - } else { - Text( - text = stringResource(R.string.project_rename_hint), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } + Text( + text = if (trimmed.isEmpty()) { + stringResource(R.string.ux2_projects_rename_empty) + } else { + stringResource(R.string.ux2_projects_rename_hint) + }, + style = MaterialTheme.typography.bodySmall, + color = if (trimmed.isEmpty()) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) } }, confirmButton = { - TextButton( + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = stringResource(R.string.ux2_projects_save), onClick = { onConfirm(trimmed) }, enabled = trimmed.isNotEmpty(), - ) { - Text(stringResource(R.string.action_save)) - } + ) }, dismissButton = { - TextButton(onClick = onDismiss) { - Text(stringResource(R.string.action_cancel)) - } + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.ux2_projects_cancel), + onClick = onDismiss, + ) }, ) } @@ -498,26 +851,40 @@ private fun DeleteProjectDialog( ) { AlertDialog( onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.project_delete_title)) }, - text = { Text(stringResource(R.string.project_delete_message, title)) }, + icon = { + ForgeIcon( + icon = ForgeIcons.Trash, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + }, + title = { + Text( + text = stringResource(R.string.ux2_projects_delete_title), + style = MaterialTheme.typography.titleLargeEmphasized, + ) + }, + text = { Text(stringResource(R.string.ux2_projects_delete_message, title)) }, confirmButton = { - TextButton(onClick = onConfirm) { - Text( - text = stringResource(R.string.action_delete), - color = MaterialTheme.colorScheme.error, - ) - } + ForgeSecondaryAction( + icon = ForgeIcons.Trash, + label = stringResource(R.string.ux2_projects_delete), + onClick = onConfirm, + danger = true, + ) }, dismissButton = { - TextButton(onClick = onDismiss) { - Text(stringResource(R.string.action_cancel)) - } + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.ux2_projects_cancel), + onClick = onDismiss, + ) }, ) } // --------------------------------------------------------------------------- -// Preview:正常(含 2000 章聚合卡)/ 空库 / 无搜索结果 / 深色 200%。 +// Preview:正常(含 2000 章聚合卡)/ 空库 / 无结果 / 深色 200%。 // --------------------------------------------------------------------------- private fun previewSummary( @@ -580,7 +947,7 @@ private fun previewLibraryState(): ProjectLibraryUiState = buildProjectLibraryUi ) @Preview( - name = "ProjectLibrary Normal", + name = "Projects Normal", showBackground = true, backgroundColor = 0xFFF7F8FC, ) @@ -592,7 +959,7 @@ private fun ProjectLibraryNormalPreview() { } @Preview( - name = "ProjectLibrary Empty", + name = "Projects Empty", showBackground = true, backgroundColor = 0xFFF7F8FC, ) @@ -604,7 +971,7 @@ private fun ProjectLibraryEmptyPreview() { } @Preview( - name = "ProjectLibrary NoResult", + name = "Projects NoResult", showBackground = true, backgroundColor = 0xFFF7F8FC, ) @@ -621,7 +988,7 @@ private fun ProjectLibraryNoResultPreview() { } @Preview( - name = "ProjectLibrary Dark 200%", + name = "Projects Dark 200%", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES, fontScale = 2f, diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/script/ScriptScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/script/ScriptScreen.kt index 8b4f2cf..2bfd7c4 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/script/ScriptScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/script/ScriptScreen.kt @@ -1,67 +1,54 @@ +@file:OptIn(androidx.compose.foundation.layout.ExperimentalLayoutApi::class) + package com.estimatefaster.audioforge.feature.script import android.content.res.Configuration import androidx.annotation.StringRes -import androidx.compose.foundation.background -import androidx.compose.foundation.combinedClickable -import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.sizeIn -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilterChip +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface -import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.rememberCoroutineScope 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.draw.clip -import androidx.compose.ui.draw.drawBehind -import androidx.compose.ui.geometry.Size +import androidx.compose.ui.draw.alpha import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.LiveRegionMode -import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.disabled import androidx.compose.ui.semantics.liveRegion -import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.selected -import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -69,19 +56,30 @@ import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.core.model.Emotion import com.estimatefaster.audioforge.core.model.NARRATOR_ROLE_ID import com.estimatefaster.audioforge.core.model.SegmentType -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorState import com.estimatefaster.audioforge.ui.components.RoleAvatar +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar +import com.estimatefaster.audioforge.ui.forge.ForgeWavyProgress import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing +import kotlinx.coroutines.launch + +/** LazyColumn 中固定头部的 item 数:hero、角色筛选、搜索、段落标题。 */ +private const val SCRIPT_HEADER_ITEMS = 4 /** - * 剧本页(P5-01 / 执行计划 §12.4 S06)。 + * 剧本页(Forge Framework v1)。 * * 有状态入口:收集 [ScriptViewModel.state] 后委托给无状态版本。 * 播放/编辑/重生成都只是回调,页面不直接访问仓库或播放器。 - * 播放按钮先经过 [ScriptViewModel.playFrom](跳过无音频段、更新跟随状态), - * 再把解析出的整章 index 交给宿主 `onPlaySegment` 起播;自动前进由 ViewModel 的 - * `onPlaybackAdvanced` 回调通知宿主(或直接 collect [ScriptViewModel.followState])。 */ @Composable fun ScriptScreen( @@ -132,14 +130,10 @@ fun ScriptScreen( /** * 无状态剧本页。 * - * - 顶部:返回 + 章节标题; - * - 角色筛选(全部 + 人物 chips)+ 搜索台词; - * - `LazyColumn` 稳定 key(片段主键/位置兜底),当前播放段高亮并自动滚动; - * - 段落整行可点(编辑回调),长按/“更多”打开播放/编辑/重新生成菜单; - * - 底部迷你播放条:播放/暂停、上一句/下一句、连续播放开关、跳过无音频提示; - * - 空态区分“整章没有剧本”和“筛选后为空”,加载/错误复用 P4-02 组件。 + * 结构对齐 `docs/prototype/forge-framework.html` 的 Script: + * topbar → 章节 hero(含生成进度)→ 角色 chips → 台词搜索 → 分段列表 → 迷你播放条。 + * 当前播放段高亮并自动滚动;筛选、搜索、连播、播放跟随状态机保持原语义。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ScriptScreen( state: ScriptUiState, @@ -162,42 +156,57 @@ fun ScriptScreen( playingSegmentIndex: Int? = state.playingSegmentIndex, ) { val loadError = state.loadError + val listState = rememberLazyListState() + val scope = rememberCoroutineScope() + val scrollTarget = state.scrollTargetFor(playingSegmentIndex) + + // 播放段变化/重新出现在筛选结果里时,滚动到当前段;被筛掉时不强制跳转。 + LaunchedEffect(playingSegmentIndex, scrollTarget) { + if (scrollTarget != null) { + listState.animateScrollToItem(SCRIPT_HEADER_ITEMS + scrollTarget) + } + } + Scaffold( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - navigationIcon = { - TextButton( - onClick = onBack, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_back)) - } + ForgeTopBar( + title = stringResource(R.string.ux2_script_title), + subtitle = if (state.chapterTitle.isBlank()) { + null + } else { + stringResource( + R.string.ux2_script_subtitle, + state.chapterTitle, + state.segments.size, + ) }, - title = { - val titleText = if (state.chapterTitle.isBlank()) { - stringResource(R.string.script_title) - } else { - state.chapterTitle + navigationIcon = ForgeIcons.Back, + navigationDescription = stringResource(R.string.ux2_script_back), + onNavigation = onBack, + actions = { + if (state.segments.isNotEmpty()) { + ForgeIconAction( + icon = ForgeIcons.List, + contentDescription = stringResource(R.string.ux2_script_locate_current), + onClick = { + scope.launch { + val target = state.scrollTargetFor(playingSegmentIndex) + listState.animateScrollToItem( + target?.let { SCRIPT_HEADER_ITEMS + it } ?: 0, + ) + } + }, + container = false, + ) } - Text( - text = titleText, - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - ) }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, bottomBar = { if (state.segments.isNotEmpty()) { - ScriptMiniPlayer( + ScriptMiniBar( state = state, followState = followState, onPlayPause = onPlayPause, @@ -208,363 +217,507 @@ fun ScriptScreen( } }, ) { padding -> - Column( + Box( modifier = Modifier .fillMaxSize() .padding(padding), ) { - if (state.segments.isNotEmpty()) { - ScriptRoleFilterRow( + when { + state.isInitialLoading -> ForgeLoading( + label = stringResource(R.string.ux2_script_loading), + modifier = Modifier.fillMaxSize(), + ) + + loadError != null -> ForgeError( + message = stringResource(R.string.ux2_script_load_error, loadError), + onRetry = onRetry, + ) + + state.isEmpty -> ForgeEmpty( + icon = ForgeIcons.FileText, + title = stringResource(R.string.ux2_script_empty_title), + description = stringResource(R.string.ux2_script_empty_description), + actionIcon = if (onParseChapter != null) ForgeIcons.Wand else null, + actionLabel = if (onParseChapter != null) { + stringResource(R.string.ux2_script_parse) + } else { + null + }, + onAction = onParseChapter, + ) + + else -> ScriptContent( state = state, + listState = listState, + playingSegmentIndex = playingSegmentIndex, + onQueryChange = onQueryChange, onRoleFilterChange = onRoleFilterChange, + onClearFilters = onClearFilters, + onSegmentClick = onSegmentClick, + onEditSegment = onEditSegment, + onRegenerateSegment = onRegenerateSegment, + onPlaySegment = onPlaySegment, + onPlayPause = onPlayPause, ) - OutlinedTextField( - value = state.query, - onValueChange = onQueryChange, + } + } + } +} + +@Composable +private fun ScriptContent( + state: ScriptUiState, + listState: androidx.compose.foundation.lazy.LazyListState, + playingSegmentIndex: Int?, + onQueryChange: (String) -> Unit, + onRoleFilterChange: (String?) -> Unit, + onClearFilters: () -> Unit, + onSegmentClick: (Int) -> Unit, + onEditSegment: (Int) -> Unit, + onRegenerateSegment: (Int) -> Unit, + onPlaySegment: (Int) -> Unit, + onPlayPause: () -> Unit, +) { + LazyColumn( + state = listState, + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + top = MaterialTheme.spacing.sm, + bottom = MaterialTheme.spacing.xl, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + item(key = "hero") { + ScriptHero(state = state) + } + item(key = "role-filters") { + ScriptRoleFilters( + state = state, + onRoleFilterChange = onRoleFilterChange, + ) + } + item(key = "search") { + ScriptSearchField( + state = state, + onQueryChange = onQueryChange, + ) + } + item(key = "section") { + ForgeSectionHeader( + title = stringResource(R.string.ux2_script_section_title), + subtitle = stringResource( + R.string.ux2_script_section_count, + state.visibleSegments.size, + ), + modifier = Modifier.padding(top = MaterialTheme.spacing.xs), + ) + } + + if (state.isFilteredEmpty) { + item(key = "filtered-empty") { + ForgeEmpty( + icon = ForgeIcons.Search, + title = stringResource(R.string.ux2_script_filtered_title), + description = stringResource(R.string.ux2_script_filtered_description), modifier = Modifier .fillMaxWidth() - .padding(start = 20.dp, end = 20.dp, top = 4.dp), - label = { Text(stringResource(R.string.script_search_label)) }, - placeholder = { Text(stringResource(R.string.script_search_placeholder)) }, - singleLine = true, - trailingIcon = { - if (state.query.isNotEmpty()) { - TextButton( - onClick = { onQueryChange("") }, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.script_search_clear)) - } - } - }, + .heightIn(min = 320.dp), + actionIcon = ForgeIcons.Refresh, + actionLabel = stringResource(R.string.ux2_script_clear_filters), + onAction = onClearFilters, ) } + } else { + items( + items = state.visibleSegments, + key = { segment -> segment.key }, + contentType = { segment -> segment.type.wire }, + ) { segment -> + val isCurrent = state.isPlaying(segment, playingSegmentIndex) + ScriptSegmentCard( + segment = segment, + isCurrent = isCurrent, + isPlaying = isCurrent && state.playing, + hasAudio = segment.hasAudio, + onSegmentClick = { onSegmentClick(segment.index) }, + onEditSegment = { onEditSegment(segment.index) }, + onRegenerateSegment = { onRegenerateSegment(segment.index) }, + onPlayPause = onPlayPause, + onPlaySegment = { onPlaySegment(segment.index) }, + ) + } + } - Box( - modifier = Modifier - .fillMaxWidth() - .weight(1f), - ) { - when { - state.isInitialLoading -> ScriptLoading( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 24.dp), - ) - - loadError != null -> Box( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - ErrorState( - message = stringResource(R.string.script_load_error, loadError), - onRetry = onRetry, - ) - } - - state.isEmpty -> Box( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource(R.string.script_empty_title), - description = stringResource(R.string.script_empty_description), - actionText = if (onParseChapter != null) { - stringResource(R.string.script_empty_action_parse) - } else { - null - }, - onAction = onParseChapter, - ) - } + item(key = "note") { + ScriptNote() + } + } +} - state.isFilteredEmpty -> Box( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 12.dp), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource(R.string.script_filtered_empty_title), - description = stringResource(R.string.script_filtered_empty_description), - actionText = stringResource(R.string.script_filtered_empty_action), - onAction = onClearFilters, - ) - } +@Composable +private fun ScriptHero(state: ScriptUiState) { + val total = state.segments.size + val generated = state.playableCount + val progress = if (total == 0) 0f else generated.toFloat() / total.toFloat() - else -> ScriptSegmentList( - state = state, - playingSegmentIndex = playingSegmentIndex, - onSegmentClick = onSegmentClick, - onEditSegment = onEditSegment, - onRegenerateSegment = onRegenerateSegment, - onPlaySegment = onPlaySegment, - onPlayPause = onPlayPause, - ) - } - } + ForgeCard { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIcon( + icon = ForgeIcons.BookOpen, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource(R.string.ux2_script_eyebrow), + style = MaterialTheme.typography.labelSmallEmphasized, + color = MaterialTheme.colorScheme.primary, + ) } + Text( + text = state.chapterTitle.ifBlank { + stringResource(R.string.ux2_script_title) + }, + style = MaterialTheme.typography.headlineSmallEmphasized, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + Text( + text = stringResource(R.string.ux2_script_summary, total, generated), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + val progressDescription = stringResource(R.string.ux2_script_progress_description) + ForgeWavyProgress( + progress = progress, + modifier = Modifier.semantics { contentDescription = progressDescription }, + ) + Text( + text = stringResource(R.string.ux2_script_progress_caption, generated, total), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } } @Composable -private fun ScriptRoleFilterRow( +private fun ScriptRoleFilters( state: ScriptUiState, onRoleFilterChange: (String?) -> Unit, ) { - Row( - modifier = Modifier - .fillMaxWidth() - .horizontalScroll(rememberScrollState()) - .padding(horizontal = 20.dp, vertical = 4.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), - ) { - FilterChip( - selected = state.selectedRoleId == null, - onClick = { onRoleFilterChange(null) }, - label = { Text(stringResource(R.string.script_filter_all)) }, + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs)) { + Text( + text = stringResource(R.string.ux2_script_filter_label), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) - state.characters.forEach { character -> - FilterChip( - selected = state.selectedRoleId == character.roleId, - onClick = { onRoleFilterChange(character.roleId) }, - label = { Text(characterName(character)) }, + FlowRow( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeChip( + label = stringResource( + R.string.ux2_script_filter_count, + stringResource(R.string.ux2_script_filter_all), + state.segments.size, + ), + selected = state.selectedRoleId == null, + onClick = { onRoleFilterChange(null) }, + icon = ForgeIcons.Users, ) + state.characters.forEach { character -> + ForgeChip( + label = stringResource( + R.string.ux2_script_filter_count, + characterName(character), + state.segments.count { segment -> segment.roleId == character.roleId }, + ), + selected = state.selectedRoleId == character.roleId, + onClick = { onRoleFilterChange(character.roleId) }, + icon = if (character.isNarrator) ForgeIcons.Mic else ForgeIcons.UserRound, + ) + } } } } @Composable -private fun ScriptSegmentList( +private fun ScriptSearchField( state: ScriptUiState, - playingSegmentIndex: Int?, - onSegmentClick: (Int) -> Unit, - onEditSegment: (Int) -> Unit, - onRegenerateSegment: (Int) -> Unit, - onPlaySegment: (Int) -> Unit, - onPlayPause: () -> Unit, + onQueryChange: (String) -> Unit, ) { - val listState = rememberLazyListState() - val scrollTarget = state.scrollTargetFor(playingSegmentIndex) - - // 播放段变化/重新出现在筛选结果里时,滚动到当前段;被筛掉时不强制跳转。 - LaunchedEffect(playingSegmentIndex, scrollTarget) { - if (scrollTarget != null) { - listState.animateScrollToItem(scrollTarget) - } - } - - LazyColumn( - state = listState, - modifier = Modifier.fillMaxSize(), - contentPadding = PaddingValues(start = 20.dp, end = 20.dp, top = 4.dp, bottom = 24.dp), - verticalArrangement = Arrangement.spacedBy(8.dp), - ) { - items( - items = state.visibleSegments, - key = { segment -> segment.key }, - contentType = { segment -> segment.type.wire }, - ) { segment -> - val isCurrent = state.isPlaying(segment, playingSegmentIndex) - ScriptSegmentRow( - segment = segment, - isCurrent = isCurrent, - isPlaying = isCurrent && state.playing, - onSegmentClick = onSegmentClick, - onEditSegment = onEditSegment, - onRegenerateSegment = onRegenerateSegment, - onPlaySegment = onPlaySegment, - onPlayPause = onPlayPause, + OutlinedTextField( + value = state.query, + onValueChange = onQueryChange, + modifier = Modifier.fillMaxWidth(), + singleLine = true, + shape = MaterialTheme.shapes.extraLarge, + leadingIcon = { + ForgeIcon( + icon = ForgeIcons.Search, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, ) - } - } + }, + trailingIcon = if (state.query.isNotEmpty()) { + { + IconButton( + onClick = { onQueryChange("") }, + modifier = Modifier.size(48.dp), + ) { + ForgeIcon( + icon = ForgeIcons.Close, + contentDescription = stringResource(R.string.ux2_script_search_clear), + ) + } + } + } else { + null + }, + placeholder = { + Text( + text = stringResource(R.string.ux2_script_search_hint), + style = MaterialTheme.typography.bodyMedium, + ) + }, + ) } @Composable -private fun ScriptSegmentRow( +private fun ScriptSegmentCard( segment: ScriptSegmentUi, isCurrent: Boolean, isPlaying: Boolean, - onSegmentClick: (Int) -> Unit, - onEditSegment: (Int) -> Unit, - onRegenerateSegment: (Int) -> Unit, - onPlaySegment: (Int) -> Unit, + hasAudio: Boolean, + onSegmentClick: () -> Unit, + onEditSegment: () -> Unit, + onRegenerateSegment: () -> Unit, onPlayPause: () -> Unit, + onPlaySegment: () -> Unit, ) { var menuExpanded by rememberSaveable(segment.key) { mutableStateOf(false) } - - val shape = MaterialTheme.shapes.medium - val accent = if (segment.isNarration) { - MaterialTheme.colorScheme.outline - } else { - MaterialTheme.colorScheme.primary - } - val container = if (isCurrent) { - MaterialTheme.colorScheme.primaryContainer - } else { - MaterialTheme.colorScheme.surface - } val displayName = segmentName(segment) - val editClickLabel = stringResource(R.string.script_segment_click_edit) - val moreClickLabel = stringResource(R.string.script_segment_long_click_more) - val moreDescription = stringResource( - R.string.script_segment_more_content_description, + val playDescription = stringResource( + if (isPlaying) R.string.ux2_script_segment_pause else R.string.ux2_script_segment_play, segment.number, ) - val playLabel = stringResource( - if (isPlaying) R.string.script_segment_action_pause else R.string.script_segment_action_play, - ) + val editDescription = stringResource(R.string.ux2_script_segment_edit, segment.number) + val moreDescription = stringResource(R.string.ux2_script_segment_more, segment.number) + val statusText = when { + segment.hasAudio -> stringResource(R.string.ux2_script_segment_has_audio) + else -> stringResource(R.string.ux2_script_segment_no_audio) + } - Card( + ForgeCard( modifier = Modifier .fillMaxWidth() - .clip(shape) - .combinedClickable( - onClickLabel = editClickLabel, - onLongClickLabel = moreClickLabel, - onLongClick = { menuExpanded = true }, - onClick = { onSegmentClick(segment.index) }, - ) .semantics { selected = isCurrent }, - shape = shape, - colors = CardDefaults.cardColors(containerColor = container), + onClick = onSegmentClick, + containerColor = if (isCurrent) { + MaterialTheme.colorScheme.primaryContainer + } else { + MaterialTheme.colorScheme.surfaceContainerLow + }, + contentPadding = PaddingValues(MaterialTheme.spacing.md), ) { Row( - modifier = Modifier - .drawBehind { - drawRect(color = accent, size = Size(4.dp.toPx(), size.height)) - } - .padding(start = 16.dp, end = 8.dp, top = 12.dp, bottom = 12.dp), - verticalAlignment = Alignment.Top, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - ScriptNumberBadge(number = segment.number) - Spacer(Modifier.width(8.dp)) - // 名字在右侧可见,头像只做装饰,避免 TalkBack 把同一人物读两遍。 - RoleAvatar(name = displayName, size = 40.dp, decorative = true) - Spacer(Modifier.width(10.dp)) + SegmentNumberBadge(number = segment.number) + RoleAvatar(name = displayName, size = 36.dp, decorative = true) Column(modifier = Modifier.weight(1f)) { - Row(verticalAlignment = Alignment.CenterVertically) { - Text( - text = displayName, - modifier = Modifier.weight(1f), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - TextButton( - onClick = { - // 当前段:播放中→暂停,已暂停→恢复;其他段:从该段起播。 - if (isCurrent) onPlayPause() else onPlaySegment(segment.index) - }, - enabled = segment.hasAudio, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(playLabel) - } - Box { - TextButton( - onClick = { menuExpanded = true }, - modifier = Modifier - .heightIn(min = 48.dp) - .semantics { contentDescription = moreDescription }, - ) { - Text(stringResource(R.string.action_more)) - } - ScriptSegmentMenu( - expanded = menuExpanded, - hasAudio = segment.hasAudio, - onDismiss = { menuExpanded = false }, - onPlay = { - menuExpanded = false - onPlaySegment(segment.index) - }, - onEdit = { - menuExpanded = false - onEditSegment(segment.index) - }, - onRegenerate = { - menuExpanded = false - onRegenerateSegment(segment.index) - }, - ) - } - } - Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - Text( - text = stringResource(segment.type.labelRes()), - style = MaterialTheme.typography.labelMedium, - color = accent, - fontWeight = FontWeight.SemiBold, - ) - EmotionTag(emotion = segment.emotion) - } - Spacer(Modifier.height(6.dp)) Text( - text = segment.text, - style = MaterialTheme.typography.bodyMedium, + text = displayName, + style = MaterialTheme.typography.titleSmallEmphasized, + maxLines = 1, + overflow = TextOverflow.Ellipsis, ) - val errorMessage = segment.errorMessage - if (errorMessage != null) { - Spacer(Modifier.height(6.dp)) - Text( - text = stringResource(R.string.script_segment_error, errorMessage), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, + Text( + text = stringResource(emotionLabelRes(segment.emotion)), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + Box { + ForgeIconAction( + icon = ForgeIcons.More, + contentDescription = moreDescription, + onClick = { menuExpanded = true }, + container = false, + ) + DropdownMenu( + expanded = menuExpanded, + onDismissRequest = { menuExpanded = false }, + ) { + DropdownMenuItem( + text = { Text(stringResource(R.string.ux2_script_segment_menu_edit)) }, + onClick = { + menuExpanded = false + onEditSegment() + }, + leadingIcon = { + ForgeIcon(ForgeIcons.Edit, contentDescription = null) + }, ) - } - if (!segment.hasAudio) { - Spacer(Modifier.height(6.dp)) - Text( - text = stringResource(R.string.script_segment_no_audio_hint), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + DropdownMenuItem( + text = { + Text(stringResource(R.string.ux2_script_segment_menu_regenerate)) + }, + onClick = { + menuExpanded = false + onRegenerateSegment() + }, + leadingIcon = { + ForgeIcon(ForgeIcons.Refresh, contentDescription = null) + }, ) } } } + + SegmentText(segment = segment) + + if (segment.hasError) { + Text( + text = segment.errorMessage?.let { message -> + stringResource(R.string.ux2_script_segment_error, message) + } ?: stringResource(R.string.ux2_script_segment_error_generic), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) + } + + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { + Text( + text = stringResource( + R.string.ux2_script_segment_foot, + segment.number, + statusText, + ), + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + if (isCurrent) { + CurrentSegmentTag() + } + ForgeIconAction( + icon = if (isPlaying) ForgeIcons.Pause else ForgeIcons.Play, + contentDescription = playDescription, + onClick = { + if (hasAudio) { + if (isCurrent) onPlayPause() else onPlaySegment() + } + }, + container = false, + modifier = Modifier + .alpha(if (hasAudio) 1f else 0.4f) + .semantics { if (!hasAudio) disabled() }, + ) + ForgeIconAction( + icon = ForgeIcons.Edit, + contentDescription = editDescription, + onClick = onEditSegment, + container = false, + ) + } } } @Composable -private fun ScriptSegmentMenu( - expanded: Boolean, - hasAudio: Boolean, - onDismiss: () -> Unit, - onPlay: () -> Unit, - onEdit: () -> Unit, - onRegenerate: () -> Unit, -) { - DropdownMenu( - expanded = expanded, - onDismissRequest = onDismiss, +private fun SegmentText(segment: ScriptSegmentUi) { + val quoteColor = MaterialTheme.colorScheme.onSurfaceVariant + val body = buildAnnotatedString { + if (segment.isNarration) { + append(segment.text) + } else { + withStyle(SpanStyle(color = quoteColor)) { append("“") } + append(segment.text) + withStyle(SpanStyle(color = quoteColor)) { append("”") } + } + } + Text( + text = body, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + ) +} + +@Composable +private fun SegmentNumberBadge(number: Int) { + Surface( + shape = MaterialTheme.shapes.small, + color = MaterialTheme.colorScheme.surfaceContainerHigh, ) { - DropdownMenuItem( - text = { Text(stringResource(R.string.script_segment_action_play)) }, - onClick = onPlay, - enabled = hasAudio, + Text( + text = number.toString().padStart(2, '0'), + modifier = Modifier.padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.xxs, + ), + style = MaterialTheme.typography.labelSmallEmphasized, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, ) - DropdownMenuItem( - text = { Text(stringResource(R.string.script_segment_action_edit)) }, - onClick = onEdit, + } +} + +@Composable +private fun CurrentSegmentTag() { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(2.dp), + ) { + ForgeIcon( + icon = ForgeIcons.AudioLines, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource(R.string.ux2_script_segment_current), + style = MaterialTheme.typography.labelSmallEmphasized, + color = MaterialTheme.colorScheme.primary, + maxLines = 1, + ) + } +} + +@Composable +private fun ScriptNote() { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeIcon( + icon = ForgeIcons.Info, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = MaterialTheme.colorScheme.primary, ) - DropdownMenuItem( - text = { Text(stringResource(R.string.script_segment_action_regenerate)) }, - onClick = onRegenerate, + Text( + text = stringResource(R.string.ux2_script_note), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } -@OptIn(ExperimentalLayoutApi::class) @Composable -private fun ScriptMiniPlayer( +private fun ScriptMiniBar( state: ScriptUiState, followState: FollowState, onPlayPause: () -> Unit, @@ -574,77 +727,107 @@ private fun ScriptMiniPlayer( ) { val current = state.currentSegment val hasAudio = state.hasPlayableAudio - val continuousLabel = stringResource(R.string.script_playback_continuous) - Surface( - modifier = Modifier.fillMaxWidth(), - tonalElevation = 3.dp, - shadowElevation = 3.dp, - ) { + val continuousLabel = stringResource(R.string.ux2_script_mini_continuous) + val status = when { + followState.nextChapterRequested -> + stringResource(R.string.ux2_script_mini_next_chapter) + + followState.chapterFinished -> stringResource(R.string.ux2_script_mini_chapter_done) + current != null -> stringResource(R.string.ux2_script_mini_now, current.number) + !hasAudio -> stringResource(R.string.ux2_script_mini_no_audio) + else -> stringResource(R.string.ux2_script_mini_idle) + } + + Surface(color = MaterialTheme.colorScheme.surfaceContainerLow) { Column( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 16.dp, vertical = 8.dp), + .navigationBarsPadding() + .padding( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.sm, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), ) { Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(8.dp), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { Column(modifier = Modifier.weight(1f)) { Text( - text = when { - followState.nextChapterRequested -> stringResource( - R.string.script_playback_chapter_done_next, - ) - - followState.chapterFinished -> stringResource( - R.string.script_playback_chapter_done, - ) - - current != null -> stringResource( - R.string.script_playback_now_playing, - current.number, - ) - - !hasAudio -> stringResource(R.string.script_playback_no_audio) - else -> stringResource(R.string.script_playback_idle) - }, + text = status, modifier = Modifier.semantics { liveRegion = LiveRegionMode.Polite }, - style = MaterialTheme.typography.bodyMedium, - fontWeight = FontWeight.SemiBold, + style = MaterialTheme.typography.bodyMediumEmphasized, + maxLines = 1, + overflow = TextOverflow.Ellipsis, ) if (current != null) { Text( text = stringResource( - R.string.script_playback_subtitle, + R.string.ux2_script_mini_subtitle, segmentName(current), current.text, ), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 2, + maxLines = 1, overflow = TextOverflow.Ellipsis, ) } } - Text( - text = continuousLabel, - // 开关本身已有 contentDescription;可视化标签不重复进入读屏。 - modifier = Modifier.clearAndSetSemantics { }, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + } + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIconAction( + icon = ForgeIcons.SkipPrevious, + contentDescription = stringResource(R.string.ux2_script_mini_prev), + onClick = { if (hasAudio) onPlayPrevious() }, + container = false, + modifier = Modifier + .alpha(if (hasAudio) 1f else 0.4f) + .semantics { if (!hasAudio) disabled() }, + ) + ForgeIconAction( + icon = if (state.playing) ForgeIcons.Pause else ForgeIcons.Play, + contentDescription = stringResource( + if (state.playing) { + R.string.ux2_script_mini_pause + } else { + R.string.ux2_script_mini_play + }, + ), + onClick = { if (hasAudio) onPlayPause() }, + container = true, + modifier = Modifier + .alpha(if (hasAudio) 1f else 0.4f) + .semantics { if (!hasAudio) disabled() }, + ) + ForgeIconAction( + icon = ForgeIcons.SkipNext, + contentDescription = stringResource(R.string.ux2_script_mini_next), + onClick = { if (hasAudio) onPlayNext() }, + container = false, + modifier = Modifier + .alpha(if (hasAudio) 1f else 0.4f) + .semantics { if (!hasAudio) disabled() }, ) - Switch( - checked = state.continuousPlayback, - onCheckedChange = onContinuousChange, - enabled = hasAudio, - modifier = Modifier.semantics { contentDescription = continuousLabel }, + Spacer(Modifier.weight(1f)) + ForgeChip( + label = continuousLabel, + selected = state.continuousPlayback, + onClick = { if (hasAudio) onContinuousChange(!state.continuousPlayback) }, + icon = ForgeIcons.Repeat, + modifier = Modifier.alpha(if (hasAudio) 1f else 0.5f), ) } if (followState.skippedNoAudio && hasAudio) { Text( - text = stringResource(R.string.script_playback_skipped_no_audio), + text = stringResource(R.string.ux2_script_mini_skipped), modifier = Modifier.semantics { liveRegion = LiveRegionMode.Polite }, @@ -652,143 +835,41 @@ private fun ScriptMiniPlayer( color = MaterialTheme.colorScheme.onSurfaceVariant, ) } - FlowRow( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.spacedBy(4.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), - ) { - TextButton( - onClick = onPlayPrevious, - enabled = hasAudio, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.script_playback_prev)) - } - TextButton( - onClick = onPlayPause, - enabled = hasAudio, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text( - stringResource( - if (state.playing) { - R.string.script_playback_pause - } else { - R.string.script_playback_play - }, - ), - ) - } - TextButton( - onClick = onPlayNext, - enabled = hasAudio, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.script_playback_next)) - } - } } } } @Composable -private fun ScriptNumberBadge(number: Int) { - Box( - modifier = Modifier - .sizeIn(minWidth = 32.dp, minHeight = 32.dp) - .clip(RoundedCornerShape(10.dp)) - .background(MaterialTheme.colorScheme.surfaceVariant) - .padding(horizontal = 6.dp, vertical = 4.dp), - contentAlignment = Alignment.Center, - ) { - Text( - text = number.toString(), - style = MaterialTheme.typography.labelMedium, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.onSurfaceVariant, - maxLines = 1, - ) - } +private fun characterName(character: ScriptCharacterUi): String = when { + character.name.isNotBlank() -> character.name + character.isNarrator -> stringResource(R.string.ux2_script_narration) + else -> stringResource(R.string.ux2_script_unknown_role) } @Composable -private fun EmotionTag(emotion: Emotion) { - Box( - modifier = Modifier - .clip(RoundedCornerShape(8.dp)) - .background(MaterialTheme.colorScheme.secondaryContainer) - .padding(horizontal = 8.dp, vertical = 2.dp), - ) { - Text( - text = stringResource(emotion.labelRes()), - style = MaterialTheme.typography.labelSmall, - color = MaterialTheme.colorScheme.onSecondaryContainer, - maxLines = 1, - ) - } +private fun segmentName(segment: ScriptSegmentUi): String = when { + segment.roleName.isNotBlank() -> segment.roleName + segment.roleId == NARRATOR_ROLE_ID -> stringResource(R.string.ux2_script_narration) + else -> stringResource(R.string.ux2_script_unknown_role) } -@Composable -private fun ScriptLoading(modifier: Modifier = Modifier) { - Column( - modifier = modifier, - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center, - ) { - CircularProgressIndicator() - Spacer(Modifier.height(14.dp)) - Text( - text = stringResource(R.string.script_loading), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } -} - -@Composable -private fun characterName(character: ScriptCharacterUi): String = - if (character.name.isNotBlank()) { - character.name - } else if (character.isNarrator) { - stringResource(R.string.script_type_narration) - } else { - stringResource(R.string.script_role_unknown) - } - -@Composable -private fun segmentName(segment: ScriptSegmentUi): String = - if (segment.roleName.isNotBlank()) { - segment.roleName - } else if (segment.roleId == NARRATOR_ROLE_ID) { - stringResource(R.string.script_type_narration) - } else { - stringResource(R.string.script_role_unknown) - } - @StringRes -private fun SegmentType.labelRes(): Int = when (this) { - SegmentType.Dialogue -> R.string.script_type_dialogue - SegmentType.Narration -> R.string.script_type_narration -} - -@StringRes -private fun Emotion.labelRes(): Int = when (this) { - Emotion.Neutral -> R.string.script_emotion_neutral - Emotion.Happy -> R.string.script_emotion_happy - Emotion.Sad -> R.string.script_emotion_sad - Emotion.Angry -> R.string.script_emotion_angry - Emotion.Anxious -> R.string.script_emotion_anxious - Emotion.Excited -> R.string.script_emotion_excited - Emotion.Surprised -> R.string.script_emotion_surprised - Emotion.SoftTone -> R.string.script_emotion_soft_tone - Emotion.Serious -> R.string.script_emotion_serious - Emotion.Calm -> R.string.script_emotion_calm - Emotion.Whispering -> R.string.script_emotion_whispering +private fun emotionLabelRes(emotion: Emotion): Int = when (emotion) { + Emotion.Neutral -> R.string.ux2_emotion_neutral + Emotion.Happy -> R.string.ux2_emotion_happy + Emotion.Sad -> R.string.ux2_emotion_sad + Emotion.Angry -> R.string.ux2_emotion_angry + Emotion.Anxious -> R.string.ux2_emotion_anxious + Emotion.Excited -> R.string.ux2_emotion_excited + Emotion.Surprised -> R.string.ux2_emotion_surprised + Emotion.SoftTone -> R.string.ux2_emotion_soft_tone + Emotion.Serious -> R.string.ux2_emotion_serious + Emotion.Calm -> R.string.ux2_emotion_calm + Emotion.Whispering -> R.string.ux2_emotion_whispering } // --------------------------------------------------------------------------- -// Preview:播放中(连播开)/ 播放中(连播关)/ 筛选空结果(深色 200%)/ 整章空态。 -// 演示文本只是预览数据;所有 UI 文案来自 strings.xml。 +// Preview:播放中(含当前段高亮)/ 空态(深色 200%)。数据只是固定夹具。 // --------------------------------------------------------------------------- private fun previewSegment( @@ -807,17 +888,12 @@ private fun previewSegment( roleName = roleName, emotion = emotion, text = text, - status = "pending", + status = "done", hasAudio = true, errorMessage = null, ) -private fun previewCharacters(): List = listOf( - ScriptCharacterUi(roleId = "role_0001", name = "沈砚"), - ScriptCharacterUi(roleId = "role_0002", name = "顾青"), -) - -private fun previewSegments(): List = listOf( +private fun previewScriptSegments(): List = listOf( previewSegment( id = 1, index = 0, @@ -845,27 +921,22 @@ private fun previewSegments(): List = listOf( emotion = Emotion.Whispering, text = "渡口的老船夫交给我的。他说,写信的人已经等了三年。", ), - previewSegment( - id = 4, - index = 3, - type = SegmentType.Dialogue, - roleId = "role_0001", - roleName = "沈砚", - emotion = Emotion.Sad, - text = "三年……原来他一直没有离开。", - ), ) -@Preview(name = "Script Playing", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview(name = "Script Forge", showBackground = true, backgroundColor = 0xFFF7F9F8) @Composable -private fun ScriptPlayingPreview() { +private fun ScriptForgePreview() { AudioForgeTheme(dynamicColor = false) { ScriptScreen( state = ScriptUiState( loading = false, - chapterTitle = "第三章 旧信", - segments = previewSegments(), - characters = previewCharacters(), + chapterTitle = "第三章 长夜", + segments = previewScriptSegments(), + characters = listOf( + ScriptCharacterUi(roleId = NARRATOR_ROLE_ID, name = ""), + ScriptCharacterUi(roleId = "role_0001", name = "沈砚"), + ScriptCharacterUi(roleId = "role_0002", name = "顾青"), + ), playingSegmentIndex = 1, continuousPlayback = true, playing = true, @@ -875,56 +946,17 @@ private fun ScriptPlayingPreview() { } } -@Preview(name = "Script Continuous Off", showBackground = true, backgroundColor = 0xFFF7F8FC) -@Composable -private fun ScriptContinuousOffPreview() { - AudioForgeTheme(dynamicColor = false) { - ScriptScreen( - state = ScriptUiState( - loading = false, - chapterTitle = "第三章 旧信", - segments = previewSegments(), - characters = previewCharacters(), - playingSegmentIndex = 2, - continuousPlayback = false, - playing = true, - ), - followState = FollowState(currentIndex = 2, shouldScroll = true), - ) - } -} - @Preview( - name = "Script Filtered Empty Dark 200%", + name = "Script Empty Dark 200%", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES, fontScale = 2f, ) @Composable -private fun ScriptFilteredEmptyPreview() { - AudioForgeTheme(darkTheme = true, dynamicColor = false) { - ScriptScreen( - state = ScriptUiState( - loading = false, - chapterTitle = "第三章 旧信", - segments = previewSegments(), - characters = previewCharacters(), - selectedRoleId = "role_0002", - query = "不存在的台词", - ), - ) - } -} - -@Preview(name = "Script Empty", showBackground = true, backgroundColor = 0xFFF7F8FC) -@Composable private fun ScriptEmptyPreview() { - AudioForgeTheme(dynamicColor = false) { + AudioForgeTheme(darkTheme = true, dynamicColor = false) { ScriptScreen( - state = ScriptUiState( - loading = false, - chapterTitle = "第五章 入城", - ), + state = ScriptUiState(loading = false, chapterTitle = "第五章 入城"), onParseChapter = {}, ) } diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/script/SegmentEditSheet.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/script/SegmentEditSheet.kt index 01d36ee..2abfdb6 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/script/SegmentEditSheet.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/script/SegmentEditSheet.kt @@ -1,54 +1,41 @@ +@file:OptIn( + androidx.compose.material3.ExperimentalMaterial3Api::class, + androidx.compose.foundation.layout.ExperimentalLayoutApi::class, +) + package com.estimatefaster.audioforge.feature.script import androidx.annotation.StringRes +import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Button -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.DropdownMenu -import androidx.compose.material3.DropdownMenuItem -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.SegmentedButton -import androidx.compose.material3.SegmentedButtonDefaults -import androidx.compose.material3.SingleChoiceSegmentedButtonRow import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.rememberUpdatedState -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.res.stringResource import androidx.compose.ui.semantics.LiveRegionMode import androidx.compose.ui.semantics.liveRegion import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -57,23 +44,30 @@ import com.estimatefaster.audioforge.core.model.Emotion import com.estimatefaster.audioforge.core.model.NARRATOR_ROLE_ID import com.estimatefaster.audioforge.core.model.SegmentType import com.estimatefaster.audioforge.data.db.SegmentEntity +import com.estimatefaster.audioforge.ui.components.RoleAvatar +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeChip +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSegmented +import com.estimatefaster.audioforge.ui.forge.ForgeSheetHeader import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing /** - * 片段编辑 Sheet(P5-02 / 执行计划 §12.4 S07)。 + * 片段编辑 Sheet(Forge Framework v1)。 * * 有状态入口:收集 [SegmentEditViewModel.state],把一次性事件转成调用方回调: - * - `Saved` → `onSaved(updated)`(调用方决定是否关闭 Sheet / 提示已保存); + * - `Saved` → `onSaved(updated)`; * - `Cancelled` → `onDismiss`; * - `RegenerateRequested` → `onRegenerate(segmentId)`(本 Sheet 不直接调用 TTS)。 * - * 保存、失败重试、取消、重置都委托给 ViewModel;Composable 不访问数据库。 - * * @param onDismiss 用户取消/下滑/返回时关闭 Sheet * @param onSaved 保存成功;`segment` 是实际写入的实体 * @param onRegenerate “重新生成此句”回调;调用方负责入队 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun SegmentEditSheet( viewModel: SegmentEditViewModel, @@ -120,13 +114,12 @@ fun SegmentEditSheet( } /** - * 无状态 Sheet 内容;Preview 与后续 UI 测试直接渲染它。 + * 无状态 Sheet 内容;Preview 与 UI 测试直接渲染它。 * - * 布局:标题 + 重置 → 类型 → 角色 → 情绪 → 文本/计数 → 保存提示 → 校验错误 → - * 保存错误 → 保存/重新生成/取消。内容整体可滚动并加 `imePadding()`,键盘弹出时 - * 不会盖住文本或底部按钮。所有用户可见文案来自 `strings.xml`。 + * 布局对齐 prototype 的 SegmentEdit Sheet:固定 Sheet 头 + 角色 hero + 类型/角色/ + * 情绪/文本编辑区 + 固定底部操作(重置 / 重新生成 / 保存)。文案全部来自 + * `strings_ux_v2_script_characters.xml`。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun SegmentEditSheetContent( state: SegmentEditUiState, @@ -144,368 +137,326 @@ fun SegmentEditSheetContent( Column( modifier = modifier .fillMaxWidth() + .fillMaxHeight(0.92f) .imePadding() - .navigationBarsPadding() - .verticalScroll(rememberScrollState()) - .padding(horizontal = 24.dp) - .padding(top = 8.dp, bottom = 24.dp), - verticalArrangement = Arrangement.spacedBy(16.dp), + .navigationBarsPadding(), ) { - SegmentEditHeader(state = state, onReset = onReset) - - TypeSelector( - type = state.type, - enabled = !state.saving, - onTypeChange = onTypeChange, - ) - RoleSelector( - state = state, - onRoleChange = onRoleChange, - ) - EmotionSelector( - emotion = state.emotion, - enabled = !state.saving, - onEmotionChange = onEmotionChange, - ) - TextEditor( - state = state, - onTextChange = onTextChange, - ) - - Text( - text = stringResource(R.string.segment_edit_hint), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + ForgeSheetHeader( + icon = ForgeIcons.Edit, + title = stringResource(R.string.ux2_segment_title), + onClose = onCancel, + subtitle = stringResource( + R.string.ux2_segment_header_subtitle, + state.segmentNumber, + stringResource(state.type.labelRes()), + ), + modifier = Modifier.padding( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.sm, + top = MaterialTheme.spacing.sm, + bottom = MaterialTheme.spacing.xs, + ), ) - if (state.validationErrors.isNotEmpty()) { - ValidationCard(errors = state.validationErrors) - } - state.saveError?.let { message -> - SaveErrorCard( - message = message, - enabled = !state.saving, - onRetry = onRetry, + Column( + modifier = Modifier + .weight(1f) + .verticalScroll(rememberScrollState()) + .padding( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.sm, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.lg), + ) { + SegmentHero(state = state) + TypeSection( + state = state, + onTypeChange = onTypeChange, + ) + RoleSection( + state = state, + onRoleChange = onRoleChange, + ) + EmotionSection( + state = state, + onEmotionChange = onEmotionChange, + ) + TextSection( + state = state, + onTextChange = onTextChange, + ) + Text( + text = stringResource(R.string.ux2_segment_hint), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) + + if (state.validationErrors.isNotEmpty()) { + ValidationCard(errors = state.validationErrors) + } + state.saveError?.let { message -> + SaveErrorCard( + message = message, + enabled = !state.saving, + onRetry = onRetry, + ) + } } - SaveButton( - saving = state.saving, - enabled = state.canSave, + SegmentFooter( + state = state, + onReset = onReset, + onRegenerate = onRegenerate, onSave = onSave, ) - Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { - OutlinedButton( - onClick = onRegenerate, - enabled = !state.saving, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.segment_edit_regenerate)) - } - TextButton( - onClick = onCancel, - enabled = !state.saving, - modifier = Modifier - .weight(1f) - .heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_cancel)) + } +} + +@Composable +private fun SegmentHero(state: SegmentEditUiState) { + val roleName = state.selectedRole?.let { option -> roleLabel(option) } + ?: stringResource(R.string.ux2_script_unknown_role) + + ForgeCard(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + RoleAvatar(name = roleName, size = 48.dp, decorative = true) + Column(modifier = Modifier.weight(1f)) { + Text( + text = stringResource(R.string.ux2_segment_hero_title, state.segmentNumber), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + Text( + text = stringResource( + R.string.ux2_segment_hero_subtitle, + stringResource(state.type.labelRes()), + stringResource(state.emotion.labelRes()), + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } + SegmentCurrentTag() } } } @Composable -private fun SegmentEditHeader( - state: SegmentEditUiState, - onReset: () -> Unit, -) { +private fun SegmentCurrentTag() { Row( - modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(2.dp), ) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = stringResource(R.string.segment_edit_title), - style = MaterialTheme.typography.headlineSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource( - R.string.segment_edit_subtitle, - state.segmentNumber, - stringResource(state.type.labelRes()), - ), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - TextButton( - onClick = onReset, - enabled = state.isDirty && !state.saving, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.segment_edit_reset)) - } + ForgeIcon( + icon = ForgeIcons.AudioLines, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource(R.string.ux2_segment_current), + style = MaterialTheme.typography.labelSmallEmphasized, + color = MaterialTheme.colorScheme.primary, + maxLines = 1, + ) } } -@OptIn(ExperimentalMaterial3Api::class) @Composable -private fun TypeSelector( - type: SegmentType, - enabled: Boolean, +private fun TypeSection( + state: SegmentEditUiState, onTypeChange: (SegmentType) -> Unit, ) { - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - FieldLabel(text = stringResource(R.string.segment_edit_type_label)) - SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth()) { - EDITABLE_TYPES.forEachIndexed { index, candidate -> - SegmentedButton( - selected = type == candidate, - onClick = { onTypeChange(candidate) }, - shape = SegmentedButtonDefaults.itemShape( - index = index, - count = EDITABLE_TYPES.size, - ), - enabled = enabled, - label = { Text(stringResource(candidate.labelRes())) }, - ) - } - } + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + SectionLabel(text = stringResource(R.string.ux2_segment_section_type)) + ForgeSegmented( + options = listOf( + ForgeIcons.UserRound to stringResource(R.string.ux2_script_type_dialogue), + ForgeIcons.BookOpen to stringResource(R.string.ux2_script_type_narration), + ), + selectedIndex = if (state.type == SegmentType.Dialogue) 0 else 1, + onSelect = { index -> + if (!state.saving) { + onTypeChange( + if (index == 0) SegmentType.Dialogue else SegmentType.Narration, + ) + } + }, + ) } } -/** - * 角色下拉。 - * - * 对白列出本书角色(可搜索);旁白只有旁白且不可展开。当前 roleId 不在候选里时 - * 显示“未知角色”,同时校验卡片会提示重选。 - */ @Composable -private fun RoleSelector( +private fun RoleSection( state: SegmentEditUiState, onRoleChange: (String) -> Unit, ) { - var expanded by rememberSaveable { mutableStateOf(false) } - var query by rememberSaveable { mutableStateOf("") } - val options = state.roleOptions - val filtered = if (query.isBlank()) { - options - } else { - options.filter { option -> - option.name.contains(query, ignoreCase = true) || - option.roleId.contains(query, ignoreCase = true) - } - } - val selected = options.firstOrNull { it.roleId == state.roleId.trim() } - val display = selected?.let { roleLabel(it) } - ?: stringResource(R.string.script_role_unknown) - val canOpen = !state.saving && !state.isNarration && options.isNotEmpty() - - // 切到旁白后不会再需要角色菜单,顺手关掉并清空搜索。 - LaunchedEffect(state.type) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + SectionLabel(text = stringResource(R.string.ux2_segment_section_role)) if (state.isNarration) { - expanded = false - query = "" - } - } - - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - FieldLabel(text = stringResource(R.string.segment_edit_role_label)) - Box { - OutlinedButton( - onClick = { expanded = true }, - enabled = canOpen, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text( - text = display, - modifier = Modifier.weight(1f), - textAlign = TextAlign.Start, - ) - Text(text = stringResource(R.string.segment_edit_dropdown_indicator)) - } - DropdownMenu( - expanded = expanded, - onDismissRequest = { - expanded = false - query = "" - }, - modifier = Modifier.widthIn(min = 260.dp), + Surface( + shape = MaterialTheme.shapes.small, + color = MaterialTheme.colorScheme.surfaceContainerHigh, ) { - if (options.size > 4) { - OutlinedTextField( - value = query, - onValueChange = { query = it }, - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 12.dp, vertical = 8.dp), - placeholder = { - Text(stringResource(R.string.segment_edit_role_search_placeholder)) - }, - singleLine = true, + Row( + modifier = Modifier.padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.xxs, + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { + ForgeIcon( + icon = ForgeIcons.BookOpen, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = MaterialTheme.colorScheme.primary, ) - } - if (filtered.isEmpty()) { - DropdownMenuItem( - text = { Text(stringResource(R.string.segment_edit_role_no_match)) }, - onClick = {}, - enabled = false, + Text( + text = stringResource(R.string.ux2_script_type_narration), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) - } else { - filtered.forEach { option -> - DropdownMenuItem( - text = { Text(roleLabel(option)) }, - onClick = { - onRoleChange(option.roleId) - expanded = false - query = "" - }, - enabled = !state.saving, - trailingIcon = { - if (option.roleId == state.roleId) { - Text( - text = stringResource(R.string.segment_edit_selected_indicator), - color = MaterialTheme.colorScheme.primary, - ) - } - }, - ) - } } } - } - if (state.isNarration) { Text( - text = stringResource(R.string.segment_edit_role_locked), + text = stringResource(R.string.ux2_segment_role_locked), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) + } else { + val options = state.roleOptions.filterNot { option -> option.isNarrator } + if (options.isEmpty()) { + Text( + text = stringResource(R.string.ux2_segment_role_empty), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } else { + FlowRow( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + options.forEach { option -> + ForgeChip( + label = roleLabel(option), + selected = option.roleId == state.roleId.trim(), + onClick = { + if (!state.saving) onRoleChange(option.roleId) + }, + icon = ForgeIcons.UserRound, + ) + } + } + } + if (state.selectedRole == null) { + Text( + text = stringResource(R.string.ux2_segment_unknown_role_hint), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) + } } } } -/** 情绪下拉:11 种,显示中文标签 + wire(wire 是落库/API 稳定值,不能翻译)。 */ @Composable -private fun EmotionSelector( - emotion: Emotion, - enabled: Boolean, +private fun EmotionSection( + state: SegmentEditUiState, onEmotionChange: (Emotion) -> Unit, ) { - var expanded by rememberSaveable { mutableStateOf(false) } - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - FieldLabel(text = stringResource(R.string.segment_edit_emotion_label)) - Box { - OutlinedButton( - onClick = { expanded = true }, - enabled = enabled, - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp), - ) { - Text( - text = emotionLabel(emotion), - modifier = Modifier.weight(1f), - textAlign = TextAlign.Start, + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + SectionLabel(text = stringResource(R.string.ux2_segment_section_emotion)) + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + Emotion.entries.forEach { emotion -> + ForgeChip( + label = stringResource(emotion.labelRes()), + selected = emotion == state.emotion, + onClick = { if (!state.saving) onEmotionChange(emotion) }, + icon = ForgeIcons.Sparkles, ) - Text(text = stringResource(R.string.segment_edit_dropdown_indicator)) - } - DropdownMenu( - expanded = expanded, - onDismissRequest = { expanded = false }, - modifier = Modifier.widthIn(min = 260.dp), - ) { - Emotion.entries.forEach { candidate -> - DropdownMenuItem( - text = { Text(emotionLabel(candidate)) }, - onClick = { - onEmotionChange(candidate) - expanded = false - }, - enabled = enabled, - trailingIcon = { - if (candidate == emotion) { - Text( - text = stringResource(R.string.segment_edit_selected_indicator), - color = MaterialTheme.colorScheme.primary, - ) - } - }, - ) - } } } } } @Composable -private fun TextEditor( +private fun TextSection( state: SegmentEditUiState, onTextChange: (String) -> Unit, ) { - val textError = state.validationErrors.any { - it == SegmentEditError.EmptyText || it == SegmentEditError.TextTooLong + val textError = state.validationErrors.any { error -> + error == SegmentEditError.EmptyText || error == SegmentEditError.TextTooLong + } + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + SectionLabel(text = stringResource(R.string.ux2_segment_section_text)) + OutlinedTextField( + value = state.text, + onValueChange = onTextChange, + modifier = Modifier.fillMaxWidth(), + enabled = !state.saving, + placeholder = { + Text(stringResource(R.string.ux2_segment_text_placeholder)) + }, + minLines = 4, + maxLines = 10, + isError = textError, + shape = MaterialTheme.shapes.large, + supportingText = { + Text( + text = stringResource( + R.string.ux2_segment_text_hint, + state.characterCount, + SegmentEditUiState.MAX_TEXT_LENGTH, + ), + color = if (textError) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) + }, + ) } - OutlinedTextField( - value = state.text, - onValueChange = onTextChange, - modifier = Modifier.fillMaxWidth(), - enabled = !state.saving, - label = { Text(stringResource(R.string.segment_edit_text_label)) }, - placeholder = { Text(stringResource(R.string.segment_edit_text_placeholder)) }, - minLines = 4, - maxLines = 8, - isError = textError, - supportingText = { - Text( - text = stringResource( - R.string.segment_edit_text_counter, - state.characterCount, - SegmentEditUiState.MAX_TEXT_LENGTH, - ), - color = if (textError) { - MaterialTheme.colorScheme.error - } else { - MaterialTheme.colorScheme.onSurfaceVariant - }, - ) - }, - ) } @Composable private fun ValidationCard(errors: List) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer, - ), + ForgeCard( + containerColor = MaterialTheme.colorScheme.errorContainer, + contentPadding = PaddingValues(MaterialTheme.spacing.lg), ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) Text( - text = stringResource(R.string.segment_edit_validation_title), + text = stringResource(R.string.ux2_segment_validation_title), modifier = Modifier.semantics { liveRegion = LiveRegionMode.Polite }, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + style = MaterialTheme.typography.titleSmallEmphasized, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + } + errors.distinct().forEach { error -> + Text( + text = error.message(), + style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onErrorContainer, ) - errors.distinct().forEach { error -> - Text( - text = error.message(), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onErrorContainer, - ) - } } } } @@ -516,125 +467,136 @@ private fun SaveErrorCard( enabled: Boolean, onRetry: () -> Unit, ) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.errorContainer, - ), + ForgeCard( + containerColor = MaterialTheme.colorScheme.errorContainer, + contentPadding = PaddingValues(MaterialTheme.spacing.lg), ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) Text( - text = stringResource(R.string.action_save_error, message), + text = stringResource(R.string.ux2_segment_save_error, message), + modifier = Modifier.semantics { + liveRegion = LiveRegionMode.Polite + }, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onErrorContainer, ) - TextButton( - onClick = onRetry, - enabled = enabled, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_retry)) - } } + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.ux2_segment_retry), + onClick = onRetry, + enabled = enabled, + ) } } @Composable -private fun SaveButton( - saving: Boolean, - enabled: Boolean, +private fun SegmentFooter( + state: SegmentEditUiState, + onReset: () -> Unit, + onRegenerate: () -> Unit, onSave: () -> Unit, ) { - Button( - onClick = onSave, - enabled = enabled, + Column( modifier = Modifier .fillMaxWidth() - .heightIn(min = 48.dp), + .padding( + start = MaterialTheme.spacing.lg, + end = MaterialTheme.spacing.lg, + top = MaterialTheme.spacing.sm, + bottom = MaterialTheme.spacing.lg, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - if (saving) { - CircularProgressIndicator( - modifier = Modifier.size(18.dp), - strokeWidth = 2.dp, + Row(horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + ForgeSecondaryAction( + icon = ForgeIcons.RotateCcw, + label = stringResource(R.string.ux2_segment_reset), + onClick = onReset, + modifier = Modifier.weight(1f), + enabled = state.isDirty && !state.saving, + ) + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.ux2_segment_regenerate), + onClick = onRegenerate, + modifier = Modifier.weight(1f), + enabled = !state.saving, ) - Spacer(Modifier.width(8.dp)) - Text(stringResource(R.string.action_saving)) - } else { - Text(stringResource(R.string.action_save)) } + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = stringResource( + if (state.saving) R.string.ux2_segment_saving else R.string.ux2_segment_save, + ), + onClick = onSave, + modifier = Modifier.fillMaxWidth(), + enabled = state.canSave, + loading = state.saving, + ) } } @Composable -private fun FieldLabel(text: String) { +private fun SectionLabel(text: String) { Text( text = text, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + style = MaterialTheme.typography.titleMediumEmphasized, ) } @Composable private fun roleLabel(option: SegmentRoleOption): String = when { - option.isNarrator -> stringResource(R.string.script_type_narration) + option.isNarrator -> stringResource(R.string.ux2_script_type_narration) option.name.isNotBlank() -> option.name - else -> stringResource(R.string.script_role_unknown) + else -> stringResource(R.string.ux2_script_unknown_role) } -@Composable -private fun emotionLabel(emotion: Emotion): String = stringResource( - R.string.segment_edit_emotion_option, - stringResource(emotion.labelRes()), - emotion.wire, -) - @Composable private fun SegmentEditError.message(): String = when (this) { - SegmentEditError.EmptyText -> stringResource(R.string.segment_edit_error_empty_text) + SegmentEditError.EmptyText -> stringResource(R.string.ux2_segment_error_empty) SegmentEditError.TextTooLong -> stringResource( - R.string.segment_edit_error_too_long, + R.string.ux2_segment_error_too_long, SegmentEditUiState.MAX_TEXT_LENGTH, ) SegmentEditError.NarrationRequiresNarrator -> - stringResource(R.string.segment_edit_error_narration_role) + stringResource(R.string.ux2_segment_error_narration_role) SegmentEditError.DialogueRequiresRole -> - stringResource(R.string.segment_edit_error_dialogue_role) - SegmentEditError.UnknownRole -> stringResource(R.string.segment_edit_error_unknown_role) + stringResource(R.string.ux2_segment_error_dialogue_role) + SegmentEditError.UnknownRole -> stringResource(R.string.ux2_segment_error_unknown_role) } @StringRes private fun SegmentType.labelRes(): Int = when (this) { - SegmentType.Dialogue -> R.string.script_type_dialogue - SegmentType.Narration -> R.string.script_type_narration + SegmentType.Dialogue -> R.string.ux2_script_type_dialogue + SegmentType.Narration -> R.string.ux2_script_type_narration } @StringRes private fun Emotion.labelRes(): Int = when (this) { - Emotion.Neutral -> R.string.script_emotion_neutral - Emotion.Happy -> R.string.script_emotion_happy - Emotion.Sad -> R.string.script_emotion_sad - Emotion.Angry -> R.string.script_emotion_angry - Emotion.Anxious -> R.string.script_emotion_anxious - Emotion.Excited -> R.string.script_emotion_excited - Emotion.Surprised -> R.string.script_emotion_surprised - Emotion.SoftTone -> R.string.script_emotion_soft_tone - Emotion.Serious -> R.string.script_emotion_serious - Emotion.Calm -> R.string.script_emotion_calm - Emotion.Whispering -> R.string.script_emotion_whispering + Emotion.Neutral -> R.string.ux2_emotion_neutral + Emotion.Happy -> R.string.ux2_emotion_happy + Emotion.Sad -> R.string.ux2_emotion_sad + Emotion.Angry -> R.string.ux2_emotion_angry + Emotion.Anxious -> R.string.ux2_emotion_anxious + Emotion.Excited -> R.string.ux2_emotion_excited + Emotion.Surprised -> R.string.ux2_emotion_surprised + Emotion.SoftTone -> R.string.ux2_emotion_soft_tone + Emotion.Serious -> R.string.ux2_emotion_serious + Emotion.Calm -> R.string.ux2_emotion_calm + Emotion.Whispering -> R.string.ux2_emotion_whispering } -/** 可编辑类型顺序与 §12.4 S07 一致:对白在前、旁白在后。 */ -private val EDITABLE_TYPES: List = listOf( - SegmentType.Dialogue, - SegmentType.Narration, -) - // --------------------------------------------------------------------------- -// Preview:对白正常态 / 旁白态 / 校验错误态 / 保存失败可重试态。 -// 演示文本只是预览数据;所有 UI 文案来自 strings.xml。 +// Preview:对白正常态 / 校验错误态。演示文本只是固定夹具。 // --------------------------------------------------------------------------- private fun previewRoles(): List = listOf( @@ -643,9 +605,9 @@ private fun previewRoles(): List = listOf( SegmentRoleOption(roleId = "role_0002", name = "顾青"), ) -@Preview(name = "SegmentEdit Dialogue", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview(name = "SegmentEdit Forge", showBackground = true, backgroundColor = 0xFFF7F9F8) @Composable -private fun SegmentEditDialoguePreview() { +private fun SegmentEditForgePreview() { AudioForgeTheme(dynamicColor = false) { Surface { SegmentEditSheetContent( @@ -663,31 +625,7 @@ private fun SegmentEditDialoguePreview() { } } -@Preview(name = "SegmentEdit Narration", showBackground = true, backgroundColor = 0xFFF7F8FC) -@Composable -private fun SegmentEditNarrationPreview() { - AudioForgeTheme(dynamicColor = false) { - Surface { - SegmentEditSheetContent( - state = SegmentEditUiState( - segmentId = 8L, - segmentNumber = 4, - type = SegmentType.Narration, - roleId = NARRATOR_ROLE_ID, - emotion = Emotion.SoftTone, - text = "山雨欲来,旧城的灯火在风里一盏盏暗下去。", - roles = previewRoles(), - ), - ) - } - } -} - -@Preview( - name = "SegmentEdit Validation Error", - showBackground = true, - backgroundColor = 0xFFF7F8FC, -) +@Preview(name = "SegmentEdit Validation", showBackground = true, backgroundColor = 0xFFF7F9F8) @Composable private fun SegmentEditValidationPreview() { AudioForgeTheme(dynamicColor = false) { @@ -706,24 +644,3 @@ private fun SegmentEditValidationPreview() { } } } - -@Preview(name = "SegmentEdit Save Error", showBackground = true, backgroundColor = 0xFFF7F8FC) -@Composable -private fun SegmentEditSaveErrorPreview() { - AudioForgeTheme(dynamicColor = false) { - Surface { - SegmentEditSheetContent( - state = SegmentEditUiState( - segmentId = 10L, - segmentNumber = 6, - type = SegmentType.Dialogue, - roleId = "role_0002", - emotion = Emotion.Sad, - text = "雨停了,他却还没有回来。", - roles = previewRoles(), - saveError = "database is locked", - ), - ) - } - } -} diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/settings/SettingsScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/settings/SettingsScreen.kt index 92acc22..b8203f6 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/settings/SettingsScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/settings/SettingsScreen.kt @@ -1,8 +1,12 @@ +@file:OptIn(androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class) + package com.estimatefaster.audioforge.feature.settings import android.content.res.Configuration -import androidx.compose.foundation.horizontalScroll +import androidx.annotation.DrawableRes +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.PaddingValues @@ -12,26 +16,20 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilterChip import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -43,13 +41,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.LiveRegionMode import androidx.compose.ui.semantics.Role -import androidx.compose.ui.semantics.error import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.liveRegion import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -57,17 +55,25 @@ import com.estimatefaster.audioforge.BuildConfig import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.core.settings.AppSettings import com.estimatefaster.audioforge.core.settings.ThemeMode -import com.estimatefaster.audioforge.ui.components.AdaptiveFieldRow -import com.estimatefaster.audioforge.ui.components.ErrorBanner -import com.estimatefaster.audioforge.ui.components.ScreenState -import com.estimatefaster.audioforge.ui.components.SectionHeader +import com.estimatefaster.audioforge.ui.components.StatusPill +import com.estimatefaster.audioforge.ui.components.StatusTone +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSegmented +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing /** - * 全局设置页(P4-09 / 执行计划 §7.4、§12.4 S11)。 + * 全局设置页有状态入口(P4-09 / §7.4、§12.4 S11)。 * - * 有状态入口:收集 [SettingsViewModel.state] 后委托给无状态版本。 - * 保存回调只通过 ViewModel 触达仓库,UI 不直接读写 DataStore。 + * 公开签名保持不变:收集 [SettingsViewModel.state] 后委托给无状态版本; + * 保存/Key 写入只通过 ViewModel 触达仓库,UI 不直接读写 DataStore。 */ @Composable fun SettingsScreen( @@ -102,12 +108,16 @@ fun SettingsScreen( /** * 无状态设置页。 * - * - 分组:API / 生成 / 网络 / 设备 / 外观 / 存储 / 关于; - * - 输入即时校验([SettingsUiState.errors] / [SettingsUiState.formatErrors]); - * - 保存按钮只在“有改动且无错误”时可点,点击后由 ViewModel 调用仓库; - * - Key 只展示末 4 位,设置/清除都走独立对话框,输入框使用密码样式、不回显已存值。 + * 布局严格按 `docs/prototype/forge-framework.html` 的 Settings 重写: + * TopBar → API 状态 hero → 7 组卡片(API / 生成 / 网络 / 设备 / 外观 / 存储 / 关于) + * → 唯一主按钮「保存设置」。 + * + * 行为口径与旧版一致: + * - 每行都有 leading Lucide 图标;所有操作都是 icon+text 或 icon-only; + * - 文本/数字字段点整行打开编辑弹窗,编辑即时写回草稿(保存仍受 [SettingsUiState.canSave] 约束); + * - 校验错误显示在对应行/弹窗,保存按钮只在“有改动且无错误”时可点; + * - Key 只展示末 4 位,设置/清除都走独立对话框,输入框密码样式且不回显已存值。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun SettingsScreen( state: SettingsUiState, @@ -130,92 +140,62 @@ fun SettingsScreen( // Key 明文不能进 saved instance state(可能落盘),只用 remember 存活在当前组合里。 var keyInput by remember { mutableStateOf("") } var clearTargetName by rememberSaveable { mutableStateOf("") } + // 文本字段编辑:只记录字段名与打开时的原始值;取消时把草稿恢复回去。 + var editFieldName by rememberSaveable { mutableStateOf("") } + var editOriginalValue by rememberSaveable { mutableStateOf("") } val keyDialogTarget = keyTargetByName(keyDialogTargetName) val clearTarget = keyTargetByName(clearTargetName) + val editField = fieldByName(editFieldName) + val loadError = state.loadError Scaffold( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - navigationIcon = { - TextButton( - onClick = onBack, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_back)) - } - }, - title = { - Column { - Text( - text = stringResource(R.string.settings_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - ) - if (state.saved) { - Text( - text = stringResource(R.string.settings_saved), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.primary, - ) - } - } - }, - actions = { - TextButton( - onClick = onSave, - enabled = state.canSave, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_save)) - } - }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), + ForgeTopBar( + title = stringResource(R.string.settings_title), + subtitle = stringResource(R.string.ux_settings_subtitle), + navigationIcon = ForgeIcons.Back, + navigationDescription = stringResource(R.string.action_back), + onNavigation = onBack, ) }, ) { padding -> - val screenState = when { - state.loading -> ScreenState.Loading(stringResource(R.string.settings_loading)) + val contentModifier = Modifier.padding(padding) + when { + state.loading -> ForgeLoading( + label = stringResource(R.string.settings_loading), + modifier = contentModifier, + ) - state.loadError != null -> ScreenState.Error( - message = stringResource( - R.string.settings_load_error, - state.loadError, - ), + loadError != null -> ForgeError( + message = stringResource(R.string.settings_load_error, loadError), + modifier = contentModifier, onRetry = onRetry, + retryLabel = stringResource(R.string.action_retry), ) - else -> ScreenState.Content - } - ScreenState( - state = screenState, - modifier = Modifier.padding(padding), - ) { - SettingsContent( + else -> SettingsContent( state = state, versionName = versionName, contentPadding = padding, onFieldChange = onFieldChange, onToggleChange = onToggleChange, - onRequestSetKey = { target -> - clearTargetName = "" - keyInput = "" - keyDialogTargetName = target.name - }, - onRequestClearKey = { target -> - keyDialogTargetName = "" - clearTargetName = target.name - }, + onSave = onSave, onOpenLicenses = onOpenLicenses, onOpenStorage = onOpenStorage, onOpenAbout = onOpenAbout, onRestartOnboarding = onRestartOnboarding, - onSave = onSave, + onOpenField = { field -> + editOriginalValue = state.draft.textOf(field) + editFieldName = field.name + }, + onOpenKey = { target -> + clearTargetName = "" + keyInput = "" + keyDialogTargetName = target.name + }, ) } } @@ -224,6 +204,8 @@ fun SettingsScreen( KeyInputDialog( target = keyDialogTarget, value = keyInput, + configured = state.keys.forTarget(keyDialogTarget).configured, + busy = state.keyBusy, onValueChange = { keyInput = it }, onDismiss = { keyDialogTargetName = "" @@ -234,12 +216,18 @@ fun SettingsScreen( keyDialogTargetName = "" keyInput = "" }, + onRequestClear = { + keyDialogTargetName = "" + keyInput = "" + clearTargetName = keyDialogTarget.name + }, ) } if (clearTarget != null) { ClearKeyDialog( target = clearTarget, + busy = state.keyBusy, onDismiss = { clearTargetName = "" }, onConfirm = { onClearKey(clearTarget) @@ -247,6 +235,26 @@ fun SettingsScreen( }, ) } + + if (editField != null) { + FieldEditDialog( + title = stringResource( + R.string.ux_settings_edit_title, + fieldTitle(editField), + ), + value = state.draft.textOf(editField), + hint = fieldHint(editField), + errorText = fieldErrorText(state, editField), + enabled = !state.saving, + keyboardType = fieldKeyboardType(editField), + onValueChange = { value -> onFieldChange(editField, value) }, + onDismiss = { + onFieldChange(editField, editOriginalValue) + editFieldName = "" + }, + onConfirm = { editFieldName = "" }, + ) + } } @Composable @@ -256,13 +264,13 @@ private fun SettingsContent( contentPadding: PaddingValues, onFieldChange: (SettingsField, String) -> Unit, onToggleChange: (SettingsField, Boolean) -> Unit, - onRequestSetKey: (SettingsKeyTarget) -> Unit, - onRequestClearKey: (SettingsKeyTarget) -> Unit, + onSave: () -> Unit, onOpenLicenses: () -> Unit, onOpenStorage: () -> Unit, onOpenAbout: () -> Unit, onRestartOnboarding: () -> Unit, - onSave: () -> Unit, + onOpenField: (SettingsField) -> Unit, + onOpenKey: (SettingsKeyTarget) -> Unit, ) { val enabled = !state.saving @@ -270,372 +278,437 @@ private fun SettingsContent( modifier = Modifier .fillMaxSize() .padding(contentPadding), - contentPadding = PaddingValues(horizontal = 20.dp, vertical = 16.dp), - verticalArrangement = Arrangement.spacedBy(14.dp), + contentPadding = PaddingValues( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.lg, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.lg), ) { - if (state.saving || state.saved || state.saveError != null) { - item(key = "save-status") { - SaveStatus(state = state, onSave = onSave) - } + item(key = "hero") { + SettingsHero(state = state) } + if (state.isDirty && state.hasErrors) { item(key = "validation-summary") { - Text( - text = stringResource( - R.string.settings_error_summary, - state.errors.size + state.formatErrors.size, - ), - modifier = Modifier.semantics { - liveRegion = LiveRegionMode.Polite - }, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, + ValidationSummary(state = state) + } + } + + val keyError = state.keyError + if (keyError != null) { + item(key = "key-error") { + InlineErrorCard( + message = stringResource(R.string.settings_key_error, keyError), ) } } - item(key = "api") { - ApiSection( + + item(key = "group-api") { + ApiGroup( state = state, enabled = enabled, - onFieldChange = onFieldChange, - onRequestSetKey = onRequestSetKey, - onRequestClearKey = onRequestClearKey, + onOpenField = onOpenField, + onOpenKey = onOpenKey, ) } - item(key = "generation") { - GenerationSection( + item(key = "group-generation") { + GenerationGroup( state = state, enabled = enabled, - onFieldChange = onFieldChange, + onOpenField = onOpenField, ) } - item(key = "network") { - NetworkSection( + item(key = "group-network") { + NetworkGroup( state = state, enabled = enabled, onToggleChange = onToggleChange, ) } - item(key = "device") { - DeviceSection( + item(key = "group-device") { + DeviceGroup( state = state, enabled = enabled, - onFieldChange = onFieldChange, onToggleChange = onToggleChange, + onOpenField = onOpenField, ) } - item(key = "appearance") { - AppearanceSection( + item(key = "group-appearance") { + AppearanceGroup( state = state, enabled = enabled, onFieldChange = onFieldChange, onToggleChange = onToggleChange, ) } - item(key = "storage") { - StorageSection( + item(key = "group-storage") { + StorageGroup( state = state, enabled = enabled, - onFieldChange = onFieldChange, + onOpenField = onOpenField, onOpenStorage = onOpenStorage, ) } - item(key = "about") { - AboutSection( + item(key = "group-about") { + AboutGroup( versionName = versionName, onOpenLicenses = onOpenLicenses, onOpenAbout = onOpenAbout, onRestartOnboarding = onRestartOnboarding, ) } + + item(key = "save") { + SaveFooter(state = state, onSave = onSave) + } } } @Composable -private fun SaveStatus(state: SettingsUiState, onSave: () -> Unit) { - when { - state.saving -> Row( - modifier = Modifier - .fillMaxWidth() - .semantics { liveRegion = LiveRegionMode.Polite }, +private fun SettingsHero(state: SettingsUiState) { + val ready = state.keys.llm.configured && state.keys.fish.configured + ForgeCard { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + Surface( + modifier = Modifier.size(46.dp), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.primaryContainer, + ) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center, + ) { + ForgeIcon( + icon = ForgeIcons.Shield, + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + } + } + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { + Text( + text = stringResource( + if (ready) { + R.string.ux_settings_hero_ready_title + } else { + R.string.ux_settings_hero_missing_title + }, + ), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + Text( + text = stringResource( + if (ready) { + R.string.ux_settings_hero_ready_desc + } else { + R.string.ux_settings_hero_missing_desc + }, + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + StatusPill( + text = stringResource( + if (ready) { + R.string.ux_settings_hero_ready_status + } else { + R.string.ux_settings_hero_missing_status + }, + ), + tone = if (ready) StatusTone.Success else StatusTone.Warning, + ) + } + } +} + +@Composable +private fun InlineErrorCard(message: String) { + ForgeCard(containerColor = MaterialTheme.colorScheme.errorContainer) { + Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - LinearProgressIndicator(modifier = Modifier.weight(1f)) + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) Text( - text = stringResource(R.string.action_saving), + text = message, + modifier = Modifier + .weight(1f) + .semantics { liveRegion = LiveRegionMode.Polite }, style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + color = MaterialTheme.colorScheme.onErrorContainer, ) } - - state.saveError != null -> ErrorBanner( - message = stringResource(R.string.action_save_error, state.saveError), - onRetry = onSave, - ) - - else -> Text( - text = stringResource(R.string.settings_saved), - modifier = Modifier.semantics { liveRegion = LiveRegionMode.Polite }, - style = MaterialTheme.typography.labelLarge, - color = MaterialTheme.colorScheme.primary, - ) } } @Composable -private fun SettingsSection( - title: String, - subtitle: String, - content: @Composable ColumnScope.() -> Unit, -) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(18.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), +private fun ValidationSummary(state: SettingsUiState) { + val count = state.errors.size + state.formatErrors.size + ForgeCard(containerColor = MaterialTheme.colorScheme.errorContainer) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - SectionHeader(title = title, subtitle = subtitle) - content() + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) + Text( + text = stringResource(R.string.settings_error_summary, count), + modifier = Modifier + .weight(1f) + .semantics { liveRegion = LiveRegionMode.Polite }, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + ) } } } @Composable -private fun ApiSection( +private fun ApiGroup( state: SettingsUiState, enabled: Boolean, - onFieldChange: (SettingsField, String) -> Unit, - onRequestSetKey: (SettingsKeyTarget) -> Unit, - onRequestClearKey: (SettingsKeyTarget) -> Unit, + onOpenField: (SettingsField) -> Unit, + onOpenKey: (SettingsKeyTarget) -> Unit, ) { - SettingsSection( + val emptyValue = stringResource(R.string.ux_settings_value_empty) + SettingsGroup( + icon = ForgeIcons.Key, title = stringResource(R.string.settings_section_api), - subtitle = stringResource(R.string.settings_section_api_desc), + hint = stringResource(R.string.ux_settings_group_api_hint), ) { - SectionLabel(text = stringResource(R.string.settings_api_llm)) - - SettingsTextField( - field = SettingsField.LLM_BASE_URL, + SettingsEditRow( state = state, - label = stringResource(R.string.settings_field_llm_base_url), - keyboardType = KeyboardType.Uri, + field = SettingsField.LLM_BASE_URL, + icon = ForgeIcons.Globe, + title = stringResource(R.string.settings_field_llm_base_url), + description = stringResource(R.string.ux_settings_desc_llm_base_url), + value = state.draft.llmBaseUrl.ifBlank { emptyValue }, enabled = enabled, - onFieldChange = onFieldChange, + onOpen = { onOpenField(SettingsField.LLM_BASE_URL) }, ) - SettingsTextField( - field = SettingsField.LLM_MODEL, + SettingsDivider() + SettingsEditRow( state = state, - label = stringResource(R.string.settings_field_llm_model), + field = SettingsField.LLM_MODEL, + icon = ForgeIcons.Sparkles, + title = stringResource(R.string.settings_field_llm_model), + description = stringResource(R.string.ux_settings_desc_llm_model), + value = state.draft.llmModel.ifBlank { emptyValue }, enabled = enabled, - onFieldChange = onFieldChange, + onOpen = { onOpenField(SettingsField.LLM_MODEL) }, ) - ApiKeyRow( - title = stringResource(R.string.settings_key_llm_title), + SettingsDivider() + SettingsKeyRow( key = state.keys.llm, - busy = state.keyBusy, + title = stringResource(R.string.settings_key_llm_title), enabled = enabled, - onSet = { onRequestSetKey(SettingsKeyTarget.LLM) }, - onClear = { onRequestClearKey(SettingsKeyTarget.LLM) }, + onClick = { onOpenKey(SettingsKeyTarget.LLM) }, ) - - HorizontalDivider() - - SectionLabel(text = stringResource(R.string.settings_api_fish)) - - SettingsTextField( - field = SettingsField.FISH_BASE_URL, + SettingsDivider() + SettingsEditRow( state = state, - label = stringResource(R.string.settings_field_fish_base_url), - keyboardType = KeyboardType.Uri, + field = SettingsField.FISH_BASE_URL, + icon = ForgeIcons.Globe, + title = stringResource(R.string.settings_field_fish_base_url), + description = stringResource(R.string.ux_settings_desc_fish_base_url), + value = state.draft.fishBaseUrl.ifBlank { emptyValue }, enabled = enabled, - onFieldChange = onFieldChange, + onOpen = { onOpenField(SettingsField.FISH_BASE_URL) }, ) - SettingsTextField( - field = SettingsField.FISH_TTS_MODEL, + SettingsDivider() + SettingsEditRow( state = state, - label = stringResource(R.string.settings_field_fish_tts_model), + field = SettingsField.FISH_TTS_MODEL, + icon = ForgeIcons.AudioLines, + title = stringResource(R.string.settings_field_fish_tts_model), + description = stringResource(R.string.ux_settings_desc_fish_model), + value = state.draft.fishTtsModel.ifBlank { emptyValue }, enabled = enabled, - onFieldChange = onFieldChange, + onOpen = { onOpenField(SettingsField.FISH_TTS_MODEL) }, ) - ApiKeyRow( - title = stringResource(R.string.settings_key_fish_title), + SettingsDivider() + SettingsKeyRow( key = state.keys.fish, - busy = state.keyBusy, + title = stringResource(R.string.settings_key_fish_title), enabled = enabled, - onSet = { onRequestSetKey(SettingsKeyTarget.FISH) }, - onClear = { onRequestClearKey(SettingsKeyTarget.FISH) }, + onClick = { onOpenKey(SettingsKeyTarget.FISH) }, ) - - if (state.keyError != null) { - ErrorBanner( - message = stringResource(R.string.settings_key_error, state.keyError), - ) - } } } @Composable -private fun GenerationSection( +private fun GenerationGroup( state: SettingsUiState, enabled: Boolean, - onFieldChange: (SettingsField, String) -> Unit, + onOpenField: (SettingsField) -> Unit, ) { - SettingsSection( + val emptyValue = stringResource(R.string.ux_settings_value_empty) + SettingsGroup( + icon = ForgeIcons.Sliders, title = stringResource(R.string.settings_section_generation), - subtitle = stringResource(R.string.settings_section_generation_desc), + hint = stringResource(R.string.ux_settings_group_generation_hint), ) { - AdaptiveFieldRow( - { - SettingsTextField( - field = SettingsField.LLM_CONCURRENCY, - state = state, - label = stringResource(R.string.settings_field_llm_concurrency), - hint = stringResource(R.string.settings_field_llm_concurrency_hint), - keyboardType = KeyboardType.Number, - enabled = enabled, - onFieldChange = onFieldChange, - ) - }, - { - SettingsTextField( - field = SettingsField.TTS_CONCURRENCY, - state = state, - label = stringResource(R.string.settings_field_tts_concurrency), - hint = stringResource(R.string.settings_field_tts_concurrency_hint), - keyboardType = KeyboardType.Number, - enabled = enabled, - onFieldChange = onFieldChange, - ) - }, + SettingsEditRow( + state = state, + field = SettingsField.LLM_CONCURRENCY, + icon = ForgeIcons.Sliders, + title = stringResource(R.string.settings_field_llm_concurrency), + description = stringResource(R.string.ux_settings_desc_llm_concurrency), + value = state.draft.llmConcurrency.ifBlank { emptyValue }, + enabled = enabled, + onOpen = { onOpenField(SettingsField.LLM_CONCURRENCY) }, ) - AdaptiveFieldRow( - { - SettingsTextField( - field = SettingsField.SEGMENT_MAX_CHARS, - state = state, - label = stringResource(R.string.settings_field_segment_max_chars), - hint = stringResource(R.string.settings_field_segment_max_chars_hint), - keyboardType = KeyboardType.Number, - enabled = enabled, - onFieldChange = onFieldChange, - ) - }, - { - SettingsTextField( - field = SettingsField.BATCH_SIZE, - state = state, - label = stringResource(R.string.settings_field_batch_size), - hint = stringResource(R.string.settings_field_batch_size_hint), - keyboardType = KeyboardType.Number, - enabled = enabled, - onFieldChange = onFieldChange, - ) - }, + SettingsDivider() + SettingsEditRow( + state = state, + field = SettingsField.TTS_CONCURRENCY, + icon = ForgeIcons.AudioLines, + title = stringResource(R.string.settings_field_tts_concurrency), + description = stringResource(R.string.ux_settings_desc_tts_concurrency), + value = state.draft.ttsConcurrency.ifBlank { emptyValue }, + enabled = enabled, + onOpen = { onOpenField(SettingsField.TTS_CONCURRENCY) }, + ) + SettingsDivider() + SettingsEditRow( + state = state, + field = SettingsField.SEGMENT_MAX_CHARS, + icon = ForgeIcons.FileText, + title = stringResource(R.string.settings_field_segment_max_chars), + description = stringResource(R.string.ux_settings_desc_segment_max), + value = stringResource(R.string.ux_settings_value_chars, state.draft.segmentMaxChars), + enabled = enabled, + onOpen = { onOpenField(SettingsField.SEGMENT_MAX_CHARS) }, ) - SettingsTextField( + SettingsDivider() + SettingsEditRow( + state = state, field = SettingsField.MIN_COVERAGE, + icon = ForgeIcons.Gauge, + title = stringResource(R.string.settings_field_min_coverage), + description = stringResource(R.string.ux_settings_desc_min_coverage), + value = state.draft.minCoverage.ifBlank { emptyValue }, + enabled = enabled, + onOpen = { onOpenField(SettingsField.MIN_COVERAGE) }, + ) + SettingsDivider() + SettingsEditRow( state = state, - label = stringResource(R.string.settings_field_min_coverage), - hint = stringResource(R.string.settings_field_min_coverage_hint), - keyboardType = KeyboardType.Decimal, + field = SettingsField.BATCH_SIZE, + icon = ForgeIcons.List, + title = stringResource(R.string.settings_field_batch_size), + description = stringResource(R.string.ux_settings_desc_batch_size), + value = stringResource(R.string.ux_settings_value_chapters, state.draft.batchSize), enabled = enabled, - onFieldChange = onFieldChange, + onOpen = { onOpenField(SettingsField.BATCH_SIZE) }, ) - AdaptiveFieldRow( - { - SettingsTextField( - field = SettingsField.NARRATOR_SILENCE_MS, - state = state, - label = stringResource(R.string.settings_field_narrator_silence), - hint = stringResource(R.string.settings_field_narrator_silence_hint), - keyboardType = KeyboardType.Number, - enabled = enabled, - onFieldChange = onFieldChange, - ) - }, - { - SettingsTextField( - field = SettingsField.PARAGRAPH_SILENCE_MS, - state = state, - label = stringResource(R.string.settings_field_paragraph_silence), - hint = stringResource(R.string.settings_field_paragraph_silence_hint), - keyboardType = KeyboardType.Number, - enabled = enabled, - onFieldChange = onFieldChange, - ) - }, + SettingsDivider() + SettingsEditRow( + state = state, + field = SettingsField.NARRATOR_SILENCE_MS, + icon = ForgeIcons.Timer, + title = stringResource(R.string.settings_field_narrator_silence), + description = stringResource(R.string.ux_settings_desc_narrator_silence), + value = stringResource(R.string.ux_settings_value_ms, state.draft.narratorSilenceMs), + enabled = enabled, + onOpen = { onOpenField(SettingsField.NARRATOR_SILENCE_MS) }, + ) + SettingsDivider() + SettingsEditRow( + state = state, + field = SettingsField.PARAGRAPH_SILENCE_MS, + icon = ForgeIcons.Timer, + title = stringResource(R.string.settings_field_paragraph_silence), + description = stringResource(R.string.ux_settings_desc_paragraph_silence), + value = stringResource(R.string.ux_settings_value_ms, state.draft.paragraphSilenceMs), + enabled = enabled, + onOpen = { onOpenField(SettingsField.PARAGRAPH_SILENCE_MS) }, ) - SettingsTextField( + SettingsDivider() + SettingsEditRow( + state = state, field = SettingsField.DEFAULT_VOICE_CATEGORY, + icon = ForgeIcons.Mic, + title = stringResource(R.string.settings_field_default_voice), + description = stringResource(R.string.ux_settings_desc_default_voice), + value = state.draft.defaultVoiceCategory.ifBlank { emptyValue }, + enabled = enabled, + onOpen = { onOpenField(SettingsField.DEFAULT_VOICE_CATEGORY) }, + ) + SettingsDivider() + SettingsEditRow( state = state, - label = stringResource(R.string.settings_field_default_voice), - hint = stringResource(R.string.settings_field_default_voice_hint), + field = SettingsField.DEFAULT_SPEED, + icon = ForgeIcons.Gauge, + title = stringResource(R.string.settings_field_default_speed), + description = stringResource(R.string.ux_settings_desc_default_speed), + value = state.draft.defaultSpeed.ifBlank { emptyValue }, enabled = enabled, - onFieldChange = onFieldChange, + onOpen = { onOpenField(SettingsField.DEFAULT_SPEED) }, ) - AdaptiveFieldRow( - { - SettingsTextField( - field = SettingsField.DEFAULT_SPEED, - state = state, - label = stringResource(R.string.settings_field_default_speed), - hint = stringResource(R.string.settings_field_default_speed_hint), - keyboardType = KeyboardType.Decimal, - enabled = enabled, - onFieldChange = onFieldChange, - ) - }, - { - SettingsTextField( - field = SettingsField.DEFAULT_VOLUME, - state = state, - label = stringResource(R.string.settings_field_default_volume), - hint = stringResource(R.string.settings_field_default_volume_hint), - keyboardType = KeyboardType.Decimal, - enabled = enabled, - onFieldChange = onFieldChange, - ) - }, - { - SettingsTextField( - field = SettingsField.DEFAULT_PITCH, - state = state, - label = stringResource(R.string.settings_field_default_pitch), - hint = stringResource(R.string.settings_field_default_pitch_hint), - keyboardType = KeyboardType.Text, - enabled = enabled, - onFieldChange = onFieldChange, - ) - }, + SettingsDivider() + SettingsEditRow( + state = state, + field = SettingsField.DEFAULT_VOLUME, + icon = ForgeIcons.Volume, + title = stringResource(R.string.settings_field_default_volume), + description = stringResource(R.string.ux_settings_desc_default_volume), + value = state.draft.defaultVolume.ifBlank { emptyValue }, + enabled = enabled, + onOpen = { onOpenField(SettingsField.DEFAULT_VOLUME) }, + ) + SettingsDivider() + SettingsEditRow( + state = state, + field = SettingsField.DEFAULT_PITCH, + icon = ForgeIcons.Music, + title = stringResource(R.string.settings_field_default_pitch), + description = stringResource(R.string.ux_settings_desc_default_pitch), + value = state.draft.defaultPitch.ifBlank { emptyValue }, + enabled = enabled, + onOpen = { onOpenField(SettingsField.DEFAULT_PITCH) }, ) } } @Composable -private fun NetworkSection( +private fun NetworkGroup( state: SettingsUiState, enabled: Boolean, onToggleChange: (SettingsField, Boolean) -> Unit, ) { - SettingsSection( + SettingsGroup( + icon = ForgeIcons.Wifi, title = stringResource(R.string.settings_section_network), - subtitle = stringResource(R.string.settings_section_network_desc), + hint = stringResource(R.string.ux_settings_group_network_hint), ) { SettingsSwitchRow( + icon = ForgeIcons.Wifi, title = stringResource(R.string.settings_switch_wifi_only), - description = stringResource(R.string.settings_switch_wifi_only_desc), + subtitle = stringResource(R.string.ux_settings_desc_wifi), checked = state.draft.wifiOnly, enabled = enabled, onCheckedChange = { onToggleChange(SettingsField.WIFI_ONLY, it) }, ) + SettingsDivider() SettingsSwitchRow( + icon = ForgeIcons.Battery, title = stringResource(R.string.settings_switch_charging_only), - description = stringResource(R.string.settings_switch_charging_only_desc), + subtitle = stringResource(R.string.ux_settings_desc_charging), checked = state.draft.chargingOnly, enabled = enabled, onCheckedChange = { onToggleChange(SettingsField.CHARGING_ONLY, it) }, @@ -644,75 +717,69 @@ private fun NetworkSection( } @Composable -private fun DeviceSection( +private fun DeviceGroup( state: SettingsUiState, enabled: Boolean, - onFieldChange: (SettingsField, String) -> Unit, onToggleChange: (SettingsField, Boolean) -> Unit, + onOpenField: (SettingsField) -> Unit, ) { - SettingsSection( + SettingsGroup( + icon = ForgeIcons.Smartphone, title = stringResource(R.string.settings_section_device), - subtitle = stringResource(R.string.settings_section_device_desc), + hint = stringResource(R.string.ux_settings_group_device_hint), ) { - SettingsTextField( - field = SettingsField.BATTERY_PAUSE_THRESHOLD, - state = state, - label = stringResource(R.string.settings_field_battery_threshold), - hint = stringResource(R.string.settings_field_battery_threshold_hint), - keyboardType = KeyboardType.Number, + SettingsSwitchRow( + icon = ForgeIcons.Bell, + title = stringResource(R.string.settings_switch_notifications), + subtitle = stringResource(R.string.ux_settings_desc_notifications), + checked = state.draft.notificationsEnabled, enabled = enabled, - onFieldChange = onFieldChange, + onCheckedChange = { onToggleChange(SettingsField.NOTIFICATIONS_ENABLED, it) }, ) + SettingsDivider() SettingsSwitchRow( + icon = ForgeIcons.Gauge, title = stringResource(R.string.settings_switch_thermal), - description = stringResource(R.string.settings_switch_thermal_desc), + subtitle = stringResource(R.string.ux_settings_desc_thermal), checked = state.draft.thermalThrottle, enabled = enabled, onCheckedChange = { onToggleChange(SettingsField.THERMAL_THROTTLE, it) }, ) - SettingsSwitchRow( - title = stringResource(R.string.settings_switch_notifications), - description = stringResource(R.string.settings_switch_notifications_desc), - checked = state.draft.notificationsEnabled, + SettingsDivider() + SettingsEditRow( + state = state, + field = SettingsField.BATTERY_PAUSE_THRESHOLD, + icon = ForgeIcons.Battery, + title = stringResource(R.string.settings_field_battery_threshold), + description = stringResource(R.string.ux_settings_desc_battery_threshold), + value = stringResource( + R.string.ux_settings_value_percent, + state.draft.batteryPauseThreshold, + ), enabled = enabled, - onCheckedChange = { onToggleChange(SettingsField.NOTIFICATIONS_ENABLED, it) }, + onOpen = { onOpenField(SettingsField.BATTERY_PAUSE_THRESHOLD) }, ) } } @Composable -private fun AppearanceSection( +private fun AppearanceGroup( state: SettingsUiState, enabled: Boolean, onFieldChange: (SettingsField, String) -> Unit, onToggleChange: (SettingsField, Boolean) -> Unit, ) { - SettingsSection( + SettingsGroup( + icon = ForgeIcons.Palette, title = stringResource(R.string.settings_section_appearance), - subtitle = stringResource(R.string.settings_section_appearance_desc), + hint = stringResource(R.string.ux_settings_group_appearance_hint), ) { - Text( - text = stringResource(R.string.settings_theme_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Row( - modifier = Modifier.horizontalScroll(rememberScrollState()), - horizontalArrangement = Arrangement.spacedBy(8.dp), - ) { - ThemeMode.entries.forEach { mode -> - FilterChip( - selected = state.draft.themeMode == mode.wire, - onClick = { onFieldChange(SettingsField.THEME_MODE, mode.wire) }, - enabled = enabled, - label = { Text(themeLabel(mode)) }, - ) - } - } + ThemeRow(state = state, enabled = enabled, onFieldChange = onFieldChange) + SettingsDivider() SettingsSwitchRow( + icon = ForgeIcons.Palette, title = stringResource(R.string.settings_switch_dynamic_color), - description = stringResource(R.string.settings_switch_dynamic_color_desc), + subtitle = stringResource(R.string.ux_settings_desc_dynamic_color), checked = state.draft.dynamicColor, enabled = enabled, onCheckedChange = { onToggleChange(SettingsField.DYNAMIC_COLOR, it) }, @@ -721,200 +788,402 @@ private fun AppearanceSection( } @Composable -private fun StorageSection( +private fun ThemeRow( state: SettingsUiState, enabled: Boolean, onFieldChange: (SettingsField, String) -> Unit, +) { + val options = listOf( + ForgeIcons.Smartphone to stringResource(R.string.settings_theme_system), + ForgeIcons.Sun to stringResource(R.string.settings_theme_light), + ForgeIcons.Moon to stringResource(R.string.settings_theme_dark), + ) + val themeError = fieldErrorText(state, SettingsField.THEME_MODE) + Column( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.md, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + SettingsLeadingIcon(ForgeIcons.Palette) + Column(modifier = Modifier.weight(1f)) { + Text( + text = stringResource(R.string.settings_theme_title), + style = MaterialTheme.typography.titleSmallEmphasized, + modifier = Modifier.semantics { heading() }, + ) + } + } + ForgeSegmented( + options = options, + selectedIndex = ThemeMode.entries.indexOfFirst { + it.wire == state.draft.themeMode + }, + onSelect = { index -> + if (enabled) { + onFieldChange(SettingsField.THEME_MODE, ThemeMode.entries[index].wire) + } + }, + ) + if (themeError != null) { + Text( + text = themeError, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) + } + } +} + +@Composable +private fun StorageGroup( + state: SettingsUiState, + enabled: Boolean, + onOpenField: (SettingsField) -> Unit, onOpenStorage: () -> Unit, ) { - SettingsSection( + SettingsGroup( + icon = ForgeIcons.Storage, title = stringResource(R.string.settings_section_storage), - subtitle = stringResource(R.string.settings_section_storage_desc), + hint = stringResource(R.string.ux_settings_group_storage_hint), ) { - SettingsTextField( - field = SettingsField.KEEP_SEGMENT_CACHE_DAYS, + SettingsRow( + icon = ForgeIcons.Storage, + title = stringResource(R.string.settings_action_open_storage), + subtitle = stringResource(R.string.ux_settings_desc_storage_open), + enabled = enabled, + showChevron = true, + onClick = onOpenStorage, + ) + SettingsDivider() + SettingsEditRow( state = state, - label = stringResource(R.string.settings_field_keep_days), - hint = stringResource(R.string.settings_field_keep_days_hint), - keyboardType = KeyboardType.Number, + field = SettingsField.KEEP_SEGMENT_CACHE_DAYS, + icon = ForgeIcons.Clock, + title = stringResource(R.string.settings_field_keep_days), + description = stringResource(R.string.ux_settings_desc_retention), + value = stringResource( + R.string.ux_settings_value_days, + state.draft.keepSegmentCacheDays, + ), enabled = enabled, - onFieldChange = onFieldChange, + onOpen = { onOpenField(SettingsField.KEEP_SEGMENT_CACHE_DAYS) }, ) - TextButton( - onClick = onOpenStorage, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.settings_action_open_storage)) - } } } @Composable -private fun AboutSection( +private fun AboutGroup( versionName: String, onOpenLicenses: () -> Unit, onOpenAbout: () -> Unit, onRestartOnboarding: () -> Unit, ) { - SettingsSection( + SettingsGroup( + icon = ForgeIcons.Info, title = stringResource(R.string.settings_section_about), - subtitle = stringResource(R.string.settings_section_about_desc), + hint = stringResource(R.string.ux_settings_group_about_hint), ) { - Text( - text = stringResource(R.string.settings_about_version, versionName), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, + SettingsRow( + icon = ForgeIcons.Info, + title = stringResource(R.string.ux_settings_version_title), + subtitle = stringResource(R.string.ux_settings_version_build), + trailingText = versionName, ) - TextButton( - onClick = onOpenAbout, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.settings_action_open_about)) - } - TextButton( + SettingsDivider() + SettingsRow( + icon = ForgeIcons.Shield, + title = stringResource(R.string.settings_about_licenses), + subtitle = stringResource(R.string.settings_about_licenses_desc), + showChevron = true, onClick = onOpenLicenses, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.settings_about_licenses)) + ) + SettingsDivider() + SettingsRow( + icon = ForgeIcons.Refresh, + title = stringResource(R.string.settings_action_restart_onboarding), + subtitle = stringResource(R.string.ux_settings_desc_restart_onboarding), + showChevron = true, + onClick = onRestartOnboarding, + ) + SettingsDivider() + SettingsRow( + icon = ForgeIcons.Info, + title = stringResource(R.string.settings_action_open_about), + subtitle = stringResource(R.string.ux_settings_desc_about_open), + showChevron = true, + onClick = onOpenAbout, + ) + } +} + +@Composable +private fun SaveFooter(state: SettingsUiState, onSave: () -> Unit) { + val saveError = state.saveError + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + when { + state.saving -> StatusLine( + icon = ForgeIcons.Loader, + text = stringResource(R.string.action_saving), + ) + + saveError != null -> SaveErrorCard( + message = stringResource(R.string.action_save_error, saveError), + onRetry = onSave, + ) + + state.saved -> StatusLine( + icon = ForgeIcons.Check, + text = stringResource(R.string.settings_saved), + tint = MaterialTheme.colorScheme.primary, + ) } + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = stringResource(R.string.ux_settings_save), + onClick = onSave, + modifier = Modifier.fillMaxWidth(), + enabled = state.canSave, + loading = state.saving, + ) Text( - text = stringResource(R.string.settings_about_licenses_desc), + text = stringResource( + if (state.saved) { + R.string.ux_settings_saved_hint + } else { + R.string.ux_settings_save_hint + }, + ), + modifier = Modifier.fillMaxWidth(), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, ) - TextButton( - onClick = onRestartOnboarding, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.settings_action_restart_onboarding)) - } } } @Composable -private fun SectionLabel(text: String) { - Text( - text = text, - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.primary, - ) +private fun StatusLine( + @DrawableRes icon: Int, + text: String, + tint: androidx.compose.ui.graphics.Color = MaterialTheme.colorScheme.onSurfaceVariant, +) { + Row( + modifier = Modifier + .fillMaxWidth() + .semantics { liveRegion = LiveRegionMode.Polite }, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeIcon(icon = icon, contentDescription = null, tint = tint) + Text( + text = text, + style = MaterialTheme.typography.bodySmall, + color = tint, + ) + } } @Composable -private fun SettingsTextField( - field: SettingsField, - state: SettingsUiState, - label: String, - modifier: Modifier = Modifier, - hint: String? = null, - keyboardType: KeyboardType = KeyboardType.Text, - enabled: Boolean = true, - onFieldChange: (SettingsField, String) -> Unit, -) { - val errorText = fieldErrorText(state, field) - val supportingText: (@Composable () -> Unit)? = when { - errorText != null -> { - { Text(text = errorText, color = MaterialTheme.colorScheme.error) } +private fun SaveErrorCard(message: String, onRetry: () -> Unit) { + ForgeCard(containerColor = MaterialTheme.colorScheme.errorContainer) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) + Text( + text = message, + modifier = Modifier + .weight(1f) + .semantics { liveRegion = LiveRegionMode.Polite }, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + ) } + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.action_retry), + onClick = onRetry, + modifier = Modifier.fillMaxWidth(), + danger = true, + ) + } +} - hint != null -> { - { Text(text = hint, color = MaterialTheme.colorScheme.onSurfaceVariant) } +@Composable +private fun SettingsGroup( + @DrawableRes icon: Int, + title: String, + hint: String, + content: @Composable ColumnScope.() -> Unit, +) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = MaterialTheme.spacing.xs), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIcon( + icon = icon, + contentDescription = null, + modifier = Modifier.size(16.dp), + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = title, + modifier = Modifier + .weight(1f) + .semantics { heading() }, + style = MaterialTheme.typography.labelLargeEmphasized, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = hint, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + ForgeCard(contentPadding = PaddingValues(0.dp)) { + Column(content = content) } - - else -> null } - OutlinedTextField( - value = state.draft.textOf(field), - onValueChange = { value -> onFieldChange(field, value) }, - modifier = modifier - .fillMaxWidth() - .semantics { - if (errorText != null) { - error(errorText) - } - }, - enabled = enabled, - label = { Text(label) }, - singleLine = true, - isError = errorText != null, - keyboardOptions = KeyboardOptions(keyboardType = keyboardType), - supportingText = supportingText, - ) } @Composable -private fun ApiKeyRow( +private fun SettingsRow( + @DrawableRes icon: Int, title: String, - key: SecureKeyUi, - busy: Boolean, - enabled: Boolean, - onSet: () -> Unit, - onClear: () -> Unit, + subtitle: String?, + modifier: Modifier = Modifier, + trailingText: String? = null, + enabled: Boolean = true, + subtitleIsError: Boolean = false, + showChevron: Boolean = false, + onClick: (() -> Unit)? = null, ) { + val clickModifier = if (onClick != null) { + Modifier.clickable(enabled = enabled, role = Role.Button, onClick = onClick) + } else { + Modifier + } Row( - modifier = Modifier + modifier = modifier .fillMaxWidth() - .heightIn(min = 48.dp), + .then(clickModifier) + .heightIn(min = 64.dp) + .padding( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.md, + ), verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - Column(modifier = Modifier.weight(1f)) { + SettingsLeadingIcon(icon) + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { Text( text = title, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = when { - !key.configured -> stringResource(R.string.settings_key_unset) - key.last4.isNotBlank() -> stringResource( - R.string.settings_key_mask, - key.last4, - ) - else -> stringResource(R.string.settings_key_masked_short) - }, - style = MaterialTheme.typography.bodySmall, - color = if (key.configured) { - MaterialTheme.colorScheme.onSurfaceVariant - } else { - MaterialTheme.colorScheme.error - }, + style = MaterialTheme.typography.titleSmallEmphasized, + maxLines = 2, + overflow = TextOverflow.Ellipsis, ) + if (subtitle != null) { + Text( + text = subtitle, + style = MaterialTheme.typography.bodySmall, + color = if (subtitleIsError) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + } } - Spacer(Modifier.width(8.dp)) - TextButton( - onClick = onSet, - enabled = enabled && !busy, - modifier = Modifier.heightIn(min = 48.dp), - ) { + if (trailingText != null) { Text( - text = if (key.configured) { - stringResource(R.string.settings_key_change) - } else { - stringResource(R.string.settings_key_set) - }, + text = trailingText, + modifier = Modifier.widthIn(max = 150.dp), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + textAlign = TextAlign.End, ) } - if (key.configured) { - TextButton( - onClick = onClear, - enabled = enabled && !busy, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text( - text = stringResource(R.string.settings_key_clear), - color = MaterialTheme.colorScheme.error, - ) - } + if (showChevron) { + ForgeIcon( + icon = ForgeIcons.ChevronRight, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) } } } @Composable -private fun SettingsSwitchRow( +private fun SettingsEditRow( + state: SettingsUiState, + field: SettingsField, + @DrawableRes icon: Int, title: String, description: String, + value: String, + enabled: Boolean, + onOpen: () -> Unit, +) { + val error = fieldErrorText(state, field) + SettingsRow( + icon = icon, + title = title, + subtitle = error ?: description, + trailingText = value, + enabled = enabled, + subtitleIsError = error != null, + showChevron = true, + onClick = onOpen, + ) +} + +@Composable +private fun SettingsKeyRow( + key: SecureKeyUi, + title: String, + enabled: Boolean, + onClick: () -> Unit, +) { + SettingsRow( + icon = ForgeIcons.Key, + title = title, + subtitle = keySubtitle(key), + enabled = enabled, + showChevron = true, + onClick = onClick, + ) +} + +@Composable +private fun SettingsSwitchRow( + @DrawableRes icon: Int, + title: String, + subtitle: String, checked: Boolean, enabled: Boolean, onCheckedChange: (Boolean) -> Unit, @@ -922,28 +1191,36 @@ private fun SettingsSwitchRow( Row( modifier = Modifier .fillMaxWidth() - .heightIn(min = 48.dp) .toggleable( value = checked, enabled = enabled, role = Role.Switch, onValueChange = onCheckedChange, ) - .padding(vertical = 8.dp), + .heightIn(min = 64.dp) + .padding( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.md, + ), verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - Column(modifier = Modifier.weight(1f)) { + SettingsLeadingIcon(icon) + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), + ) { Text( text = title, - style = MaterialTheme.typography.titleSmall, + style = MaterialTheme.typography.titleSmallEmphasized, ) Text( - text = description, + text = subtitle, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) } - Spacer(Modifier.width(12.dp)) + Spacer(Modifier.width(MaterialTheme.spacing.xs)) Switch( checked = checked, onCheckedChange = null, @@ -952,24 +1229,154 @@ private fun SettingsSwitchRow( } } +@Composable +private fun SettingsLeadingIcon(@DrawableRes icon: Int) { + Surface( + modifier = Modifier.size(40.dp), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.secondaryContainer, + ) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center, + ) { + ForgeIcon( + icon = icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, + ) + } + } +} + +@Composable +private fun SettingsDivider() { + HorizontalDivider( + modifier = Modifier.padding(horizontal = MaterialTheme.spacing.lg), + color = MaterialTheme.colorScheme.outlineVariant, + ) +} + +@Composable +private fun FieldEditDialog( + title: String, + value: String, + hint: String?, + errorText: String?, + enabled: Boolean, + keyboardType: KeyboardType, + onValueChange: (String) -> Unit, + onDismiss: () -> Unit, + onConfirm: () -> Unit, +) { + val supportingText: (@Composable () -> Unit)? = when { + errorText != null -> { + { + Text( + text = errorText, + color = MaterialTheme.colorScheme.error, + ) + } + } + + hint != null -> { + { + Text( + text = hint, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + + else -> null + } + AlertDialog( + onDismissRequest = onDismiss, + icon = { + ForgeIcon( + icon = ForgeIcons.Edit, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) + }, + title = { + Text( + text = title, + style = MaterialTheme.typography.titleLargeEmphasized, + ) + }, + text = { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm)) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + modifier = Modifier + .fillMaxWidth() + .semantics { + if (errorText != null) { + liveRegion = LiveRegionMode.Polite + } + }, + enabled = enabled, + singleLine = true, + isError = errorText != null, + keyboardOptions = KeyboardOptions(keyboardType = keyboardType), + supportingText = supportingText, + ) + } + }, + confirmButton = { + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = stringResource(R.string.action_save), + onClick = onConfirm, + enabled = enabled, + ) + }, + dismissButton = { + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.action_cancel), + onClick = onDismiss, + ) + }, + ) +} + @Composable private fun KeyInputDialog( target: SettingsKeyTarget, value: String, + configured: Boolean, + busy: Boolean, onValueChange: (String) -> Unit, onDismiss: () -> Unit, onConfirm: () -> Unit, + onRequestClear: () -> Unit, ) { val title = keyTitle(target) AlertDialog( onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.settings_key_dialog_title, title)) }, + icon = { + ForgeIcon( + icon = ForgeIcons.Key, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) + }, + title = { + Text( + text = stringResource(R.string.settings_key_dialog_title, title), + style = MaterialTheme.typography.titleLargeEmphasized, + ) + }, text = { - Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Column(verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md)) { OutlinedTextField( value = value, onValueChange = onValueChange, modifier = Modifier.fillMaxWidth(), + enabled = !busy, label = { Text(stringResource(R.string.settings_key_dialog_label)) }, singleLine = true, visualTransformation = PasswordVisualTransformation(), @@ -980,20 +1387,39 @@ private fun KeyInputDialog( style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) + if (configured) { + ForgeSecondaryAction( + icon = ForgeIcons.Trash, + label = stringResource(R.string.settings_key_clear), + onClick = onRequestClear, + modifier = Modifier.fillMaxWidth(), + enabled = !busy, + danger = true, + ) + } } }, confirmButton = { - TextButton( + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = stringResource( + if (configured) { + R.string.settings_key_change + } else { + R.string.settings_key_set + }, + ), onClick = onConfirm, - enabled = value.isNotBlank(), - ) { - Text(stringResource(R.string.action_save)) - } + enabled = value.isNotBlank() && !busy, + loading = busy, + ) }, dismissButton = { - TextButton(onClick = onDismiss) { - Text(stringResource(R.string.action_cancel)) - } + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.action_cancel), + onClick = onDismiss, + ) }, ) } @@ -1001,30 +1427,62 @@ private fun KeyInputDialog( @Composable private fun ClearKeyDialog( target: SettingsKeyTarget, + busy: Boolean, onDismiss: () -> Unit, onConfirm: () -> Unit, ) { val title = keyTitle(target) AlertDialog( onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.settings_key_clear_title)) }, - text = { Text(stringResource(R.string.settings_key_clear_message, title)) }, + icon = { + ForgeIcon( + icon = ForgeIcons.Trash, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + }, + title = { + Text( + text = stringResource(R.string.settings_key_clear_title), + style = MaterialTheme.typography.titleLargeEmphasized, + ) + }, + text = { + Text( + text = stringResource(R.string.settings_key_clear_message, title), + style = MaterialTheme.typography.bodyMedium, + ) + }, confirmButton = { - TextButton(onClick = onConfirm) { - Text( - text = stringResource(R.string.settings_key_clear), - color = MaterialTheme.colorScheme.error, - ) - } + ForgeSecondaryAction( + icon = ForgeIcons.Trash, + label = stringResource(R.string.settings_key_clear), + onClick = onConfirm, + enabled = !busy, + danger = true, + ) }, dismissButton = { - TextButton(onClick = onDismiss) { - Text(stringResource(R.string.action_cancel)) - } + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.action_cancel), + onClick = onDismiss, + ) }, ) } +@Composable +private fun keySubtitle(key: SecureKeyUi): String = when { + !key.configured -> stringResource(R.string.settings_key_unset) + key.last4.isNotBlank() -> stringResource( + R.string.ux_settings_key_ready, + stringResource(R.string.settings_key_mask, key.last4), + ) + + else -> stringResource(R.string.settings_key_masked_short) +} + @Composable private fun keyTitle(target: SettingsKeyTarget): String = when (target) { SettingsKeyTarget.LLM -> stringResource(R.string.settings_key_llm_title) @@ -1032,12 +1490,82 @@ private fun keyTitle(target: SettingsKeyTarget): String = when (target) { } @Composable -private fun themeLabel(mode: ThemeMode): String = when (mode) { - ThemeMode.System -> stringResource(R.string.settings_theme_system) - ThemeMode.Light -> stringResource(R.string.settings_theme_light) - ThemeMode.Dark -> stringResource(R.string.settings_theme_dark) +private fun fieldTitle(field: SettingsField): String = stringResource( + when (field) { + SettingsField.LLM_BASE_URL -> R.string.settings_field_llm_base_url + SettingsField.LLM_MODEL -> R.string.settings_field_llm_model + SettingsField.LLM_CONCURRENCY -> R.string.settings_field_llm_concurrency + SettingsField.FISH_BASE_URL -> R.string.settings_field_fish_base_url + SettingsField.FISH_TTS_MODEL -> R.string.settings_field_fish_tts_model + SettingsField.TTS_CONCURRENCY -> R.string.settings_field_tts_concurrency + SettingsField.SEGMENT_MAX_CHARS -> R.string.settings_field_segment_max_chars + SettingsField.NARRATOR_SILENCE_MS -> R.string.settings_field_narrator_silence + SettingsField.PARAGRAPH_SILENCE_MS -> R.string.settings_field_paragraph_silence + SettingsField.DEFAULT_VOICE_CATEGORY -> R.string.settings_field_default_voice + SettingsField.DEFAULT_SPEED -> R.string.settings_field_default_speed + SettingsField.DEFAULT_VOLUME -> R.string.settings_field_default_volume + SettingsField.DEFAULT_PITCH -> R.string.settings_field_default_pitch + SettingsField.MIN_COVERAGE -> R.string.settings_field_min_coverage + SettingsField.BATCH_SIZE -> R.string.settings_field_batch_size + SettingsField.BATTERY_PAUSE_THRESHOLD -> R.string.settings_field_battery_threshold + SettingsField.KEEP_SEGMENT_CACHE_DAYS -> R.string.settings_field_keep_days + SettingsField.THEME_MODE -> R.string.settings_theme_title + SettingsField.WIFI_ONLY, + SettingsField.CHARGING_ONLY, + SettingsField.THERMAL_THROTTLE, + SettingsField.NOTIFICATIONS_ENABLED, + SettingsField.DYNAMIC_COLOR -> R.string.settings_theme_title + }, +) + +@Composable +private fun fieldHint(field: SettingsField): String? = when (field) { + SettingsField.LLM_CONCURRENCY -> stringResource(R.string.settings_field_llm_concurrency_hint) + SettingsField.TTS_CONCURRENCY -> stringResource(R.string.settings_field_tts_concurrency_hint) + SettingsField.SEGMENT_MAX_CHARS -> stringResource(R.string.settings_field_segment_max_chars_hint) + SettingsField.MIN_COVERAGE -> stringResource(R.string.settings_field_min_coverage_hint) + SettingsField.BATCH_SIZE -> stringResource(R.string.settings_field_batch_size_hint) + SettingsField.NARRATOR_SILENCE_MS -> stringResource(R.string.settings_field_narrator_silence_hint) + SettingsField.PARAGRAPH_SILENCE_MS -> stringResource(R.string.settings_field_paragraph_silence_hint) + SettingsField.DEFAULT_VOICE_CATEGORY -> stringResource(R.string.settings_field_default_voice_hint) + SettingsField.DEFAULT_SPEED -> stringResource(R.string.settings_field_default_speed_hint) + SettingsField.DEFAULT_VOLUME -> stringResource(R.string.settings_field_default_volume_hint) + SettingsField.DEFAULT_PITCH -> stringResource(R.string.settings_field_default_pitch_hint) + SettingsField.BATTERY_PAUSE_THRESHOLD -> stringResource( + R.string.settings_field_battery_threshold_hint, + ) + + SettingsField.KEEP_SEGMENT_CACHE_DAYS -> stringResource(R.string.settings_field_keep_days_hint) + else -> null +} + +private fun fieldKeyboardType(field: SettingsField): KeyboardType = when (field) { + SettingsField.LLM_BASE_URL, + SettingsField.FISH_BASE_URL -> KeyboardType.Uri + + SettingsField.LLM_CONCURRENCY, + SettingsField.TTS_CONCURRENCY, + SettingsField.SEGMENT_MAX_CHARS, + SettingsField.BATCH_SIZE, + SettingsField.NARRATOR_SILENCE_MS, + SettingsField.PARAGRAPH_SILENCE_MS, + SettingsField.BATTERY_PAUSE_THRESHOLD, + SettingsField.KEEP_SEGMENT_CACHE_DAYS -> KeyboardType.Number + + SettingsField.MIN_COVERAGE, + SettingsField.DEFAULT_SPEED, + SettingsField.DEFAULT_VOLUME, + SettingsField.DEFAULT_PITCH -> KeyboardType.Decimal + + else -> KeyboardType.Text } +private fun keyTargetByName(name: String): SettingsKeyTarget? = + SettingsKeyTarget.entries.firstOrNull { it.name == name } + +private fun fieldByName(name: String): SettingsField? = + SettingsField.entries.firstOrNull { it.name == name } + @Composable private fun fieldErrorText(state: SettingsUiState, field: SettingsField): String? { val formatError = state.formatError(field) @@ -1053,9 +1581,6 @@ private fun formatErrorLabel(error: FieldFormatError): String = when (error) { FieldFormatError.InvalidOption -> stringResource(R.string.settings_error_option) } -private fun keyTargetByName(name: String): SettingsKeyTarget? = - SettingsKeyTarget.entries.firstOrNull { it.name == name } - /** 草稿的字符串视图;只读 UI 使用,写路径统一走 [SettingsDraft.withField]。 */ private fun SettingsDraft.textOf(field: SettingsField): String = when (field) { SettingsField.LLM_BASE_URL -> llmBaseUrl @@ -1084,7 +1609,7 @@ private fun SettingsDraft.textOf(field: SettingsField): String = when (field) { } // --------------------------------------------------------------------------- -// Preview:浅色默认态 / 深色带字段错误。文案全部来自 strings.xml。 +// Preview:浅色默认态 / 深色带字段错误。文案来自 strings.xml 与本页新文案文件。 // --------------------------------------------------------------------------- private fun previewState(): SettingsUiState = SettingsUiState.from( diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/storage/StorageScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/storage/StorageScreen.kt index 2f93faf..14acb36 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/storage/StorageScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/storage/StorageScreen.kt @@ -1,61 +1,69 @@ package com.estimatefaster.audioforge.feature.storage import android.content.res.Configuration +import androidx.annotation.DrawableRes +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.LinearWavyProgressIndicator +import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.Slider +import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.LiveRegionMode import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.liveRegion import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorBanner -import com.estimatefaster.audioforge.ui.components.ErrorState -import com.estimatefaster.audioforge.ui.components.LoadingState -import com.estimatefaster.audioforge.ui.components.SectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeListRow +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeSegmented +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar +import com.estimatefaster.audioforge.ui.forge.ForgeWavyProgress import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing import kotlin.math.roundToInt /** - * 存储页(P5-09 / 执行计划 §12.4 S14、§15 P5-09)。 + * 存储页(P5-09 / 执行计划 §12.4 S14、§15 P5-09),Forge Framework v1 重做。 * * 有状态入口:收集 [StorageViewModel.state] 后委托给无状态版本;页面不直接访问 * 文件系统、DB 或 `StorageMaintenance`,所有扫描/清理都通过 ViewModel。 @@ -84,17 +92,19 @@ fun StorageScreen( } /** - * 无状态存储页。 + * 无状态存储页(Forge Framework v1)。 * - * 布局: - * - 顶部:返回、标题、刷新; - * - 空间概览卡:总占用、可用空间、音频/导入/导出分区、文件数; - * - 按项目卡:项目名、占用、章节数;已删除项目的残留以「未关联项目」展示; - * - 保留期卡:7..365 天滑块 + 数字输入,非法输入就地提示; - * - 清理卡:清理孤儿 / 清理过期,确认后显示进度与释放字节/删除数/失败数; - * - 空态、加载、错误复用 P4-02 组件。 + * 布局严格对齐 `docs/prototype/forge-framework.html` 的 Storage 页: + * - ForgeTopBar:返回图标、标题、占用副标题、刷新图标操作; + * - Hero 卡:总占用 / 容量、Wavy 进度、三色分区条与图例、文件数、扫描失败提示; + * - 项目占用:ForgeListRow(图标 + 标题 + 章节数 + 占用),按状态层顺序展示; + * - 保留期:7/30/90 快捷 chip、滑块、数字输入、应用按钮; + * - 清理:孤儿 / 过期两条「图标 + 文案」次操作,确认弹窗后才执行; + * 清理中显示进度行,结果卡展示释放量/删除数/失败数并可重试或关闭。 + * + * 所有数字与文案来自 [StorageUiState] 与 `strings.xml` / `strings_ux_v2_storage_about.xml`, + * 本文件不做统计、不做清理,也不直接读写文件。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun StorageScreen( state: StorageUiState, @@ -110,71 +120,76 @@ fun StorageScreen( onRetryCleanup: () -> Unit = {}, onDismissResult: () -> Unit = {}, ) { + val overview = state.overview + Scaffold( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - navigationIcon = { - TextButton( - onClick = onBack, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_back)) - } - }, - title = { - Text( - text = stringResource(R.string.storage_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, + ForgeTopBar( + title = stringResource(R.string.storage_title), + subtitle = if (overview == null) { + stringResource(R.string.storage_overview_subtitle) + } else { + stringResource( + R.string.storage_v2_topbar_subtitle, + formatByteSize(overview.totalBytes), + formatByteSize(overview.totalBytes + overview.usableBytes), ) }, + navigationIcon = ForgeIcons.Back, + navigationDescription = stringResource(R.string.action_back), + onNavigation = onBack, actions = { - TextButton( + ForgeIconAction( + icon = ForgeIcons.Refresh, + contentDescription = stringResource(R.string.storage_v2_refresh_action), onClick = onRefresh, - enabled = !state.isBusy, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_refresh)) - } + ) }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, ) { padding -> - when { - state.loading && state.overview == null -> LoadingState( - message = stringResource(R.string.storage_loading), - modifier = Modifier.padding(padding), - ) + Box( + modifier = Modifier + .fillMaxSize() + .padding(padding), + ) { + when { + overview == null && state.loading -> ForgeLoading( + label = stringResource(R.string.storage_loading), + ) - state.loadError != null && state.overview == null -> Box( - modifier = Modifier - .fillMaxSize() - .padding(padding), - contentAlignment = Alignment.Center, - ) { - ErrorState( - message = stringResource(R.string.storage_load_error, state.loadError.orEmpty()), + overview == null && state.loadError != null -> ForgeError( + message = stringResource( + R.string.storage_load_error, + state.loadError.orEmpty(), + ), onRetry = onRefresh, + retryLabel = stringResource(R.string.action_retry), ) - } - else -> StorageContent( - state = state, - contentPadding = padding, - onRefresh = onRefresh, - onRetentionInputChange = onRetentionInputChange, - onRetentionSliderChange = onRetentionSliderChange, - onRetentionCommit = onRetentionCommit, - onRequestCleanup = onRequestCleanup, - onRetryCleanup = onRetryCleanup, - onDismissResult = onDismissResult, - ) + overview == null || state.isEmpty -> ForgeEmpty( + icon = ForgeIcons.Storage, + title = stringResource(R.string.storage_empty_title), + description = stringResource(R.string.storage_v2_empty_description), + actionIcon = ForgeIcons.Refresh, + actionLabel = stringResource(R.string.storage_empty_action), + onAction = onRefresh, + ) + + else -> StorageContent( + state = state, + overview = overview, + onRefresh = onRefresh, + onRetentionInputChange = onRetentionInputChange, + onRetentionSliderChange = onRetentionSliderChange, + onRetentionCommit = onRetentionCommit, + onRequestCleanup = onRequestCleanup, + onRetryCleanup = onRetryCleanup, + onDismissResult = onDismissResult, + ) + } } } @@ -192,7 +207,7 @@ fun StorageScreen( @Composable private fun StorageContent( state: StorageUiState, - contentPadding: PaddingValues, + overview: StorageOverview, onRefresh: () -> Unit, onRetentionInputChange: (String) -> Unit, onRetentionSliderChange: (Int) -> Unit, @@ -201,23 +216,26 @@ private fun StorageContent( onRetryCleanup: () -> Unit, onDismissResult: () -> Unit, ) { - val overview = state.overview + val spacing = MaterialTheme.spacing + val refreshingDescription = stringResource(R.string.storage_loading) LazyColumn( - modifier = Modifier - .fillMaxSize() - .padding(contentPadding), - contentPadding = PaddingValues(horizontal = 20.dp, vertical = 16.dp), - verticalArrangement = Arrangement.spacedBy(14.dp), + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(horizontal = spacing.lg, vertical = spacing.md), + verticalArrangement = Arrangement.spacedBy(spacing.md), ) { if (state.isLoading) { item(key = "refreshing") { - LinearProgressIndicator(modifier = Modifier.fillMaxWidth()) + LinearWavyProgressIndicator( + modifier = Modifier + .fillMaxWidth() + .semantics { contentDescription = refreshingDescription }, + ) } } if (state.loadError != null) { item(key = "load-error") { - ErrorBanner( + LoadErrorCard( message = stringResource( R.string.storage_load_error, state.loadError.orEmpty(), @@ -226,25 +244,39 @@ private fun StorageContent( ) } } - if (overview != null) { - if (state.isEmpty) { - item(key = "empty") { - EmptyState( - title = stringResource(R.string.storage_empty_title), - description = stringResource(R.string.storage_empty_description), - actionText = stringResource(R.string.storage_empty_action), - onAction = onRefresh, - ) - } - } else { - item(key = "overview") { - OverviewCard(overview = overview) - } - item(key = "projects") { - ProjectsCard(projects = overview.projects) - } + + item(key = "hero") { + StorageHeroCard(overview = overview) + } + + item(key = "projects-header") { + ForgeSectionHeader( + title = stringResource(R.string.storage_projects_title), + subtitle = stringResource( + R.string.storage_projects_subtitle, + overview.projects.size, + ), + actionIcon = ForgeIcons.Refresh, + actionDescription = stringResource(R.string.storage_v2_projects_refresh), + onAction = onRefresh, + ) + } + if (overview.projects.isEmpty()) { + item(key = "projects-empty") { + NoteRow( + icon = ForgeIcons.Info, + text = stringResource(R.string.storage_projects_empty), + ) + } + } else { + items( + items = overview.projects, + key = { project -> "project-${project.novelId}" }, + ) { project -> + ProjectUsageRow(project = project) } } + item(key = "retention") { RetentionCard( state = state, @@ -253,78 +285,110 @@ private fun StorageContent( onCommit = onRetentionCommit, ) } - if (overview != null && (!state.isEmpty || state.hasResult)) { - item(key = "cleanup") { - CleanupCard( - state = state, - onRequestCleanup = onRequestCleanup, - onRetryCleanup = onRetryCleanup, - onDismissResult = onDismissResult, - ) - } + + item(key = "cleanup") { + CleanupCard( + state = state, + onRequestCleanup = onRequestCleanup, + onRetryCleanup = onRetryCleanup, + onDismissResult = onDismissResult, + ) } } } +// --------------------------------------------------------------------------- +// Hero:总占用、Wavy 进度、三色分区条与图例 +// --------------------------------------------------------------------------- + @Composable -private fun OverviewCard(overview: StorageOverview) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(18.dp), - verticalArrangement = Arrangement.spacedBy(12.dp), +private fun StorageHeroCard(overview: StorageOverview) { + val spacing = MaterialTheme.spacing + val capacity = overview.totalBytes + overview.usableBytes + val usedRatio = if (capacity <= 0L) { + 0f + } else { + (overview.totalBytes.toDouble() / capacity.toDouble()).toFloat().coerceIn(0f, 1f) + } + val usedPercent = (usedRatio * 100f).roundToInt() + + ForgeCard { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.Bottom, ) { - SectionHeader( - title = stringResource(R.string.storage_overview_title), - subtitle = stringResource(R.string.storage_overview_subtitle), - ) - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.Bottom, - ) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = stringResource(R.string.storage_total_used), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Text( - text = formatByteSize(overview.totalBytes), - style = MaterialTheme.typography.headlineMedium, - fontWeight = FontWeight.Bold, - ) - } - Column(horizontalAlignment = Alignment.End) { - Text( - text = stringResource(R.string.storage_free_space), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Text( - text = formatByteSize(overview.usableBytes), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - ) - } + Column(modifier = Modifier.weight(1f)) { + Text( + text = stringResource(R.string.storage_total_used), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = formatByteSize(overview.totalBytes), + style = MaterialTheme.typography.displaySmallEmphasized, + ) } - HorizontalDivider() - overview.areas.forEach { usage -> - AreaRow( - label = areaLabel(usage.area), - bytes = usage.bytes, - share = overview.shareOf(usage.area), + Column(horizontalAlignment = Alignment.End) { + Text( + text = stringResource(R.string.storage_free_space), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = formatByteSize(overview.usableBytes), + style = MaterialTheme.typography.titleMediumEmphasized, ) } + } + + Text( + text = stringResource(R.string.storage_v2_hero_caption), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + ForgeWavyProgress(progress = usedRatio) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Text( + text = stringResource(R.string.storage_v2_used_percent, usedPercent), + style = MaterialTheme.typography.labelMediumEmphasized, + color = MaterialTheme.colorScheme.primary, + ) Text( text = stringResource(R.string.storage_file_count, overview.fileCount), - style = MaterialTheme.typography.bodySmall, + style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - if (overview.scanFailureCount > 0) { + } + + PartitionBar(overview = overview) + + Column(verticalArrangement = Arrangement.spacedBy(spacing.xs)) { + overview.areas.forEach { usage -> + PartitionLegendRow( + usage = usage, + share = overview.shareOf(usage.area), + ) + } + } + + if (overview.scanFailureCount > 0) { + Row( + modifier = Modifier + .fillMaxWidth() + .semantics(mergeDescendants = true) {}, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(spacing.sm), + ) { + ForgeIcon( + icon = ForgeIcons.TriangleAlert, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) Text( text = stringResource( R.string.storage_scan_failures, @@ -338,109 +402,102 @@ private fun OverviewCard(overview: StorageOverview) { } } +/** 音频 / 导入 / 导出的三色分区条;无占用时只显示轨道。 */ @Composable -private fun AreaRow( - label: String, - bytes: Long, - share: Float, -) { - Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { - Row(modifier = Modifier.fillMaxWidth()) { - Text( - text = label, - style = MaterialTheme.typography.bodyMedium, - modifier = Modifier.weight(1f), - ) - Text( - text = formatByteSize(bytes), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) +private fun PartitionBar(overview: StorageOverview) { + val shares = overview.areas.map { usage -> overview.shareOf(usage.area) } + val description = stringResource( + R.string.storage_v2_partition_bar_description, + (shares.getOrElse(0) { 0f } * 100f).roundToInt(), + (shares.getOrElse(1) { 0f } * 100f).roundToInt(), + (shares.getOrElse(2) { 0f } * 100f).roundToInt(), + ) + + Row( + modifier = Modifier + .fillMaxWidth() + .height(10.dp) + .clip(MaterialTheme.shapes.small) + .background(MaterialTheme.colorScheme.surfaceContainerHighest) + .semantics { contentDescription = description }, + ) { + if (overview.totalBytes > 0L) { + overview.areas.forEach { usage -> + val share = overview.shareOf(usage.area) + if (share > 0f) { + Box( + modifier = Modifier + .weight(share) + .fillMaxHeight() + .background(areaColor(usage.area)), + ) + } + } } - val shareDescription = stringResource( - R.string.storage_area_progress_content_description, - label, - (share.coerceIn(0f, 1f) * 100f).roundToInt(), - ) - LinearProgressIndicator( - progress = { share }, - modifier = Modifier - .fillMaxWidth() - .height(4.dp) - .semantics { contentDescription = shareDescription }, - ) } } @Composable -private fun ProjectsCard(projects: List) { - Card( +private fun PartitionLegendRow(usage: StorageAreaUsage, share: Float) { + val spacing = MaterialTheme.spacing + Row( modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(spacing.sm), ) { - Column( + Box( modifier = Modifier - .fillMaxWidth() - .padding(18.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), - ) { - SectionHeader( - title = stringResource(R.string.storage_projects_title), - subtitle = stringResource(R.string.storage_projects_subtitle, projects.size), - ) - if (projects.isEmpty()) { - Text( - text = stringResource(R.string.storage_projects_empty), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } else { - projects.forEachIndexed { index, project -> - if (index > 0) HorizontalDivider() - ProjectRow(project = project) - } - } - } + .size(8.dp) + .clip(CircleShape) + .background(areaColor(usage.area)), + ) + ForgeIcon( + icon = areaIcon(usage.area), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = areaLabel(usage.area), + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.weight(1f), + ) + Text( + text = stringResource( + R.string.storage_v2_partition_size_share, + formatByteSize(usage.bytes), + (share * 100f).roundToInt(), + ), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } } +// --------------------------------------------------------------------------- +// 项目占用 +// --------------------------------------------------------------------------- + @Composable -private fun ProjectRow(project: StorageProjectUsage) { +private fun ProjectUsageRow(project: StorageProjectUsage) { val title = project.title ?: stringResource(R.string.storage_project_unknown, project.novelId) - val meta = if (project.chapterCount > 0) { + val subtitle = if (project.chapterCount > 0) { stringResource(R.string.storage_project_chapters, project.chapterCount) } else { stringResource(R.string.storage_project_no_chapters) } - Row( - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 48.dp) - .semantics(mergeDescendants = true) {}, - verticalAlignment = Alignment.CenterVertically, - ) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = title, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = meta, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - Spacer(Modifier.width(12.dp)) - Text( - text = formatByteSize(project.bytes), - style = MaterialTheme.typography.titleSmall, - color = MaterialTheme.colorScheme.primary, - ) - } + ForgeListRow( + icon = if (project.title != null) ForgeIcons.BookOpen else ForgeIcons.FolderOpen, + title = title, + subtitle = subtitle, + trailingText = formatByteSize(project.bytes), + ) } +// --------------------------------------------------------------------------- +// 保留期:快捷 chip + 滑块 + 数字输入 + 应用 +// --------------------------------------------------------------------------- + @Composable private fun RetentionCard( state: StorageUiState, @@ -448,75 +505,88 @@ private fun RetentionCard( onSliderChange: (Int) -> Unit, onCommit: () -> Unit, ) { + val spacing = MaterialTheme.spacing val errorText = retentionErrorText(state.retentionError) val sliderDescription = stringResource( R.string.storage_retention_slider_description, state.retentionDays, ) - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(18.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), + val quickOptions = QUICK_RETENTION_DAYS.map { days -> + ForgeIcons.Clock to stringResource(R.string.storage_v2_retention_day_option, days) + } + + ForgeCard { + ForgeSectionHeader( + title = stringResource(R.string.storage_retention_title), + subtitle = stringResource(R.string.storage_v2_retention_section_subtitle), + ) + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, ) { - SectionHeader( - title = stringResource(R.string.storage_retention_title), - subtitle = stringResource(R.string.storage_retention_subtitle), - ) - Row(verticalAlignment = Alignment.CenterVertically) { - Text( - text = stringResource( - R.string.storage_retention_value, - state.retentionDays, - ), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - modifier = Modifier.weight(1f), - ) - Text( - text = stringResource(R.string.storage_retention_range), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - Slider( - value = state.retentionDays.toFloat(), - onValueChange = { value -> onSliderChange(value.roundToInt()) }, - onValueChangeFinished = onCommit, - valueRange = MIN_RETENTION_DAYS.toFloat()..MAX_RETENTION_DAYS.toFloat(), - enabled = !state.isBusy, - modifier = Modifier.semantics { - contentDescription = sliderDescription - }, + Text( + text = stringResource(R.string.storage_retention_value, state.retentionDays), + style = MaterialTheme.typography.titleMediumEmphasized, + modifier = Modifier.weight(1f), ) - OutlinedTextField( - value = state.retentionInput, - onValueChange = onInputChange, - modifier = Modifier.fillMaxWidth(), - enabled = !state.isBusy, - label = { Text(stringResource(R.string.storage_retention_label)) }, - singleLine = true, - isError = errorText != null, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), - supportingText = { - Text( - text = errorText ?: stringResource(R.string.storage_retention_hint), - color = if (errorText != null) { - MaterialTheme.colorScheme.error - } else { - MaterialTheme.colorScheme.onSurfaceVariant - }, - ) - }, + Text( + text = stringResource(R.string.storage_retention_range), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } + ForgeSegmented( + options = quickOptions, + selectedIndex = QUICK_RETENTION_DAYS.indexOf(state.retentionDays), + onSelect = { index -> + QUICK_RETENTION_DAYS.getOrNull(index)?.let { days -> + onSliderChange(days) + onCommit() + } + }, + ) + Slider( + value = state.retentionDays.toFloat(), + onValueChange = { value -> onSliderChange(value.roundToInt()) }, + onValueChangeFinished = onCommit, + valueRange = MIN_RETENTION_DAYS.toFloat()..MAX_RETENTION_DAYS.toFloat(), + enabled = !state.isBusy, + modifier = Modifier.semantics { contentDescription = sliderDescription }, + ) + OutlinedTextField( + value = state.retentionInput, + onValueChange = onInputChange, + modifier = Modifier.fillMaxWidth(), + enabled = !state.isBusy, + singleLine = true, + label = { Text(stringResource(R.string.storage_retention_label)) }, + isError = errorText != null, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + supportingText = { + Text( + text = errorText ?: stringResource(R.string.storage_v2_retention_hint), + color = if (errorText != null) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) + }, + ) + ForgePrimaryAction( + icon = ForgeIcons.Check, + label = stringResource(R.string.storage_v2_retention_apply), + onClick = onCommit, + modifier = Modifier.fillMaxWidth(), + enabled = !state.isBusy && state.retentionError == null, + ) } } +// --------------------------------------------------------------------------- +// 清理:确认 → 进度 → 结果 +// --------------------------------------------------------------------------- + @Composable private fun CleanupCard( state: StorageUiState, @@ -524,128 +594,136 @@ private fun CleanupCard( onRetryCleanup: () -> Unit, onDismissResult: () -> Unit, ) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column( - modifier = Modifier - .fillMaxWidth() - .padding(18.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), - ) { - SectionHeader( - title = stringResource(R.string.storage_cleanup_title), - subtitle = stringResource(R.string.storage_cleanup_subtitle), - ) - CleanupActionRow( - title = stringResource(R.string.storage_cleanup_orphans_title), - description = stringResource(R.string.storage_cleanup_orphans_desc), - meta = stringResource( - R.string.storage_cleanup_meta, - state.overview?.orphanCount ?: 0, - formatByteSize(state.overview?.orphanBytes ?: 0L), - ), - actionText = stringResource(R.string.storage_action_clean_orphans), - enabled = state.canCleanOrphans && !state.isBusy, - onClick = { onRequestCleanup(StorageCleanupKind.ORPHANS) }, - ) - HorizontalDivider() - CleanupActionRow( - title = stringResource(R.string.storage_cleanup_expired_title), - description = stringResource( - R.string.storage_cleanup_expired_desc, - state.retentionDays, - ), - meta = stringResource( - R.string.storage_cleanup_meta, - state.overview?.expiredCount ?: 0, - formatByteSize(state.overview?.expiredBytes ?: 0L), - ), - actionText = stringResource(R.string.storage_action_clean_expired), - enabled = state.canCleanExpired && !state.isBusy, - onClick = { onRequestCleanup(StorageCleanupKind.EXPIRED) }, + val overview = state.overview + + ForgeCard { + ForgeSectionHeader( + title = stringResource(R.string.storage_cleanup_title), + subtitle = stringResource(R.string.storage_v2_cleanup_section_subtitle), + ) + + CleanupBlock( + icon = ForgeIcons.Trash, + title = stringResource(R.string.storage_cleanup_orphans_title), + description = stringResource(R.string.storage_cleanup_orphans_desc), + meta = stringResource( + R.string.storage_cleanup_meta, + overview?.orphanCount ?: 0, + formatByteSize(overview?.orphanBytes ?: 0L), + ), + actionLabel = stringResource(R.string.storage_action_clean_orphans), + enabled = state.canCleanOrphans, + danger = false, + onClick = { onRequestCleanup(StorageCleanupKind.ORPHANS) }, + ) + + HorizontalDivider() + + CleanupBlock( + icon = ForgeIcons.Clock, + title = stringResource(R.string.storage_cleanup_expired_title), + description = stringResource( + R.string.storage_cleanup_expired_desc, + state.retentionDays, + ), + meta = stringResource( + R.string.storage_cleanup_meta, + overview?.expiredCount ?: 0, + formatByteSize(overview?.expiredBytes ?: 0L), + ), + actionLabel = stringResource(R.string.storage_action_clean_expired), + enabled = state.canCleanExpired, + danger = true, + onClick = { onRequestCleanup(StorageCleanupKind.EXPIRED) }, + ) + + NoteRow( + icon = ForgeIcons.Lock, + text = stringResource(R.string.storage_expired_protected), + ) + + val cleaning = state.cleaning + when { + cleaning != null -> CleaningRow(kind = cleaning) + state.hasResult -> CleanupResultSection( + state = state, + onRetryCleanup = onRetryCleanup, + onDismissResult = onDismissResult, ) - Text( - text = stringResource(R.string.storage_expired_protected), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + + else -> NoteRow( + icon = ForgeIcons.Info, + text = stringResource(R.string.storage_cleanup_hint), ) + } + } +} - val cleaning = state.cleaning - if (cleaning != null) { - Row( - modifier = Modifier - .fillMaxWidth() - .semantics { liveRegion = LiveRegionMode.Polite }, - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp), - ) { - LinearProgressIndicator(modifier = Modifier.weight(1f)) - Text( - text = cleaningLabel(cleaning), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - } else if (state.hasResult) { - HorizontalDivider() - CleanupResultSection( - state = state, - onRetryCleanup = onRetryCleanup, - onDismissResult = onDismissResult, +@Composable +private fun CleanupBlock( + @DrawableRes icon: Int, + title: String, + description: String, + meta: String, + actionLabel: String, + enabled: Boolean, + danger: Boolean, + onClick: () -> Unit, +) { + val spacing = MaterialTheme.spacing + Column(verticalArrangement = Arrangement.spacedBy(spacing.sm)) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(spacing.md), + ) { + IconBubble(icon = icon, danger = danger) + Column(modifier = Modifier.weight(1f)) { + Text( + text = title, + style = MaterialTheme.typography.titleSmallEmphasized, ) - } else { Text( - text = stringResource(R.string.storage_cleanup_hint), + text = description, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) + Text( + text = meta, + style = MaterialTheme.typography.labelMedium, + color = if (danger) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.primary + }, + ) } } + ForgeSecondaryAction( + icon = icon, + label = actionLabel, + onClick = onClick, + modifier = Modifier.fillMaxWidth(), + enabled = enabled, + danger = danger, + ) } } @Composable -private fun CleanupActionRow( - title: String, - description: String, - meta: String, - actionText: String, - enabled: Boolean, - onClick: () -> Unit, -) { +private fun CleaningRow(kind: StorageCleanupKind) { Row( modifier = Modifier .fillMaxWidth() - .heightIn(min = 48.dp), + .semantics { liveRegion = LiveRegionMode.Polite }, verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - Column(modifier = Modifier.weight(1f)) { - Text( - text = title, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = description, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Text( - text = meta, - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.primary, - ) - } - Spacer(Modifier.width(12.dp)) - FilledTonalButton( - onClick = onClick, - enabled = enabled, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(actionText) - } + LoadingIndicator(modifier = Modifier.size(20.dp)) + Text( + text = cleaningLabel(kind), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } } @@ -655,108 +733,140 @@ private fun CleanupResultSection( onRetryCleanup: () -> Unit, onDismissResult: () -> Unit, ) { + val spacing = MaterialTheme.spacing val result = state.lastCleanup val cleanupError = state.cleanupError val failed = result?.hasFailures == true || cleanupError != null - Text( - text = stringResource( - if (failed) { - R.string.storage_cleanup_result_failed_title - } else { - R.string.storage_cleanup_result_title - }, - ), - modifier = Modifier.semantics { liveRegion = LiveRegionMode.Polite }, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - color = if (failed) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary, - ) - if (result != null) { - Text( - text = stringResource( - R.string.storage_cleanup_result_summary, - formatByteSize(result.freedBytes), - result.deletedCount, - ), - style = MaterialTheme.typography.bodyMedium, - ) - if (result.deletedNothing) { - Text( - text = stringResource(R.string.storage_cleanup_result_none_deleted), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - if (result.failureCount > 0) { - Text( - text = stringResource( - R.string.storage_cleanup_result_failures, - result.failureCount, - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, + + Column( + modifier = Modifier + .fillMaxWidth() + .semantics { liveRegion = LiveRegionMode.Polite }, + verticalArrangement = Arrangement.spacedBy(spacing.xs), + ) { + HorizontalDivider() + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(spacing.sm), + ) { + ForgeIcon( + icon = if (failed) ForgeIcons.AlertCircle else ForgeIcons.CheckCircle, + contentDescription = null, + tint = if (failed) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.primary + }, ) - } - if (result.skippedReferencedCount > 0) { Text( text = stringResource( - R.string.storage_cleanup_result_skipped_referenced, - result.skippedReferencedCount, + if (failed) { + R.string.storage_cleanup_result_failed_title + } else { + R.string.storage_cleanup_result_title + }, ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.titleSmallEmphasized, + color = if (failed) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.primary + }, ) } - if (result.skippedTooRecentCount > 0) { + if (result != null) { Text( text = stringResource( - R.string.storage_cleanup_result_skipped_recent, - result.skippedTooRecentCount, + R.string.storage_cleanup_result_summary, + formatByteSize(result.freedBytes), + result.deletedCount, ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.bodyMedium, ) + if (result.deletedNothing) { + ResultNote( + text = stringResource(R.string.storage_cleanup_result_none_deleted), + error = false, + ) + } + if (result.failureCount > 0) { + ResultNote( + text = stringResource( + R.string.storage_cleanup_result_failures, + result.failureCount, + ), + error = true, + ) + } + if (result.skippedReferencedCount > 0) { + ResultNote( + text = stringResource( + R.string.storage_cleanup_result_skipped_referenced, + result.skippedReferencedCount, + ), + error = false, + ) + } + if (result.skippedTooRecentCount > 0) { + ResultNote( + text = stringResource( + R.string.storage_cleanup_result_skipped_recent, + result.skippedTooRecentCount, + ), + error = false, + ) + } + if (result.skippedMissingCount > 0) { + ResultNote( + text = stringResource( + R.string.storage_cleanup_result_skipped_missing, + result.skippedMissingCount, + ), + error = false, + ) + } } - if (result.skippedMissingCount > 0) { - Text( - text = stringResource( - R.string.storage_cleanup_result_skipped_missing, - result.skippedMissingCount, - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + if (cleanupError != null) { + ResultNote( + text = stringResource(R.string.storage_cleanup_error, cleanupError), + error = true, ) } - } - if (cleanupError != null) { - Text( - text = stringResource(R.string.storage_cleanup_error, cleanupError), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, - ) - } - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.End, - ) { - if (state.canRetryCleanup) { - FilledTonalButton( - onClick = onRetryCleanup, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.storage_cleanup_action_retry)) - } - Spacer(Modifier.width(8.dp)) - } - TextButton( - onClick = onDismissResult, - modifier = Modifier.heightIn(min = 48.dp), + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(spacing.sm), ) { - Text(stringResource(R.string.storage_cleanup_action_dismiss)) + if (state.canRetryCleanup) { + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.storage_cleanup_action_retry), + onClick = onRetryCleanup, + modifier = Modifier.fillMaxWidth(), + ) + } + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.storage_cleanup_action_dismiss), + onClick = onDismissResult, + modifier = Modifier.fillMaxWidth(), + ) } } } +@Composable +private fun ResultNote(text: String, error: Boolean) { + Text( + text = text, + style = MaterialTheme.typography.bodySmall, + color = if (error) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) +} + @Composable private fun CleanupConfirmDialog( kind: StorageCleanupKind, @@ -766,6 +876,17 @@ private fun CleanupConfirmDialog( ) { AlertDialog( onDismissRequest = onDismiss, + icon = { + ForgeIcon( + icon = if (kind == StorageCleanupKind.ORPHANS) { + ForgeIcons.Trash + } else { + ForgeIcons.Clock + }, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + }, title = { Text( text = stringResource( @@ -777,6 +898,7 @@ private fun CleanupConfirmDialog( R.string.storage_cleanup_confirm_title_expired }, ), + style = MaterialTheme.typography.titleLargeEmphasized, ) }, text = { @@ -794,24 +916,109 @@ private fun CleanupConfirmDialog( ) }, confirmButton = { - TextButton( + ForgeSecondaryAction( + icon = ForgeIcons.Trash, + label = stringResource(R.string.storage_cleanup_confirm_action), onClick = onConfirm, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.storage_cleanup_confirm_action)) - } + danger = true, + ) }, dismissButton = { - TextButton( + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.action_cancel), onClick = onDismiss, - modifier = Modifier.heightIn(min = 48.dp), - ) { - Text(stringResource(R.string.action_cancel)) - } + ) }, ) } +// --------------------------------------------------------------------------- +// 共享小件 +// --------------------------------------------------------------------------- + +@Composable +private fun LoadErrorCard(message: String, onRetry: () -> Unit) { + val spacing = MaterialTheme.spacing + ForgeCard { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(spacing.md), + ) { + ForgeIcon( + icon = ForgeIcons.TriangleAlert, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + Text( + text = message, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + modifier = Modifier.weight(1f), + ) + } + ForgeSecondaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.action_retry), + onClick = onRetry, + modifier = Modifier.fillMaxWidth(), + ) + } +} + +@Composable +private fun NoteRow(@DrawableRes icon: Int, text: String) { + Row( + modifier = Modifier + .fillMaxWidth() + .semantics(mergeDescendants = true) {}, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeIcon( + icon = icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = text, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.weight(1f), + ) + } +} + +@Composable +private fun IconBubble(@DrawableRes icon: Int, danger: Boolean) { + val containerColor = if (danger) { + MaterialTheme.colorScheme.errorContainer + } else { + MaterialTheme.colorScheme.secondaryContainer + } + val contentColor = if (danger) { + MaterialTheme.colorScheme.onErrorContainer + } else { + MaterialTheme.colorScheme.onSecondaryContainer + } + Surface( + shape = MaterialTheme.shapes.large, + color = containerColor, + modifier = Modifier.size(44.dp), + ) { + Column( + modifier = Modifier.fillMaxSize(), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + ForgeIcon(icon = icon, contentDescription = null, tint = contentColor) + } + } +} + +// --------------------------------------------------------------------------- +// 文案映射 +// --------------------------------------------------------------------------- + @Composable private fun areaLabel(area: StorageArea): String = when (area) { StorageArea.AUDIO -> stringResource(R.string.storage_area_audio) @@ -819,6 +1026,20 @@ private fun areaLabel(area: StorageArea): String = when (area) { StorageArea.EXPORTS -> stringResource(R.string.storage_area_exports) } +@DrawableRes +private fun areaIcon(area: StorageArea): Int = when (area) { + StorageArea.AUDIO -> ForgeIcons.AudioLines + StorageArea.IMPORTS -> ForgeIcons.FolderOpen + StorageArea.EXPORTS -> ForgeIcons.FileText +} + +@Composable +private fun areaColor(area: StorageArea): Color = when (area) { + StorageArea.AUDIO -> MaterialTheme.colorScheme.primary + StorageArea.IMPORTS -> MaterialTheme.colorScheme.secondary + StorageArea.EXPORTS -> MaterialTheme.colorScheme.tertiary +} + @Composable private fun cleaningLabel(kind: StorageCleanupKind): String = when (kind) { StorageCleanupKind.ORPHANS -> stringResource(R.string.storage_cleaning_orphans) @@ -833,8 +1054,11 @@ private fun retentionErrorText(error: RetentionError?): String? = when (error) { RetentionError.OutOfRange -> stringResource(R.string.storage_retention_error_range) } +/** 保留期快捷选项(天);选中项与 [StorageUiState.retentionDays] 精确匹配。 */ +private val QUICK_RETENTION_DAYS: List = listOf(7, 30, 90) + // --------------------------------------------------------------------------- -// Preview:正常 / 清理确认 / 空态 / 清理结果。文案全部来自 strings.xml。 +// Preview:正常 / 清理确认 / 空态 / 清理结果。文案全部来自 strings。 // --------------------------------------------------------------------------- private fun previewOverview(): StorageOverview = StorageOverview( @@ -865,7 +1089,7 @@ private fun previewState(): StorageUiState = StorageUiState( retentionDays = 30, ) -@Preview(name = "Storage Normal", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview(name = "Storage Forge Normal", showBackground = true, backgroundColor = 0xFFF7F8FC) @Composable private fun StorageNormalPreview() { AudioForgeTheme(darkTheme = false, dynamicColor = false) { @@ -873,24 +1097,18 @@ private fun StorageNormalPreview() { } } -@Preview( - name = "Storage Cleanup Confirm", - showBackground = true, - backgroundColor = 0xFFF7F8FC, -) +@Preview(name = "Storage Forge Cleanup Confirm", showBackground = true, backgroundColor = 0xFFF7F8FC) @Composable private fun StorageCleanupConfirmPreview() { AudioForgeTheme(darkTheme = false, dynamicColor = false) { StorageScreen( - state = previewState().copy( - pendingCleanup = StorageCleanupKind.EXPIRED, - ), + state = previewState().copy(pendingCleanup = StorageCleanupKind.EXPIRED), ) } } @Preview( - name = "Storage Empty Dark 200%", + name = "Storage Forge Empty Dark 200%", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES, fontScale = 2f, @@ -921,7 +1139,7 @@ private fun StorageEmptyPreview() { } } -@Preview(name = "Storage Cleanup Result", showBackground = true, backgroundColor = 0xFFF7F8FC) +@Preview(name = "Storage Forge Cleanup Result", showBackground = true, backgroundColor = 0xFFF7F8FC) @Composable private fun StorageCleanupResultPreview() { AudioForgeTheme(darkTheme = false, dynamicColor = false) { diff --git a/app/src/main/java/com/estimatefaster/audioforge/feature/tasks/TasksScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/feature/tasks/TasksScreen.kt index a524ce3..4dd5bd4 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/feature/tasks/TasksScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/feature/tasks/TasksScreen.kt @@ -1,6 +1,7 @@ +@file:OptIn(androidx.compose.material3.ExperimentalMaterial3ExpressiveApi::class) + package com.estimatefaster.audioforge.feature.tasks -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -9,22 +10,15 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -35,26 +29,32 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.ProgressBarRangeInfo +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.progressBarRangeInfo import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.heading -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.data.db.JobEntity -import com.estimatefaster.audioforge.ui.components.EmptyState -import com.estimatefaster.audioforge.ui.components.ErrorBanner -import com.estimatefaster.audioforge.ui.components.ErrorState -import com.estimatefaster.audioforge.ui.components.LoadingState -import com.estimatefaster.audioforge.ui.components.ProgressRing -import com.estimatefaster.audioforge.ui.components.SectionHeader import com.estimatefaster.audioforge.ui.components.StatusKind import com.estimatefaster.audioforge.ui.components.StatusPill -import com.estimatefaster.audioforge.ui.components.StatusTone +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeEmpty +import com.estimatefaster.audioforge.ui.forge.ForgeError +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIconAction +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgeListRow +import com.estimatefaster.audioforge.ui.forge.ForgeLoading +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar +import com.estimatefaster.audioforge.ui.forge.ForgeWavyProgress import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing import java.time.Instant import java.time.ZoneId import java.time.format.DateTimeFormatter @@ -63,12 +63,12 @@ import java.time.format.FormatStyle /** * 任务页有状态入口(P4-08 / §12.4 S12)。 * - * 导航层只需注入 [TasksViewModel]、`onOpenProject` 与 [taskRunnerAvailable]; - * 停止先弹确认框,确认后调用 `viewModel.stop(novelId)`(只写 stopRequested)。 + * 公开签名保持不变:导航层只注入 [TasksViewModel]、`onOpenProject` 与 + * [taskRunnerAvailable];停止先二次确认,确认后回调 `onStop(novelId)`。 * - * [taskRunnerAvailable] 与 P4-05 的 `batchRunnerAvailable` 同口径:批次执行/队列 - * (P3-04 BatchRunner)尚未装配时为 false,停止按钮禁用并显示说明,避免给用户 - * “点了没反应”的假象。任务页本身仍可只读展示库里已有的任务与历史。 + * 布局按 `docs/prototype/forge-framework.html` 的 Tasks 重写: + * TopBar(刷新 icon-only)→ 当前任务 hero(大字百分比 + Wavy 进度 + danger 停止) + * → 指标条 → 队列 → 历史任务。所有操作都带 Lucide 图标。 */ @Composable fun TasksScreen( @@ -91,13 +91,16 @@ fun TasksScreen( } /** - * 无状态任务页:当前任务卡 + 队列 + 最近任务。 + * 无状态任务页。 + * + * 状态机、校验与回调口径与旧版一致: + * - 停止按钮点击后先弹二次确认;确认才回调 [onStop](参数是 novelId); + * - 确认框打开期间任务自己结束会自动收起; + * - [taskRunnerAvailable] 为 false 时停止按钮禁用并显示说明。 * - * 停止按钮点击后先弹二次确认;确认才回调 [onStop](参数是 novelId,不是 jobId, - * 与页面/导航的解耦口径一致)。整行点击队列/历史会通过 [onOpenProject] 打开项目, - * 失败重试在项目页/章节页完成。 + * 视觉全部走 `ui/forge/`:ForgeTopBar / ForgeCard / ForgeListRow / + * ForgeSecondaryAction / ForgeIconAction / ForgeEmpty / ForgeError / ForgeLoading。 */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun TasksScreen( state: TasksUiState, @@ -109,8 +112,8 @@ fun TasksScreen( taskRunnerAvailable: Boolean = false, ) { var pendingStopNovelId by rememberSaveable { mutableStateOf(null) } - val actionError = state.actionError val loadError = state.loadError + val actionError = state.actionError val stopTarget = pendingStopNovelId?.let { novelId -> state.taskFor(novelId) } // 任务在确认框打开期间自己结束了:自动收起,避免对已结束任务发停止请求。 @@ -125,59 +128,42 @@ fun TasksScreen( modifier = modifier, containerColor = MaterialTheme.colorScheme.background, topBar = { - TopAppBar( - title = { - Column { - Text( - text = stringResource(R.string.tasks_title), - modifier = Modifier.semantics { heading() }, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource(R.string.tasks_subtitle), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } + ForgeTopBar( + title = stringResource(R.string.tasks_title), + subtitle = stringResource(R.string.ux_tasks_subtitle), + actions = { + ForgeIconAction( + icon = ForgeIcons.Refresh, + contentDescription = stringResource(R.string.ux_tasks_refresh), + onClick = onRetry, + ) }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), ) }, ) { padding -> + val contentModifier = Modifier.padding(padding) when { - state.loading -> LoadingState( - message = stringResource(R.string.tasks_loading), - modifier = Modifier.padding(padding), + state.loading -> ForgeLoading( + label = stringResource(R.string.tasks_loading), + modifier = contentModifier, ) - loadError != null -> Box( - modifier = Modifier - .fillMaxSize() - .padding(padding), - contentAlignment = Alignment.Center, - ) { - ErrorState( - message = stringResource(R.string.tasks_load_error, loadError), - onRetry = onRetry, - ) - } + loadError != null -> ForgeError( + message = stringResource(R.string.tasks_load_error, loadError), + modifier = contentModifier, + onRetry = onRetry, + retryLabel = stringResource(R.string.action_retry), + ) - state.isEmpty -> Box( - modifier = Modifier - .fillMaxSize() - .padding(padding), - contentAlignment = Alignment.Center, - ) { - EmptyState( - title = stringResource(R.string.tasks_empty_title), - description = stringResource(R.string.tasks_empty_description), - actionText = stringResource(R.string.action_refresh), - onAction = onRetry, - ) - } + state.isEmpty -> ForgeEmpty( + icon = ForgeIcons.Inbox, + title = stringResource(R.string.ux_tasks_empty_title), + description = stringResource(R.string.ux_tasks_empty_desc), + modifier = contentModifier, + actionIcon = ForgeIcons.Refresh, + actionLabel = stringResource(R.string.action_refresh), + onAction = onRetry, + ) else -> TasksContent( state = state, @@ -187,6 +173,7 @@ fun TasksScreen( onDismissActionError = onDismissActionError, onRequestStop = { novelId -> pendingStopNovelId = novelId }, onOpenProject = onOpenProject, + onRetry = onRetry, ) } } @@ -213,195 +200,318 @@ private fun TasksContent( onDismissActionError: () -> Unit, onRequestStop: (Long) -> Unit, onOpenProject: (Long) -> Unit, + onRetry: () -> Unit, ) { + val current = state.current + LazyColumn( modifier = Modifier .fillMaxSize() .padding(contentPadding), - contentPadding = PaddingValues(horizontal = 20.dp, vertical = 16.dp), - verticalArrangement = Arrangement.spacedBy(14.dp), + contentPadding = PaddingValues( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.lg, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { if (actionError != null) { item(key = "action-error") { - ErrorBanner( - message = stringResource(R.string.action_failed, actionError), - onDismiss = onDismissActionError, - ) + ActionErrorCard(message = actionError, onDismiss = onDismissActionError) } } - val current = state.current + item(key = "current") { + CurrentTaskSection( + card = current, + taskRunnerAvailable = taskRunnerAvailable, + onRequestStop = onRequestStop, + ) + } + if (current != null) { - item(key = "current-header") { - SectionHeader(title = stringResource(R.string.tasks_current_title)) - } - item(key = "current-card") { - CurrentTaskCard( - card = current, - taskRunnerAvailable = taskRunnerAvailable, - onRequestStop = { onRequestStop(current.novelId) }, - ) + item(key = "current-meta") { + TaskMetaStrip(card = current) } - } else { - item(key = "no-running") { NoRunningCard() } } if (state.queued.isNotEmpty()) { item(key = "queue-header") { - SectionHeader( - title = stringResource(R.string.tasks_queue_title), - subtitle = stringResource(R.string.tasks_queue_subtitle, state.queued.size), + ForgeSectionHeader( + title = stringResource(R.string.ux_tasks_queue_title), + subtitle = stringResource(R.string.ux_tasks_queue_count, state.queued.size), ) } items(items = state.queued, key = { "queue-${it.jobId}" }) { card -> - QueueTaskRow(card = card, onOpenProject = onOpenProject) + ForgeListRow( + icon = if (card.status == TaskStatusUi.Running) { + ForgeIcons.Loader + } else { + ForgeIcons.Clock + }, + title = card.novelTitle, + subtitle = stringResource( + R.string.tasks_queue_item_meta, + taskModeLabel(card.mode), + card.percent, + ), + trailingIcon = ForgeIcons.ChevronRight, + trailingDescription = stringResource( + R.string.ux_tasks_open_project, + card.novelTitle, + ), + onTrailingClick = { onOpenProject(card.novelId) }, + ) } } if (state.recent.isNotEmpty()) { item(key = "history-header") { - SectionHeader( - title = stringResource(R.string.tasks_history_title), - subtitle = stringResource(R.string.tasks_history_subtitle, state.recent.size), + ForgeSectionHeader( + title = stringResource(R.string.ux_tasks_history_title), + subtitle = stringResource(R.string.ux_tasks_history_count, state.recent.size), + actionIcon = ForgeIcons.Refresh, + actionDescription = stringResource(R.string.ux_tasks_refresh_list), + onAction = onRetry, ) } items(items = state.recent, key = { "history-${it.jobId}" }) { item -> - HistoryRow(item = item, onOpenProject = onOpenProject) + HistoryCard(item = item, onOpenProject = onOpenProject) } } } } @Composable -private fun CurrentTaskCard( +private fun CurrentTaskSection( + card: TaskCardUi?, + taskRunnerAvailable: Boolean, + onRequestStop: (Long) -> Unit, +) { + if (card == null) { + NoRunningCard() + return + } + CurrentTaskHero( + card = card, + taskRunnerAvailable = taskRunnerAvailable, + onRequestStop = { onRequestStop(card.novelId) }, + ) +} + +@Composable +private fun CurrentTaskHero( card: TaskCardUi, taskRunnerAvailable: Boolean, onRequestStop: () -> Unit, ) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), + val stopping = card.isStopping + val chaptersTotal = card.stats.chaptersTotal + val kicker = when { + stopping -> stringResource(R.string.ux_tasks_kicker_stopping) + chaptersTotal > 0 -> stringResource( + R.string.ux_tasks_kicker_running, + (card.stats.chaptersDone + 1).coerceAtMost(chaptersTotal), + chaptersTotal, + ) + + else -> stringResource(R.string.ux_tasks_kicker_running_plain) + } + val progressDescription = stringResource(R.string.ux_tasks_progress_desc) + + ForgeCard( + containerColor = if (stopping) { + MaterialTheme.colorScheme.surfaceContainerHigh + } else { + MaterialTheme.colorScheme.surfaceContainerLow + }, ) { - Column( - modifier = Modifier.padding(18.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), ) { - Row(verticalAlignment = Alignment.Top) { - Column( - modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.spacedBy(2.dp), - ) { - Text( - text = card.novelTitle, - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - Text( - text = stringResource( - R.string.tasks_mode_label, - taskModeLabel(card.mode), - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - StatusPill(kind = StatusKind.Task, status = card.status.wire) - if (card.isStopping) { - StatusPill( - text = stringResource(R.string.tasks_status_stopping), - tone = StatusTone.Warning, - ) - } - } - } + ForgeIcon( + icon = if (stopping) ForgeIcons.ErrorCircle else ForgeIcons.Loader, + contentDescription = null, + tint = if (stopping) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.primary + }, + ) + Text( + text = kicker, + style = MaterialTheme.typography.labelMediumEmphasized, + color = if (stopping) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.primary + }, + ) + } + + Text( + text = stringResource( + R.string.ux_tasks_title_mode, + card.novelTitle, + taskModeLabel(card.mode), + ), + style = MaterialTheme.typography.headlineSmallEmphasized, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + Text( + text = stringResource( + R.string.tasks_started_elapsed, + formatTimestamp(card.startedAt), + formatTaskDuration(card.elapsedMs) + ?: stringResource(R.string.tasks_value_unknown), + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) - Row(verticalAlignment = Alignment.CenterVertically) { - ProgressRing( - progress = card.progress, - label = progressRingLabel(card), - diameter = 96.dp, - strokeWidth = 8.dp, - liveRegion = true, + if (stopping) { + Text( + text = if (chaptersTotal > 0) { + stringResource( + R.string.ux_tasks_stopping_body, + card.stats.chaptersDone, + chaptersTotal, + ) + } else { + stringResource(R.string.ux_tasks_stopping_body_plain) + }, + style = MaterialTheme.typography.bodyMedium, + ) + } else { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.Bottom, + ) { + Text( + text = stringResource(R.string.progress_percent, card.percent), + style = MaterialTheme.typography.displaySmallEmphasized, ) - Spacer(Modifier.width(18.dp)) + Spacer(Modifier.weight(1f)) Column( - modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.spacedBy(6.dp), + horizontalAlignment = Alignment.End, + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), ) { - Text( - text = stringResource( - R.string.tasks_progress_chapters, - card.stats.chaptersDone, - card.stats.chaptersTotal, - ), - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource( - R.string.tasks_progress_segments, - card.stats.segDone, - card.stats.segTotal, - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - if (card.stats.hasTtsCounts) { + if (card.currentTitle.isNotBlank()) { Text( text = stringResource( - R.string.tasks_progress_tts, - card.stats.ttsOk, - card.stats.ttsFailed, + R.string.tasks_current_chapter, + card.currentTitle, ), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 2, + overflow = TextOverflow.Ellipsis, ) } + Text( + text = etaLabel(card), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } } + } - if (card.currentTitle.isNotBlank()) { - Text( - text = stringResource(R.string.tasks_current_chapter, card.currentTitle), - style = MaterialTheme.typography.bodyMedium, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - } + ForgeWavyProgress( + progress = card.progress, + modifier = Modifier.semantics { + contentDescription = progressDescription + progressBarRangeInfo = ProgressBarRangeInfo(card.progress, 0f..1f) + }, + ) + ForgeSecondaryAction( + icon = ForgeIcons.ErrorCircle, + label = if (stopping) { + stringResource(R.string.tasks_status_stopping) + } else { + stringResource(R.string.ux_tasks_stop) + }, + onClick = onRequestStop, + modifier = Modifier.fillMaxWidth(), + enabled = taskRunnerAvailable && !card.stopRequested, + danger = true, + ) + + if (!taskRunnerAvailable) { Text( - text = stringResource( - R.string.tasks_started_elapsed, - formatTimestamp(card.startedAt), - formatTaskDuration(card.elapsedMs) - ?: stringResource(R.string.tasks_value_unknown), - ), - style = MaterialTheme.typography.labelMedium, + text = stringResource(R.string.tasks_control_unavailable), + style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - if (!card.isStopping) { - Text( - text = etaLabel(card), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } + } + } +} - OutlinedButton( - onClick = onRequestStop, - enabled = taskRunnerAvailable && !card.stopRequested, - modifier = Modifier.heightIn(min = 48.dp), +@Composable +private fun TaskMetaStrip(card: TaskCardUi) { + val duration = formatTaskDuration(card.elapsedMs) + ?: stringResource(R.string.tasks_value_unknown) + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + MetaLine( + items = listOf( + ForgeIcons.Users to stringResource( + R.string.tasks_progress_chapters, + card.stats.chaptersDone, + card.stats.chaptersTotal, + ), + ForgeIcons.FileText to stringResource( + R.string.tasks_progress_segments, + card.stats.segDone, + card.stats.segTotal, + ), + ), + ) + val elapsed = ForgeIcons.Clock to stringResource( + R.string.ux_tasks_elapsed, + duration, + ) + val tts = if (card.stats.hasTtsCounts) { + ForgeIcons.AudioLines to stringResource( + R.string.tasks_progress_tts, + card.stats.ttsOk, + card.stats.ttsFailed, + ) + } else { + null + } + MetaLine(items = listOfNotNull(elapsed, tts)) + } +} + +@Composable +private fun MetaLine(items: List>) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + items.forEach { (icon, label) -> + Row( + modifier = Modifier.weight(1f), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), ) { - Text(stringResource(R.string.tasks_action_stop)) - } - if (!taskRunnerAvailable) { + ForgeIcon( + icon = icon, + contentDescription = null, + modifier = Modifier.size(16.dp), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) Text( - text = stringResource(R.string.tasks_control_unavailable), - style = MaterialTheme.typography.bodySmall, + text = label, + style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, ) } } @@ -410,129 +520,157 @@ private fun CurrentTaskCard( @Composable private fun NoRunningCard() { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surfaceVariant, - ), - ) { - Text( - text = stringResource(R.string.tasks_no_running), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.padding(16.dp), - ) + ForgeCard { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + ForgeIcon( + icon = ForgeIcons.Inbox, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + text = stringResource(R.string.tasks_no_running), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } } @Composable -private fun QueueTaskRow( - card: TaskCardUi, - onOpenProject: (Long) -> Unit, -) { - Card( - modifier = Modifier - .fillMaxWidth() - .clickable(role = Role.Button) { onOpenProject(card.novelId) }, - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surfaceVariant, - ), - ) { +private fun ActionErrorCard(message: String, onDismiss: () -> Unit) { + ForgeCard(containerColor = MaterialTheme.colorScheme.errorContainer) { Row( - modifier = Modifier.padding(16.dp), - horizontalArrangement = Arrangement.spacedBy(12.dp), verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + ForgeIcon( + icon = ForgeIcons.AlertCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.onErrorContainer, + ) + Text( + text = stringResource(R.string.ux_tasks_action_failed, message), + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onErrorContainer, + ) + ForgeIconAction( + icon = ForgeIcons.Close, + contentDescription = stringResource(R.string.action_dismiss), + onClick = onDismiss, + ) + } + } +} + +@Composable +private fun HistoryCard(item: TaskHistoryUi, onOpenProject: (Long) -> Unit) { + val status = item.status + val container = when (status) { + TaskStatusUi.Done -> MaterialTheme.colorScheme.tertiaryContainer + TaskStatusUi.Error -> MaterialTheme.colorScheme.errorContainer + else -> MaterialTheme.colorScheme.surfaceContainerHighest + } + val content = when (status) { + TaskStatusUi.Done -> MaterialTheme.colorScheme.onTertiaryContainer + TaskStatusUi.Error -> MaterialTheme.colorScheme.onErrorContainer + else -> MaterialTheme.colorScheme.onSurfaceVariant + } + val statusIcon = when (status) { + TaskStatusUi.Done -> ForgeIcons.CheckCircle + TaskStatusUi.Cancelled -> ForgeIcons.Close + else -> ForgeIcons.ErrorCircle + } + val duration = formatTaskDuration(item.durationMs) + ?: stringResource(R.string.tasks_value_unknown) + val errorSummary = item.errorSummary + + ForgeCard { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.Top, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { + Surface( + modifier = Modifier.size(40.dp), + shape = MaterialTheme.shapes.large, + color = container, + ) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center, + ) { + ForgeIcon( + icon = statusIcon, + contentDescription = null, + tint = content, + ) + } + } Column( modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.spacedBy(2.dp), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xxs), ) { Text( - text = card.novelTitle, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, + text = stringResource( + R.string.ux_tasks_title_mode, + item.novelTitle, + taskModeLabel(item.mode), + ), + style = MaterialTheme.typography.titleSmallEmphasized, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + Text( + text = historyResultLabel(item), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis, ) Text( text = stringResource( - R.string.tasks_queue_item_meta, - taskModeLabel(card.mode), - card.percent, + R.string.tasks_history_finished, + formatTimestamp(item.finishedAt), ), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - if (card.currentTitle.isNotBlank()) { + if (errorSummary != null) { Text( - text = card.currentTitle, + text = stringResource(R.string.tasks_history_error, errorSummary), style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, + color = MaterialTheme.colorScheme.error, maxLines = 2, overflow = TextOverflow.Ellipsis, ) } } - StatusPill(kind = StatusKind.Task, status = card.status.wire) + ForgeIconAction( + icon = ForgeIcons.ChevronRight, + contentDescription = stringResource( + R.string.ux_tasks_open_project, + item.novelTitle, + ), + onClick = { onOpenProject(item.novelId) }, + container = false, + ) } - } -} -@Composable -private fun HistoryRow( - item: TaskHistoryUi, - onOpenProject: (Long) -> Unit, -) { - val duration = formatTaskDuration(item.durationMs) - val errorSummary = item.errorSummary - Card( - modifier = Modifier - .fillMaxWidth() - .clickable(role = Role.Button) { onOpenProject(item.novelId) }, - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(4.dp), + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, ) { - Row(verticalAlignment = Alignment.Top) { - Text( - text = item.novelTitle, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.SemiBold, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - modifier = Modifier.weight(1f), - ) - Spacer(Modifier.width(8.dp)) - StatusPill(kind = StatusKind.Task, status = item.status.wire) - } - Text( - text = stringResource( - R.string.tasks_history_meta, - taskModeLabel(item.mode), - duration ?: stringResource(R.string.tasks_value_unknown), - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) + StatusPill(kind = StatusKind.Task, status = status.wire) Text( - text = stringResource( - R.string.tasks_history_finished, - formatTimestamp(item.finishedAt), - ), - style = MaterialTheme.typography.bodySmall, + text = stringResource(R.string.ux_tasks_duration, duration), + style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, ) - if (errorSummary != null) { - Text( - text = stringResource(R.string.tasks_history_error, errorSummary), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.error, - maxLines = 2, - overflow = TextOverflow.Ellipsis, - ) - } } } } @@ -545,20 +683,39 @@ private fun StopConfirmDialog( ) { AlertDialog( onDismissRequest = onDismiss, - title = { Text(stringResource(R.string.tasks_stop_confirm_title)) }, - text = { Text(stringResource(R.string.tasks_stop_confirm_message, novelTitle)) }, + icon = { + ForgeIcon( + icon = ForgeIcons.ErrorCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.error, + ) + }, + title = { + Text( + text = stringResource(R.string.tasks_stop_confirm_title), + style = MaterialTheme.typography.titleLargeEmphasized, + ) + }, + text = { + Text( + text = stringResource(R.string.tasks_stop_confirm_message, novelTitle), + style = MaterialTheme.typography.bodyMedium, + ) + }, confirmButton = { - TextButton(onClick = onConfirm) { - Text( - text = stringResource(R.string.tasks_action_stop_confirm), - color = MaterialTheme.colorScheme.error, - ) - } + ForgeSecondaryAction( + icon = ForgeIcons.ErrorCircle, + label = stringResource(R.string.tasks_action_stop_confirm), + onClick = onConfirm, + danger = true, + ) }, dismissButton = { - TextButton(onClick = onDismiss) { - Text(stringResource(R.string.action_cancel)) - } + ForgeSecondaryAction( + icon = ForgeIcons.Close, + label = stringResource(R.string.action_cancel), + onClick = onDismiss, + ) }, ) } @@ -574,19 +731,37 @@ private fun taskModeLabel(mode: TaskModeUi): String = stringResource( ) @Composable -private fun progressRingLabel(card: TaskCardUi): String = stringResource( - when { - card.stats.segTotal > 0 -> R.string.tasks_progress_ring_segments - card.stats.chaptersTotal > 0 -> R.string.tasks_progress_ring_chapters - else -> R.string.tasks_progress_ring_empty - }, -) +private fun historyResultLabel(item: TaskHistoryUi): String = when (item.status) { + TaskStatusUi.Done -> when { + item.stats.chaptersDone <= 0 -> stringResource(R.string.tasks_value_unknown) + item.stats.segDone > 0 -> stringResource( + R.string.ux_tasks_result_done, + item.stats.chaptersDone, + item.stats.segDone, + ) + + else -> stringResource( + R.string.tasks_progress_chapters, + item.stats.chaptersDone, + item.stats.chaptersTotal, + ) + } + + TaskStatusUi.Cancelled -> stringResource( + R.string.ux_tasks_result_cancelled, + item.stats.chaptersDone, + item.stats.chaptersTotal, + ) + + TaskStatusUi.Error -> stringResource(R.string.ux_tasks_result_error) + else -> stringResource(R.string.tasks_value_unknown) +} @Composable private fun etaLabel(card: TaskCardUi): String { val eta = card.etaMs?.let { formatTaskDuration(it) } return if (eta != null) { - stringResource(R.string.tasks_eta, eta) + stringResource(R.string.ux_tasks_eta, eta) } else { stringResource(R.string.tasks_eta_unknown) } @@ -599,7 +774,7 @@ private fun formatTimestamp(epochMs: Long): String = remember(epochMs) { } // --------------------------------------------------------------------------- -// Preview:正常 / 空态 / 错误态。所有文案来自 strings.xml。 +// Preview:正常 / 仅历史 / 空态 / 错误态。文案来自 strings.xml 与本页新文案文件。 // --------------------------------------------------------------------------- private const val PREVIEW_NOW: Long = 1_760_000_400_000L @@ -663,7 +838,7 @@ private fun previewTasksState(): TasksUiState = buildTasksUiState( status = "done", startedAt = PREVIEW_NOW - 3_600_000L, finishedAt = PREVIEW_NOW - 600_000L, - statsJson = """{"chaptersDone":5,"chaptersTotal":5}""", + statsJson = """{"chaptersDone":5,"chaptersTotal":5,"segDone":120,"segTotal":120}""", ), ), TaskJobSnapshot( diff --git a/app/src/main/java/com/estimatefaster/audioforge/ui/HomeScreen.kt b/app/src/main/java/com/estimatefaster/audioforge/ui/HomeScreen.kt index bc87f7a..151a697 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/ui/HomeScreen.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/ui/HomeScreen.kt @@ -5,9 +5,13 @@ import android.content.pm.PackageManager import android.os.Build import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize @@ -16,18 +20,11 @@ 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.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -37,7 +34,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat @@ -45,11 +41,28 @@ import com.estimatefaster.audioforge.BuildConfig import com.estimatefaster.audioforge.R import com.estimatefaster.audioforge.core.audio.FfmpegProbeState import com.estimatefaster.audioforge.data.db.RoomProbeState +import com.estimatefaster.audioforge.ui.forge.ForgeCard +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.forge.ForgePrimaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSecondaryAction +import com.estimatefaster.audioforge.ui.forge.ForgeSectionHeader +import com.estimatefaster.audioforge.ui.forge.ForgeTopBar import com.estimatefaster.audioforge.ui.theme.AudioForgeTheme +import com.estimatefaster.audioforge.ui.theme.spacing import com.estimatefaster.audioforge.work.ProbeWorkSnapshot import com.estimatefaster.audioforge.work.ProbeWorkStatus -@OptIn(ExperimentalMaterial3Api::class) +/** + * 首页(Forge Framework v1)。 + * + * 版式照设计稿的 tab 页面:`ForgeTopBar` + 内容卡片;诊断区沿用 Phase 0 的 + * Room / FFmpeg / WorkManager 冒烟卡,但全部换成 [ForgeCard] 与 + * [ForgePrimaryAction] / [ForgeSecondaryAction],操作一律 Lucide 图标 + 文案。 + * + * 回调与既有文案 key 全部保留:`onRunRoomProbe`、`onRunFfmpegProbe`、 + * `onStartProbeWorker`、`onStopProbeWorker` 及 `diag_*` / `home_*` / `checklist_*` 等。 + */ @Composable fun HomeScreen( roomProbeState: RoomProbeState = RoomProbeState.Idle, @@ -64,24 +77,9 @@ fun HomeScreen( Scaffold( topBar = { - TopAppBar( - title = { - Column { - Text( - text = stringResource(R.string.home_title), - style = MaterialTheme.typography.titleLarge, - fontWeight = FontWeight.SemiBold, - ) - Text( - text = stringResource(R.string.home_subtitle), - style = MaterialTheme.typography.labelMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - }, - colors = TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.background, - ), + ForgeTopBar( + title = stringResource(R.string.home_title), + subtitle = stringResource(R.string.home_subtitle), ) }, containerColor = MaterialTheme.colorScheme.background, @@ -89,38 +87,31 @@ fun HomeScreen( LazyColumn( modifier = Modifier .fillMaxSize() - .padding(padding) - .padding(horizontal = 20.dp), - verticalArrangement = Arrangement.spacedBy(14.dp), + .padding(padding), + contentPadding = PaddingValues( + horizontal = MaterialTheme.spacing.lg, + vertical = MaterialTheme.spacing.md, + ), + verticalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), ) { - item { Spacer(Modifier.height(4.dp)) } - item { HeroCard() } + item { HomeHeroCard() } item { ChecklistCard() } if (BuildConfig.DEBUG) { + item { + ForgeSectionHeader( + title = stringResource(R.string.ux_home_diagnostics_title), + subtitle = stringResource(R.string.ux_home_diagnostics_subtitle), + ) + } item { RoomProbeCard(roomProbeState, onRunRoomProbe) } item { FfmpegProbeCard(ffmpegProbeState, onRunFfmpegProbe) } item { ProbeWorkerCard(probeWork, onStartProbeWorker, onStopProbeWorker) } } item { NextCard(showDetails) { showDetails = !showDetails } } - item { - AnimatedVisibility(visible = showDetails) { - Card( - colors = CardDefaults.cardColors( - containerColor = MaterialTheme.colorScheme.surfaceVariant, - ), - ) { - Text( - text = stringResource(R.string.phase0_details), - modifier = Modifier.padding(16.dp), - style = MaterialTheme.typography.bodyMedium, - ) - } - } - } item { Text( text = stringResource(R.string.footer), - modifier = Modifier.padding(vertical = 18.dp), + modifier = Modifier.padding(vertical = MaterialTheme.spacing.md), style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -130,73 +121,69 @@ fun HomeScreen( } @Composable -private fun HeroCard() { - Surface( - modifier = Modifier.fillMaxWidth(), - shape = MaterialTheme.shapes.extraLarge, - color = MaterialTheme.colorScheme.primaryContainer, - ) { - Column(modifier = Modifier.padding(22.dp)) { +private fun HomeHeroCard() { + ForgeCard(contentPadding = PaddingValues(MaterialTheme.spacing.xl)) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + Surface( + modifier = Modifier.size(48.dp), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.primaryContainer, + ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon( + icon = ForgeIcons.Sparkles, + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + } + } Text( text = stringResource(R.string.phase0_badge), - style = MaterialTheme.typography.labelLarge, - color = MaterialTheme.colorScheme.onPrimaryContainer, - ) - Spacer(Modifier.height(10.dp)) - Text( - text = stringResource(R.string.home_title), - style = MaterialTheme.typography.displaySmall, - fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.onPrimaryContainer, - ) - Spacer(Modifier.height(6.dp)) - Text( - text = stringResource(R.string.home_intro), - style = MaterialTheme.typography.bodyLarge, - color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.85f), + style = MaterialTheme.typography.labelLargeEmphasized, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } + Text( + text = stringResource(R.string.home_intro), + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } } @Composable private fun ChecklistCard() { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column(modifier = Modifier.padding(18.dp)) { - Text( - text = stringResource(R.string.checklist_title), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - ) - Spacer(Modifier.height(10.dp)) - listOf( - R.string.checklist_1, - R.string.checklist_2, - R.string.checklist_3, - R.string.checklist_4, - ).forEachIndexed { index, textRes -> - if (index > 0) { - HorizontalDivider( - modifier = Modifier.padding(vertical = 9.dp), - color = MaterialTheme.colorScheme.outline.copy(alpha = 0.5f), - ) - } - Row(verticalAlignment = Alignment.CenterVertically) { - Text( - text = "✓", - modifier = Modifier.size(22.dp), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.primary, - ) - Text( - text = stringResource(textRes), - modifier = Modifier.padding(start = 10.dp), - style = MaterialTheme.typography.bodyMedium, - ) - } + ForgeCard { + Text( + text = stringResource(R.string.checklist_title), + style = MaterialTheme.typography.titleMediumEmphasized, + ) + listOf( + R.string.checklist_1, + R.string.checklist_2, + R.string.checklist_3, + R.string.checklist_4, + ).forEachIndexed { index, textRes -> + if (index > 0) { + HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant) + } + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.sm), + ) { + ForgeIcon( + icon = ForgeIcons.Check, + contentDescription = null, + modifier = Modifier.size(20.dp), + tint = MaterialTheme.colorScheme.primary, + ) + Text( + text = stringResource(textRes), + style = MaterialTheme.typography.bodyMedium, + ) } } } @@ -205,93 +192,97 @@ private fun ChecklistCard() { @Composable private fun RoomProbeCard(state: RoomProbeState, onReRun: () -> Unit) { val failed = state is RoomProbeState.Failed - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column(modifier = Modifier.padding(18.dp)) { - Text( - text = stringResource(R.string.diag_title), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - ) - Spacer(Modifier.height(6.dp)) - Text( - text = when (state) { - RoomProbeState.Idle -> stringResource(R.string.diag_room_idle) - RoomProbeState.Running -> stringResource(R.string.diag_room_running) - is RoomProbeState.Passed -> stringResource( - R.string.diag_room_passed, - state.counter, - state.elapsedMs, - ) - is RoomProbeState.Failed -> stringResource( - R.string.diag_room_failed, - state.message, - ) - }, - style = MaterialTheme.typography.bodyMedium, - color = if (failed) { - MaterialTheme.colorScheme.error - } else { - MaterialTheme.colorScheme.onSurfaceVariant - }, - ) - Spacer(Modifier.height(12.dp)) - FilledTonalButton( - onClick = onReRun, - enabled = state !is RoomProbeState.Running, - ) { - Text(stringResource(R.string.diag_room_action)) - } - } + val running = state is RoomProbeState.Running + val status = when { + running -> ProbeStatus(ForgeIcons.Loader, R.string.ux_home_status_running, ProbeTone.Running) + failed -> ProbeStatus(ForgeIcons.AlertCircle, R.string.ux_home_status_failed, ProbeTone.Failed) + state is RoomProbeState.Passed -> + ProbeStatus(ForgeIcons.CheckCircle, R.string.ux_home_status_passed, ProbeTone.Passed) + else -> ProbeStatus(ForgeIcons.Clock, R.string.ux_home_status_idle, ProbeTone.Idle) + } + val body = when (state) { + RoomProbeState.Idle -> stringResource(R.string.diag_room_idle) + RoomProbeState.Running -> stringResource(R.string.diag_room_running) + is RoomProbeState.Passed -> stringResource( + R.string.diag_room_passed, + state.counter, + state.elapsedMs, + ) + is RoomProbeState.Failed -> stringResource(R.string.diag_room_failed, state.message) + } + + ForgeCard { + DiagnosticCardHeader( + icon = ForgeIcons.Database, + title = stringResource(R.string.diag_title), + status = status, + ) + Text( + text = body, + style = MaterialTheme.typography.bodyMedium, + color = if (failed) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) + ForgePrimaryAction( + icon = ForgeIcons.Refresh, + label = stringResource(R.string.diag_room_action), + onClick = onReRun, + modifier = Modifier.fillMaxWidth(), + enabled = !running, + loading = running, + ) } } @Composable private fun FfmpegProbeCard(state: FfmpegProbeState, onRun: () -> Unit) { val failed = state is FfmpegProbeState.Failed - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column(modifier = Modifier.padding(18.dp)) { - Text( - text = stringResource(R.string.diag_ffmpeg_title), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - ) - Spacer(Modifier.height(6.dp)) - Text( - text = when (state) { - FfmpegProbeState.Idle -> stringResource(R.string.diag_ffmpeg_idle) - FfmpegProbeState.Running -> stringResource(R.string.diag_ffmpeg_running) - is FfmpegProbeState.Passed -> stringResource( - R.string.diag_ffmpeg_passed, - state.version, - state.silenceBytes, - state.joinedDurationMs, - ) - is FfmpegProbeState.Failed -> stringResource( - R.string.diag_ffmpeg_failed, - state.message, - ) - }, - style = MaterialTheme.typography.bodyMedium, - color = if (failed) { - MaterialTheme.colorScheme.error - } else { - MaterialTheme.colorScheme.onSurfaceVariant - }, - ) - Spacer(Modifier.height(12.dp)) - FilledTonalButton( - onClick = onRun, - enabled = state !is FfmpegProbeState.Running, - ) { - Text(stringResource(R.string.diag_ffmpeg_action)) - } - } + val running = state is FfmpegProbeState.Running + val status = when { + running -> ProbeStatus(ForgeIcons.Loader, R.string.ux_home_status_running, ProbeTone.Running) + failed -> ProbeStatus(ForgeIcons.AlertCircle, R.string.ux_home_status_failed, ProbeTone.Failed) + state is FfmpegProbeState.Passed -> + ProbeStatus(ForgeIcons.CheckCircle, R.string.ux_home_status_passed, ProbeTone.Passed) + else -> ProbeStatus(ForgeIcons.Clock, R.string.ux_home_status_idle, ProbeTone.Idle) + } + val body = when (state) { + FfmpegProbeState.Idle -> stringResource(R.string.diag_ffmpeg_idle) + FfmpegProbeState.Running -> stringResource(R.string.diag_ffmpeg_running) + is FfmpegProbeState.Passed -> stringResource( + R.string.diag_ffmpeg_passed, + state.version, + state.silenceBytes, + state.joinedDurationMs, + ) + is FfmpegProbeState.Failed -> stringResource(R.string.diag_ffmpeg_failed, state.message) + } + + ForgeCard { + DiagnosticCardHeader( + icon = ForgeIcons.AudioLines, + title = stringResource(R.string.diag_ffmpeg_title), + status = status, + ) + Text( + text = body, + style = MaterialTheme.typography.bodyMedium, + color = if (failed) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) + ForgePrimaryAction( + icon = ForgeIcons.Wand, + label = stringResource(R.string.diag_ffmpeg_action), + onClick = onRun, + modifier = Modifier.fillMaxWidth(), + enabled = !running, + loading = running, + ) } } @@ -308,136 +299,218 @@ private fun ProbeWorkerCard( // 无论是否授权都继续启动;未授权时只是通知不可见(执行计划 §11.2)。 onStart() } + val active = snapshot.status == ProbeWorkStatus.RUNNING || + snapshot.status == ProbeWorkStatus.ENQUEUED - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column(modifier = Modifier.padding(18.dp)) { - Text( - text = stringResource(R.string.diag_work_title), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, + ForgeCard { + DiagnosticCardHeader( + icon = ForgeIcons.Timer, + title = stringResource(R.string.diag_work_title), + status = snapshot.status.probeStatus(), + ) + Text( + text = stringResource( + R.string.diag_work_status, + stringResource(snapshot.status.labelRes()), + snapshot.progress, + ), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Row( + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + verticalAlignment = Alignment.CenterVertically, + ) { + ForgePrimaryAction( + icon = ForgeIcons.Play, + label = stringResource(R.string.diag_work_start), + onClick = { + val needsPermission = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && + ContextCompat.checkSelfPermission( + context, + Manifest.permission.POST_NOTIFICATIONS, + ) != PackageManager.PERMISSION_GRANTED + if (needsPermission) { + permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS) + } else { + onStart() + } + }, + modifier = Modifier.weight(1f), + enabled = !active, + loading = active, ) - Spacer(Modifier.height(6.dp)) - Text( - text = stringResource( - R.string.diag_work_status, - stringResource(snapshot.status.labelRes()), - snapshot.progress, - ), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, + ForgeSecondaryAction( + icon = ForgeIcons.ErrorCircle, + label = stringResource(R.string.diag_work_stop), + onClick = onStop, + modifier = Modifier.weight(1f), + danger = true, ) - Spacer(Modifier.height(12.dp)) - Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { - FilledTonalButton( - onClick = { - val needsPermission = - Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && - ContextCompat.checkSelfPermission( - context, - Manifest.permission.POST_NOTIFICATIONS, - ) != PackageManager.PERMISSION_GRANTED - if (needsPermission) { - permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS) - } else { - onStart() - } - }, - enabled = snapshot.status != ProbeWorkStatus.RUNNING && - snapshot.status != ProbeWorkStatus.ENQUEUED, - ) { - Text(stringResource(R.string.diag_work_start)) - } - OutlinedButton(onClick = onStop) { - Text(stringResource(R.string.diag_work_stop)) - } - } } } } -private fun ProbeWorkStatus.labelRes(): Int = when (this) { - ProbeWorkStatus.IDLE -> R.string.diag_work_state_idle - ProbeWorkStatus.ENQUEUED -> R.string.diag_work_state_enqueued - ProbeWorkStatus.RUNNING -> R.string.diag_work_state_running - ProbeWorkStatus.SUCCEEDED -> R.string.diag_work_state_succeeded - ProbeWorkStatus.FAILED -> R.string.diag_work_state_failed - ProbeWorkStatus.CANCELLED -> R.string.diag_work_state_cancelled - ProbeWorkStatus.BLOCKED -> R.string.diag_work_state_blocked -} - @Composable private fun NextCard(showDetails: Boolean, onToggle: () -> Unit) { - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), - ) { - Column(modifier = Modifier.padding(18.dp)) { - Text( - text = stringResource(R.string.next_title), - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.SemiBold, - ) - Spacer(Modifier.height(6.dp)) - Text( - text = stringResource(R.string.next_body), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Spacer(Modifier.height(14.dp)) - FilledTonalButton(onClick = onToggle) { + ForgeCard { + Text( + text = stringResource(R.string.next_title), + style = MaterialTheme.typography.titleMediumEmphasized, + ) + Text( + text = stringResource(R.string.next_body), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + ForgeSecondaryAction( + icon = if (showDetails) ForgeIcons.Close else ForgeIcons.ChevronDown, + label = stringResource( + if (showDetails) R.string.ux_home_action_details_collapse else R.string.next_action, + ), + onClick = onToggle, + ) + AnimatedVisibility(visible = showDetails) { + Column { + Spacer(Modifier.height(MaterialTheme.spacing.md)) + HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant) + Spacer(Modifier.height(MaterialTheme.spacing.md)) Text( - if (showDetails) "收起" else stringResource(R.string.next_action), + text = stringResource(R.string.phase0_details), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, ) } } } } -@Preview(showBackground = true, backgroundColor = 0xFFF7F8FC) @Composable -private fun HomeScreenPreview() { - AudioForgeTheme(dynamicColor = false) { - HomeScreen() +private fun DiagnosticCardHeader( + @DrawableRes icon: Int, + title: String, + status: ProbeStatus, +) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + Surface( + modifier = Modifier.size(44.dp), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.secondaryContainer, + ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon( + icon = icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, + ) + } + } + Text( + text = title, + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + DiagnosticStatusBadge(status) } } -@Preview(showBackground = true, backgroundColor = 0xFFF7F8FC) @Composable -private fun RoomProbeCardPreview() { - AudioForgeTheme(dynamicColor = false) { - RoomProbeCard( - state = RoomProbeState.Passed(counter = 3, elapsedMs = 12), - onReRun = {}, - ) +private fun DiagnosticStatusBadge(status: ProbeStatus) { + val containerColor = when (status.tone) { + ProbeTone.Idle -> MaterialTheme.colorScheme.surfaceContainerHigh + ProbeTone.Running -> MaterialTheme.colorScheme.secondaryContainer + ProbeTone.Passed -> MaterialTheme.colorScheme.primaryContainer + ProbeTone.Failed -> MaterialTheme.colorScheme.errorContainer + } + val contentColor = when (status.tone) { + ProbeTone.Idle -> MaterialTheme.colorScheme.onSurfaceVariant + ProbeTone.Running -> MaterialTheme.colorScheme.onSecondaryContainer + ProbeTone.Passed -> MaterialTheme.colorScheme.onPrimaryContainer + ProbeTone.Failed -> MaterialTheme.colorScheme.onErrorContainer + } + Surface( + shape = MaterialTheme.shapes.large, + color = containerColor, + ) { + Row( + modifier = Modifier.padding( + horizontal = MaterialTheme.spacing.sm, + vertical = MaterialTheme.spacing.xs, + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.xs), + ) { + ForgeIcon( + icon = status.icon, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = contentColor, + ) + Text( + text = stringResource(status.labelRes), + style = MaterialTheme.typography.labelMedium, + color = contentColor, + ) + } } } +private data class ProbeStatus( + @DrawableRes val icon: Int, + @StringRes val labelRes: Int, + val tone: ProbeTone, +) + +private enum class ProbeTone { + Idle, + Running, + Passed, + Failed, +} + +private fun ProbeWorkStatus.probeStatus(): ProbeStatus = when (this) { + ProbeWorkStatus.RUNNING, ProbeWorkStatus.ENQUEUED -> + ProbeStatus(ForgeIcons.Loader, labelRes(), ProbeTone.Running) + + ProbeWorkStatus.SUCCEEDED -> + ProbeStatus(ForgeIcons.CheckCircle, labelRes(), ProbeTone.Passed) + + ProbeWorkStatus.FAILED -> + ProbeStatus(ForgeIcons.AlertCircle, labelRes(), ProbeTone.Failed) + + ProbeWorkStatus.IDLE, ProbeWorkStatus.CANCELLED, ProbeWorkStatus.BLOCKED -> + ProbeStatus(ForgeIcons.Clock, labelRes(), ProbeTone.Idle) +} + +private fun ProbeWorkStatus.labelRes(): Int = when (this) { + ProbeWorkStatus.IDLE -> R.string.diag_work_state_idle + ProbeWorkStatus.ENQUEUED -> R.string.diag_work_state_enqueued + ProbeWorkStatus.RUNNING -> R.string.diag_work_state_running + ProbeWorkStatus.SUCCEEDED -> R.string.diag_work_state_succeeded + ProbeWorkStatus.FAILED -> R.string.diag_work_state_failed + ProbeWorkStatus.CANCELLED -> R.string.diag_work_state_cancelled + ProbeWorkStatus.BLOCKED -> R.string.diag_work_state_blocked +} + +// --------------------------------------------------------------------------- +// Preview:示例数据 +// --------------------------------------------------------------------------- @Preview(showBackground = true, backgroundColor = 0xFFF7F8FC) @Composable -private fun FfmpegProbeCardPreview() { +private fun HomeScreenPreview() { AudioForgeTheme(dynamicColor = false) { - FfmpegProbeCard( - state = FfmpegProbeState.Passed( + HomeScreen( + roomProbeState = RoomProbeState.Passed(counter = 3, elapsedMs = 12), + ffmpegProbeState = FfmpegProbeState.Passed( version = "ffmpeg version 8.1.9", silenceBytes = 3_264, joinedDurationMs = 1_018, ), - onRun = {}, - ) - } -} - -@Preview(showBackground = true, backgroundColor = 0xFFF7F8FC) -@Composable -private fun ProbeWorkerCardPreview() { - AudioForgeTheme(dynamicColor = false) { - ProbeWorkerCard( - snapshot = ProbeWorkSnapshot(status = ProbeWorkStatus.RUNNING, progress = 60), - onStart = {}, - onStop = {}, + probeWork = ProbeWorkSnapshot(status = ProbeWorkStatus.RUNNING, progress = 60), ) } } diff --git a/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeIcons.kt b/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeIcons.kt index a932bf7..2c8d7a9 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeIcons.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/ui/forge/ForgeIcons.kt @@ -26,6 +26,7 @@ object ForgeIcons { @DrawableRes val SkipNext = LucideR.drawable.lucide_ic_skip_forward @DrawableRes val SkipPrevious = LucideR.drawable.lucide_ic_skip_back @DrawableRes val Plus = LucideR.drawable.lucide_ic_plus + @DrawableRes val Minus = LucideR.drawable.lucide_ic_minus @DrawableRes val Search = LucideR.drawable.lucide_ic_search @DrawableRes val Settings = LucideR.drawable.lucide_ic_settings @DrawableRes val Sliders = LucideR.drawable.lucide_ic_sliders_horizontal @@ -35,17 +36,25 @@ object ForgeIcons { @DrawableRes val Upload = LucideR.drawable.lucide_ic_upload @DrawableRes val Share = LucideR.drawable.lucide_ic_share_2 @DrawableRes val Trash = LucideR.drawable.lucide_ic_trash_2 + @DrawableRes val Copy = LucideR.drawable.lucide_ic_copy @DrawableRes val Edit = LucideR.drawable.lucide_ic_pencil @DrawableRes val List = LucideR.drawable.lucide_ic_list @DrawableRes val Check = LucideR.drawable.lucide_ic_check + @DrawableRes val Circle = LucideR.drawable.lucide_ic_circle @DrawableRes val Close = LucideR.drawable.lucide_ic_x @DrawableRes val Back = LucideR.drawable.lucide_ic_arrow_left @DrawableRes val ChevronRight = LucideR.drawable.lucide_ic_chevron_right @DrawableRes val ChevronLeft = LucideR.drawable.lucide_ic_chevron_left @DrawableRes val ChevronDown = LucideR.drawable.lucide_ic_chevron_down + @DrawableRes val ChevronUp = LucideR.drawable.lucide_ic_chevron_up @DrawableRes val More = LucideR.drawable.lucide_ic_ellipsis @DrawableRes val Menu = LucideR.drawable.lucide_ic_menu @DrawableRes val Refresh = LucideR.drawable.lucide_ic_refresh_cw + @DrawableRes val RotateCcw = LucideR.drawable.lucide_ic_rotate_ccw + @DrawableRes val Square = LucideR.drawable.lucide_ic_square + @DrawableRes val Repeat = LucideR.drawable.lucide_ic_repeat + @DrawableRes val Tag = LucideR.drawable.lucide_ic_tag + @DrawableRes val Storage = LucideR.drawable.lucide_ic_hard_drive @DrawableRes val Info = LucideR.drawable.lucide_ic_info @DrawableRes val Key = LucideR.drawable.lucide_ic_key_round @@ -67,6 +76,7 @@ object ForgeIcons { @DrawableRes val Smartphone = LucideR.drawable.lucide_ic_smartphone @DrawableRes val CheckCircle = LucideR.drawable.lucide_ic_circle_check @DrawableRes val AlertCircle = LucideR.drawable.lucide_ic_circle_alert + @DrawableRes val TriangleAlert = LucideR.drawable.lucide_ic_triangle_alert @DrawableRes val ErrorCircle = LucideR.drawable.lucide_ic_circle_x @DrawableRes val Loader = LucideR.drawable.lucide_ic_loader_circle @DrawableRes val Inbox = LucideR.drawable.lucide_ic_inbox diff --git a/app/src/main/java/com/estimatefaster/audioforge/ui/navigation/AdaptiveScaffold.kt b/app/src/main/java/com/estimatefaster/audioforge/ui/navigation/AdaptiveScaffold.kt index c065636..5bc2d75 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/ui/navigation/AdaptiveScaffold.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/ui/navigation/AdaptiveScaffold.kt @@ -1,20 +1,45 @@ package com.estimatefaster.audioforge.ui.navigation +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.Icon +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.size +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.NavigationBarItemDefaults +import androidx.compose.material3.NavigationRail +import androidx.compose.material3.NavigationRailItem +import androidx.compose.material3.NavigationRailItemDefaults +import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.estimatefaster.audioforge.R +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons /** - * 自适应导航壳(P4-01):手机底部 `NavigationBar`,宽屏自动切换为 `NavigationRail`。 + * Forge Framework v1 自适应导航壳。 * - * 断点判断交给 [NavigationSuiteScaffold](内部读取 WindowSizeClass),本轮不重复实现。 - * 迷你播放器固定在导航栏上方;内容区由调用方传入(通常是 NavHost)。 + * 固定 3 个主目的地(书架 / 任务 / 设置),全部操作为 Lucide 图标 + 文案; + * 选中态使用 primaryContainer 的 tonal indicator。 + * + * - 宽 < 600dp:内容 + 迷你播放器 + [NavigationBar](手机底栏) + * - 宽 ≥ 600dp:左侧 [NavigationRail] + 右侧内容与迷你播放器 + * + * 设计稿没有给 Rail 单独画样式,按同一套 NavigationBar 的图标/指示器规则实现, + * 断点与 Material 3 的 compact/medium 分界一致。内容区不额外加内边距, + * 由各页面自己的 Scaffold/TopAppBar 处理系统栏。 */ @Composable fun AdaptiveScaffold( @@ -24,29 +49,156 @@ fun AdaptiveScaffold( miniPlayer: @Composable () -> Unit = { MiniPlayerPlaceholder() }, content: @Composable () -> Unit, ) { - NavigationSuiteScaffold( - modifier = modifier, - navigationSuiteItems = { - TopLevelDestination.entries.forEach { destination -> - item( - selected = destination == selectedDestination, - onClick = { onSelectDestination(destination) }, - icon = { - Icon( - imageVector = destination.icon.vector, - contentDescription = null, - ) - }, - label = { Text(text = stringResource(destination.labelRes)) }, + BoxWithConstraints(modifier = modifier.fillMaxSize()) { + if (maxWidth >= NavigationRailBreakpoint) { + Row(modifier = Modifier.fillMaxSize()) { + ForgeNavigationRail( + selectedDestination = selectedDestination, + onSelectDestination = onSelectDestination, ) + Column(modifier = Modifier.weight(1f).fillMaxHeight()) { + Box(modifier = Modifier.weight(1f).fillMaxWidth()) { + content() + } + miniPlayer() + } } - }, + } else { + Column(modifier = Modifier.fillMaxSize()) { + Box(modifier = Modifier.weight(1f).fillMaxWidth()) { + content() + } + miniPlayer() + ForgeNavigationBar( + selectedDestination = selectedDestination, + onSelectDestination = onSelectDestination, + ) + } + } + } +} + +/** 手机底栏:3 个 tab、Lucide 图标、primaryContainer tonal indicator。 */ +@Composable +private fun ForgeNavigationBar( + selectedDestination: TopLevelDestination?, + onSelectDestination: (TopLevelDestination) -> Unit, +) { + NavigationBar( + containerColor = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 0.dp, ) { - Column(modifier = Modifier.fillMaxSize()) { - Box(modifier = Modifier.weight(1f)) { - content() + TopLevelDestination.entries.forEach { destination -> + val selected = destination == selectedDestination + NavigationBarItem( + selected = selected, + onClick = { onSelectDestination(destination) }, + icon = { + ForgeIcon( + icon = destination.uxIcon(), + contentDescription = null, + tint = if (selected) { + MaterialTheme.colorScheme.onPrimaryContainer + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) + }, + label = { + Text( + text = stringResource(destination.uxLabelRes()), + style = MaterialTheme.typography.labelMedium, + ) + }, + colors = NavigationBarItemDefaults.colors( + selectedIconColor = MaterialTheme.colorScheme.onPrimaryContainer, + selectedTextColor = MaterialTheme.colorScheme.primary, + indicatorColor = MaterialTheme.colorScheme.primaryContainer, + unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant, + unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant, + ), + ) + } + } +} + +/** 宽屏 Rail:图标与指示器规则同底栏,文案始终显示。 */ +@Composable +private fun ForgeNavigationRail( + selectedDestination: TopLevelDestination?, + onSelectDestination: (TopLevelDestination) -> Unit, +) { + NavigationRail( + modifier = Modifier.fillMaxHeight(), + containerColor = MaterialTheme.colorScheme.surfaceContainerLow, + header = { + Surface( + modifier = Modifier.size(48.dp), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.primaryContainer, + ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon( + icon = ForgeIcons.Sparkles, + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + ) + } } - miniPlayer() + }, + ) { + TopLevelDestination.entries.forEach { destination -> + val selected = destination == selectedDestination + NavigationRailItem( + selected = selected, + onClick = { onSelectDestination(destination) }, + icon = { + ForgeIcon( + icon = destination.uxIcon(), + contentDescription = null, + tint = if (selected) { + MaterialTheme.colorScheme.onPrimaryContainer + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) + }, + label = { + Text( + text = stringResource(destination.uxLabelRes()), + style = MaterialTheme.typography.labelMedium, + ) + }, + alwaysShowLabel = true, + colors = NavigationRailItemDefaults.colors( + selectedIconColor = MaterialTheme.colorScheme.onPrimaryContainer, + selectedTextColor = MaterialTheme.colorScheme.primary, + indicatorColor = MaterialTheme.colorScheme.primaryContainer, + unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant, + unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant, + ), + ) } } } + +/** + * 导航文案以设计稿 3 tabs 为准(书架 / 任务 / 设置)。 + * [TopLevelDestination.labelRes] 保留给测试与其它入口,这里只覆盖导航壳展示。 + */ +@StringRes +private fun TopLevelDestination.uxLabelRes(): Int = when (this) { + TopLevelDestination.Projects -> R.string.ux_nav_tab_library + TopLevelDestination.Tasks -> R.string.ux_nav_tab_tasks + TopLevelDestination.Settings -> R.string.ux_nav_tab_settings +} + +/** 图标全部取自 [ForgeIcons](Lucide):书架 library / 任务 gauge / 设置 settings。 */ +@DrawableRes +private fun TopLevelDestination.uxIcon(): Int = when (this) { + TopLevelDestination.Projects -> ForgeIcons.Library + TopLevelDestination.Tasks -> ForgeIcons.Gauge + TopLevelDestination.Settings -> ForgeIcons.Settings +} + +private val NavigationRailBreakpoint = 600.dp diff --git a/app/src/main/java/com/estimatefaster/audioforge/ui/navigation/MiniPlayerPlaceholder.kt b/app/src/main/java/com/estimatefaster/audioforge/ui/navigation/MiniPlayerPlaceholder.kt index ab2ac81..51ca364 100644 --- a/app/src/main/java/com/estimatefaster/audioforge/ui/navigation/MiniPlayerPlaceholder.kt +++ b/app/src/main/java/com/estimatefaster/audioforge/ui/navigation/MiniPlayerPlaceholder.kt @@ -1,14 +1,13 @@ package com.estimatefaster.audioforge.ui.navigation -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text @@ -18,41 +17,70 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.estimatefaster.audioforge.R +import com.estimatefaster.audioforge.ui.forge.ForgeExtendedFab +import com.estimatefaster.audioforge.ui.forge.ForgeIcon +import com.estimatefaster.audioforge.ui.forge.ForgeIcons +import com.estimatefaster.audioforge.ui.theme.spacing /** - * 迷你播放器占位(P4-01)。 + * 迷你播放器占位(P4-01,Forge Framework v1 版)。 * - * 只负责固定在底栏/rail 内容区底部并显示「未在播放」;真正的播放状态在 P2-14/P4-13 接入, - * 这里刻意不依赖播放模块。 + * 结构照设计稿:封面 + 标题/副标题 + 播放操作;播放操作使用 + * [ForgeExtendedFab](Lucide `ForgeIcons.Play` + 文案),不再用纯文字冒充按钮。 + * + * 真正的播放状态在 P2-14/P4-13 接入;此文件刻意不依赖播放模块, + * [onOpenPlayer] 默认空实现,接线时由壳层传入。 */ @Composable -fun MiniPlayerPlaceholder(modifier: Modifier = Modifier) { +fun MiniPlayerPlaceholder( + modifier: Modifier = Modifier, + onOpenPlayer: () -> Unit = {}, +) { Surface( modifier = modifier.fillMaxWidth(), + color = MaterialTheme.colorScheme.surfaceContainerLow, tonalElevation = 3.dp, shadowElevation = 3.dp, ) { - Row( - modifier = Modifier - .fillMaxWidth() - .heightIn(min = 56.dp) - .padding(horizontal = 16.dp, vertical = 8.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp), - ) { - Box( + Column { + HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant) + Row( modifier = Modifier - .size(8.dp) - .background( - color = MaterialTheme.colorScheme.outline, - shape = CircleShape, - ), - ) - Text( - text = stringResource(R.string.mini_player_idle), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) + .fillMaxWidth() + .padding(horizontal = MaterialTheme.spacing.md, vertical = MaterialTheme.spacing.sm), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.md), + ) { + Surface( + modifier = Modifier.size(40.dp), + shape = MaterialTheme.shapes.large, + color = MaterialTheme.colorScheme.secondaryContainer, + ) { + Box(contentAlignment = Alignment.Center) { + ForgeIcon( + icon = ForgeIcons.Headphones, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, + ) + } + } + Column(modifier = Modifier.weight(1f)) { + Text( + text = stringResource(R.string.mini_player_idle), + style = MaterialTheme.typography.titleSmallEmphasized, + ) + Text( + text = stringResource(R.string.ux_mini_player_hint), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + ForgeExtendedFab( + icon = ForgeIcons.Play, + label = stringResource(R.string.ux_mini_player_play), + onClick = onOpenPlayer, + ) + } } } } diff --git a/app/src/main/res/values/strings_ux_v2_nav.xml b/app/src/main/res/values/strings_ux_v2_nav.xml new file mode 100644 index 0000000..cc046f7 --- /dev/null +++ b/app/src/main/res/values/strings_ux_v2_nav.xml @@ -0,0 +1,24 @@ + + + + + 书架 + 任务 + 设置 + + + 播放会话接入后显示当前章节 + 播放 + + + 诊断 + 本机能力自检 · 仅 Debug 构建显示 + 待运行 + 运行中 + 通过 + 失败 + 收起 + diff --git a/app/src/main/res/values/strings_ux_v2_onboarding_player_export.xml b/app/src/main/res/values/strings_ux_v2_onboarding_player_export.xml new file mode 100644 index 0000000..875b555 --- /dev/null +++ b/app/src/main/res/values/strings_ux_v2_onboarding_player_export.xml @@ -0,0 +1,26 @@ + + + + + + %1$s · 首次启动 + 让文字开口 + 连接你的模型 + 把后台说明白 + 步骤 %1$d / %2$d + 开始配置 + 开始使用 + 存储访问 + 导入 txt、写入章节音频与最终导出文件都需要本机存储。 + + + 正在播放 + %1$s · 本地音频 + 第 %1$d / %2$d 句 + %1$d 段 · %2$s + + + 已选 + %1$d%% + 共 %1$d 个文件 + diff --git a/app/src/main/res/values/strings_ux_v2_project.xml b/app/src/main/res/values/strings_ux_v2_project.xml new file mode 100644 index 0000000..15d298e --- /dev/null +++ b/app/src/main/res/values/strings_ux_v2_project.xml @@ -0,0 +1,102 @@ + + + + + 已生成 + 生成中 + 待生成 + 失败 + + + 项目 + %1$s · %2$d 章 + 生成中 + 有失败 + 已完成 + 待开始 + %1$s · %2$d 字 + %1$d 章 + %1$d 位角色 + 多人演播 + 播放全书 + 项目更多操作 + 整体进度 + %1$d%% + 章节 + 分段 + 角色 + %1$d/%2$d + %1$d + 管理人物音色 + 共 %1$d 章 · %2$d 章待生成 + 查看全部章节 + 章节列表 + %1$d 已完成 · %2$d 生成中 · %3$d 待生成 + 继续生成 + 还有 %1$d 章待生成 · 开始后可后台运行 + 全部章节已生成 · 可重新生成或调参 + 已有章节在处理 · 停止后会收尾当前片段 + 停止生成 + 项目里还没有章节 + 导入后先解析章节,再开始生成。项目封面与元信息会保留。 + + + 章节 + 已加载 %1$d 章 + 全部章节 + 筛选结果 + %1$s %2$d + 已生成 + 失败 + %1$d/%2$d 段 + 尚未分段 + %1$d%% + + + 批量生成 + 长任务 · 可后台运行 + 生成范围 + 全部章节 + 未完成章节 + 已选 %1$d 章 + 处理模式 + 解析 + 生成 + 仅解析 + 仅渲染 + 解析剧本并生成音频 + 只解析剧本,不生成音频 + 只生成音频,跳过解析 + 选项 + 强制重做已完成章节 + 会覆盖已有音频与分段 + 并发数 + 同时请求的章节数 · 受设置页限制 + 减少并发 + 增加并发 + 、 + 可在后台继续;进度在任务页查看。 + 开始批量生成 + 开始后可随时在任务页停止。 + + + 调参 + 角色级参数 · 保存后生效 + 角色参数 + 角色级覆盖优先于全局默认 + 慢 + 快 + 轻 + 响 + 低 + 高 + %1$s – %2$s + 有改动 + 跟随全局 + 未改动 + 未知角色 + 保存参数 + 保存后立即应用到该角色的后续生成。 + diff --git a/app/src/main/res/values/strings_ux_v2_projects.xml b/app/src/main/res/values/strings_ux_v2_projects.xml new file mode 100644 index 0000000..64fc526 --- /dev/null +++ b/app/src/main/res/values/strings_ux_v2_projects.xml @@ -0,0 +1,107 @@ + + + + + + 书架 + 把小说变成多人演播的有声书 · 全部数据留在本机 + 搜索书名 + 聚焦搜索 + 清除搜索 + 书架更多操作 + 导入小说 + 刷新书架 + 导入 + + + 书架总进度 + %1$d 个项目 · %2$d 章已完成 / 共 %3$d 章 + 项目 + 章节 + 片段 + %1$d/%2$d + + + 全部 + 生成中 + 已完成 + 未开始 + 全部项目 + %1$d / %2$d + + + 《%1$s》更多操作 + 打开《%1$s》 + %1$s · %2$s 字 + 本地文件 + %1$d%% + 已完成 + 生成中 + 未开始 + 重命名 + 删除 + + + 重命名项目 + 项目名称 + 名称不能为空;保存后立即生效。 + 名称不能为空 + 删除项目? + 将删除《%1$s》及其章节、剧本与音频记录。此操作不可撤销。 + 保存 + 取消 + 删除 + + + 正在读取书架… + 书架还是空的 + 导入一本 .txt 小说,解析章节后就能开始生成有声书。 + 导入小说 + 没有匹配的项目 + 换个关键词,或清除筛选后再试。 + 清除筛选 + 读取书架失败:%1$s + 重试 + 操作失败:%1$s + + + 导入 + 单文件 · 本地解析 + 1 · 选择文件 + 3 · 文本编码 + 选择 .txt 文件 + 支持 UTF-8 / GBK · 单个文件最大 64MB + 已选择文件 + 重新选择文件 + 大小:%1$s + 未知 + 开始导入 + 取消导入 + 正在导入… + %1$d%% + 文件大小未知,正在复制与解析… + 无法自动识别编码 + 请选择文件编码后重试;选错会再次失败,也可以重新选择文件。 + 以 %1$s 重试 + 导入失败:%1$s + 重试 + 重新选择文件 + 已存在同名项目 + 项目《%1$s》已经存在,导入不会覆盖它。 + 取消后可以重新选择文件,或改名后再导入。 + 打开已有项目 + 取消 + 导入成功 + 正在打开项目… + 导入在本机完成,不会上传任何内容。 + 只支持 .txt 文件 + 文件为空 + 文件超过 64MB 限制 + 文件大小无效 + 无法读取所选文件,请重新选择。 + 导入失败,请重试。 + + diff --git a/app/src/main/res/values/strings_ux_v2_script_characters.xml b/app/src/main/res/values/strings_ux_v2_script_characters.xml new file mode 100644 index 0000000..2f3f56c --- /dev/null +++ b/app/src/main/res/values/strings_ux_v2_script_characters.xml @@ -0,0 +1,196 @@ + + + + + + 剧本 + %1$s · %2$d 段 + 返回 + 搜索台词 + 定位当前段 + 本章剧本 + %1$d 段台词 · %2$d 段已生成 + 已生成 %1$d / %2$d + 本章生成进度 + 按角色筛选 + 全部 + %1$s %2$d + 搜索台词 + 清除搜索 + 台词分段 + %1$d 段 + 当前段用青绿高亮并在播放时自动跟随;播放中按钮会切换为暂停。 + 正在载入剧本… + 剧本加载失败:%1$s + 这一章还没有台词分段 + 先解析章节并生成分段,台词卡会按角色和情绪出现在这里。 + 去生成 + 没有匹配的台词 + 换个角色,或清空搜索关键词。 + 清除筛选 + 播放第 %1$d 段 + 暂停第 %1$d 段 + 编辑第 %1$d 段 + 第 %1$d 段更多操作 + 编辑台词 + 重新生成 + 当前段 + 已生成 + 未生成 + #%1$02d · %2$s + 生成失败:%1$s + 这一段生成失败,请重新生成。 + 旁白 + 未命名角色 + 对白 + 旁白 + 上一句 + 下一句 + 播放 + 暂停 + 连续 + 准备好播放本章 + 正在播放第 %1$d 段 + 本章还没有可播放音频 + 本章已播完 + 正在请求下一章… + 已跳过没有音频的段落 + %1$s · %2$s + + + 平静 + 开心 + 难过 + 生气 + 焦虑 + 兴奋 + 惊讶 + 轻柔 + 严肃 + 冷静 + 低语 + + + 片段编辑 + 台词 / 情绪 / 音色 + 关闭 + 第 %1$d 段 · %2$s + 第 %1$d 段 · 台词编辑 + %1$s · %2$s + 当前段 + 段落类型 + 说话角色 + 情绪 + 台词文本 + 旁白段落的角色固定为旁白。 + 本书还没有可用角色,先到人物页解析角色。 + 当前角色不在本书角色列表里,请重新选择。 + %1$d / %2$d 字 + 输入台词… + 保存后只更新本段台词;重新生成会覆盖已有音频。 + 重置 + 重新生成 + 保存修改 + 保存中… + 保存失败:%1$s + 重试 + 还不能保存 + 台词不能为空。 + 台词不能超过 %1$d 字。 + 旁白段落必须使用旁白角色。 + 对白段落必须选择一个角色。 + 角色不在本书角色列表里,请重新选择。 + + + 人物 + %1$d 个角色 · %2$d 个已配音 + 返回 + 搜索角色 + 搜索名字 / 别名 / 音色 + 清除搜索 + 性别 + 重要性 + 全部 + %1$s %2$d + 男声 + 女声 + 中性 + 主角 + 配角 + 次要 + 角色与音色 + %1$d 个角色 + 更换音色 + 调整 %1$s 参数 + %1$s 更多操作 + 重命名 + 编辑别名 + 调整参数 + 排除角色 + 未分配音色 + %1$s · %2$s + 别名:%1$s + 、 + 已锁定 + 锁定角色在音色选择 Sheet 里保存前需要二次确认;排除角色不会删除已生成音频。 + 还没有识别到人物 + 解析章节后,人物和对白会在这里生成角色卡与默认音色。 + 去解析 + 重新加载 + 没有匹配的角色 + 清空搜索或筛选条件后再试。 + 清除筛选 + 正在载入人物… + 人物加载失败:%1$s + 未命名角色 + 为 %1$s 更换音色 + + + 音色选择 + Fish Audio 音色库 + 关闭 + 取消 + 为「%1$s」选择音色 + 当前:%1$s · %2$s + 已锁定 + 可更换 + 搜索音色 / 标签 / voice id + 清除搜索 + 音色分组 + 全部 + 旁白 + 男声 + 女声 + 其他 + 可用音色 · %1$d + %1$s · %2$s + %1$s · %2$s + voice id:%1$s + 备注:%1$s + 默认 %1$s× + 选择音色 %1$s + 已选择 %1$s + 当前 + 使用此音色 + 保存中… + 保存失败:%1$s + 重试 + 已选中当前音色。 + 音色池为空 + 检查 assets 里的音色池文件后重试。 + 关闭 + 没有匹配的音色 + 换个关键词或分组再试。 + 清除筛选 + 更换锁定角色的音色? + 该角色已锁定,更换音色会影响后续生成,确认继续? + 仍要更换 + 该角色已锁定,保存前需要二次确认。 + 未知音色 + 未知 voice id + 中文 + + diff --git a/app/src/main/res/values/strings_ux_v2_storage_about.xml b/app/src/main/res/values/strings_ux_v2_storage_about.xml new file mode 100644 index 0000000..7a00e36 --- /dev/null +++ b/app/src/main/res/values/strings_ux_v2_storage_about.xml @@ -0,0 +1,39 @@ + + + + + + %1$s / %2$s · 本地 + 刷新存储 + 导入并生成音频后,这里会显示音频、导入与导出的分区明细。 + + 音频占大头 · 清理不会删除项目文本 + %1$d%% 已用 + 存储分区占比:音频 %1$d%%,导入 %2$d%%,导出 %3$d%% + %1$s · %2$d%% + + 重新计算占用 + + 自动清理阈值 + %1$d 天 + 输入 7–365 之间的整数;点「应用保留期」重新统计,并作为过期清理的依据。 + 应用保留期 + + 危险操作需二次确认 + + + 版本、诊断与许可 + 把小说变成多人演播的有声书 + %1$s · %2$s + 重新运行诊断 + 本地 · 不含密钥或正文 + 可读取 + 进行中 %1$d 个任务 + 展开或收起 %1$s 的许可 + 诊断文本只含版本、计数与错误摘要;复制或导出前会自动掩码密钥。 + AudioForge · Android 原生重构\nMIT License · 上游 StoryForge · 本地优先,不含遥测 + + diff --git a/app/src/main/res/values/strings_ux_v2_tasks_settings.xml b/app/src/main/res/values/strings_ux_v2_tasks_settings.xml new file mode 100644 index 0000000..0090df8 --- /dev/null +++ b/app/src/main/res/values/strings_ux_v2_tasks_settings.xml @@ -0,0 +1,100 @@ + + + + + + 长任务进度与历史记录 · 退到后台也会继续 + 刷新任务 + 刷新任务列表 + 正在生成 · 第 %1$d/%2$d 章 + 正在生成 + 任务停止中 + %1$s · %2$s + 剩余 %1$s + 停止生成 + 已生成 %1$d/%2$d 章,将在当前片段收尾后停止。 + 已请求停止,将在当前片段收尾后停下。 + 当前任务进度 + 已运行 %1$s + + + 没有正在运行的任务 + 导入小说或开始批量生成后,任务进度会出现在这里。 + 队列 + 还有 %1$d 个任务等待或进行中 + 历史任务 + %1$d 条 + 完成 %1$d 章 · %2$d 段 + 完成 %1$d/%2$d 章 + 任务失败 + 耗时 %1$s + 打开项目《%1$s》 + 任务操作失败:%1$s + + + 7 组 · 本地优先 + API 已配置 · 本机保存 + API 待配置 · 本机保存 + LLM 与 Fish Audio 均已设置 · 仅显示末 4 位 + 补全 LLM 与 Fish Audio 的 Key 后才能开始生成 + 正常 + 待配置 + + + BYOK + 默认参数 + 长任务条件 + 通知与温控 + 主题与取色 + 占用与保留 + 版本与引导 + + + OpenAI 兼容接口地址 + 默认使用的文本模型 + Fish Audio 服务地址 + 默认语音合成模型 + 已设置 · %1$s + + + 同时请求的章节数 + 同时合成的片段数 + 超出后自动切分 + 低于阈值时任务判为失败 + 每次批量生成包含的章节数 + 旁白段之间的静音 + 段落之间的静音 + 内置音色池的类别 ID + 应用到未单独调参的角色 + 应用到未单独调参的角色 + 半音,0 为原声 + + + 移动网络下暂停任务 + 省电策略,未充电时暂停 + 低于该电量时暂停任务 + 前台服务与完成通知 + 过热时降低并发 + Android 12+ 跟随壁纸 + 查看占用与清理缓存 + 超过后在存储页清理 + 版本、许可与引导 + 重看 Key 与权限说明 + 版本 + 构建版本 + + + 保存设置 + 修改只保存在本页,点击保存后写入设置 + 已保存到本机 + 编辑 %1$s + 未填写 + %1$s 字 + %1$s 章 + %1$s 毫秒 + %1$s 天 + %1$s%% +