From 86921dc35c7863659a3b14675d5b63486bae4fb6 Mon Sep 17 00:00:00 2001 From: kalarina Date: Tue, 10 Nov 2026 16:01:30 +0200 Subject: [PATCH] Redesign UI: neon/lime dark theme, new home and profile screens --- .../cc/skysparkle/matewave/MainActivity.kt | 10 +- .../matewave/ui/components/AppBackground.kt | 100 ++-- .../matewave/ui/components/AppBottomBar.kt | 92 ++-- .../matewave/ui/components/AppDialog.kt | 7 +- .../matewave/ui/components/AppIcon.kt | 7 +- .../matewave/ui/components/GlassUi.kt | 70 +-- .../matewave/ui/components/SetupStyle.kt | 12 +- .../matewave/ui/screens/AccountScreen.kt | 373 ++++++++------ .../matewave/ui/screens/AppearanceScreen.kt | 4 +- .../matewave/ui/screens/ConnectionScreen.kt | 8 +- .../matewave/ui/screens/FriendsScreen.kt | 12 +- .../matewave/ui/screens/GameScreen.kt | 3 +- .../matewave/ui/screens/MainMenuScreen.kt | 471 ++++++++++++------ .../matewave/ui/screens/OpeningStudyScreen.kt | 2 +- .../ui/screens/OpeningTrainerScreen.kt | 2 +- .../matewave/ui/screens/PermissionsScreen.kt | 8 +- .../matewave/ui/screens/PuzzleScreen.kt | 2 +- .../matewave/ui/screens/SettingsScreen.kt | 2 +- .../matewave/ui/screens/VsAiSetupScreen.kt | 1 - .../cc/skysparkle/matewave/ui/theme/Glass.kt | 22 +- .../cc/skysparkle/matewave/ui/theme/Theme.kt | 68 ++- app/src/main/res/drawable-nodpi/bg_forest.jpg | Bin 62216 -> 0 bytes app/src/main/res/values-de/strings.xml | 4 + app/src/main/res/values-ja/strings.xml | 4 + app/src/main/res/values-lt/strings.xml | 4 + app/src/main/res/values-ru/strings.xml | 4 + app/src/main/res/values-zh/strings.xml | 4 + app/src/main/res/values/strings.xml | 4 + 28 files changed, 815 insertions(+), 485 deletions(-) delete mode 100644 app/src/main/res/drawable-nodpi/bg_forest.jpg diff --git a/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt b/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt index 343710a..4a5a7ea 100644 --- a/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt +++ b/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt @@ -1,6 +1,5 @@ package cc.skysparkle.matewave -import androidx.compose.foundation.background import androidx.compose.foundation.layout.fillMaxSize import android.os.Build @@ -57,7 +56,7 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - // The app has one dark look: light system bar icons over the background photo. + // The app has one dark look: light system bar icons over the dark backdrop. enableEdgeToEdge( statusBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT), navigationBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT) @@ -79,12 +78,7 @@ class MainActivity : ComponentActivity() { androidx.compose.foundation.layout.Box( modifier = androidx.compose.ui.Modifier.fillMaxSize() ) { - cc.skysparkle.matewave.ui.components.AppBackgroundImage() - androidx.compose.foundation.layout.Box( - modifier = androidx.compose.ui.Modifier - .fillMaxSize() - .background(cc.skysparkle.matewave.ui.theme.PhotoScrim) - ) + cc.skysparkle.matewave.ui.components.AppBackdrop() AppNavHost() } } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/components/AppBackground.kt b/app/src/main/java/cc/skysparkle/matewave/ui/components/AppBackground.kt index 72140e3..54d30a0 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/components/AppBackground.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/components/AppBackground.kt @@ -1,81 +1,39 @@ package cc.skysparkle.matewave.ui.components -import android.content.Context -import android.graphics.BitmapFactory -import android.util.DisplayMetrics -import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.ImageBitmap -import androidx.compose.ui.graphics.asImageBitmap -import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.platform.LocalContext -import cc.skysparkle.matewave.R -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext - -private object BackgroundAssetCache { - @Volatile private var bitmap: ImageBitmap? = null - - fun cached(): ImageBitmap? = bitmap - - fun load(context: Context): ImageBitmap? { - bitmap?.let { return it } - synchronized(this) { - bitmap?.let { return it } - val metrics: DisplayMetrics = context.resources.displayMetrics - val target = maxOf(metrics.widthPixels, metrics.heightPixels).coerceAtLeast(1) - - val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true } - BitmapFactory.decodeResource(context.resources, R.drawable.bg_forest, bounds) - - var sample = 1 - while (maxOf(bounds.outWidth, bounds.outHeight) / sample > target * 2) sample *= 2 - - val options = BitmapFactory.Options().apply { - inSampleSize = sample - inPreferredConfig = android.graphics.Bitmap.Config.RGB_565 - } - val decoded = runCatching { - BitmapFactory.decodeResource(context.resources, R.drawable.bg_forest, options) - ?.asImageBitmap() - }.getOrNull() - bitmap = decoded - return decoded - } - } -} +import androidx.compose.ui.draw.drawWithCache +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import cc.skysparkle.matewave.ui.theme.AppBackground +import cc.skysparkle.matewave.ui.theme.ChessGreen +import cc.skysparkle.matewave.ui.theme.Lime +/** Near-black backdrop with a faint neon glow at the top and a lime one at the bottom. */ @Composable -fun AppBackgroundImage() { - val context = LocalContext.current - - var bitmap by remember { mutableStateOf(BackgroundAssetCache.cached()) } - - LaunchedEffect(Unit) { - if (bitmap == null) { - bitmap = withContext(Dispatchers.IO) { BackgroundAssetCache.load(context) } - } - } - - val image = bitmap - if (image != null) { - Image( - bitmap = image, - contentDescription = null, - modifier = Modifier.fillMaxSize(), - contentScale = ContentScale.Crop - ) - } else { - Box(modifier = Modifier.fillMaxSize().background(Color(0xFF101413))) - } +fun AppBackdrop() { + Box( + modifier = Modifier + .fillMaxSize() + .background(AppBackground) + .drawWithCache { + val top = Brush.radialGradient( + colors = listOf(ChessGreen.copy(alpha = 0.16f), ChessGreen.copy(alpha = 0f)), + center = Offset(size.width * 0.85f, size.height * 0.02f), + radius = size.maxDimension * 0.55f + ) + val bottom = Brush.radialGradient( + colors = listOf(Lime.copy(alpha = 0.06f), Lime.copy(alpha = 0f)), + center = Offset(0f, size.height), + radius = size.maxDimension * 0.5f + ) + onDrawBehind { + drawRect(top) + drawRect(bottom) + } + } + ) } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/components/AppBottomBar.kt b/app/src/main/java/cc/skysparkle/matewave/ui/components/AppBottomBar.kt index 15fe39e..496d4e2 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/components/AppBottomBar.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/components/AppBottomBar.kt @@ -2,37 +2,45 @@ package cc.skysparkle.matewave.ui.components import cc.skysparkle.matewave.ui.theme.ink +import androidx.compose.animation.animateColorAsState import androidx.compose.foundation.Image import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope -import androidx.compose.foundation.layout.Spacer 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.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.selected +import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp import cc.skysparkle.matewave.R -import cc.skysparkle.matewave.ui.theme.UiCornerRadius +import cc.skysparkle.matewave.ui.theme.FloatingBarFill +import cc.skysparkle.matewave.ui.theme.Lime +import cc.skysparkle.matewave.ui.theme.OnAccent +import cc.skysparkle.matewave.ui.theme.PanelBorder enum class BottomTab { HOME, FRIENDS, SETTINGS, ACCOUNT } +/** Floating pill; the active tab is a lime circle, the others are plain icons. */ @Composable fun AppBottomBar( current: BottomTab, @@ -43,22 +51,27 @@ fun AppBottomBar( accountAvatarBase64: String? = null ) { + val shape = RoundedCornerShape(50) Row( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 24.dp, vertical = 4.dp) - .background(cc.skysparkle.matewave.ui.theme.FloatingBarFill, RoundedCornerShape(UiCornerRadius)) - .padding(vertical = 6.dp), - horizontalArrangement = Arrangement.SpaceEvenly + .padding(horizontal = 24.dp, vertical = 8.dp) + .clip(shape) + .background(FloatingBarFill) + .border(1.dp, PanelBorder, shape) + .padding(horizontal = 8.dp, vertical = 8.dp) + .height(52.dp), + horizontalArrangement = Arrangement.SpaceEvenly, + verticalAlignment = Alignment.CenterVertically ) { NavItem(stringResource(R.string.nav_home), current == BottomTab.HOME, onHomeClick) { tint -> - NavIcon(R.drawable.ic_home, tint) + AppIcon(R.drawable.ic_home, size = 24.dp, tint = tint) } NavItem(stringResource(R.string.nav_friends), current == BottomTab.FRIENDS, onFriendsClick) { tint -> - NavIcon(R.drawable.ic_friends, tint) + AppIcon(R.drawable.ic_friends, size = 24.dp, tint = tint) } NavItem(stringResource(R.string.nav_settings), current == BottomTab.SETTINGS, onSettingsClick) { tint -> - NavIcon(R.drawable.ic_settings, tint) + AppIcon(R.drawable.ic_settings, size = 24.dp, tint = tint) } NavItem(stringResource(R.string.account_title), current == BottomTab.ACCOUNT, onAccountClick) { tint -> val bitmap = rememberChatImage(accountAvatarBase64, AVATAR_MAX_DIMENSION_PX) @@ -67,10 +80,10 @@ fun AppBottomBar( bitmap = bitmap, contentDescription = null, contentScale = ContentScale.Crop, - modifier = Modifier.size(24.dp).clip(CircleShape) + modifier = Modifier.size(28.dp).clip(CircleShape) ) } else { - NavIcon(R.drawable.ic_default_avatar, tint) + AppIcon(R.drawable.ic_default_avatar, size = 24.dp, tint = tint) } } } @@ -84,33 +97,30 @@ private fun RowScope.NavItem( onClick: () -> Unit, icon: @Composable (tint: Color) -> Unit ) { - val shape = RoundedCornerShape(UiCornerRadius) - val itemColor = if (active) ink else ink.copy(alpha = 0.7f) - Column( + val fill by animateColorAsState(if (active) Lime else Lime.copy(alpha = 0f), label = "navFill") + Box( modifier = Modifier .weight(1f) - .clip(shape) - .background(if (active) ink.copy(alpha = 0.14f) else ink.copy(alpha = 0f), shape) - .clickable(onClick = onClick) - .padding(vertical = 8.dp), - horizontalAlignment = Alignment.CenterHorizontally + .semantics { + contentDescription = label + selected = active + } + .clickable( + interactionSource = remember { MutableInteractionSource() }, + indication = null, + role = Role.Tab, + onClick = onClick + ), + contentAlignment = Alignment.Center ) { - icon(itemColor) - Spacer(Modifier.height(4.dp)) - Text( - label, - color = if (active) itemColor else Color.Transparent, - style = MaterialTheme.typography.labelMedium - ) + Box( + modifier = Modifier + .size(52.dp) + .clip(CircleShape) + .background(fill), + contentAlignment = Alignment.Center + ) { + icon(if (active) OnAccent else ink.copy(alpha = 0.6f)) + } } } - -@Composable -private fun NavIcon(iconRes: Int, tint: Color) { - Image( - painter = painterResource(iconRes), - contentDescription = null, - colorFilter = ColorFilter.tint(tint), - modifier = Modifier.size(24.dp) - ) -} diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/components/AppDialog.kt b/app/src/main/java/cc/skysparkle/matewave/ui/components/AppDialog.kt index 9065ea6..4ddbdeb 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/components/AppDialog.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/components/AppDialog.kt @@ -22,6 +22,7 @@ import androidx.compose.ui.window.DialogWindowProvider import cc.skysparkle.matewave.ui.theme.DialogScrimColor import cc.skysparkle.matewave.ui.theme.ink import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -49,8 +50,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -val DialogSurface = Color(0xFF262B29) -val DialogAccent = Color(0xFF93DBA3) +val DialogSurface = cc.skysparkle.matewave.ui.theme.Surface1 +val DialogAccent = cc.skysparkle.matewave.ui.theme.ChessGreen val DialogShape = RoundedCornerShape(28.dp) @Composable @@ -115,7 +116,7 @@ fun AppDialog( } .clip(DialogShape) .background(DialogSurface) - + .border(1.dp, cc.skysparkle.matewave.ui.theme.PanelBorder, DialogShape) .clickable( interactionSource = remember { MutableInteractionSource() }, indication = null diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/components/AppIcon.kt b/app/src/main/java/cc/skysparkle/matewave/ui/components/AppIcon.kt index d7e4e33..fafb8dc 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/components/AppIcon.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/components/AppIcon.kt @@ -1,10 +1,9 @@ package cc.skysparkle.matewave.ui.components -import cc.skysparkle.matewave.ui.theme.ink - import androidx.compose.foundation.Image import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.material3.LocalContentColor import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -17,7 +16,7 @@ import androidx.compose.ui.unit.dp fun AppIcon( resId: Int, size: Dp = 20.dp, - tint: Color = ink, + tint: Color = LocalContentColor.current, modifier: Modifier = Modifier, contentDescription: String? = null ) { @@ -30,6 +29,6 @@ fun AppIcon( } @Composable -fun ButtonIcon(resId: Int, tint: Color = ink, size: Dp = 18.dp) { +fun ButtonIcon(resId: Int, tint: Color = LocalContentColor.current, size: Dp = 18.dp) { AppIcon(resId, size = size, tint = tint, modifier = Modifier.padding(end = 8.dp)) } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/components/GlassUi.kt b/app/src/main/java/cc/skysparkle/matewave/ui/components/GlassUi.kt index 1024216..fb9d435 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/components/GlassUi.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/components/GlassUi.kt @@ -42,9 +42,15 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import cc.skysparkle.matewave.R import cc.skysparkle.matewave.ui.theme.ChessGreen +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.LocalContentColor +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.text.style.TextOverflow +import cc.skysparkle.matewave.ui.theme.Lime +import cc.skysparkle.matewave.ui.theme.OnAccent +import cc.skysparkle.matewave.ui.theme.Surface2 import cc.skysparkle.matewave.ui.theme.GlassShape import cc.skysparkle.matewave.ui.theme.PanelBorder -import cc.skysparkle.matewave.ui.theme.PanelFill import cc.skysparkle.matewave.ui.theme.TabletMaxContentWidth import cc.skysparkle.matewave.ui.theme.glass @@ -61,7 +67,7 @@ fun GlassScaffold( Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) { Column(modifier = Modifier.fillMaxSize().widthIn(max = TabletMaxContentWidth)) { Row( - modifier = Modifier.fillMaxWidth().statusBarsPadding().padding(horizontal = 4.dp, vertical = 4.dp), + modifier = Modifier.fillMaxWidth().statusBarsPadding().padding(start = 4.dp, end = 4.dp, top = 8.dp, bottom = 8.dp), verticalAlignment = Alignment.CenterVertically ) { if (onBack != null) { @@ -69,11 +75,12 @@ fun GlassScaffold( AppIcon( R.drawable.ic_arrow_back, size = 24.dp, + tint = ChessGreen, contentDescription = stringResource(R.string.back) ) } } else { - Spacer(Modifier.width(48.dp)) + Spacer(Modifier.width(16.dp)) } if (titleContent != null) { Row(modifier = Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically, content = titleContent) @@ -81,7 +88,9 @@ fun GlassScaffold( Text( title, color = ink, - style = MaterialTheme.typography.titleLarge, + style = MaterialTheme.typography.headlineSmall, + maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f) ) } @@ -122,6 +131,9 @@ private fun Modifier.pressScale(interactionSource: MutableInteractionSource): Mo return this.graphicsLayer { scaleX = scale; scaleY = scale } } +private val PillShape = RoundedCornerShape(50) + +/** The main action: a lime pill with dark text and icons. */ @Composable fun GlassButton( onClick: () -> Unit, @@ -130,24 +142,26 @@ fun GlassButton( content: @Composable RowScope.() -> Unit ) { val interaction = remember { MutableInteractionSource() } - Row( - modifier = modifier - .pressScale(interaction) - .alpha(if (enabled) 1f else 0.4f) - .clip(GlassShape) - .background(ChessGreen) - .then( - if (enabled) Modifier.clickable( - interactionSource = interaction, - indication = LocalIndication.current, - onClick = onClick - ) else Modifier - ) - .padding(horizontal = 20.dp, vertical = 14.dp), - horizontalArrangement = Arrangement.Center, - verticalAlignment = Alignment.CenterVertically, - content = content - ) + CompositionLocalProvider(LocalContentColor provides OnAccent) { + Row( + modifier = modifier + .pressScale(interaction) + .alpha(if (enabled) 1f else 0.4f) + .clip(PillShape) + .background(Lime) + .then( + if (enabled) Modifier.clickable( + interactionSource = interaction, + indication = LocalIndication.current, + onClick = onClick + ) else Modifier + ) + .padding(horizontal = 22.dp, vertical = 15.dp), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically, + content = content + ) + } } @Composable @@ -162,9 +176,9 @@ fun GlassOutlinedButton( modifier = modifier .pressScale(interaction) .alpha(if (enabled) 1f else 0.4f) - .clip(GlassShape) - .background(PanelFill) - .border(1.dp, PanelBorder, GlassShape) + .clip(PillShape) + .background(Surface2) + .border(1.dp, PanelBorder, PillShape) .then( if (enabled) Modifier.clickable( interactionSource = interaction, @@ -172,7 +186,7 @@ fun GlassOutlinedButton( onClick = onClick ) else Modifier ) - .padding(horizontal = 20.dp, vertical = 14.dp), + .padding(horizontal = 22.dp, vertical = 15.dp), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically, content = content @@ -185,7 +199,7 @@ fun GlassCard(modifier: Modifier = Modifier, content: @Composable ColumnScope.() modifier = modifier .glass() .border(1.dp, PanelBorder, GlassShape) - .padding(14.dp), + .padding(16.dp), content = content ) } @@ -193,7 +207,7 @@ fun GlassCard(modifier: Modifier = Modifier, content: @Composable ColumnScope.() @Composable fun GlassProgress(text: String) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { - CircularProgressIndicator(color = ink, modifier = Modifier.padding(2.dp)) + CircularProgressIndicator(color = ChessGreen, modifier = Modifier.padding(2.dp)) Text(text, color = ink, style = MaterialTheme.typography.bodyMedium) } } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/components/SetupStyle.kt b/app/src/main/java/cc/skysparkle/matewave/ui/components/SetupStyle.kt index 0747367..4d74bde 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/components/SetupStyle.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/components/SetupStyle.kt @@ -19,6 +19,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import cc.skysparkle.matewave.ui.theme.ChessGreen +import cc.skysparkle.matewave.ui.theme.OnAccent +import cc.skysparkle.matewave.ui.theme.Surface1 @Composable fun SetupSectionLabel(text: String, modifier: Modifier = Modifier) { @@ -36,7 +38,7 @@ fun SetupSegmented(options: List, selectedIndex: Int, onSelect: (Int) -> modifier = Modifier .fillMaxWidth() .clip(RoundedCornerShape(50)) - .background(ink.copy(alpha = 0.08f)) + .background(Surface1) .padding(4.dp), horizontalArrangement = Arrangement.spacedBy(4.dp) ) { @@ -46,12 +48,16 @@ fun SetupSegmented(options: List, selectedIndex: Int, onSelect: (Int) -> modifier = Modifier .weight(1f) .clip(RoundedCornerShape(50)) - .background(if (selected) ChessGreen.copy(alpha = 0.35f) else Color.Transparent) + .background(if (selected) ChessGreen else Color.Transparent) .clickable { onSelect(index) } .padding(vertical = 10.dp), contentAlignment = Alignment.Center ) { - Text(label, color = ink, style = MaterialTheme.typography.bodyMedium) + Text( + label, + color = if (selected) OnAccent else ink.copy(alpha = 0.8f), + style = MaterialTheme.typography.labelLarge + ) } } } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/AccountScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/AccountScreen.kt index c5804ac..3207afe 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/AccountScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/AccountScreen.kt @@ -1,6 +1,5 @@ package cc.skysparkle.matewave.ui.screens -import cc.skysparkle.matewave.ui.components.ListDivider import cc.skysparkle.matewave.ui.components.ListGroup import cc.skysparkle.matewave.ui.components.ListRow import cc.skysparkle.matewave.ui.components.SectionCaption @@ -45,12 +44,10 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -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.unit.Dp import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import cc.skysparkle.matewave.R import cc.skysparkle.matewave.ui.components.DialogText import cc.skysparkle.matewave.ui.components.DialogAction @@ -60,12 +57,18 @@ import cc.skysparkle.matewave.ui.components.BottomTab import cc.skysparkle.matewave.data.ProfileStore import cc.skysparkle.matewave.ui.components.AppIcon import cc.skysparkle.matewave.ui.components.ButtonIcon -import cc.skysparkle.matewave.ui.components.GlassOutlinedButton +import cc.skysparkle.matewave.ui.components.GlassButton import cc.skysparkle.matewave.ui.components.GlassScaffold import cc.skysparkle.matewave.ui.components.rememberChatImage import cc.skysparkle.matewave.ui.components.encodeImageForChat import cc.skysparkle.matewave.ui.theme.ChessGreen import cc.skysparkle.matewave.ui.theme.PanelBorder +import cc.skysparkle.matewave.ui.theme.GlassShape +import cc.skysparkle.matewave.ui.theme.Lime +import cc.skysparkle.matewave.ui.theme.OnAccent +import cc.skysparkle.matewave.ui.theme.Surface1 +import cc.skysparkle.matewave.ui.theme.Surface2 +import androidx.compose.foundation.layout.Spacer import cc.skysparkle.matewave.ui.theme.whiteOutlinedTextFieldColors import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -137,109 +140,64 @@ fun AccountScreen( ) } ) { - Box( - modifier = Modifier - .fillMaxWidth() - .height(168.dp) - .clip(RoundedCornerShape(20.dp)) - .clickable { backgroundPicker.launch("image/*") } - ) { - val bgBitmap = rememberChatImage(profile.backgroundBase64) - if (bgBitmap != null) { - Image( - bitmap = bgBitmap, - contentDescription = null, - modifier = Modifier.fillMaxWidth().height(168.dp), - contentScale = ContentScale.Crop - ) - } else { - Image( - painter = painterResource(R.drawable.bg_profile_default), - contentDescription = null, - modifier = Modifier.fillMaxWidth().height(168.dp), - contentScale = ContentScale.Crop - ) - } + ProfileHero( + profile = profile, + onPickBackground = { backgroundPicker.launch("image/*") }, + onPickAvatar = { avatarPicker.launch("image/*") }, + onEditName = { editingName = true } + ) - Box( - modifier = Modifier.fillMaxWidth().height(168.dp).background( - Brush.verticalGradient( - 0.0f to Color.Black.copy(alpha = 0.30f), - 0.55f to Color.Black.copy(alpha = 0.45f), - 1.0f to Color.Black.copy(alpha = 0.72f) - ) - ) + Row(verticalAlignment = Alignment.CenterVertically) { + AppIcon(R.drawable.ic_rating, size = 20.dp, tint = Lime) + Spacer(Modifier.width(8.dp)) + Text( + stringResource(R.string.friends_rating, profile.elo), + color = ink, + style = MaterialTheme.typography.titleMedium, + modifier = Modifier.weight(1f) ) - - Box( + Text( + stringResource(R.string.stats_dialog_title), + color = ChessGreen, + style = MaterialTheme.typography.labelLarge, modifier = Modifier - .align(Alignment.TopEnd) - .padding(10.dp) - .size(36.dp) - .clip(CircleShape) - .background(Color.Black.copy(alpha = 0.45f)) - .clickable { backgroundPicker.launch("image/*") }, - contentAlignment = Alignment.Center - ) { - AppIcon(R.drawable.ic_add_photo, size = 20.dp) - } + .clip(RoundedCornerShape(50)) + .border(1.dp, ChessGreen.copy(alpha = 0.6f), RoundedCornerShape(50)) + .clickable { showStats = true } + .padding(horizontal = 14.dp, vertical = 6.dp) + ) + } - Column( - modifier = Modifier - .align(Alignment.BottomStart) - .fillMaxWidth() - .padding(horizontal = 18.dp, vertical = 16.dp) - ) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(16.dp)) { - Box { - AvatarCircle( - base64 = profile.avatarBase64, - size = 76.dp, - modifier = Modifier.clickable { avatarPicker.launch("image/*") } - ) - Box( - modifier = Modifier - .align(Alignment.BottomEnd) - .size(28.dp) - .clip(CircleShape) - .background(ChessGreen) - .clickable { avatarPicker.launch("image/*") }, - contentAlignment = Alignment.Center - ) { - AppIcon(R.drawable.ic_edit, size = 14.dp) - } - } - Column { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(8.dp) - ) { - Text( - profile.name, - color = ink, - fontSize = 23.sp, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - - AppIcon( - R.drawable.ic_edit, - size = 18.dp, - tint = ink.copy(alpha = 0.75f), - modifier = Modifier.clickable { editingName = true } - ) - } - Text( - stringResource(R.string.account_header_summary, profile.elo, cc.skysparkle.matewave.stats.Stats.gamesPlayed()), - color = ink.copy(alpha = 0.72f), - style = MaterialTheme.typography.bodyMedium - ) - } - } + if (!profile.levelChosen) { + GlassButton(onClick = { showLevelPicker = true }, modifier = Modifier.fillMaxWidth()) { + ButtonIcon(R.drawable.ic_speed) + Text(stringResource(R.string.account_choose_level), style = MaterialTheme.typography.titleMedium) } } + StatTiles() + + // Progress: the reason to open a profile. + SectionCaption(stringResource(R.string.account_progress)) + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + HighlightCard( + iconRes = R.drawable.ic_study, + title = stringResource(R.string.study_title), + value = "${study.learnedCount}/${study.courses.size} · ★${study.masteredCount}", + modifier = Modifier.weight(1f), + onClick = onStudyClick + ) + HighlightCard( + iconRes = R.drawable.ic_puzzle, + title = stringResource(R.string.puzzles_title), + value = "${cc.skysparkle.matewave.stats.Stats.solvedPuzzles().size}", + modifier = Modifier.weight(1f), + onClick = null + ) + } + + RatingHistoryCard(elo = profile.elo, onClick = { showStats = true }) + if (profile.avatarBase64 != null || profile.backgroundBase64 != null) { Text( stringResource(R.string.account_reset_avatar), @@ -253,43 +211,6 @@ fun AccountScreen( ) } - if (!profile.levelChosen) { - GlassOutlinedButton(onClick = { showLevelPicker = true }, modifier = Modifier.fillMaxWidth()) { - ButtonIcon(R.drawable.ic_speed) - Text(stringResource(R.string.account_choose_level), color = ink) - } - } - - // Progress: the reason to open a profile. The rating is shown here once, with its trend. - SectionCaption(stringResource(R.string.account_progress)) - ListGroup { - val curve = remember(profile.elo) { cc.skysparkle.matewave.stats.Stats.ratingCurve(profile.elo) } - ListRow( - title = stringResource(R.string.account_rating_row), - icon = R.drawable.ic_rating, - iconTint = ChessGreen, - value = "${profile.elo}", - valueColor = ink, - trailing = { MiniRatingGraph(points = curve, modifier = Modifier.width(64.dp).height(24.dp)) }, - chevron = true, - onClick = { showStats = true } - ) - ListDivider() - ListRow( - title = stringResource(R.string.study_title), - icon = R.drawable.ic_study, - value = "${study.learnedCount}/${study.courses.size} · ★${study.masteredCount}", - chevron = true, - onClick = onStudyClick - ) - ListDivider() - ListRow( - title = stringResource(R.string.puzzles_title), - icon = R.drawable.ic_puzzle, - value = stringResource(R.string.puzzle_solved_count, cc.skysparkle.matewave.stats.Stats.solvedPuzzles().size) - ) - } - // Security folded into one row; the details live in a dialog. if (myFingerprint != null) { SectionCaption(stringResource(R.string.account_section_security)) @@ -393,6 +314,176 @@ fun AccountScreen( } } +/** Big name over a dimmed cover, with a large avatar in a neon ring, as in the mockup. */ +@Composable +private fun ProfileHero( + profile: cc.skysparkle.matewave.data.Profile, + onPickBackground: () -> Unit, + onPickAvatar: () -> Unit, + onEditName: () -> Unit +) { + val heroHeight = 236.dp + Box( + modifier = Modifier + .fillMaxWidth() + .height(heroHeight) + .clip(GlassShape) + .background(Surface1) + ) { + val bgBitmap = rememberChatImage(profile.backgroundBase64) + if (bgBitmap != null) { + Image( + bitmap = bgBitmap, + contentDescription = null, + modifier = Modifier.fillMaxWidth().height(heroHeight), + contentScale = ContentScale.Crop, + alpha = 0.45f + ) + } else { + Image( + painter = painterResource(R.drawable.bg_profile_default), + contentDescription = null, + modifier = Modifier.fillMaxWidth().height(heroHeight), + contentScale = ContentScale.Crop, + alpha = 0.45f + ) + } + Box( + modifier = Modifier.fillMaxWidth().height(heroHeight).background( + Brush.verticalGradient( + 0.0f to Surface1.copy(alpha = 0.2f), + 0.6f to Surface1.copy(alpha = 0.6f), + 1.0f to Surface1.copy(alpha = 0.95f) + ) + ) + ) + + Box( + modifier = Modifier + .align(Alignment.TopStart) + .padding(12.dp) + .size(36.dp) + .clip(CircleShape) + .background(Color.Black.copy(alpha = 0.45f)) + .clickable(onClick = onPickBackground), + contentAlignment = Alignment.Center + ) { + AppIcon(R.drawable.ic_add_photo, size = 20.dp) + } + + Box( + modifier = Modifier + .align(Alignment.TopEnd) + .padding(top = 16.dp, end = 16.dp) + ) { + Box( + modifier = Modifier.size(148.dp).clip(CircleShape).background(ChessGreen), + contentAlignment = Alignment.Center + ) { + AvatarCircle( + base64 = profile.avatarBase64, + size = 136.dp, + modifier = Modifier.clickable(onClick = onPickAvatar) + ) + } + Box( + modifier = Modifier + .align(Alignment.BottomStart) + .padding(start = 8.dp, bottom = 8.dp) + .size(34.dp) + .clip(CircleShape) + .background(Lime) + .clickable(onClick = onPickAvatar), + contentAlignment = Alignment.Center + ) { + AppIcon(R.drawable.ic_edit, size = 16.dp, tint = OnAccent) + } + } + + Row( + modifier = Modifier + .align(Alignment.BottomStart) + .fillMaxWidth() + .clickable(onClick = onEditName) + .padding(start = 18.dp, end = 18.dp, bottom = 16.dp), + verticalAlignment = Alignment.Bottom + ) { + Text( + profile.name, + color = ink, + style = MaterialTheme.typography.displaySmall, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f, fill = false) + ) + Spacer(Modifier.width(8.dp)) + AppIcon( + R.drawable.ic_edit, + size = 18.dp, + tint = ink.copy(alpha = 0.7f), + modifier = Modifier.padding(bottom = 8.dp) + ) + } + } +} + +@Composable +private fun HighlightCard( + iconRes: Int, + title: String, + value: String, + modifier: Modifier = Modifier, + onClick: (() -> Unit)? +) { + Row( + modifier = modifier + .clip(GlassShape) + .background(Surface1) + .border(1.dp, PanelBorder, GlassShape) + .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier) + .padding(14.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier.size(40.dp).clip(RoundedCornerShape(14.dp)).background(Surface2), + contentAlignment = Alignment.Center + ) { + AppIcon(iconRes, size = 22.dp, tint = ChessGreen) + } + Spacer(Modifier.width(10.dp)) + Column(modifier = Modifier.weight(1f)) { + Text(title, color = ink.copy(alpha = 0.6f), style = MaterialTheme.typography.labelSmall, maxLines = 2, overflow = TextOverflow.Ellipsis) + Text(value, color = ink, style = MaterialTheme.typography.titleMedium, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } +} + +@Composable +private fun RatingHistoryCard(elo: Int, onClick: () -> Unit) { + val curve = remember(elo) { cc.skysparkle.matewave.stats.Stats.ratingCurve(elo) } + Column( + modifier = Modifier + .fillMaxWidth() + .clip(GlassShape) + .background(Surface1) + .border(1.dp, PanelBorder, GlassShape) + .clickable(onClick = onClick) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + stringResource(R.string.account_rating_row), + color = ink, + style = MaterialTheme.typography.titleMedium, + modifier = Modifier.weight(1f) + ) + AppIcon(R.drawable.ic_arrow_forward, size = 20.dp, tint = ink.copy(alpha = 0.6f)) + } + MiniRatingGraph(points = curve, modifier = Modifier.fillMaxWidth().height(96.dp), showDots = false) + } +} + private const val MAX_NAME_LENGTH = 20 @Composable @@ -463,12 +554,12 @@ private fun LevelPickerDialog(onChoose: (Int) -> Unit, onDismiss: () -> Unit) { } ) { SKILL_LEVELS.forEach { level -> - val rowShape = RoundedCornerShape(12.dp) + val rowShape = RoundedCornerShape(16.dp) Row( modifier = Modifier .fillMaxWidth() .clip(rowShape) - .background(ink.copy(alpha = 0.07f)) + .background(Surface2) .clickable { onChoose(level.elo) } .padding(horizontal = 16.dp, vertical = 14.dp), horizontalArrangement = Arrangement.SpaceBetween @@ -487,7 +578,7 @@ fun AvatarCircle(base64: String?, size: Dp, modifier: Modifier = Modifier) { modifier = modifier .size(size) .clip(CircleShape) - .background(ChessGreen.copy(alpha = 0.6f)) + .background(Surface2) .border(2.dp, PanelBorder, CircleShape), contentAlignment = Alignment.Center ) { @@ -502,7 +593,7 @@ fun AvatarCircle(base64: String?, size: Dp, modifier: Modifier = Modifier) { Image( painter = painterResource(R.drawable.ic_default_avatar), contentDescription = null, - colorFilter = ColorFilter.tint(ink), + colorFilter = ColorFilter.tint(ink.copy(alpha = 0.8f)), modifier = Modifier.size(size * 0.8f) ) } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/AppearanceScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/AppearanceScreen.kt index 93391ca..3a4792f 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/AppearanceScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/AppearanceScreen.kt @@ -182,8 +182,8 @@ private fun AppearanceToggle( checked = checked, onCheckedChange = onCheckedChange, colors = SwitchDefaults.colors( - checkedThumbColor = Color.White, - checkedTrackColor = Color(0xFF4F8A5B) + checkedThumbColor = cc.skysparkle.matewave.ui.theme.OnAccent, + checkedTrackColor = cc.skysparkle.matewave.ui.theme.ChessGreen ) ) } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/ConnectionScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/ConnectionScreen.kt index 83dd128..107daaf 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/ConnectionScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/ConnectionScreen.kt @@ -64,6 +64,8 @@ import cc.skysparkle.matewave.ui.components.GlassButton import cc.skysparkle.matewave.ui.components.GlassScaffold import cc.skysparkle.matewave.ui.components.rememberPermissionRequester import cc.skysparkle.matewave.ui.theme.ChessGreen +import cc.skysparkle.matewave.ui.theme.Lime +import cc.skysparkle.matewave.ui.theme.OnAccent private enum class Hint { BLUETOOTH_PERMISSION, BLUETOOTH_OFF, WIFI_OFF } @@ -173,7 +175,7 @@ fun ConnectionScreen( modifier = Modifier.weight(1f) ) { ButtonIcon(R.drawable.ic_add, size = 20.dp) - Text(stringResource(R.string.nearby_create), color = ink, style = MaterialTheme.typography.titleMedium, maxLines = 1) + Text(stringResource(R.string.nearby_create), style = MaterialTheme.typography.titleMedium, maxLines = 1) } GlassOutlinedButton(onClick = { pickTime = true }) { Text(timeControl.shortLabel(), color = ink, maxLines = 1) @@ -256,11 +258,11 @@ fun ConnectionScreen( Spacer(Modifier.width(8.dp)) Text( stringResource(R.string.players_play), - color = Color.White, + color = OnAccent, style = MaterialTheme.typography.labelLarge, modifier = Modifier .clip(RoundedCornerShape(50)) - .background(ChessGreen) + .background(Lime) .clickable { onJoin(entry.type, timeControl, entry.address) } .padding(horizontal = 14.dp, vertical = 6.dp) ) diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/FriendsScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/FriendsScreen.kt index b70f0d1..0153f05 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/FriendsScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/FriendsScreen.kt @@ -47,6 +47,8 @@ import cc.skysparkle.matewave.ui.components.ButtonIcon import cc.skysparkle.matewave.ui.components.BottomTab import cc.skysparkle.matewave.ui.components.GlassScaffold import cc.skysparkle.matewave.ui.theme.ChessGreen +import cc.skysparkle.matewave.ui.theme.Lime +import cc.skysparkle.matewave.ui.theme.OnAccent import cc.skysparkle.matewave.spectate.FriendGameStatus import cc.skysparkle.matewave.spectate.FriendStatusResolver import cc.skysparkle.matewave.spectate.NearbyPlayerGame @@ -130,7 +132,7 @@ fun FriendsScreen( Text(stringResource(R.string.friends_nobody_hint), color = ink.copy(alpha = 0.65f), style = MaterialTheme.typography.bodyMedium) GlassButton(onClick = onPlay, modifier = Modifier.fillMaxWidth()) { ButtonIcon(R.drawable.ic_play) - Text(stringResource(R.string.friends_play_nearby), color = ink) + Text(stringResource(R.string.friends_play_nearby), style = MaterialTheme.typography.titleMedium) } return@GlassScaffold } @@ -234,11 +236,11 @@ private fun displayName(name: String, id: String): String { private fun PlayChip(onClick: () -> Unit) { Text( stringResource(R.string.friends_play), - color = Color.White, + color = OnAccent, style = MaterialTheme.typography.labelLarge, modifier = Modifier .clip(RoundedCornerShape(50)) - .background(ChessGreen) + .background(Lime) .clickable(onClick = onClick) .padding(horizontal = 14.dp, vertical = 6.dp) ) @@ -384,12 +386,12 @@ private fun WatchChip(status: FriendGameStatus, onClick: () -> Unit) { } Text( label, - color = if (enabled) Color.White else ink.copy(alpha = 0.5f), + color = if (enabled) OnAccent else ink.copy(alpha = 0.5f), style = MaterialTheme.typography.labelLarge, maxLines = 1, modifier = Modifier .clip(RoundedCornerShape(50)) - .background(if (enabled) ChessGreen else ink.copy(alpha = 0.12f)) + .background(if (enabled) Lime else ink.copy(alpha = 0.12f)) .then(if (enabled) Modifier.clickable(onClick = onClick) else Modifier) .padding(horizontal = 14.dp, vertical = 6.dp) ) diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/GameScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/GameScreen.kt index 74b8b92..9f64e4f 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/GameScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/GameScreen.kt @@ -49,6 +49,7 @@ import cc.skysparkle.matewave.ui.components.GlassOutlinedButton import cc.skysparkle.matewave.ui.components.GlassScaffold import cc.skysparkle.matewave.ui.components.PromotionDialog import cc.skysparkle.matewave.ui.theme.ChessGreen +import cc.skysparkle.matewave.ui.theme.OnAccent import cc.skysparkle.matewave.viewmodel.GameMode import cc.skysparkle.matewave.viewmodel.GameUiState import cc.skysparkle.matewave.viewmodel.GameViewModel @@ -300,7 +301,7 @@ private fun ChatButton(unreadCount: Int, onClick: () -> Unit) { .background(ChessGreen), contentAlignment = Alignment.Center ) { - Text(unreadCount.toString(), color = Color.White, fontSize = 11.sp) + Text(unreadCount.toString(), color = OnAccent, fontSize = 11.sp) } } } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/MainMenuScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/MainMenuScreen.kt index 05bef79..bebd514 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/MainMenuScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/MainMenuScreen.kt @@ -1,17 +1,6 @@ package cc.skysparkle.matewave.ui.screens -import androidx.compose.foundation.layout.statusBarsPadding -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.ui.draw.clip -import androidx.compose.ui.platform.LocalContext -import cc.skysparkle.matewave.ui.components.ListDivider -import cc.skysparkle.matewave.ui.components.ListGroup -import cc.skysparkle.matewave.ui.components.ListRow -import cc.skysparkle.matewave.ui.components.SectionCaption - -import cc.skysparkle.matewave.ui.theme.ink - +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -20,20 +9,24 @@ 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.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.statusBarsPadding 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.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -41,33 +34,42 @@ 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.draw.drawWithCache +import androidx.compose.ui.draw.rotate import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.compose.foundation.Image import cc.skysparkle.matewave.R -import cc.skysparkle.matewave.ui.components.DialogText -import cc.skysparkle.matewave.ui.components.DialogAction -import cc.skysparkle.matewave.ui.components.AppDialog import cc.skysparkle.matewave.stats.Stats import cc.skysparkle.matewave.ui.components.AppBottomBar +import cc.skysparkle.matewave.ui.components.AppDialog +import cc.skysparkle.matewave.ui.components.AppIcon import cc.skysparkle.matewave.ui.components.BottomTab +import cc.skysparkle.matewave.ui.components.DialogAction +import cc.skysparkle.matewave.ui.components.DialogText +import cc.skysparkle.matewave.ui.components.SectionCaption +import cc.skysparkle.matewave.ui.components.displayName import cc.skysparkle.matewave.ui.theme.ChessGreen -import cc.skysparkle.matewave.ui.theme.TabletMaxContentWidth import cc.skysparkle.matewave.ui.theme.GlassShape -import cc.skysparkle.matewave.ui.theme.glass +import cc.skysparkle.matewave.ui.theme.HeroTextStyle +import cc.skysparkle.matewave.ui.theme.Lime +import cc.skysparkle.matewave.ui.theme.OnAccent +import cc.skysparkle.matewave.ui.theme.PanelBorder +import cc.skysparkle.matewave.ui.theme.Surface1 +import cc.skysparkle.matewave.ui.theme.Surface2 +import cc.skysparkle.matewave.ui.theme.TabletMaxContentWidth +import cc.skysparkle.matewave.ui.theme.ink import cc.skysparkle.matewave.viewmodel.GameViewModel import cc.skysparkle.matewave.viewmodel.ResumeInfo -import cc.skysparkle.matewave.ui.components.displayName @Composable fun MainMenuScreen( @@ -86,13 +88,13 @@ fun MainMenuScreen( val context = LocalContext.current val resumable by viewModel.resumable.collectAsState() val ongoing = resumable - val hasOngoingGame = ongoing != null val profile = remember { cc.skysparkle.matewave.data.ProfileStore.get() } val lastSetup = remember { cc.skysparkle.matewave.settings.LastGameSetup(context) } LaunchedEffect(Unit) { studyViewModel.init(context) } val study by studyViewModel.overview.collectAsState() var showRatingGate by remember { mutableStateOf(false) } + var showStats by remember { mutableStateOf(false) } Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) { Column(modifier = Modifier.fillMaxSize().widthIn(max = TabletMaxContentWidth)) { @@ -100,26 +102,33 @@ fun MainMenuScreen( modifier = Modifier .fillMaxWidth() .statusBarsPadding() - .padding(top = 16.dp, start = 20.dp, end = 20.dp, bottom = 10.dp), + .padding(top = 12.dp, start = 20.dp, end = 20.dp, bottom = 4.dp), verticalAlignment = Alignment.CenterVertically ) { - Image( - painter = painterResource(R.drawable.logo_knight), - contentDescription = null, - modifier = Modifier.size(width = 30.dp, height = 44.dp) - ) - Spacer(Modifier.width(12.dp)) - Greeting(modifier = Modifier.weight(1f)) + Box( + modifier = Modifier.size(44.dp).clip(CircleShape).background(Surface2), + contentAlignment = Alignment.Center + ) { + Image( + painter = painterResource(R.drawable.logo_knight), + contentDescription = null, + modifier = Modifier.size(width = 20.dp, height = 29.dp) + ) + } + Spacer(Modifier.weight(1f)) // The rating is always in sight. - Text( - "${profile.elo}", - color = ink, - style = MaterialTheme.typography.titleMedium, + Row( modifier = Modifier .clip(RoundedCornerShape(50)) - .background(ink.copy(alpha = 0.10f)) - .padding(horizontal = 12.dp, vertical = 6.dp) - ) + .background(Surface2) + .clickable { showStats = true } + .padding(start = 10.dp, end = 14.dp, top = 8.dp, bottom = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + AppIcon(R.drawable.ic_rating, size = 18.dp, tint = Lime) + Spacer(Modifier.width(6.dp)) + Text("${profile.elo}", color = ink, style = MaterialTheme.typography.titleSmall) + } } Column( @@ -130,70 +139,71 @@ fun MainMenuScreen( .verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(14.dp) ) { - // The most urgent thing first: an unfinished game. - if (ongoing != null) ContinueCard(ongoing, onContinueGame) + Hero() - Row(horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth()) { - ModeTile( - iconRes = R.drawable.ic_ai_app, - title = stringResource(R.string.mode_ai_title), + Row( + modifier = Modifier.fillMaxWidth().height(250.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp) + ) { + AiCard( subtitle = stringResource(R.string.mode_ai_subtitle), - modifier = Modifier.weight(1f), + modifier = Modifier.weight(1f).fillMaxHeight(), onClick = { if (profile.levelChosen) onVsAiClick() else showRatingGate = true } ) - ModeTile( - iconRes = R.drawable.ic_versus, - title = stringResource(R.string.mode_online_title), - subtitle = stringResource(R.string.mode_online_subtitle), - modifier = Modifier.weight(1f), - onClick = { if (profile.levelChosen) onVsPlayerClick() else showRatingGate = true } - ) + Column( + modifier = Modifier.weight(1f).fillMaxHeight(), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + SmallModeCard( + iconRes = R.drawable.ic_versus, + title = stringResource(R.string.mode_online_title), + subtitle = stringResource(R.string.mode_online_subtitle), + modifier = Modifier.weight(1f).fillMaxWidth(), + onClick = { if (profile.levelChosen) onVsPlayerClick() else showRatingGate = true } + ) + // The most urgent thing takes this slot: an unfinished game, otherwise a quick rematch. + if (ongoing != null) { + ContinueCard(ongoing, Modifier.weight(1f).fillMaxWidth(), onContinueGame) + } else { + SmallModeCard( + iconRes = R.drawable.ic_quick_game, + title = stringResource(R.string.quick_game_title), + subtitle = stringResource(difficultyName(lastSetup.aiDifficulty)) + + " · " + lastSetup.aiTime.displayName(), + modifier = Modifier.weight(1f).fillMaxWidth(), + onClick = { if (profile.levelChosen) onQuickGame() else showRatingGate = true } + ) + } + } } SectionCaption(stringResource(R.string.home_today)) - ListGroup { - if (!hasOngoingGame) { - ListRow( - title = stringResource(R.string.quick_game_title), - subtitle = stringResource( - R.string.quick_game_subtitle, - stringResource(difficultyName(lastSetup.aiDifficulty)), - lastSetup.aiTime.displayName() - ), - icon = R.drawable.ic_quick_game, - iconTint = ChessGreen, - chevron = true, - onClick = { if (profile.levelChosen) onQuickGame() else showRatingGate = true } - ) - ListDivider() - } - if (study.dueCards > 0) { - ListRow( - title = stringResource(R.string.study_review_title), - subtitle = stringResource(R.string.study_review_summary, study.dueCards, study.dueCourses), - icon = R.drawable.ic_review, - iconTint = cc.skysparkle.matewave.ui.screens.StarGold, - chevron = true, - onClick = onStudyClick - ) - } else { - ListRow( - title = stringResource(R.string.study_title), - subtitle = stringResource(R.string.study_menu_subtitle), - icon = R.drawable.ic_study, - chevron = true, - onClick = onStudyClick - ) - } - ListDivider() - ListRow( + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + val due = study.dueCards > 0 + LearnCard( + iconRes = if (due) R.drawable.ic_review else R.drawable.ic_study, + title = stringResource(if (due) R.string.study_review_title else R.string.study_title), + subtitle = if (due) { + stringResource(R.string.study_review_summary, study.dueCards, study.dueCourses) + } else { + stringResource(R.string.study_menu_subtitle) + }, + highlighted = due, + modifier = Modifier.weight(1f), + onClick = onStudyClick + ) + LearnCard( + iconRes = R.drawable.ic_puzzle, title = stringResource(R.string.puzzles_title), - subtitle = stringResource(R.string.puzzles_subtitle), - icon = R.drawable.ic_puzzle, - chevron = true, + subtitle = stringResource(R.string.puzzle_solved_count, Stats.solvedPuzzles().size), + highlighted = false, + modifier = Modifier.weight(1f), onClick = onPuzzlesClick ) } + + ProgressPanel(elo = profile.elo, onClick = { showStats = true }) + Spacer(Modifier.height(4.dp)) } Box(modifier = Modifier.navigationBarsPadding()) { @@ -215,10 +225,11 @@ fun MainMenuScreen( onDismiss = { showRatingGate = false } ) } + if (showStats) StatsDialog(onDismiss = { showStats = false }) } @Composable -private fun Greeting(modifier: Modifier = Modifier) { +private fun Hero() { val hour = remember { java.util.Calendar.getInstance().get(java.util.Calendar.HOUR_OF_DAY) } val greeting = when (hour) { in 5..11 -> stringResource(R.string.greeting_morning) @@ -226,65 +237,240 @@ private fun Greeting(modifier: Modifier = Modifier) { in 18..22 -> stringResource(R.string.greeting_evening) else -> stringResource(R.string.greeting_night) } - Column(modifier = modifier) { - Row(verticalAlignment = Alignment.CenterVertically) { - Text(greeting, color = ink, style = MaterialTheme.typography.headlineSmall) - Spacer(Modifier.width(6.dp)) - Text("👋", fontSize = 20.sp) + Box(modifier = Modifier.fillMaxWidth().padding(top = 8.dp)) { + Column(modifier = Modifier.padding(end = 92.dp)) { + Text("$greeting 👋", color = ink.copy(alpha = 0.6f), style = MaterialTheme.typography.bodyLarge) + Spacer(Modifier.height(2.dp)) + Text( + stringResource(R.string.home_hero), + color = ink, + style = HeroTextStyle, + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) } - Text(stringResource(R.string.greeting_ready), color = ink.copy(alpha = 0.7f), style = MaterialTheme.typography.bodyMedium) + Image( + painter = painterResource(R.drawable.piece_white_knight), + contentDescription = null, + modifier = Modifier + .align(Alignment.CenterEnd) + .size(96.dp) + .rotate(-14f) + ) + } +} + +/** The main mode: a tall neon card with a big piece, like the hero tile of the mockup. */ +@Composable +private fun AiCard(subtitle: String, modifier: Modifier = Modifier, onClick: () -> Unit) { + Box( + modifier = modifier + .clip(GlassShape) + .background(ChessGreen) + .clickable(onClick = onClick) + ) { + Image( + painter = painterResource(R.drawable.piece_black_king), + contentDescription = null, + modifier = Modifier + .align(Alignment.TopEnd) + .padding(top = 10.dp, end = 4.dp) + .size(108.dp) + .rotate(10f) + ) + Column( + modifier = Modifier.align(Alignment.BottomStart).fillMaxWidth().padding(16.dp) + ) { + Text( + stringResource(R.string.mode_ai_title), + color = OnAccent, + style = MaterialTheme.typography.headlineSmall, + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) + Spacer(Modifier.height(4.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + subtitle, + color = OnAccent.copy(alpha = 0.7f), + style = MaterialTheme.typography.bodySmall, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f) + ) + Spacer(Modifier.width(8.dp)) + ArrowBubble(fill = OnAccent, tint = ChessGreen) + } + } + } +} + +@Composable +private fun SmallModeCard( + iconRes: Int, + title: String, + subtitle: String, + modifier: Modifier = Modifier, + onClick: () -> Unit +) { + Column( + modifier = modifier + .clip(GlassShape) + .background(Surface1) + .border(1.dp, PanelBorder, GlassShape) + .clickable(onClick = onClick) + .padding(14.dp) + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Box( + modifier = Modifier.size(34.dp).clip(CircleShape).background(ChessGreen.copy(alpha = 0.14f)), + contentAlignment = Alignment.Center + ) { + AppIcon(iconRes, size = 18.dp, tint = ChessGreen) + } + Spacer(Modifier.weight(1f)) + ArrowBubble(fill = Surface2, tint = ink) + } + Spacer(Modifier.weight(1f)) + Text(title, color = ink, style = MaterialTheme.typography.titleMedium, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(subtitle, color = ink.copy(alpha = 0.55f), style = MaterialTheme.typography.bodySmall, maxLines = 1, overflow = TextOverflow.Ellipsis) } } /** An unfinished game against the AI: move number, whose turn and the clock, one tap to resume. */ @Composable -private fun ContinueCard(info: ResumeInfo, onClick: () -> Unit) { +private fun ContinueCard(info: ResumeInfo, modifier: Modifier = Modifier, onClick: () -> Unit) { val turn = stringResource(if (info.myTurn) R.string.home_your_move else R.string.home_ai_move) val clock = info.myMillis?.let { ms -> val s = ms.coerceAtLeast(0) / 1000 "%d:%02d".format(s / 60, s % 60) } val details = stringResource(R.string.home_continue_details, info.moveNumber, turn) + (clock?.let { " · $it" } ?: "") - Row( - modifier = Modifier - .fillMaxWidth() - .glass() - .border(1.dp, ChessGreen.copy(alpha = 0.6f), GlassShape) + Column( + modifier = modifier + .clip(GlassShape) + .background(Lime) .clickable(onClick = onClick) - .padding(16.dp), - verticalAlignment = Alignment.CenterVertically + .padding(14.dp) ) { - Column(modifier = Modifier.weight(1f)) { - Text(stringResource(R.string.continue_game_title), color = ink, style = MaterialTheme.typography.titleMedium) - Text(details, color = ink.copy(alpha = 0.7f), style = MaterialTheme.typography.bodySmall) - } - Box( - modifier = Modifier.size(44.dp).clip(CircleShape).background(ChessGreen), - contentAlignment = Alignment.Center - ) { - cc.skysparkle.matewave.ui.components.AppIcon(R.drawable.ic_arrow_forward, size = 20.dp, tint = Color.White) + Row(verticalAlignment = Alignment.CenterVertically) { + Box( + modifier = Modifier.size(34.dp).clip(CircleShape).background(OnAccent.copy(alpha = 0.1f)), + contentAlignment = Alignment.Center + ) { + AppIcon(R.drawable.ic_play, size = 18.dp, tint = OnAccent) + } + Spacer(Modifier.weight(1f)) + ArrowBubble(fill = OnAccent, tint = Lime) } + Spacer(Modifier.weight(1f)) + Text( + stringResource(R.string.continue_game_title), + color = OnAccent, + style = MaterialTheme.typography.titleMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text(details, color = OnAccent.copy(alpha = 0.7f), style = MaterialTheme.typography.bodySmall, maxLines = 1, overflow = TextOverflow.Ellipsis) } } -/** One of the two equal ways to start a game. */ @Composable -private fun ModeTile(iconRes: Int, title: String, subtitle: String, modifier: Modifier = Modifier, onClick: () -> Unit) { +private fun ArrowBubble(fill: Color, tint: Color) { + Box( + modifier = Modifier.size(30.dp).clip(CircleShape).background(fill), + contentAlignment = Alignment.Center + ) { + AppIcon(R.drawable.ic_arrow_forward, size = 16.dp, tint = tint) + } +} + +@Composable +private fun LearnCard( + iconRes: Int, + title: String, + subtitle: String, + highlighted: Boolean, + modifier: Modifier = Modifier, + onClick: () -> Unit +) { Column( modifier = modifier - .glass() + .height(148.dp) + .clip(GlassShape) + .background(Surface1) + .border(1.dp, if (highlighted) Lime.copy(alpha = 0.7f) else PanelBorder, GlassShape) .clickable(onClick = onClick) - .padding(14.dp), - verticalArrangement = Arrangement.spacedBy(4.dp) + .padding(14.dp) ) { - Image( - painter = painterResource(iconRes), - contentDescription = null, - colorFilter = ColorFilter.tint(ink), - modifier = Modifier.size(24.dp) - ) - Text(title, color = ink, style = MaterialTheme.typography.titleMedium) - Text(subtitle, color = ink.copy(alpha = 0.65f), style = MaterialTheme.typography.bodySmall) + Box( + modifier = Modifier + .size(40.dp) + .clip(RoundedCornerShape(14.dp)) + .background(if (highlighted) Lime else Surface2), + contentAlignment = Alignment.Center + ) { + AppIcon(iconRes, size = 22.dp, tint = if (highlighted) OnAccent else ChessGreen) + } + Spacer(Modifier.weight(1f)) + Text(title, color = ink, style = MaterialTheme.typography.titleSmall, maxLines = 2, overflow = TextOverflow.Ellipsis) + Spacer(Modifier.height(2.dp)) + Text(subtitle, color = ink.copy(alpha = 0.55f), style = MaterialTheme.typography.bodySmall, maxLines = 2, overflow = TextOverflow.Ellipsis) + } +} + +/** Rating with its trend and the three numbers players look at; opens the statistics. */ +@Composable +private fun ProgressPanel(elo: Int, onClick: () -> Unit) { + val curve = remember(elo) { Stats.ratingCurve(elo) } + Column( + modifier = Modifier + .fillMaxWidth() + .clip(GlassShape) + .background(Surface1) + .border(1.dp, PanelBorder, GlassShape) + .clickable(onClick = onClick) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Column(modifier = Modifier.weight(1f)) { + Text( + stringResource(R.string.account_progress).uppercase(), + color = ink.copy(alpha = 0.5f), + style = MaterialTheme.typography.labelMedium + ) + Text("$elo", color = ink, style = MaterialTheme.typography.headlineMedium) + } + MiniRatingGraph(points = curve, modifier = Modifier.width(132.dp).height(44.dp), showDots = false, showGrid = false) + } + StatTiles() + } +} + +/** Games, wins and streak, as three equal tiles. */ +@Composable +internal fun StatTiles() { + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatTile(R.drawable.ic_play, stringResource(R.string.stat_games), "${Stats.gamesPlayed()}", Modifier.weight(1f)) + StatTile(R.drawable.ic_trophy, stringResource(R.string.stat_wins), "${Stats.wins()}", Modifier.weight(1f)) + StatTile(R.drawable.ic_speed, stringResource(R.string.stat_streak), "${Stats.streak()}", Modifier.weight(1f)) + } +} + +@Composable +private fun StatTile(iconRes: Int, label: String, value: String, modifier: Modifier = Modifier) { + Column( + modifier = modifier + .clip(RoundedCornerShape(16.dp)) + .background(Surface2) + .padding(vertical = 12.dp, horizontal = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + AppIcon(iconRes, size = 18.dp, tint = ChessGreen) + Spacer(Modifier.height(6.dp)) + Text(label, color = ink.copy(alpha = 0.6f), style = MaterialTheme.typography.labelSmall, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(value, color = ink, style = MaterialTheme.typography.titleMedium, maxLines = 1) } } @@ -326,7 +512,7 @@ internal fun StatsDialog(onDismiss: () -> Unit) { } @Composable -internal fun MiniRatingGraph(points: List, modifier: Modifier = Modifier) { +internal fun MiniRatingGraph(points: List, modifier: Modifier = Modifier, showDots: Boolean = true, showGrid: Boolean = true) { val lineInk = ink // Paths, gradient and stroke are built once per size and reused by every redraw. Spacer( @@ -352,23 +538,30 @@ internal fun MiniRatingGraph(points: List, modifier: Modifier = Modifier) { close() } val fillBrush = Brush.verticalGradient(listOf(ChessGreen.copy(alpha = 0.35f), ChessGreen.copy(alpha = 0f))) - val lineStroke = Stroke(width = 4f, cap = StrokeCap.Round) + val lineBrush = Brush.horizontalGradient(listOf(ChessGreen, Lime)) + val lineStroke = Stroke(width = 2.5.dp.toPx(), cap = StrokeCap.Round) onDrawBehind { - val gridLines = 4 - for (i in 0..gridLines) { - val y = size.height / gridLines * i - drawLine(lineInk.copy(alpha = 0.08f), Offset(0f, y), Offset(size.width, y), strokeWidth = 1f) + if (showGrid) { + val gridLines = 4 + for (i in 0..gridLines) { + val y = size.height / gridLines * i + drawLine(lineInk.copy(alpha = 0.06f), Offset(0f, y), Offset(size.width, y), strokeWidth = 1f) + } + drawLine(lineInk.copy(alpha = 0.25f), Offset(0f, zeroY), Offset(size.width, zeroY), strokeWidth = 1.5f) } - drawLine(lineInk.copy(alpha = 0.3f), Offset(0f, zeroY), Offset(size.width, zeroY), strokeWidth = 1.5f) drawPath(fill, brush = fillBrush) - drawPath(line, color = ChessGreen, style = lineStroke) + drawPath(line, brush = lineBrush, style = lineStroke) - points.forEachIndexed { i, v -> - val center = Offset(i * stepX, yOf(v)) - drawCircle(color = lineInk, radius = 5f, center = center) - drawCircle(color = ChessGreen, radius = 3f, center = center) + if (showDots) { + points.forEachIndexed { i, v -> + val center = Offset(i * stepX, yOf(v)) + drawCircle(color = Surface1, radius = 5f, center = center) + drawCircle(color = ChessGreen, radius = 3f, center = center) + } + } else { + drawCircle(color = Lime, radius = 4.dp.toPx(), center = Offset(size.width, yOf(points.last()))) } } } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/OpeningStudyScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/OpeningStudyScreen.kt index 97f5c94..de0aed7 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/OpeningStudyScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/OpeningStudyScreen.kt @@ -180,7 +180,7 @@ private fun ActionCard(icon: Int, title: String, subtitle: String?, button: Stri Spacer(Modifier.width(12.dp)) GlassButton(onClick = onClick) { ButtonIcon(R.drawable.ic_play) - Text(button, color = ink, maxLines = 1) + Text(button, maxLines = 1) } } } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/OpeningTrainerScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/OpeningTrainerScreen.kt index c42a312..33e6d4c 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/OpeningTrainerScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/OpeningTrainerScreen.kt @@ -147,7 +147,7 @@ fun OpeningTrainerScreen(viewModel: OpeningStudyViewModel, onBack: () -> Unit) { } GlassButton(onClick = { if (!viewModel.continueStudy()) onBack() }, modifier = Modifier.weight(1f)) { ButtonIcon(R.drawable.ic_next) - Text(stringResource(R.string.study_next), color = ink, maxLines = 1) + Text(stringResource(R.string.study_next), maxLines = 1) } } } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/PermissionsScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/PermissionsScreen.kt index c1724d9..5ab3ee3 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/PermissionsScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/PermissionsScreen.kt @@ -84,8 +84,8 @@ fun PermissionsScreen(onBack: () -> Unit) { cc.skysparkle.matewave.network.Transports.applyAnnounceSetting() }, colors = SwitchDefaults.colors( - checkedThumbColor = Color.White, - checkedTrackColor = Color(0xFF4F8A5B) + checkedThumbColor = cc.skysparkle.matewave.ui.theme.OnAccent, + checkedTrackColor = cc.skysparkle.matewave.ui.theme.ChessGreen ) ) } @@ -142,8 +142,8 @@ fun PermissionsScreen(onBack: () -> Unit) { } }, colors = SwitchDefaults.colors( - checkedThumbColor = Color.White, - checkedTrackColor = Color(0xFF4F8A5B) + checkedThumbColor = cc.skysparkle.matewave.ui.theme.OnAccent, + checkedTrackColor = cc.skysparkle.matewave.ui.theme.ChessGreen ) ) } diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/PuzzleScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/PuzzleScreen.kt index 7d6c322..0362f07 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/PuzzleScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/PuzzleScreen.kt @@ -184,7 +184,7 @@ fun PuzzleSolveScreen(viewModel: GameViewModel, onBack: () -> Unit, onNextPuzzle if (next != null) { GlassButton(onClick = { onNextPuzzle(next) }, modifier = Modifier.fillMaxWidth()) { ButtonIcon(R.drawable.ic_next) - Text(stringResource(R.string.puzzle_next), color = ink, style = MaterialTheme.typography.titleMedium) + Text(stringResource(R.string.puzzle_next), style = MaterialTheme.typography.titleMedium) } } Text( diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt index edae318..3d78787 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt @@ -273,7 +273,7 @@ private fun SettingSwitch(checked: Boolean, onCheckedChange: (Boolean) -> Unit) onCheckedChange = onCheckedChange, colors = SwitchDefaults.colors( checkedTrackColor = ChessGreen, - checkedThumbColor = Color.White, + checkedThumbColor = cc.skysparkle.matewave.ui.theme.OnAccent, uncheckedTrackColor = ink.copy(alpha = 0.15f), uncheckedThumbColor = Color.White.copy(alpha = 0.7f) ) diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/VsAiSetupScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/VsAiSetupScreen.kt index 1241839..7e34603 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/VsAiSetupScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/VsAiSetupScreen.kt @@ -80,7 +80,6 @@ fun VsAiSetupScreen( ButtonIcon(R.drawable.ic_play) Text( stringResource(R.string.vsai_play_summary, difficultyLabel(difficulty), timeControl.displayName()), - color = ink, style = MaterialTheme.typography.titleMedium, maxLines = 1 ) diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/theme/Glass.kt b/app/src/main/java/cc/skysparkle/matewave/ui/theme/Glass.kt index ef07af0..c9dec77 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/theme/Glass.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/theme/Glass.kt @@ -4,15 +4,14 @@ import androidx.compose.foundation.background import androidx.compose.foundation.shape.RoundedCornerShape 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.Shape import androidx.compose.ui.unit.dp -val PanelFill = Color(0xFF14171C).copy(alpha = 0.86f) -val PanelBorder = Color.White.copy(alpha = 0.10f) +val PanelFill = Surface1 +val PanelBorder = Color.White.copy(alpha = 0.06f) -val UiCornerRadius = 8.dp +val UiCornerRadius = 22.dp val GlassShape: Shape = RoundedCornerShape(UiCornerRadius) val TabletMaxContentWidth = 600.dp @@ -21,17 +20,6 @@ fun Modifier.glass(): Modifier = this .clip(GlassShape) .background(PanelFill) -val PhotoScrim = Brush.verticalGradient( - 0.00f to Color.Black.copy(alpha = 0.84f), - 0.10f to Color.Black.copy(alpha = 0.72f), - 0.22f to Color.Black.copy(alpha = 0.58f), - 0.38f to Color.Black.copy(alpha = 0.48f), - 0.55f to Color.Black.copy(alpha = 0.47f), - 0.72f to Color.Black.copy(alpha = 0.55f), - 0.88f to Color.Black.copy(alpha = 0.68f), - 1.00f to Color.Black.copy(alpha = 0.80f) -) +val DialogScrimColor = Color.Black.copy(alpha = 0.70f) -val DialogScrimColor = Color.Black.copy(alpha = 0.62f) - -val FloatingBarFill = Color.Black.copy(alpha = 0.25f) +val FloatingBarFill = Surface2 diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/theme/Theme.kt b/app/src/main/java/cc/skysparkle/matewave/ui/theme/Theme.kt index 589f745..3e686e3 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/theme/Theme.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/theme/Theme.kt @@ -3,13 +3,29 @@ package cc.skysparkle.matewave.ui.theme import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Typography import androidx.compose.material3.darkColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +/** Neon green: the brand accent for highlights, selected states and progress. */ +val ChessGreen = Color(0xFF35E07E) +val ChessGreenDark = Color(0xFF123D25) + +/** Lime: the one colour for the main action on a screen. */ +val Lime = Color(0xFFE3F84B) + +/** Text and icons on top of [ChessGreen] or [Lime]. */ +val OnAccent = Color(0xFF0B1610) + +val AppBackground = Color(0xFF0C0F0E) +val Surface1 = Color(0xFF161B19) +val Surface2 = Color(0xFF1F2623) -val ChessGreen = Color(0xFF3E7C4A) -val ChessGreenDark = Color(0xFF1B4D2E) val HighlightMove = Color(0x8858A6FF) val HighlightCheck = Color(0x88E53935) val HighlightLastMove = Color(0x664FC3F7) @@ -17,15 +33,47 @@ val HighlightHint = Color(0x88FFC107) private val DarkScheme = darkColorScheme( primary = ChessGreen, - secondary = ChessGreenDark, - background = Color(0xFF121212), - surface = Color(0xFF1E1E1E) + onPrimary = OnAccent, + secondary = Lime, + onSecondary = OnAccent, + background = AppBackground, + surface = Surface1, + surfaceVariant = Surface2 +) + +private val base = Typography() + +/** Heavy, tightly set headings like the mockups; body text stays the system default. */ +private val AppTypography = Typography( + displayLarge = base.displayLarge.copy(fontWeight = FontWeight.ExtraBold, letterSpacing = (-1.5).sp), + displayMedium = base.displayMedium.copy(fontWeight = FontWeight.ExtraBold, letterSpacing = (-1.2).sp), + displaySmall = base.displaySmall.copy(fontWeight = FontWeight.ExtraBold, letterSpacing = (-0.8).sp), + headlineLarge = base.headlineLarge.copy(fontWeight = FontWeight.Bold, letterSpacing = (-0.6).sp), + headlineMedium = base.headlineMedium.copy(fontWeight = FontWeight.Bold, letterSpacing = (-0.5).sp), + headlineSmall = base.headlineSmall.copy(fontWeight = FontWeight.Bold, letterSpacing = (-0.3).sp), + titleLarge = base.titleLarge.copy(fontWeight = FontWeight.Bold, letterSpacing = (-0.2).sp), + titleMedium = base.titleMedium.copy(fontWeight = FontWeight.SemiBold), + titleSmall = base.titleSmall.copy(fontWeight = FontWeight.SemiBold), + bodyLarge = base.bodyLarge, + bodyMedium = base.bodyMedium, + bodySmall = base.bodySmall, + labelLarge = base.labelLarge.copy(fontWeight = FontWeight.SemiBold), + labelMedium = base.labelMedium.copy(fontWeight = FontWeight.SemiBold, letterSpacing = 0.6.sp), + labelSmall = base.labelSmall.copy(fontWeight = FontWeight.Medium) +) + +/** Large hero heading on the home and profile screens. */ +val HeroTextStyle = TextStyle( + fontSize = 52.sp, + lineHeight = 52.sp, + fontWeight = FontWeight.ExtraBold, + letterSpacing = (-2).sp ) /** The app has a single dark theme; system bars are set up in MainActivity. */ @Composable fun MatewaveTheme(content: @Composable () -> Unit) { - MaterialTheme(colorScheme = DarkScheme) { + MaterialTheme(colorScheme = DarkScheme, typography = AppTypography) { // Text and icons without their own colour are light, so nothing turns black on the dark background CompositionLocalProvider(LocalContentColor provides Color.White, content = content) } @@ -35,9 +83,9 @@ fun MatewaveTheme(content: @Composable () -> Unit) { fun whiteOutlinedTextFieldColors() = OutlinedTextFieldDefaults.colors( focusedTextColor = ink, unfocusedTextColor = ink, - focusedBorderColor = ink.copy(alpha = 0.6f), - unfocusedBorderColor = ink.copy(alpha = 0.3f), - focusedLabelColor = ink.copy(alpha = 0.8f), + focusedBorderColor = ChessGreen, + unfocusedBorderColor = ink.copy(alpha = 0.2f), + focusedLabelColor = ChessGreen, unfocusedLabelColor = ink.copy(alpha = 0.6f), - cursorColor = ink + cursorColor = ChessGreen ) diff --git a/app/src/main/res/drawable-nodpi/bg_forest.jpg b/app/src/main/res/drawable-nodpi/bg_forest.jpg deleted file mode 100644 index 07fa3edcca0d8027254d7fe608189ed339b4ed4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62216 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
(1B%Sihfqm*rneG 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 F{|D(h7196z diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ae452f3..f0669d8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -307,6 +307,10 @@ Start Gesperrt Heute + Spiel los + Partien + Siege + Serie Zug %1$d · %2$s du bist am Zug KI am Zug diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c8e2b96..8eb89c4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -306,6 +306,10 @@ 始める ロック中 今日 + さあ、対局 + 対局数 + 勝利 + 連勝 %1$d手目 · %2$s あなたの番 AIの番 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index cb78619..34b99ba 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -309,6 +309,10 @@ Pradėti Užrakinta Šiandien + Žaisk + Partijos + Pergalės + Serija Ėjimas %1$d · %2$s jūsų ėjimas DI ėjimas diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 22a65ff..1ae6e01 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -315,6 +315,10 @@ Начать Закрыт Сегодня + Играй + Партии + Победы + Серия Ход %1$d · %2$s ваш ход ход ИИ diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index ba566c4..6b2e2a5 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -306,6 +306,10 @@ 开始 已锁定 今日 + 开局吧 + 对局 + 胜局 + 连胜 第 %1$d 步 · %2$s 轮到你 AI 走棋 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1be17b6..a51c706 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -307,6 +307,10 @@ Start Locked Today + Play it + Games + Wins + Streak Move %1$d · %2$s your move AI to move