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 07fa3ed..0000000 Binary files a/app/src/main/res/drawable-nodpi/bg_forest.jpg and /dev/null differ 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