diff --git a/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt b/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt index aabe664..6a1a075 100644 --- a/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt +++ b/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt @@ -66,6 +66,7 @@ class MainActivity : ComponentActivity() { SoundManager.init(this) val appContext = applicationContext + cc.skysparkle.matewave.settings.PieceSetState.load(this) kotlin.concurrent.thread(name = "warmup", isDaemon = true) { runCatching { cc.skysparkle.matewave.data.FriendsStore.preload() } // Decoded here, the pieces are ready before the first board is shown. diff --git a/app/src/main/java/cc/skysparkle/matewave/engine/Piece.kt b/app/src/main/java/cc/skysparkle/matewave/engine/Piece.kt index 6980f43..e5fb69f 100644 --- a/app/src/main/java/cc/skysparkle/matewave/engine/Piece.kt +++ b/app/src/main/java/cc/skysparkle/matewave/engine/Piece.kt @@ -7,44 +7,6 @@ enum class PieceType(val symbol: Char) { } data class Piece(val type: PieceType, val color: PieceColor) { - fun drawableRes(): Int = when (color) { - PieceColor.WHITE -> when (type) { - PieceType.PAWN -> cc.skysparkle.matewave.R.drawable.piece_white_pawn - PieceType.KNIGHT -> cc.skysparkle.matewave.R.drawable.piece_white_knight - PieceType.BISHOP -> cc.skysparkle.matewave.R.drawable.piece_white_bishop - PieceType.ROOK -> cc.skysparkle.matewave.R.drawable.piece_white_rook - PieceType.QUEEN -> cc.skysparkle.matewave.R.drawable.piece_white_queen - PieceType.KING -> cc.skysparkle.matewave.R.drawable.piece_white_king - } - PieceColor.BLACK -> when (type) { - PieceType.PAWN -> cc.skysparkle.matewave.R.drawable.piece_black_pawn - PieceType.KNIGHT -> cc.skysparkle.matewave.R.drawable.piece_black_knight - PieceType.BISHOP -> cc.skysparkle.matewave.R.drawable.piece_black_bishop - PieceType.ROOK -> cc.skysparkle.matewave.R.drawable.piece_black_rook - PieceType.QUEEN -> cc.skysparkle.matewave.R.drawable.piece_black_queen - PieceType.KING -> cc.skysparkle.matewave.R.drawable.piece_black_king - } - } - - fun unicode(): String = when (color) { - PieceColor.WHITE -> when (type) { - PieceType.PAWN -> "\u2659" - PieceType.KNIGHT -> "\u2658" - PieceType.BISHOP -> "\u2657" - PieceType.ROOK -> "\u2656" - PieceType.QUEEN -> "\u2655" - PieceType.KING -> "\u2654" - } - PieceColor.BLACK -> when (type) { - PieceType.PAWN -> "\u265F" - PieceType.KNIGHT -> "\u265E" - PieceType.BISHOP -> "\u265D" - PieceType.ROOK -> "\u265C" - PieceType.QUEEN -> "\u265B" - PieceType.KING -> "\u265A" - } - } - fun fenChar(): Char = if (color == PieceColor.WHITE) type.symbol else type.symbol.lowercaseChar() } diff --git a/app/src/main/java/cc/skysparkle/matewave/settings/BoardAppearance.kt b/app/src/main/java/cc/skysparkle/matewave/settings/BoardAppearance.kt index 0470541..dc322cd 100644 --- a/app/src/main/java/cc/skysparkle/matewave/settings/BoardAppearance.kt +++ b/app/src/main/java/cc/skysparkle/matewave/settings/BoardAppearance.kt @@ -22,10 +22,6 @@ class BoardAppearance(context: Context) { get() = prefs.getBoolean(KEY_COORDS, true) set(value) { prefs.edit().putBoolean(KEY_COORDS, value).apply() } - var useImagePieces: Boolean - get() = prefs.getBoolean(KEY_IMAGES, true) - set(value) { prefs.edit().putBoolean(KEY_IMAGES, value).apply() } - var showLastMove: Boolean get() = prefs.getBoolean(KEY_LAST_MOVE, true) set(value) { prefs.edit().putBoolean(KEY_LAST_MOVE, value).apply() } @@ -45,6 +41,5 @@ class BoardAppearance(context: Context) { const val PREFS = "board_appearance" const val KEY_THEME = "theme" const val KEY_COORDS = "coords" - const val KEY_IMAGES = "images" } } diff --git a/app/src/main/java/cc/skysparkle/matewave/settings/PieceSet.kt b/app/src/main/java/cc/skysparkle/matewave/settings/PieceSet.kt new file mode 100644 index 0000000..72ad8eb --- /dev/null +++ b/app/src/main/java/cc/skysparkle/matewave/settings/PieceSet.kt @@ -0,0 +1,94 @@ +package cc.skysparkle.matewave.settings + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import cc.skysparkle.matewave.R +import cc.skysparkle.matewave.engine.PieceColor +import cc.skysparkle.matewave.engine.PieceType + +/** Piece pictures, white and black, in PieceType order: pawn, knight, bishop, rook, queen, king. */ +enum class PieceSet(val titleRes: Int, private val white: IntArray, private val black: IntArray) { + CLASSIC( + R.string.piece_set_classic, + intArrayOf( + R.drawable.piece_classic_white_pawn, R.drawable.piece_classic_white_knight, R.drawable.piece_classic_white_bishop, + R.drawable.piece_classic_white_rook, R.drawable.piece_classic_white_queen, R.drawable.piece_classic_white_king + ), + intArrayOf( + R.drawable.piece_classic_black_pawn, R.drawable.piece_classic_black_knight, R.drawable.piece_classic_black_bishop, + R.drawable.piece_classic_black_rook, R.drawable.piece_classic_black_queen, R.drawable.piece_classic_black_king + ) + ), + OUTLINE( + R.string.piece_set_outline, + intArrayOf( + R.drawable.piece_outline_white_pawn, R.drawable.piece_outline_white_knight, R.drawable.piece_outline_white_bishop, + R.drawable.piece_outline_white_rook, R.drawable.piece_outline_white_queen, R.drawable.piece_outline_white_king + ), + intArrayOf( + R.drawable.piece_outline_black_pawn, R.drawable.piece_outline_black_knight, R.drawable.piece_outline_black_bishop, + R.drawable.piece_outline_black_rook, R.drawable.piece_outline_black_queen, R.drawable.piece_outline_black_king + ) + ), + PASTEL( + R.string.piece_set_pastel, + intArrayOf( + R.drawable.piece_pastel_white_pawn, R.drawable.piece_pastel_white_knight, R.drawable.piece_pastel_white_bishop, + R.drawable.piece_pastel_white_rook, R.drawable.piece_pastel_white_queen, R.drawable.piece_pastel_white_king + ), + intArrayOf( + R.drawable.piece_pastel_black_pawn, R.drawable.piece_pastel_black_knight, R.drawable.piece_pastel_black_bishop, + R.drawable.piece_pastel_black_rook, R.drawable.piece_pastel_black_queen, R.drawable.piece_pastel_black_king + ) + ), + WOOD( + R.string.piece_set_wood, + intArrayOf( + R.drawable.piece_wood_white_pawn, R.drawable.piece_wood_white_knight, R.drawable.piece_wood_white_bishop, + R.drawable.piece_wood_white_rook, R.drawable.piece_wood_white_queen, R.drawable.piece_wood_white_king + ), + intArrayOf( + R.drawable.piece_wood_black_pawn, R.drawable.piece_wood_black_knight, R.drawable.piece_wood_black_bishop, + R.drawable.piece_wood_black_rook, R.drawable.piece_wood_black_queen, R.drawable.piece_wood_black_king + ) + ), + FLAT( + R.string.piece_set_flat, + intArrayOf( + R.drawable.piece_flat_white_pawn, R.drawable.piece_flat_white_knight, R.drawable.piece_flat_white_bishop, + R.drawable.piece_flat_white_rook, R.drawable.piece_flat_white_queen, R.drawable.piece_flat_white_king + ), + intArrayOf( + R.drawable.piece_flat_black_pawn, R.drawable.piece_flat_black_knight, R.drawable.piece_flat_black_bishop, + R.drawable.piece_flat_black_rook, R.drawable.piece_flat_black_queen, R.drawable.piece_flat_black_king + ) + ); + + fun res(type: PieceType, color: PieceColor): Int = + (if (color == PieceColor.WHITE) white else black)[type.ordinal] +} + +/** The chosen piece set; every board and piece picture follows it at once. */ +object PieceSetState { + private const val PREFS = "board_appearance" + private const val KEY = "piece_set" + + var current by mutableStateOf(PieceSet.CLASSIC) + private set + + /** Reads the saved set; call once before the first frame. */ + fun load(context: Context) { + val saved = prefs(context).getString(KEY, null) + current = PieceSet.entries.firstOrNull { it.name == saved } ?: PieceSet.CLASSIC + } + + fun select(context: Context, set: PieceSet) { + prefs(context).edit().putString(KEY, set.name).apply() + current = set + } + + private fun prefs(context: Context) = + context.applicationContext.getSharedPreferences(PREFS, Context.MODE_PRIVATE) +} diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/components/ChessBoardView.kt b/app/src/main/java/cc/skysparkle/matewave/ui/components/ChessBoardView.kt index 8f620d4..4356f46 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/components/ChessBoardView.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/components/ChessBoardView.kt @@ -33,10 +33,11 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize import cc.skysparkle.matewave.engine.Board import cc.skysparkle.matewave.engine.Move -import cc.skysparkle.matewave.engine.Piece import cc.skysparkle.matewave.engine.PieceColor import cc.skysparkle.matewave.engine.PieceType import cc.skysparkle.matewave.settings.BoardAppearance +import cc.skysparkle.matewave.settings.PieceSet +import cc.skysparkle.matewave.settings.PieceSetState import cc.skysparkle.matewave.ui.theme.HighlightCheck import cc.skysparkle.matewave.ui.theme.HighlightHint import cc.skysparkle.matewave.ui.theme.HighlightLastMove @@ -44,21 +45,22 @@ import cc.skysparkle.matewave.ui.theme.HighlightMove import kotlin.math.floor import kotlin.math.roundToInt -/** The twelve piece pictures, decoded once and shared by the board and the other piece views. */ +/** The twelve pictures of the chosen piece set, decoded once and shared by the board and the other piece views. */ internal object PieceImages { - @Volatile private var cache: Array? = null + @Volatile private var cache: Pair>? = null - fun get(context: Context): Array { - cache?.let { return it } + fun get(context: Context, set: PieceSet = PieceSetState.current): Array { + cache?.let { if (it.first == set) return it.second } synchronized(this) { - cache?.let { return it } + cache?.let { if (it.first == set) return it.second } val options = BitmapFactory.Options().apply { inScaled = false } val types = PieceType.entries val loaded = Array(PieceColor.entries.size * types.size) { i -> - val piece = Piece(types[i % types.size], PieceColor.entries[i / types.size]) - BitmapFactory.decodeResource(context.resources, piece.drawableRes(), options).asImageBitmap() + val res = set.res(types[i % types.size], PieceColor.entries[i / types.size]) + BitmapFactory.decodeResource(context.resources, res, options).asImageBitmap() } - cache = loaded + // Only the set in use stays in memory. + cache = set to loaded return loaded } } @@ -91,12 +93,12 @@ fun ChessBoardView( val appearance = remember { BoardAppearance(context) } val theme = remember { appearance.theme } val showCoords = remember { appearance.showCoordinates } - val imagePieces = remember { appearance.useImagePieces } val lastMoveSetting = remember { appearance.showLastMove } val showLastMove = highlightLastMove ?: lastMoveSetting val showCheck = remember { appearance.showCheckHighlight } - val pieceImages = if (imagePieces) remember(context) { PieceImages.get(context) } else null + val pieceSet = PieceSetState.current + val pieceImages = remember(pieceSet) { PieceImages.get(context, pieceSet) } val targetMask = remember(legalTargets) { var mask = 0L @@ -107,9 +109,6 @@ fun ChessBoardView( val coordPaint = remember { Paint().apply { isAntiAlias = true; typeface = Typeface.DEFAULT_BOLD } } - val glyphPaint = remember { - Paint().apply { isAntiAlias = true; textAlign = Paint.Align.CENTER } - } val currentOnSquareClick by rememberUpdatedState(onSquareClick) val currentBoard by rememberUpdatedState(board) @@ -184,13 +183,6 @@ fun ChessBoardView( val liftedSize = pieceSize * LIFT_SCALE val liftedDst = IntSize(liftedSize.roundToInt(), liftedSize.roundToInt()) val hoverStroke = Stroke(width = cell * 0.07f) - val glyphSize = cell * 0.62f - glyphPaint.textSize = glyphSize - val glyphMetrics = glyphPaint.fontMetrics - val glyphShift = (glyphMetrics.ascent + glyphMetrics.descent) / 2f - glyphPaint.textSize = glyphSize * LIFT_SCALE - val liftedMetrics = glyphPaint.fontMetrics - val liftedGlyphShift = (liftedMetrics.ascent + liftedMetrics.descent) / 2f onDrawBehind { val lastFrom = if (showLastMove) (lastMove?.from ?: -1) else -1 val lastTo = if (showLastMove) (lastMove?.to ?: -1) else -1 @@ -251,10 +243,6 @@ fun ChessBoardView( } } - if (pieceImages == null) { - glyphPaint.textSize = glyphSize - glyphPaint.color = GLYPH_COLOR - } for (row in 0 until 8) { for (col in 0 until 8) { val displayRank = if (flipped) row else 7 - row @@ -262,24 +250,15 @@ fun ChessBoardView( val pieceSq = displayRank * 8 + displayFile if (pieceSq == liftedSq) continue val piece = board.pieceAt(pieceSq) ?: continue - if (pieceImages != null) { - drawImage( - image = pieceImages[PieceImages.indexOf(piece.type, piece.color)], - dstOffset = IntOffset( - (col * cell + inset).roundToInt(), - (row * cell + inset).roundToInt() - ), - dstSize = pieceDst, - filterQuality = FilterQuality.Medium - ) - } else { - drawContext.canvas.nativeCanvas.drawText( - piece.unicode(), - col * cell + cell / 2f, - row * cell + cell / 2f - glyphShift, - glyphPaint - ) - } + drawImage( + image = pieceImages[PieceImages.indexOf(piece.type, piece.color)], + dstOffset = IntOffset( + (col * cell + inset).roundToInt(), + (row * cell + inset).roundToInt() + ), + dstSize = pieceDst, + filterQuality = FilterQuality.Medium + ) } } @@ -306,25 +285,15 @@ fun ChessBoardView( topLeft = Offset(liftedAt.x - liftedSize * 0.36f, liftedAt.y + cell * 0.05f), size = Size(liftedSize * 0.72f, liftedSize * 0.28f) ) - if (pieceImages != null) { - drawImage( - image = pieceImages[PieceImages.indexOf(liftedPiece.type, liftedPiece.color)], - dstOffset = IntOffset( - (cx - liftedSize / 2f).roundToInt(), - (cy - liftedSize / 2f).roundToInt() - ), - dstSize = liftedDst, - filterQuality = FilterQuality.Medium - ) - } else { - glyphPaint.textSize = glyphSize * LIFT_SCALE - drawContext.canvas.nativeCanvas.drawText( - liftedPiece.unicode(), - cx, - cy - liftedGlyphShift, - glyphPaint - ) - } + drawImage( + image = pieceImages[PieceImages.indexOf(liftedPiece.type, liftedPiece.color)], + dstOffset = IntOffset( + (cx - liftedSize / 2f).roundToInt(), + (cy - liftedSize / 2f).roundToInt() + ), + dstSize = liftedDst, + filterQuality = FilterQuality.Medium + ) } } } @@ -344,8 +313,6 @@ private fun squareAt(x: Float, y: Float, boardPx: Float, flipped: Boolean): Int return displayRank * 8 + displayFile } -private val GLYPH_COLOR = Color(0xFF1B1B1B).toArgb() - private val FILE_LABELS = Array(8) { ('a' + it).toString() } private val RANK_LABELS = Array(8) { (it + 1).toString() } 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 ba12e3f..e1a0c8f 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 @@ -40,6 +40,10 @@ import androidx.compose.foundation.Image import cc.skysparkle.matewave.R import cc.skysparkle.matewave.settings.BoardAppearance import cc.skysparkle.matewave.settings.BoardTheme +import cc.skysparkle.matewave.settings.PieceSet +import cc.skysparkle.matewave.settings.PieceSetState +import cc.skysparkle.matewave.engine.PieceColor +import cc.skysparkle.matewave.engine.PieceType import cc.skysparkle.matewave.ui.components.GlassCard import cc.skysparkle.matewave.ui.components.GlassScaffold import cc.skysparkle.matewave.ui.theme.PanelBorder @@ -51,7 +55,6 @@ fun AppearanceScreen(onBack: () -> Unit) { var theme by remember { mutableStateOf(appearance.theme) } var coords by remember { mutableStateOf(appearance.showCoordinates) } - var images by remember { mutableStateOf(appearance.useImagePieces) } var lastMove by remember { mutableStateOf(appearance.showLastMove) } var checkGlow by remember { mutableStateOf(appearance.showCheckHighlight) } var openingBar by remember { mutableStateOf(appearance.showOpening) } @@ -81,7 +84,7 @@ fun AppearanceScreen(onBack: () -> Unit) { } ) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { - ThemePreview(candidate, showPieces = images) + ThemePreview(candidate) Text( stringResource(candidate.titleRes), color = ink, @@ -97,6 +100,43 @@ fun AppearanceScreen(onBack: () -> Unit) { } } + Text( + stringResource(R.string.appearance_pieces), + color = ink, + style = MaterialTheme.typography.titleMedium + ) + + PieceSet.entries.forEach { candidate -> + GlassCard( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 4.dp) + .clickable { + PieceSetState.select(context, candidate) + // Decode the pictures now, so the next board opens without a pause. + val appContext = context.applicationContext + kotlin.concurrent.thread(isDaemon = true) { + runCatching { cc.skysparkle.matewave.ui.components.PieceImages.get(appContext, candidate) } + } + } + ) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { + PieceSetPreview(candidate, theme) + Text( + stringResource(candidate.titleRes), + color = ink, + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.weight(1f) + ) + if (candidate == PieceSetState.current) { + cc.skysparkle.matewave.ui.components.AppIcon( + R.drawable.ic_check_box, size = 20.dp, tint = cc.skysparkle.matewave.ui.theme.ChessGreen + ) + } + } + } + } + AppearanceToggle( icon = R.drawable.ic_coordinates, title = stringResource(R.string.appearance_coordinates), @@ -104,13 +144,6 @@ fun AppearanceScreen(onBack: () -> Unit) { checked = coords ) { coords = it; appearance.showCoordinates = it } - AppearanceToggle( - icon = R.drawable.ic_image_pieces, - title = stringResource(R.string.appearance_image_pieces), - subtitle = stringResource(R.string.appearance_image_pieces_hint), - checked = images - ) { images = it; appearance.useImagePieces = it } - AppearanceToggle( icon = R.drawable.ic_last_move, title = stringResource(R.string.appearance_last_move), @@ -220,7 +253,8 @@ private fun StyleSwatch( } @Composable -private fun ThemePreview(theme: BoardTheme, showPieces: Boolean) { +private fun ThemePreview(theme: BoardTheme) { + val set = PieceSetState.current val shape = RoundedCornerShape(6.dp) Column(modifier = Modifier.size(56.dp).clip(shape).border(1.dp, PanelBorder, shape)) { repeat(2) { row -> @@ -234,16 +268,16 @@ private fun ThemePreview(theme: BoardTheme, showPieces: Boolean) { .background(if (light) theme.light else theme.dark), contentAlignment = Alignment.Center ) { - if (showPieces && row == 0 && col == 0) { + if (row == 0 && col == 0) { Image( - painter = painterResource(R.drawable.piece_white_king), + painter = painterResource(set.res(PieceType.KING, PieceColor.WHITE)), contentDescription = null, modifier = Modifier.size(22.dp) ) } - if (showPieces && row == 1 && col == 1) { + if (row == 1 && col == 1) { Image( - painter = painterResource(R.drawable.piece_black_knight), + painter = painterResource(set.res(PieceType.KNIGHT, PieceColor.BLACK)), contentDescription = null, modifier = Modifier.size(22.dp) ) @@ -255,6 +289,34 @@ private fun ThemePreview(theme: BoardTheme, showPieces: Boolean) { } } +/** Four pieces of the set on squares of the chosen board. */ +@Composable +private fun PieceSetPreview(set: PieceSet, theme: BoardTheme) { + val shape = RoundedCornerShape(6.dp) + val pieces = listOf( + PieceType.KING to PieceColor.WHITE, + PieceType.QUEEN to PieceColor.BLACK, + PieceType.KNIGHT to PieceColor.WHITE, + PieceType.PAWN to PieceColor.BLACK + ) + Row(modifier = Modifier.clip(shape).border(1.dp, PanelBorder, shape)) { + pieces.forEachIndexed { i, (type, color) -> + Box( + modifier = Modifier + .size(36.dp) + .background(if (i % 2 == 0) theme.light else theme.dark), + contentAlignment = Alignment.Center + ) { + Image( + painter = painterResource(set.res(type, color)), + contentDescription = null, + modifier = Modifier.size(32.dp) + ) + } + } + } +} + @Composable private fun AppearanceToggle( icon: Int, 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 ce8fc32..0cad1dc 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 @@ -51,6 +51,9 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import cc.skysparkle.matewave.R +import cc.skysparkle.matewave.engine.PieceColor +import cc.skysparkle.matewave.engine.PieceType +import cc.skysparkle.matewave.settings.PieceSetState import cc.skysparkle.matewave.stats.Stats import cc.skysparkle.matewave.ui.components.AppBottomBar import cc.skysparkle.matewave.ui.components.AppDialog @@ -259,7 +262,7 @@ private fun Hero() { ) } Image( - painter = painterResource(R.drawable.piece_white_knight), + painter = painterResource(PieceSetState.current.res(PieceType.KNIGHT, PieceColor.WHITE)), contentDescription = null, modifier = Modifier .align(Alignment.CenterEnd) @@ -280,7 +283,7 @@ private fun AiCard(subtitle: String, modifier: Modifier = Modifier, onClick: () .clickable(onClick = onClick) ) { Image( - painter = painterResource(R.drawable.piece_black_king), + painter = painterResource(PieceSetState.current.res(PieceType.KING, PieceColor.BLACK)), contentDescription = null, modifier = Modifier .align(Alignment.TopEnd) 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 7e34603..67826ca 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 @@ -44,6 +44,10 @@ import cc.skysparkle.matewave.R import cc.skysparkle.matewave.ai.AiDifficulty import cc.skysparkle.matewave.clock.TimeControl import cc.skysparkle.matewave.engine.PieceColor +import cc.skysparkle.matewave.engine.PieceType +import cc.skysparkle.matewave.settings.PieceSetState +import androidx.compose.ui.draw.drawWithContent +import androidx.compose.ui.graphics.drawscope.clipRect import cc.skysparkle.matewave.ui.components.GlassButton import cc.skysparkle.matewave.ui.components.GlassScaffold @@ -126,9 +130,9 @@ fun VsAiSetupScreen( SectionCaption(stringResource(R.string.your_color)) Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - ColorChip(R.drawable.piece_white_king, stringResource(R.string.color_white), color == PieceColor.WHITE) { color = PieceColor.WHITE } - ColorChip(R.drawable.piece_black_king, stringResource(R.string.color_black), color == PieceColor.BLACK) { color = PieceColor.BLACK } - ColorChip(R.drawable.ic_random_colour, stringResource(R.string.color_random), color == null) { color = null } + ColorChip(listOf(PieceColor.WHITE), stringResource(R.string.color_white), color == PieceColor.WHITE) { color = PieceColor.WHITE } + ColorChip(listOf(PieceColor.BLACK), stringResource(R.string.color_black), color == PieceColor.BLACK) { color = PieceColor.BLACK } + ColorChip(listOf(PieceColor.WHITE, PieceColor.BLACK), stringResource(R.string.color_random), color == null) { color = null } } SectionCaption(stringResource(R.string.time_control_label)) @@ -144,7 +148,7 @@ private fun aiDescription(d: AiDifficulty): Int = when (d) { } @Composable -private fun ColorChip(iconRes: Int, text: String, selected: Boolean, onClick: () -> Unit) { +private fun ColorChip(kings: List, text: String, selected: Boolean, onClick: () -> Unit) { val shape = RoundedCornerShape(50) Row( modifier = Modifier @@ -164,12 +168,26 @@ private fun ColorChip(iconRes: Int, text: String, selected: Boolean, onClick: () .background(Color(0xFF9AA0A8)), contentAlignment = Alignment.Center ) { - Image( - painter = painterResource(iconRes), - contentDescription = null, - modifier = Modifier.size(20.dp) - ) + val set = PieceSetState.current + kings.forEachIndexed { i, king -> + Image( + painter = painterResource(set.res(PieceType.KING, king)), + contentDescription = null, + modifier = Modifier + .size(20.dp) + .then(if (kings.size > 1) Modifier.halfOf(left = i == 0) else Modifier) + ) + } } Text(text, color = ink, style = MaterialTheme.typography.bodySmall) } } + +/** Draws only the left or the right half, for the half-white, half-black king. */ +private fun Modifier.halfOf(left: Boolean): Modifier = drawWithContent { + val mid = size.width / 2f + clipRect(left = if (left) 0f else mid, right = if (left) mid else size.width) { + this@drawWithContent.drawContent() + } +} + diff --git a/app/src/main/res/drawable-nodpi/ic_random_colour.png b/app/src/main/res/drawable-nodpi/ic_random_colour.png deleted file mode 100644 index c56e10f..0000000 Binary files a/app/src/main/res/drawable-nodpi/ic_random_colour.png and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/piece_black_bishop.png b/app/src/main/res/drawable-nodpi/piece_classic_black_bishop.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_black_bishop.png rename to app/src/main/res/drawable-nodpi/piece_classic_black_bishop.png diff --git a/app/src/main/res/drawable-nodpi/piece_black_king.png b/app/src/main/res/drawable-nodpi/piece_classic_black_king.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_black_king.png rename to app/src/main/res/drawable-nodpi/piece_classic_black_king.png diff --git a/app/src/main/res/drawable-nodpi/piece_black_knight.png b/app/src/main/res/drawable-nodpi/piece_classic_black_knight.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_black_knight.png rename to app/src/main/res/drawable-nodpi/piece_classic_black_knight.png diff --git a/app/src/main/res/drawable-nodpi/piece_black_pawn.png b/app/src/main/res/drawable-nodpi/piece_classic_black_pawn.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_black_pawn.png rename to app/src/main/res/drawable-nodpi/piece_classic_black_pawn.png diff --git a/app/src/main/res/drawable-nodpi/piece_black_queen.png b/app/src/main/res/drawable-nodpi/piece_classic_black_queen.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_black_queen.png rename to app/src/main/res/drawable-nodpi/piece_classic_black_queen.png diff --git a/app/src/main/res/drawable-nodpi/piece_black_rook.png b/app/src/main/res/drawable-nodpi/piece_classic_black_rook.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_black_rook.png rename to app/src/main/res/drawable-nodpi/piece_classic_black_rook.png diff --git a/app/src/main/res/drawable-nodpi/piece_white_bishop.png b/app/src/main/res/drawable-nodpi/piece_classic_white_bishop.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_white_bishop.png rename to app/src/main/res/drawable-nodpi/piece_classic_white_bishop.png diff --git a/app/src/main/res/drawable-nodpi/piece_white_king.png b/app/src/main/res/drawable-nodpi/piece_classic_white_king.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_white_king.png rename to app/src/main/res/drawable-nodpi/piece_classic_white_king.png diff --git a/app/src/main/res/drawable-nodpi/piece_white_knight.png b/app/src/main/res/drawable-nodpi/piece_classic_white_knight.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_white_knight.png rename to app/src/main/res/drawable-nodpi/piece_classic_white_knight.png diff --git a/app/src/main/res/drawable-nodpi/piece_white_pawn.png b/app/src/main/res/drawable-nodpi/piece_classic_white_pawn.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_white_pawn.png rename to app/src/main/res/drawable-nodpi/piece_classic_white_pawn.png diff --git a/app/src/main/res/drawable-nodpi/piece_white_queen.png b/app/src/main/res/drawable-nodpi/piece_classic_white_queen.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_white_queen.png rename to app/src/main/res/drawable-nodpi/piece_classic_white_queen.png diff --git a/app/src/main/res/drawable-nodpi/piece_white_rook.png b/app/src/main/res/drawable-nodpi/piece_classic_white_rook.png similarity index 100% rename from app/src/main/res/drawable-nodpi/piece_white_rook.png rename to app/src/main/res/drawable-nodpi/piece_classic_white_rook.png diff --git a/app/src/main/res/drawable-nodpi/piece_flat_black_bishop.webp b/app/src/main/res/drawable-nodpi/piece_flat_black_bishop.webp new file mode 100644 index 0000000..2eac217 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_black_bishop.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_black_king.webp b/app/src/main/res/drawable-nodpi/piece_flat_black_king.webp new file mode 100644 index 0000000..4da9fdb Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_black_king.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_black_knight.webp b/app/src/main/res/drawable-nodpi/piece_flat_black_knight.webp new file mode 100644 index 0000000..7ea2b56 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_black_knight.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_black_pawn.webp b/app/src/main/res/drawable-nodpi/piece_flat_black_pawn.webp new file mode 100644 index 0000000..ce67d5a Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_black_pawn.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_black_queen.webp b/app/src/main/res/drawable-nodpi/piece_flat_black_queen.webp new file mode 100644 index 0000000..fc828e5 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_black_queen.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_black_rook.webp b/app/src/main/res/drawable-nodpi/piece_flat_black_rook.webp new file mode 100644 index 0000000..1ec36e1 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_black_rook.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_white_bishop.webp b/app/src/main/res/drawable-nodpi/piece_flat_white_bishop.webp new file mode 100644 index 0000000..a685486 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_white_bishop.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_white_king.webp b/app/src/main/res/drawable-nodpi/piece_flat_white_king.webp new file mode 100644 index 0000000..2245bb2 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_white_king.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_white_knight.webp b/app/src/main/res/drawable-nodpi/piece_flat_white_knight.webp new file mode 100644 index 0000000..d9b4e40 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_white_knight.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_white_pawn.webp b/app/src/main/res/drawable-nodpi/piece_flat_white_pawn.webp new file mode 100644 index 0000000..01d230a Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_white_pawn.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_white_queen.webp b/app/src/main/res/drawable-nodpi/piece_flat_white_queen.webp new file mode 100644 index 0000000..d7d5840 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_white_queen.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_flat_white_rook.webp b/app/src/main/res/drawable-nodpi/piece_flat_white_rook.webp new file mode 100644 index 0000000..ecb9939 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_flat_white_rook.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_black_bishop.webp b/app/src/main/res/drawable-nodpi/piece_outline_black_bishop.webp new file mode 100644 index 0000000..b60d165 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_black_bishop.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_black_king.webp b/app/src/main/res/drawable-nodpi/piece_outline_black_king.webp new file mode 100644 index 0000000..0a9ee87 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_black_king.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_black_knight.webp b/app/src/main/res/drawable-nodpi/piece_outline_black_knight.webp new file mode 100644 index 0000000..491a244 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_black_knight.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_black_pawn.webp b/app/src/main/res/drawable-nodpi/piece_outline_black_pawn.webp new file mode 100644 index 0000000..6fbbc42 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_black_pawn.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_black_queen.webp b/app/src/main/res/drawable-nodpi/piece_outline_black_queen.webp new file mode 100644 index 0000000..168a68c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_black_queen.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_black_rook.webp b/app/src/main/res/drawable-nodpi/piece_outline_black_rook.webp new file mode 100644 index 0000000..c630582 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_black_rook.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_white_bishop.webp b/app/src/main/res/drawable-nodpi/piece_outline_white_bishop.webp new file mode 100644 index 0000000..4a79dab Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_white_bishop.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_white_king.webp b/app/src/main/res/drawable-nodpi/piece_outline_white_king.webp new file mode 100644 index 0000000..d54d3d2 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_white_king.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_white_knight.webp b/app/src/main/res/drawable-nodpi/piece_outline_white_knight.webp new file mode 100644 index 0000000..ba75d0a Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_white_knight.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_white_pawn.webp b/app/src/main/res/drawable-nodpi/piece_outline_white_pawn.webp new file mode 100644 index 0000000..8a67f50 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_white_pawn.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_white_queen.webp b/app/src/main/res/drawable-nodpi/piece_outline_white_queen.webp new file mode 100644 index 0000000..1976df9 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_white_queen.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_outline_white_rook.webp b/app/src/main/res/drawable-nodpi/piece_outline_white_rook.webp new file mode 100644 index 0000000..af3429c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_outline_white_rook.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_black_bishop.webp b/app/src/main/res/drawable-nodpi/piece_pastel_black_bishop.webp new file mode 100644 index 0000000..e9d2918 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_black_bishop.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_black_king.webp b/app/src/main/res/drawable-nodpi/piece_pastel_black_king.webp new file mode 100644 index 0000000..8fcc230 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_black_king.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_black_knight.webp b/app/src/main/res/drawable-nodpi/piece_pastel_black_knight.webp new file mode 100644 index 0000000..114cc57 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_black_knight.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_black_pawn.webp b/app/src/main/res/drawable-nodpi/piece_pastel_black_pawn.webp new file mode 100644 index 0000000..b7ad891 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_black_pawn.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_black_queen.webp b/app/src/main/res/drawable-nodpi/piece_pastel_black_queen.webp new file mode 100644 index 0000000..4ab8591 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_black_queen.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_black_rook.webp b/app/src/main/res/drawable-nodpi/piece_pastel_black_rook.webp new file mode 100644 index 0000000..6aaa389 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_black_rook.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_white_bishop.webp b/app/src/main/res/drawable-nodpi/piece_pastel_white_bishop.webp new file mode 100644 index 0000000..9269423 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_white_bishop.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_white_king.webp b/app/src/main/res/drawable-nodpi/piece_pastel_white_king.webp new file mode 100644 index 0000000..44c72a1 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_white_king.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_white_knight.webp b/app/src/main/res/drawable-nodpi/piece_pastel_white_knight.webp new file mode 100644 index 0000000..d4b83ca Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_white_knight.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_white_pawn.webp b/app/src/main/res/drawable-nodpi/piece_pastel_white_pawn.webp new file mode 100644 index 0000000..289e364 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_white_pawn.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_white_queen.webp b/app/src/main/res/drawable-nodpi/piece_pastel_white_queen.webp new file mode 100644 index 0000000..c9080a8 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_white_queen.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_pastel_white_rook.webp b/app/src/main/res/drawable-nodpi/piece_pastel_white_rook.webp new file mode 100644 index 0000000..ab1bcb0 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_pastel_white_rook.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_black_bishop.webp b/app/src/main/res/drawable-nodpi/piece_wood_black_bishop.webp new file mode 100644 index 0000000..d59397e Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_black_bishop.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_black_king.webp b/app/src/main/res/drawable-nodpi/piece_wood_black_king.webp new file mode 100644 index 0000000..fb68f20 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_black_king.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_black_knight.webp b/app/src/main/res/drawable-nodpi/piece_wood_black_knight.webp new file mode 100644 index 0000000..0d6cb43 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_black_knight.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_black_pawn.webp b/app/src/main/res/drawable-nodpi/piece_wood_black_pawn.webp new file mode 100644 index 0000000..b6b0abf Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_black_pawn.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_black_queen.webp b/app/src/main/res/drawable-nodpi/piece_wood_black_queen.webp new file mode 100644 index 0000000..63bf3d8 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_black_queen.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_black_rook.webp b/app/src/main/res/drawable-nodpi/piece_wood_black_rook.webp new file mode 100644 index 0000000..0fe587a Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_black_rook.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_white_bishop.webp b/app/src/main/res/drawable-nodpi/piece_wood_white_bishop.webp new file mode 100644 index 0000000..c320adb Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_white_bishop.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_white_king.webp b/app/src/main/res/drawable-nodpi/piece_wood_white_king.webp new file mode 100644 index 0000000..f4ece1c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_white_king.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_white_knight.webp b/app/src/main/res/drawable-nodpi/piece_wood_white_knight.webp new file mode 100644 index 0000000..f6c5272 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_white_knight.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_white_pawn.webp b/app/src/main/res/drawable-nodpi/piece_wood_white_pawn.webp new file mode 100644 index 0000000..978a6e4 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_white_pawn.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_white_queen.webp b/app/src/main/res/drawable-nodpi/piece_wood_white_queen.webp new file mode 100644 index 0000000..3f96098 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_white_queen.webp differ diff --git a/app/src/main/res/drawable-nodpi/piece_wood_white_rook.webp b/app/src/main/res/drawable-nodpi/piece_wood_white_rook.webp new file mode 100644 index 0000000..359bdfe Binary files /dev/null and b/app/src/main/res/drawable-nodpi/piece_wood_white_rook.webp differ diff --git a/app/src/main/res/drawable/ic_image_pieces.xml b/app/src/main/res/drawable/ic_image_pieces.xml deleted file mode 100644 index 9ed7f3f..0000000 --- a/app/src/main/res/drawable/ic_image_pieces.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 426136c..12e32dc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -122,10 +122,14 @@ Gerät Die Farben kommen aus deinem Hintergrundbild (Material You) und ändern sich mit ihm. Brettfarben + Figuren + Klassisch + Kontur + Pastell + Holz + Flach Buchstaben und Zahlen auf dem Brett Feldbeschriftung an den Rändern: a–h und 1–8 - Figuren als Bilder - Überall dasselbe Aussehen. Ohne das werden Figuren mit Schriftsymbolen gezeichnet und sehen auf manchen Geräten anders aus. Änderungen gelten beim nächsten Öffnen des Bretts. Neuer Gegner. Fingerabdruck: %1$s – vergleiche ihn mit dem Gegner, wenn du sichergehen willst, dass er es ist Fingerabdruck deines Schlüssels diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 21d869a..e83b076 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -122,10 +122,14 @@ 端末 色は壁紙から取得され(Material You)、壁紙に合わせて変わります。 盤の色 + 駒 + クラシック + アウトライン + パステル + 木製 + フラット 盤上の文字と数字 盤の端のマス目ラベル: a〜h と 1〜8 - 駒を画像で表示 - どのスマホでも同じ見た目になります。オフの場合、駒はフォントの記号で描かれ、端末によって見た目が異なります。 変更は次に盤を開いたときに反映されます。 新しい相手です。フィンガープリント: %1$s — 本人か確かめたい場合は、相手と照合してください あなたの鍵のフィンガープリント diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 79499ae..41bbe13 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -122,10 +122,14 @@ Įrenginys Spalvos paimamos iš ekrano fono („Material You“) ir keičiasi kartu su juo. Lentos spalvos + Figūros + Klasikinės + Kontūrinės + Pastelinės + Medinės + Plokščios Raidės ir skaičiai ant lentos Langelių žymos pakraščiuose: a–h ir 1–8 - Figūros paveikslėliais - Vienoda išvaizda visuose telefonuose. Be šito figūros piešiamos šrifto simboliais ir kai kuriuose įrenginiuose atrodo kitaip. Pakeitimai pritaikomi kitą kartą atidarius lentą. Naujas varžovas. Kontrolinis kodas: %1$s — palyginkite su juo, jei norite įsitikinti, kad tai jis Jūsų rakto kontrolinis kodas diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a214c07..c8ca751 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -127,10 +127,14 @@ Устройство Цвета берутся из обоев (Material You) и меняются вместе с ними. Цвета доски + Фигуры + Классические + Контурные + Пастельные + Деревянные + Плоские Буквы и цифры на доске Подписи полей по краям: a–h и 1–8 - Фигуры картинками - Единый вид на всех телефонах. Без этого фигуры рисуются символами шрифта и на части устройств выглядят иначе. Изменения применяются при следующем открытии доски. Новый соперник. Отпечаток: %1$s — сверьте с ним, если хотите убедиться, что это он Отпечаток вашего ключа diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index fa9b75c..23b9d39 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -122,10 +122,14 @@ 设备 颜色取自壁纸(Material You),并随壁纸变化。 棋盘颜色 + 棋子 + 经典 + 描边 + 粉彩 + 木质 + 扁平 棋盘上的字母和数字 边缘的格子标注:a–h 和 1–8 - 用图片显示棋子 - 所有手机外观一致。关闭后棋子将用字体符号绘制,在部分设备上会显示不同。 更改将在下次打开棋盘时生效。 新对手。指纹:%1$s — 如需确认是对方本人,请与其核对 你的密钥指纹 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a85c53..60607b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -122,10 +122,14 @@ Device Colors are taken from your wallpaper (Material You) and change with it. Board colors + Pieces + Classic + Outline + Pastel + Wooden + Flat Letters and numbers on the board Square labels along the edges: a–h and 1–8 - Pieces as images - The same look on every phone. Without this, pieces are drawn with font symbols and look different on some devices. Changes apply the next time the board is opened. New opponent. Fingerprint: %1$s — check it with them if you want to be sure it\'s really them Your key fingerprint diff --git a/fastlane/metadata/android/de-DE/changelogs/12.txt b/fastlane/metadata/android/de-DE/changelogs/12.txt index b9d2059..d1b14b4 100644 --- a/fastlane/metadata/android/de-DE/changelogs/12.txt +++ b/fastlane/metadata/android/de-DE/changelogs/12.txt @@ -1,3 +1,4 @@ +• Vier neue Figurensätze unter Darstellung: Kontur, Pastell, Holz und Flach; der gewählte Satz gilt überall, auch auf dem Startbildschirm. Figuren als Schriftsymbole entfallen • Unterstützungskarte mit Ko-fi-Button unten in den Einstellungen • Links zum Quellcode führen jetzt zu GitHub • Eine kurze Anleitung beim ersten Start mit Name und Spielstärke; erneut aufrufbar in den Einstellungen diff --git a/fastlane/metadata/android/en-US/changelogs/12.txt b/fastlane/metadata/android/en-US/changelogs/12.txt index 2f999ff..aa6543f 100644 --- a/fastlane/metadata/android/en-US/changelogs/12.txt +++ b/fastlane/metadata/android/en-US/changelogs/12.txt @@ -1,3 +1,4 @@ +• Four new piece sets in Appearance: outline, pastel, wooden and flat; the chosen set is used everywhere, including the home screen. The font-symbol pieces option is gone • Support card with a Ko-fi button at the bottom of Settings • Source code links now lead to GitHub • A short guide on first launch, with your name and level; open it again from Settings diff --git a/fastlane/metadata/android/ja-JP/changelogs/12.txt b/fastlane/metadata/android/ja-JP/changelogs/12.txt index 3a0d60c..197ba8b 100644 --- a/fastlane/metadata/android/ja-JP/changelogs/12.txt +++ b/fastlane/metadata/android/ja-JP/changelogs/12.txt @@ -1,3 +1,4 @@ +• 外観に4つの新しい駒セット(アウトライン、パステル、木製、フラット)。選んだセットはホーム画面を含むすべての場所に反映。フォント記号の駒は廃止 • 設定の下部にKo-fiボタン付きの支援カード • ソースコードへのリンクはGitHubに変更 • 初回起動時の簡単なガイド(名前とレベルの設定つき)。設定から再表示できます diff --git a/fastlane/metadata/android/lt/changelogs/12.txt b/fastlane/metadata/android/lt/changelogs/12.txt index 641c2a8..c9468a3 100644 --- a/fastlane/metadata/android/lt/changelogs/12.txt +++ b/fastlane/metadata/android/lt/changelogs/12.txt @@ -1,3 +1,4 @@ +• Keturi nauji figūrų rinkiniai skiltyje „Išvaizda“: kontūrinės, pastelinės, medinės ir plokščios; pasirinktas rinkinys matomas visur, ir pradžios ekrane. Figūrų šrifto simboliais nebėra • Paramos kortelė su Ko-fi mygtuku nustatymų apačioje • Nuorodos į išeitinį kodą dabar veda į GitHub • Trumpas gidas pirmą kartą paleidus, su vardu ir lygiu; jį vėl rasite nustatymuose diff --git a/fastlane/metadata/android/ru-RU/changelogs/12.txt b/fastlane/metadata/android/ru-RU/changelogs/12.txt index 87c4953..50a081b 100644 --- a/fastlane/metadata/android/ru-RU/changelogs/12.txt +++ b/fastlane/metadata/android/ru-RU/changelogs/12.txt @@ -1,3 +1,4 @@ +• Четыре новых набора фигур в «Оформлении»: контурные, пастельные, деревянные и плоские; выбранный набор виден везде, включая главный экран. Режим фигур-символов убран • Карточка поддержки с кнопкой Ko-fi внизу настроек • Ссылки на исходный код теперь ведут на GitHub • Короткий гид при первом запуске с выбором имени и уровня; его можно открыть снова в настройках diff --git a/fastlane/metadata/android/zh-CN/changelogs/12.txt b/fastlane/metadata/android/zh-CN/changelogs/12.txt index 1bb1e6b..914846b 100644 --- a/fastlane/metadata/android/zh-CN/changelogs/12.txt +++ b/fastlane/metadata/android/zh-CN/changelogs/12.txt @@ -1,3 +1,4 @@ +• 外观中新增四套棋子:描边、粉彩、木质和扁平;所选棋子在所有地方生效,包括主页。移除了字体符号棋子 • 设置底部新增带 Ko-fi 按钮的支持卡片 • 源代码链接现在指向 GitHub • 首次启动时的简短指南,可设置名字和水平;可在设置中再次打开