diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 438e71f38..fdf6e6d96 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -214,4 +214,5 @@ dependencies { androidTestImplementation(libs.coil.video) debugImplementation(libs.androidx.compose.ui.test.manifest) debugImplementation(libs.androidx.compose.ui.tooling) + debugImplementation(project(":core:harmony-ui")) } diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index 7210fda58..6871ff878 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -5,6 +5,10 @@ android:name=".UiStateTestActivity" android:windowSoftInputMode="adjustResize" android:exported="false" /> + + diff --git a/core/harmony-ui/src/main/java/org/monogram/core/harmony/GlassSurface.kt b/core/harmony-ui/src/main/java/org/monogram/core/harmony/GlassSurface.kt new file mode 100644 index 000000000..f9bb2e504 --- /dev/null +++ b/core/harmony-ui/src/main/java/org/monogram/core/harmony/GlassSurface.kt @@ -0,0 +1,115 @@ +package org.monogram.core.harmony + +import android.os.Build +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.blur +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.unit.dp + +/** + * HarmonyOS 7 only renders Immersive Light in navigation, dialogs and controls. + * [Content] deliberately falls back to an opaque surface. + */ +enum class HarmonyGlassScope { + Navigation, + Dialog, + Control, + Content, +} + +@Composable +fun ImmersiveGlass( + scope: HarmonyGlassScope, + modifier: Modifier = Modifier, + shape: Shape = RoundedCornerShape(HarmonyTokens.Radius.panel), + strength: Float = 1f, + content: @Composable () -> Unit, +) { + val dark = HarmonyTheme.isDark + val palette = HarmonyTheme.palette + val immersive = scope != HarmonyGlassScope.Content && strength > 0f + val alpha = strength.coerceIn(0f, 1f) + + val surface = if (immersive) { + Color.White.copy(alpha = (if (dark) 0.08f else 0.62f) * alpha) + } else { + if (dark) palette.surfaceDark else palette.surfaceLight + } + val highlight = if (immersive) { + Color.White.copy(alpha = (if (dark) 0.10f else 0.45f) * alpha) + } else { + surface + } + val border = if (immersive) { + Color.White.copy(alpha = (if (dark) 0.16f else 0.80f) * alpha) + } else { + MaterialTheme.colorScheme.outline.copy(alpha = 0.25f) + } + val elevation = if (immersive) HarmonyTokens.Elevation.medium else HarmonyTokens.Elevation.low + + Box( + modifier + .shadow(elevation, shape, clip = false) + .background(brush = Brush.verticalGradient(listOf(highlight, surface)), shape = shape) + .border(1.dp, border, shape) + .clip(shape), + ) { + content() + } +} + +/** + * Compose has no backdrop-filter, so the frosted look comes from blurring this + * decorative layer rather than blurring arbitrary content above it. + */ +@Composable +fun GlassBackdrop(modifier: Modifier = Modifier) { + val dark = HarmonyTheme.isDark + val palette = HarmonyTheme.palette + val glow = HarmonyTheme.glow + val backdropBlur = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) Modifier.blur(40.dp) else Modifier + + Box( + modifier + .clipToBounds() + .background(if (dark) palette.backgroundDark else palette.backgroundLight) + ) { + Box( + Modifier + .fillMaxSize() + .then(backdropBlur) + .background( + Brush.radialGradient( + colors = listOf(glow.copy(alpha = 0.50f), Color.Transparent), + center = Offset(0.2f, 0.12f), + radius = 900f, + ) + ) + ) + Box( + Modifier + .fillMaxSize() + .then(backdropBlur) + .background( + Brush.radialGradient( + colors = listOf(palette.secondary.copy(alpha = 0.32f), Color.Transparent), + center = Offset(0.9f, 0.55f), + radius = 760f, + ) + ) + ) + } +} diff --git a/core/harmony-ui/src/main/java/org/monogram/core/harmony/HarmonyGallery.kt b/core/harmony-ui/src/main/java/org/monogram/core/harmony/HarmonyGallery.kt new file mode 100644 index 000000000..30dee8e45 --- /dev/null +++ b/core/harmony-ui/src/main/java/org/monogram/core/harmony/HarmonyGallery.kt @@ -0,0 +1,499 @@ +package org.monogram.core.harmony + +import android.content.res.Configuration +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.isSystemInDarkTheme +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.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.Chat +import androidx.compose.material.icons.automirrored.filled.Send +import androidx.compose.material.icons.filled.AutoAwesome +import androidx.compose.material.icons.filled.Brightness4 +import androidx.compose.material.icons.filled.Brightness7 +import androidx.compose.material.icons.filled.Call +import androidx.compose.material.icons.filled.Folder +import androidx.compose.material.icons.filled.Image +import androidx.compose.material.icons.filled.Mic +import androidx.compose.material.icons.filled.Search +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +private enum class GalleryScreen { + Chats, + Dialog, + Widgets, +} + +@Composable +fun HarmonyGallery() { + val systemDark = isSystemInDarkTheme() + var dark by remember { mutableStateOf(systemDark) } + var accent by remember { mutableStateOf(HarmonyAccent.HarmonyBlue) } + var screen by remember { mutableStateOf(GalleryScreen.Chats) } + + HarmonyTheme(darkTheme = dark, accent = accent) { + Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) { + GlassBackdrop(Modifier.fillMaxSize()) + Column(Modifier.fillMaxSize()) { + GalleryTopBar( + dark = dark, + accent = accent, + onDarkChange = { dark = it }, + onAccentChange = { accent = it }, + ) + Box(Modifier.weight(1f)) { + when (screen) { + GalleryScreen.Chats -> ChatsScreen() + GalleryScreen.Dialog -> DialogScreen() + GalleryScreen.Widgets -> WidgetsScreen() + } + } + GalleryBottomBar(screen) { screen = it } + } + } + } +} + +@Composable +private fun GalleryTopBar( + dark: Boolean, + accent: HarmonyAccent, + onDarkChange: (Boolean) -> Unit, + onAccentChange: (HarmonyAccent) -> Unit, +) { + ImmersiveGlass( + scope = HarmonyGlassScope.Navigation, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = HarmonyTokens.Spacing.lg, vertical = HarmonyTokens.Spacing.sm), + shape = RoundedCornerShape(HarmonyTokens.Radius.capsule), + ) { + Row( + Modifier + .fillMaxWidth() + .padding(HarmonyTokens.Spacing.md, HarmonyTokens.Spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f)) { + Text( + stringResource(R.string.harmony_gallery_title), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface, + ) + Text( + stringResource(R.string.harmony_preview), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + IconButton(onClick = { onDarkChange(!dark) }) { + Icon( + if (dark) Icons.Filled.Brightness7 else Icons.Filled.Brightness4, + contentDescription = stringResource( + if (dark) R.string.harmony_theme_light else R.string.harmony_theme_dark, + ), + ) + } + IconButton( + onClick = { + onAccentChange( + if (accent == HarmonyAccent.HarmonyBlue) HarmonyAccent.DnaNeon + else HarmonyAccent.HarmonyBlue, + ) + }, + ) { + Icon( + Icons.Filled.AutoAwesome, + contentDescription = stringResource(R.string.harmony_accent), + tint = HarmonyTheme.palette.primary, + ) + } + } + } +} + +@Composable +private fun GalleryBottomBar(screen: GalleryScreen, onSelect: (GalleryScreen) -> Unit) { + ImmersiveGlass( + scope = HarmonyGlassScope.Navigation, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = HarmonyTokens.Spacing.lg, vertical = HarmonyTokens.Spacing.sm), + shape = RoundedCornerShape(HarmonyTokens.Radius.capsule), + ) { + Row(Modifier.fillMaxWidth().padding(HarmonyTokens.Spacing.sm)) { + GalleryTab( + icon = Icons.AutoMirrored.Filled.Chat, + label = stringResource(R.string.harmony_tab_chats), + selected = screen == GalleryScreen.Chats, + modifier = Modifier.weight(1f), + onClick = { onSelect(GalleryScreen.Chats) }, + ) + GalleryTab( + icon = Icons.AutoMirrored.Filled.Send, + label = stringResource(R.string.harmony_tab_dialog), + selected = screen == GalleryScreen.Dialog, + modifier = Modifier.weight(1f), + onClick = { onSelect(GalleryScreen.Dialog) }, + ) + GalleryTab( + icon = Icons.Filled.Settings, + label = stringResource(R.string.harmony_tab_widgets), + selected = screen == GalleryScreen.Widgets, + modifier = Modifier.weight(1f), + onClick = { onSelect(GalleryScreen.Widgets) }, + ) + } + } +} + +@Composable +private fun GalleryTab( + icon: ImageVector, + label: String, + selected: Boolean, + modifier: Modifier = Modifier, + onClick: () -> Unit, +) { + val accent = HarmonyTheme.palette.primary + Column( + modifier + .clip(RoundedCornerShape(HarmonyTokens.Radius.card)) + .clickable(onClick = onClick) + .padding(vertical = HarmonyTokens.Spacing.sm), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Box( + Modifier + .size(HarmonyTokens.Size.controlHeight) + .clip(CircleShape) + .background(if (selected) accent.copy(alpha = 0.20f) else Color.Transparent), + contentAlignment = Alignment.Center, + ) { + Icon(icon, contentDescription = null, tint = if (selected) accent else MaterialTheme.colorScheme.onSurfaceVariant) + } + Text( + label, + style = MaterialTheme.typography.labelSmall, + color = if (selected) accent else MaterialTheme.colorScheme.onSurfaceVariant, + ) + } +} + +@Composable +private fun ChatsScreen() { + val scroll = rememberScrollState() + Column(Modifier.fillMaxSize().verticalScroll(scroll)) { + SpatialHeader( + scroll = scroll.value.toFloat(), + title = stringResource(R.string.harmony_greeting), + subtitle = stringResource(R.string.harmony_greeting_subtitle), + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.sm)) + ImmersiveGlass( + scope = HarmonyGlassScope.Control, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = HarmonyTokens.Spacing.lg), + shape = RoundedCornerShape(HarmonyTokens.Radius.capsule), + ) { + Row( + Modifier + .fillMaxWidth() + .padding(HarmonyTokens.Spacing.md, HarmonyTokens.Spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon( + Icons.Filled.Search, + contentDescription = stringResource(R.string.harmony_search), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Spacer(Modifier.width(HarmonyTokens.Spacing.md)) + Text( + stringResource(R.string.harmony_search), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + Spacer(Modifier.height(HarmonyTokens.Spacing.lg)) + ServiceCard( + title = stringResource(R.string.harmony_widget_messages), + subtitle = stringResource(R.string.harmony_widget_messages_sub), + glyph = Icons.AutoMirrored.Filled.Chat, + tint = HarmonyTheme.palette.primary, + badge = stringResource(R.string.harmony_unread), + modifier = Modifier.padding(horizontal = HarmonyTokens.Spacing.lg), + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.lg)) + ChatCard( + title = stringResource(R.string.harmony_chat_1), + preview = stringResource(R.string.harmony_chat_1_preview), + time = stringResource(R.string.harmony_time), + unread = stringResource(R.string.harmony_unread), + modifier = Modifier.padding(horizontal = HarmonyTokens.Spacing.lg), + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.sm)) + ChatCard( + title = stringResource(R.string.harmony_chat_2), + preview = stringResource(R.string.harmony_chat_2_preview), + time = stringResource(R.string.harmony_time), + modifier = Modifier.padding(horizontal = HarmonyTokens.Spacing.lg), + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.sm)) + ChatCard( + title = stringResource(R.string.harmony_chat_3), + preview = stringResource(R.string.harmony_chat_3_preview), + time = stringResource(R.string.harmony_time), + modifier = Modifier.padding(horizontal = HarmonyTokens.Spacing.lg), + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.sm)) + ChatCard( + title = stringResource(R.string.harmony_chat_4), + preview = stringResource(R.string.harmony_chat_4_preview), + time = stringResource(R.string.harmony_time), + modifier = Modifier.padding(horizontal = HarmonyTokens.Spacing.lg), + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.xxl)) + } +} + +@Composable +private fun DialogScreen() { + Column(Modifier.fillMaxSize()) { + ImmersiveGlass( + scope = HarmonyGlassScope.Navigation, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = HarmonyTokens.Spacing.lg, vertical = HarmonyTokens.Spacing.sm), + shape = RoundedCornerShape(HarmonyTokens.Radius.capsule), + ) { + Row( + Modifier + .fillMaxWidth() + .padding(HarmonyTokens.Spacing.md, HarmonyTokens.Spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null) + Spacer(Modifier.width(HarmonyTokens.Spacing.md)) + Column(Modifier.weight(1f)) { + Text( + stringResource(R.string.harmony_dialog_title), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface, + ) + Text( + stringResource(R.string.harmony_dialog_status), + style = MaterialTheme.typography.labelSmall, + color = HarmonyTheme.palette.primary, + ) + } + } + } + Column( + Modifier + .weight(1f) + .verticalScroll(rememberScrollState()) + .fillMaxWidth() + .padding(HarmonyTokens.Spacing.lg), + verticalArrangement = Arrangement.Bottom, + ) { + MessageLine(stringResource(R.string.harmony_message_in), outgoing = false) + MessageLine(stringResource(R.string.harmony_message_out), outgoing = true) + MessageLine(stringResource(R.string.harmony_message_reply), outgoing = false) + } + ImmersiveGlass( + scope = HarmonyGlassScope.Control, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = HarmonyTokens.Spacing.lg, vertical = HarmonyTokens.Spacing.sm), + shape = RoundedCornerShape(HarmonyTokens.Radius.capsule), + ) { + Row( + Modifier + .fillMaxWidth() + .padding(HarmonyTokens.Spacing.sm, HarmonyTokens.Spacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + stringResource(R.string.harmony_type_message), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.weight(1f).padding(horizontal = HarmonyTokens.Spacing.md), + ) + IconButton(onClick = {}) { + Icon(Icons.Filled.Mic, contentDescription = stringResource(R.string.harmony_type_message)) + } + IconButton(onClick = {}) { + Icon( + Icons.AutoMirrored.Filled.Send, + contentDescription = stringResource(R.string.harmony_send), + tint = HarmonyTheme.palette.primary, + ) + } + } + } + } +} + +@Composable +private fun MessageLine(text: String, outgoing: Boolean) { + Row( + Modifier.fillMaxWidth(), + horizontalArrangement = if (outgoing) Arrangement.End else Arrangement.Start, + ) { + MessageBubble(text, outgoing, Modifier.widthIn(max = 280.dp)) + } +} + +@Composable +private fun WidgetsScreen() { + var immersive by remember { mutableStateOf(true) } + var spatial by remember { mutableStateOf(true) } + var intensity by remember { mutableStateOf(0.65f) } + + Column( + Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(HarmonyTokens.Spacing.lg), + ) { + Text( + stringResource(R.string.harmony_widgets_title), + style = MaterialTheme.typography.headlineLarge, + color = MaterialTheme.colorScheme.onSurface, + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.lg)) + Row { + ServiceCard( + title = stringResource(R.string.harmony_widget_calls), + subtitle = stringResource(R.string.harmony_widget_calls_sub), + glyph = Icons.Filled.Call, + tint = HarmonyTheme.palette.secondary, + modifier = Modifier.weight(1f), + ) + Spacer(Modifier.width(HarmonyTokens.Spacing.sm)) + ServiceCard( + title = stringResource(R.string.harmony_widget_files), + subtitle = stringResource(R.string.harmony_widget_files_sub), + glyph = Icons.Filled.Folder, + tint = HarmonyTheme.palette.primary, + modifier = Modifier.weight(1f), + ) + } + Spacer(Modifier.height(HarmonyTokens.Spacing.sm)) + Row { + ServiceCard( + title = stringResource(R.string.harmony_widget_media), + subtitle = stringResource(R.string.harmony_widget_media_sub), + glyph = Icons.Filled.Image, + tint = HarmonyTheme.palette.secondary, + modifier = Modifier.weight(1f), + ) + Spacer(Modifier.width(HarmonyTokens.Spacing.sm)) + ServiceCard( + title = stringResource(R.string.harmony_widget_messages), + subtitle = stringResource(R.string.harmony_widget_messages_sub), + glyph = Icons.AutoMirrored.Filled.Chat, + tint = HarmonyTheme.palette.primary, + modifier = Modifier.weight(1f), + ) + } + Spacer(Modifier.height(HarmonyTokens.Spacing.xl)) + Text( + stringResource(R.string.harmony_appearance), + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.onSurface, + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.md)) + SettingSwitchCard( + label = stringResource(R.string.harmony_immersive_light), + checked = immersive, + onCheckedChange = { immersive = it }, + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.sm)) + SettingSwitchCard( + label = stringResource(R.string.harmony_spatial_depth), + checked = spatial, + onCheckedChange = { spatial = it }, + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.sm)) + ImmersiveGlass( + scope = HarmonyGlassScope.Control, + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(HarmonyTokens.Radius.card), + strength = if (immersive) 1f else 0f, + ) { + Column(Modifier.fillMaxWidth().padding(HarmonyTokens.Spacing.lg)) { + Text( + stringResource(R.string.harmony_accent), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + ) + Slider(value = intensity, onValueChange = { intensity = it }) + } + } + Spacer(Modifier.height(HarmonyTokens.Spacing.lg)) + DepthBox(depth = if (spatial) 2 else 0) { + ServiceCard( + title = stringResource(R.string.harmony_gallery_title), + subtitle = stringResource(R.string.harmony_preview), + glyph = Icons.Filled.AutoAwesome, + tint = HarmonyTheme.palette.primary, + ) + } + Spacer(Modifier.height(HarmonyTokens.Spacing.xxl)) + } +} + +@Preview(name = "Harmony light", showBackground = true, widthDp = 420, heightDp = 900) +@Composable +private fun HarmonyGalleryLightPreview() { + HarmonyGallery() +} + +@Preview( + name = "Harmony dark", + showBackground = true, + widthDp = 420, + heightDp = 900, + uiMode = Configuration.UI_MODE_NIGHT_YES, +) +@Composable +private fun HarmonyGalleryDarkPreview() { + HarmonyGallery() +} diff --git a/core/harmony-ui/src/main/java/org/monogram/core/harmony/HarmonyTheme.kt b/core/harmony-ui/src/main/java/org/monogram/core/harmony/HarmonyTheme.kt new file mode 100644 index 000000000..b3c750c41 --- /dev/null +++ b/core/harmony-ui/src/main/java/org/monogram/core/harmony/HarmonyTheme.kt @@ -0,0 +1,94 @@ +package org.monogram.core.harmony + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.remember +import androidx.compose.runtime.staticCompositionLocalOf +import androidx.compose.ui.graphics.Color + +val LocalHarmonyPalette = staticCompositionLocalOf { harmonyPalette(HarmonyAccent.HarmonyBlue) } +val LocalHarmonyAccent = staticCompositionLocalOf { HarmonyAccent.HarmonyBlue } +val LocalHarmonyDarkTheme = staticCompositionLocalOf { false } +val LocalHarmonyGlow = staticCompositionLocalOf { Color(0xFF6EA8FF) } + +object HarmonyTheme { + val palette: HarmonyPalette + @Composable get() = LocalHarmonyPalette.current + + val accent: HarmonyAccent + @Composable get() = LocalHarmonyAccent.current + + val isDark: Boolean + @Composable get() = LocalHarmonyDarkTheme.current + + val glow: Color + @Composable get() = LocalHarmonyGlow.current +} + +private fun harmonyColorScheme(palette: HarmonyPalette, dark: Boolean) = if (dark) { + darkColorScheme( + primary = palette.primary, + onPrimary = palette.onPrimary, + primaryContainer = palette.primaryContainer, + onPrimaryContainer = palette.onPrimaryContainer, + secondary = palette.secondary, + onSecondary = palette.onPrimary, + surface = palette.surfaceDark, + onSurface = Color(0xFFE6EAF2), + background = palette.backgroundDark, + onBackground = Color(0xFFE6EAF2), + surfaceVariant = palette.surfaceDark, + onSurfaceVariant = Color(0xFFAAB4C4), + outline = Color(0xFF4A5568), + outlineVariant = Color(0xFF2A3342), + error = Color(0xFFFFB4AB), + onError = Color(0xFF690005), + ) +} else { + lightColorScheme( + primary = palette.primary, + onPrimary = palette.onPrimary, + primaryContainer = palette.primaryContainer, + onPrimaryContainer = palette.onPrimaryContainer, + secondary = palette.secondary, + onSecondary = Color(0xFFFFFFFF), + surface = palette.surfaceLight, + onSurface = Color(0xFF1A1A1A), + background = palette.backgroundLight, + onBackground = Color(0xFF1A1A1A), + surfaceVariant = Color(0xFFE9EDF3), + onSurfaceVariant = Color(0xFF5E6673), + outline = Color(0xFF737D8C), + outlineVariant = Color(0xFFD3D9E2), + error = Color(0xFFBA1A1A), + onError = Color(0xFFFFFFFF), + ) +} + +@Composable +fun HarmonyTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + accent: HarmonyAccent = HarmonyAccent.HarmonyBlue, + content: @Composable () -> Unit, +) { + val palette = remember(accent) { harmonyPalette(accent) } + val colors = remember(palette, darkTheme) { harmonyColorScheme(palette, darkTheme) } + + CompositionLocalProvider( + LocalHarmonyPalette provides palette, + LocalHarmonyAccent provides accent, + LocalHarmonyDarkTheme provides darkTheme, + LocalHarmonyGlow provides palette.glow, + ) { + MaterialTheme( + colorScheme = colors, + typography = HarmonyTokens.Typography, + shapes = HarmonyTokens.Shapes, + content = content, + ) + } +} diff --git a/core/harmony-ui/src/main/java/org/monogram/core/harmony/HarmonyTokens.kt b/core/harmony-ui/src/main/java/org/monogram/core/harmony/HarmonyTokens.kt new file mode 100644 index 000000000..8e54845c0 --- /dev/null +++ b/core/harmony-ui/src/main/java/org/monogram/core/harmony/HarmonyTokens.kt @@ -0,0 +1,127 @@ +package org.monogram.core.harmony + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Shapes +import androidx.compose.material3.Typography +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp + +enum class HarmonyAccent { + HarmonyBlue, + DnaNeon, +} + +data class HarmonyPalette( + val primary: Color, + val onPrimary: Color, + val primaryContainer: Color, + val onPrimaryContainer: Color, + val secondary: Color, + val glow: Color, + val surfaceLight: Color, + val surfaceDark: Color, + val backgroundLight: Color, + val backgroundDark: Color, +) + +fun harmonyPalette(accent: HarmonyAccent): HarmonyPalette = when (accent) { + HarmonyAccent.HarmonyBlue -> HarmonyPalette( + primary = Color(0xFF0A59F7), + onPrimary = Color(0xFFFFFFFF), + primaryContainer = Color(0xFFD6E4FF), + onPrimaryContainer = Color(0xFF001A53), + secondary = Color(0xFF3D7BF0), + glow = Color(0xFF6EA8FF), + surfaceLight = Color(0xFFF7F8FA), + surfaceDark = Color(0xFF0A1020), + backgroundLight = Color(0xFFF7F8FA), + backgroundDark = Color(0xFF070B14), + ) + + HarmonyAccent.DnaNeon -> HarmonyPalette( + primary = Color(0xFF5AFF9E), + onPrimary = Color(0xFF02090C), + primaryContainer = Color(0xFF0D3B2A), + onPrimaryContainer = Color(0xFFB9FFD8), + secondary = Color(0xFF5ADCFF), + glow = Color(0xFF5ADCFF), + surfaceLight = Color(0xFFF2FAF6), + surfaceDark = Color(0xFF0A1614), + backgroundLight = Color(0xFFF7FBF9), + backgroundDark = Color(0xFF02090C), + ) +} + +object HarmonyTokens { + object Spacing { + val xs = 4.dp + val sm = 8.dp + val md = 12.dp + val lg = 16.dp + val xl = 24.dp + val xxl = 32.dp + val section = 48.dp + val page = 64.dp + } + + object Radius { + val chip = 4.dp + val control = 8.dp + val card = 12.dp + val panel = 16.dp + val capsule = 24.dp + } + + object Size { + val controlHeight = 48.dp + val secondaryControlHeight = 40.dp + val tagHeight = 24.dp + val avatar = 48.dp + } + + object Elevation { + val low = 2.dp + val medium = 8.dp + val high = 16.dp + val modal = 24.dp + } + + object Type { + val caption = TextStyle(fontSize = 11.sp, lineHeight = 16.sp, fontWeight = FontWeight.Normal) + val bodySmall = TextStyle(fontSize = 12.sp, lineHeight = 18.sp, fontWeight = FontWeight.Normal) + val bodyMedium = TextStyle(fontSize = 14.sp, lineHeight = 20.sp, fontWeight = FontWeight.Normal) + val body = TextStyle(fontSize = 16.sp, lineHeight = 24.sp, fontWeight = FontWeight.Normal) + val subtitleSmall = TextStyle(fontSize = 18.sp, lineHeight = 26.sp, fontWeight = FontWeight.Medium) + val subtitle = TextStyle(fontSize = 20.sp, lineHeight = 28.sp, fontWeight = FontWeight.Medium) + val subtitleLarge = TextStyle(fontSize = 24.sp, lineHeight = 32.sp, fontWeight = FontWeight.SemiBold) + val headline = TextStyle(fontSize = 28.sp, lineHeight = 36.sp, fontWeight = FontWeight.SemiBold) + val display = TextStyle(fontSize = 36.sp, lineHeight = 44.sp, fontWeight = FontWeight.SemiBold) + } + + val Shapes = Shapes( + extraSmall = RoundedCornerShape(Radius.chip), + small = RoundedCornerShape(Radius.control), + medium = RoundedCornerShape(Radius.card), + large = RoundedCornerShape(Radius.panel), + extraLarge = RoundedCornerShape(Radius.capsule), + ) + + val Typography = Typography( + displayLarge = Type.display, + displayMedium = Type.headline, + headlineLarge = Type.headline, + headlineMedium = Type.subtitleLarge, + titleLarge = Type.subtitle, + titleMedium = Type.subtitleSmall, + titleSmall = Type.bodyMedium, + bodyLarge = Type.body, + bodyMedium = Type.bodyMedium, + bodySmall = Type.bodySmall, + labelLarge = Type.body, + labelMedium = Type.bodyMedium, + labelSmall = Type.caption, + ) +} diff --git a/core/harmony-ui/src/main/java/org/monogram/core/harmony/ServiceCards.kt b/core/harmony-ui/src/main/java/org/monogram/core/harmony/ServiceCards.kt new file mode 100644 index 000000000..ed1c11761 --- /dev/null +++ b/core/harmony-ui/src/main/java/org/monogram/core/harmony/ServiceCards.kt @@ -0,0 +1,213 @@ +package org.monogram.core.harmony + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +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.graphics.vector.ImageVector +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp + +@Composable +fun ServiceCard( + title: String, + subtitle: String, + glyph: ImageVector, + modifier: Modifier = Modifier, + tint: Color? = null, + badge: String? = null, + onClick: () -> Unit = {}, +) { + val accent = tint ?: HarmonyTheme.palette.primary + ImmersiveGlass( + scope = HarmonyGlassScope.Content, + modifier = modifier.clickable(onClick = onClick), + shape = RoundedCornerShape(HarmonyTokens.Radius.card), + ) { + Row(Modifier.padding(HarmonyTokens.Spacing.lg), verticalAlignment = Alignment.CenterVertically) { + Box( + Modifier + .size(HarmonyTokens.Size.avatar) + .clip(CircleShape) + .background(accent.copy(alpha = 0.16f)), + contentAlignment = Alignment.Center, + ) { + Icon(glyph, contentDescription = null, tint = accent, modifier = Modifier.size(22.dp)) + } + Spacer(Modifier.width(HarmonyTokens.Spacing.md)) + Column(Modifier.weight(1f)) { + Text( + title, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface, + ) + Text( + subtitle, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + if (badge != null) { + Box( + Modifier + .size(HarmonyTokens.Size.tagHeight) + .clip(CircleShape) + .background(accent), + contentAlignment = Alignment.Center, + ) { + Text( + badge, + style = MaterialTheme.typography.labelSmall, + color = if (HarmonyTheme.isDark) Color(0xFF02090C) else Color.White, + ) + } + } + } + } +} + +@Composable +fun ChatCard( + title: String, + preview: String, + time: String, + unread: String? = null, + modifier: Modifier = Modifier, +) { + val accent = HarmonyTheme.palette.primary + ImmersiveGlass( + scope = HarmonyGlassScope.Content, + modifier = modifier, + shape = RoundedCornerShape(HarmonyTokens.Radius.card), + ) { + Row(Modifier.padding(HarmonyTokens.Spacing.lg), verticalAlignment = Alignment.CenterVertically) { + Box( + Modifier + .size(52.dp) + .clip(CircleShape) + .background(accent.copy(alpha = 0.18f)), + contentAlignment = Alignment.Center, + ) { + Text( + title.take(1), + style = MaterialTheme.typography.titleLarge, + color = accent, + ) + } + Spacer(Modifier.width(HarmonyTokens.Spacing.md)) + Column(Modifier.weight(1f)) { + Text( + title, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface, + ) + Spacer(Modifier.height(HarmonyTokens.Spacing.xs)) + Text( + preview, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + Column(horizontalAlignment = Alignment.End) { + Text( + time, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + if (unread != null) { + Spacer(Modifier.height(HarmonyTokens.Spacing.sm)) + Box( + Modifier + .size(22.dp) + .clip(CircleShape) + .background(accent), + contentAlignment = Alignment.Center, + ) { + Text( + unread, + style = MaterialTheme.typography.labelSmall, + color = if (HarmonyTheme.isDark) Color(0xFF02090C) else Color.White, + ) + } + } + } + } + } +} + +@Composable +fun MessageBubble( + text: String, + outgoing: Boolean, + modifier: Modifier = Modifier, +) { + val colors = MaterialTheme.colorScheme + val shape = if (outgoing) { + RoundedCornerShape(16.dp, 4.dp, 16.dp, 16.dp) + } else { + RoundedCornerShape(4.dp, 16.dp, 16.dp, 16.dp) + } + Box( + modifier + .padding(vertical = HarmonyTokens.Spacing.sm) + .background(if (outgoing) colors.primaryContainer else colors.surfaceVariant, shape) + .padding(HarmonyTokens.Spacing.lg, HarmonyTokens.Spacing.md), + ) { + Text( + text, + style = MaterialTheme.typography.bodyMedium, + color = if (outgoing) colors.onPrimaryContainer else colors.onSurface, + ) + } +} + +@Composable +fun SettingSwitchCard( + label: String, + checked: Boolean, + onCheckedChange: (Boolean) -> Unit, + modifier: Modifier = Modifier, +) { + ImmersiveGlass( + scope = HarmonyGlassScope.Control, + modifier = modifier, + shape = RoundedCornerShape(HarmonyTokens.Radius.card), + ) { + Row( + Modifier + .fillMaxWidth() + .padding(HarmonyTokens.Spacing.lg), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + label, + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.weight(1f), + ) + Switch(checked = checked, onCheckedChange = onCheckedChange) + } + } +} diff --git a/core/harmony-ui/src/main/java/org/monogram/core/harmony/SpatialLayer.kt b/core/harmony-ui/src/main/java/org/monogram/core/harmony/SpatialLayer.kt new file mode 100644 index 000000000..fdb034fbe --- /dev/null +++ b/core/harmony-ui/src/main/java/org/monogram/core/harmony/SpatialLayer.kt @@ -0,0 +1,103 @@ +package org.monogram.core.harmony + +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +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.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.unit.dp + +@Composable +fun SpatialHeader( + scroll: Float, + title: String, + subtitle: String, + modifier: Modifier = Modifier, +) { + val palette = HarmonyTheme.palette + val glow = HarmonyTheme.glow + val shift by animateFloatAsState( + targetValue = scroll.coerceAtMost(600f), + animationSpec = spring(dampingRatio = 0.85f, stiffness = 320f), + label = "spatial-header", + ) + + Box( + modifier + .height(216.dp) + .clip(RectangleShape) + .background(Brush.verticalGradient(listOf(palette.primary.copy(alpha = 0.16f), Color.Transparent))) + ) { + Box( + Modifier + .fillMaxSize() + .graphicsLayer { + translationY = -shift * 0.35f + rotationX = (-shift / 600f) * 5f + cameraDistance = 12f * density + } + .background(Brush.verticalGradient(listOf(palette.primary.copy(alpha = 0.30f), Color.Transparent))) + ) + Box( + Modifier + .align(Alignment.TopEnd) + .padding(top = 32.dp, end = 32.dp) + .size(120.dp) + .graphicsLayer { + translationY = shift * 0.18f + scaleX = 1.04f + scaleY = 1.04f + } + .clip(CircleShape) + .background(glow.copy(alpha = 0.22f)) + ) + Column( + Modifier + .align(Alignment.BottomStart) + .padding(HarmonyTokens.Spacing.xl) + .graphicsLayer { translationY = shift * 0.08f } + ) { + Text(title, style = MaterialTheme.typography.headlineLarge, color = MaterialTheme.colorScheme.onSurface) + Spacer(Modifier.height(HarmonyTokens.Spacing.xs)) + Text( + subtitle, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } +} + +@Composable +fun DepthBox( + depth: Int, + modifier: Modifier = Modifier, + content: @Composable () -> Unit, +) { + Box( + modifier.graphicsLayer { + shadowElevation = depth * 2f * density + scaleX = 1f + depth * 0.01f + scaleY = 1f + depth * 0.01f + }, + ) { + content() + } +} diff --git a/core/harmony-ui/src/main/res/values/strings.xml b/core/harmony-ui/src/main/res/values/strings.xml new file mode 100644 index 000000000..66d836ef9 --- /dev/null +++ b/core/harmony-ui/src/main/res/values/strings.xml @@ -0,0 +1,47 @@ + + + HarmonyOS 7 + Chats + Dialog + Widgets + + Good evening + 3 unread conversations + Search + Design team + Mira: the new glass mockups are ready + Family + Photo + HarmonyOS beta + Build 7.0.0.21 is available + Alexey + Thanks, see you tomorrow! + 20:41 + 2 + + Design team + online + The new glass mockups are ready + Looks great, send them over + Opening them now + Message + Send + + Service cards + Messages + 4 unread chats + Calls + No missed calls + Files + 12 recent documents + Media + Photos and videos + + Appearance + Immersive Light + Spatial depth + Accent + Dark + Light + Preview + diff --git a/docs/HARMONY_PROTOTYPE.md b/docs/HARMONY_PROTOTYPE.md new file mode 100644 index 000000000..287876ee2 --- /dev/null +++ b/docs/HARMONY_PROTOTYPE.md @@ -0,0 +1,46 @@ +# HarmonyOS 7 visual prototype + +Форк Monogram с визуальным прототипом в духе HarmonyOS 7. Сетевой слой остаётся на Rust +(`native/mtproto-rs` + UniFFI) и в прототипе не изменяется. + +## Что добавлено + +- `core/harmony-ui` — дизайн-система прототипа: + - `HarmonyTokens.kt` — токены HarmonyOS Design (4vp-сетка, размеры шрифта 11/12/14/16/18/20/24/28/36, + радиусы 4/8/12/16/24, высота CONTROL 48, три уровня тени). + - `HarmonyTheme.kt` — светлая/тёмная темы и два акцента: `HarmonyBlue` (`#0A59F7`) и + `DnaNeon` из темы `HuaweiDnaTheme` (`#5AFF9E` / `#5ADCFF` / фон `#02090C`). + - `GlassSurface.kt` — Immersive Light только в разрешённых Huawei зонах: navigation, + dialog, control. Обычное содержимое остаётся непрозрачным. + - `SpatialLayer.kt` — параллакс шапки и слои глубины (тень + лёгкое масштабирование). + - `ServiceCards.kt` — карточки-плитки, строки чатов, пузыри сообщений. + - `HarmonyGallery.kt` — три статических экрана: чаты, диалог, виджеты. +- `HarmonyGalleryActivity` в `app/src/debug` — хост прототипа без логина в Telegram. + +## Запуск + +Нужны JDK 17, Android SDK 37, NDK r28c, Rust 1.98+ и `cargo-ndk`. Скопируйте +`local.properties.example` в `local.properties`, укажите `sdk.dir`; API-ключи для прототипа +не нужны. Подключите подмодули: + +```powershell +git submodule update --init --recursive +./gradlew.bat :app:installDebug +adb shell am start -n org.monogram.debug/org.monogram.HarmonyGalleryActivity +``` + +Для x86_64-эмулятора на Windows нужен Android Emulator hypervisor driver (AEHD); без него +запустите прототип на физическом устройстве или включите WHPX. + +В Android Studio те же экраны доступны через `@Preview` в `HarmonyGallery.kt`. + +## Ограничение Immersive Light + +С сентября 2026 Huawei ограничивает материал навигацией, диалогами и контролами. +Поэтому стекло в прототипе применяется к верхней/нижней панели, полю ввода, слайдеру +и тумблерам, а карточки чатов сделаны плотными. Это осознанное соответствие платформе, +а не недостаток реализации. + +Compose не имеет backdrop-filter, поэтому матовый эффект достигается размытием +декоративного слоя `GlassBackdrop` под панелями, а не размытием произвольного контента. +На API < 31 размытие отключается и остаётся полупрозрачный градиент. diff --git a/settings.gradle.kts b/settings.gradle.kts index 9eec1a726..e0c85a7dd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,13 +30,14 @@ dependencyResolutionManagement { } } -rootProject.name = "monogram" +rootProject.name = "harmonygram" include(":app") include(":core:common") include(":core:models") include(":core:ui") +include(":core:harmony-ui") include(":core:database") include(":core:markup")