Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3554907164 | ||
|
|
e7054202a1 | ||
|
|
34e02314fd | ||
|
|
95f638a373 | ||
|
|
7a4d300220 | ||
|
|
eae878db09 | ||
|
|
c5587e9418 | ||
|
|
438f06bce2 | ||
|
|
21b39cbc80 | ||
|
|
05d4936c90 | ||
|
|
8a40e86d73 |
@@ -1,27 +0,0 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Something doesn't work as expected
|
||||
title: "[Bug] "
|
||||
---
|
||||
|
||||
**What happened**
|
||||
|
||||
|
||||
**Steps to reproduce**
|
||||
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
|
||||
**What you expected**
|
||||
|
||||
|
||||
**Environment**
|
||||
|
||||
- App version:
|
||||
- Installed from: Gitea / F-Droid
|
||||
- Device and Android version:
|
||||
- Mode: vs AI / puzzles / openings / Bluetooth / LAN
|
||||
|
||||
**Screenshots or logs** (optional)
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea that fits the app
|
||||
title: "[Feature] "
|
||||
---
|
||||
|
||||
<!-- Please check the "Out of scope" list in CONTRIBUTING.md before opening this. -->
|
||||
|
||||
**What problem does this solve**
|
||||
|
||||
|
||||
**Proposed solution**
|
||||
|
||||
|
||||
**Alternatives you considered**
|
||||
|
||||
|
||||
- [ ] I'd like to implement this myself
|
||||
@@ -1,10 +0,0 @@
|
||||
---
|
||||
name: Puzzle or opening issue
|
||||
about: Report a wrong puzzle solution or opening line
|
||||
title: "[Content] "
|
||||
---
|
||||
|
||||
- Puzzle or opening name:
|
||||
- Position (describe or attach a screenshot):
|
||||
- What the app expects:
|
||||
- What you think is correct, and why:
|
||||
@@ -1,12 +0,0 @@
|
||||
---
|
||||
name: Translation fix
|
||||
about: Report a wrong or awkward translation
|
||||
title: "[Translation] "
|
||||
---
|
||||
|
||||
<!-- Supported languages: English, Russian, German, Japanese, Lithuanian, Chinese. New languages are not accepted. -->
|
||||
|
||||
- Language:
|
||||
- Screen or place in the app:
|
||||
- Current text:
|
||||
- Suggested text:
|
||||
@@ -1,17 +0,0 @@
|
||||
## What does this change
|
||||
|
||||
|
||||
## Related issue
|
||||
|
||||
Closes #
|
||||
|
||||
## Checklist
|
||||
|
||||
- [ ] Discussed in an issue first (not needed for small fixes)
|
||||
- [ ] `./gradlew assembleDebug` and `./gradlew testDebugUnitTest` pass
|
||||
- [ ] Tested on a device or emulator (Android version: )
|
||||
- [ ] Multiplayer changes tested on two physical devices
|
||||
- [ ] No ads, analytics, trackers or Google Play Services / Firebase dependencies
|
||||
- [ ] New strings added to `values/strings.xml` (missing translations noted below)
|
||||
- [ ] Screenshots added for UI changes
|
||||
- [ ] I agree that my contribution is licensed under GPL-3.0-or-later
|
||||
@@ -0,0 +1 @@
|
||||
ko_fi: skysparkle
|
||||
@@ -19,7 +19,7 @@ title: "[Bug] "
|
||||
**Environment**
|
||||
|
||||
- App version:
|
||||
- Installed from: Gitea / GitHub / F-Droid / Google Play
|
||||
- Installed from: GitHub / F-Droid / Google Play
|
||||
- Device and Android version:
|
||||
- Mode: vs AI / puzzles / openings / Bluetooth / LAN
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
blank_issues_enabled: true
|
||||
contact_links:
|
||||
- name: Main repository on git.skysparkle.cc
|
||||
url: https://git.skysparkle.cc/kalarina/Matewave
|
||||
about: This GitHub repository is a mirror. Issues are welcome here and on Gitea.
|
||||
- name: Support the project on Ko-fi
|
||||
url: https://ko-fi.com/skysparkle
|
||||
about: Donations keep the apps and the Skysparkle server running.
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
# Builds unsigned release APK and AAB. Download them from the run's "Artifacts" and sign locally.
|
||||
name: Build unsigned release
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main]
|
||||
tags: ["v*"]
|
||||
paths-ignore: ["**.md", "fastlane/**", ".github/ISSUE_TEMPLATE/**"]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: build-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
NAME: Matewave
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: 21
|
||||
|
||||
- uses: gradle/actions/setup-gradle@v4
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
chmod +x gradlew
|
||||
./gradlew --no-daemon clean assembleRelease bundleRelease
|
||||
|
||||
- name: Collect files
|
||||
run: |
|
||||
ver=$(grep -oP 'versionName = "\K[^"]+' app/build.gradle.kts)
|
||||
mkdir out
|
||||
cp app/build/outputs/apk/release/app-release-unsigned.apk "out/$NAME-v$ver-unsigned.apk"
|
||||
cp app/build/outputs/bundle/release/app-release.aab "out/$NAME-v$ver-unsigned.aab"
|
||||
cp app/build/outputs/mapping/release/mapping.txt "out/$NAME-v$ver-mapping.txt"
|
||||
git log -1 --format="Commit %h, %ci: %s" > out/BUILD-INFO.txt
|
||||
echo "VER=$ver" >> "$GITHUB_ENV"
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ env.NAME }}-v${{ env.VER }}-unsigned
|
||||
path: out/
|
||||
retention-days: 30
|
||||
@@ -4,7 +4,7 @@ Thanks for wanting to help! This guide explains where to contribute, what fits t
|
||||
|
||||
## Where to contribute
|
||||
|
||||
Issues and pull requests go to the repository on [Gitea](https://git.skysparkle.cc/kalarina/Matewave).
|
||||
Issues and pull requests go to the repository on [GitHub](https://github.com/kalarina-bit/Matewave).
|
||||
|
||||
## Ways to help
|
||||
|
||||
|
||||
@@ -9,8 +9,12 @@
|
||||
Play against the AI, solve puzzles, learn openings, or play friends nearby over Bluetooth and Wi-Fi/LAN.
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://ko-fi.com/skysparkle"><img src="https://ko-fi.com/img/githubbutton_sm.svg" alt="Support me on Ko-fi"></a>
|
||||
</p>
|
||||
|
||||
> [!IMPORTANT]
|
||||
> **Matewave is coming to Google Play!** The app is now in closed testing there ahead of the public release. Ideas, wishes and suggestions for improvement are very welcome — send them wherever is easiest for you: an issue on [Gitea](https://git.skysparkle.cc/kalarina/Matewave/issues) or [GitHub](https://github.com/kalarina-bit/Matewave/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me).
|
||||
> **Matewave is coming to Google Play!** The app is now in closed testing there ahead of the public release. Ideas, wishes and suggestions for improvement are very welcome — send them wherever is easiest for you: an [issue on GitHub](https://github.com/kalarina-bit/Matewave/issues), or an email to [cuken107@proton.me](mailto:cuken107@proton.me).
|
||||
|
||||
> [!NOTE]
|
||||
> **Looking for designers!** Matewave is looking for volunteer designers to help with icons, logos, animations, cover art (store graphics) and UI design. This is unpaid help for an open-source project. If you're interested, write to [cuken107@proton.me](mailto:cuken107@proton.me).
|
||||
@@ -21,9 +25,8 @@
|
||||
|
||||
<p align="center">
|
||||
<a href="https://f-droid.org/packages/cc.skysparkle.matewave/"><img src="assets/get-it-on%20(1).png" height="56" alt="Get it on F-Droid"></a>
|
||||
<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://git.skysparkle.cc/kalarina/Matewave"><img src="assets/badge_obtainium.png" height="56" alt="Get it on Obtainium"></a>
|
||||
<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/kalarina-bit/Matewave"><img src="assets/badge_obtainium.png" height="56" alt="Get it on Obtainium"></a>
|
||||
<a href="https://github.com/kalarina-bit/Matewave/releases/latest"><img src="assets/get-it-on-github.png" height="56" alt="Get it on GitHub"></a>
|
||||
<a href="https://git.skysparkle.cc/kalarina/Matewave/releases"><img src="assets/get-it-on-gitea.png" height="56" alt="Get it on Gitea"></a>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
@@ -50,8 +53,8 @@
|
||||
## <img src="assets/icon-install.png" width="32" alt=""> Installation
|
||||
|
||||
- **[F-Droid](https://f-droid.org/packages/cc.skysparkle.matewave/)** — install and update through the F-Droid client.
|
||||
- **[Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://git.skysparkle.cc/kalarina/Matewave)** — installs the APK straight from Gitea releases and keeps it up to date.
|
||||
- **Manually** — download the latest APK from [GitHub](https://github.com/kalarina-bit/Matewave/releases/latest) or [Gitea](https://git.skysparkle.cc/kalarina/Matewave/releases), allow installs from unknown sources for the app you open it with (Settings → Apps → Special access → Install unknown apps), then open the `.apk` and confirm.
|
||||
- **[Obtainium](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/kalarina-bit/Matewave)** — installs the APK straight from GitHub releases and keeps it up to date.
|
||||
- **Manually** — download the latest APK from [GitHub Releases](https://github.com/kalarina-bit/Matewave/releases/latest), allow installs from unknown sources for the app you open it with (Settings → Apps → Special access → Install unknown apps), then open the `.apk` and confirm.
|
||||
|
||||
## <img src="assets/icon-verify.png" width="32" alt=""> Verifying a download
|
||||
|
||||
@@ -82,7 +85,13 @@ Nearby multiplayer needs two physical devices — the emulator has no real Bluet
|
||||
|
||||
## 🤝 Contributing
|
||||
|
||||
Bug reports, puzzle and opening fixes, translation fixes and pull requests are welcome in the [issue tracker](https://git.skysparkle.cc/kalarina/Matewave/issues). Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — it explains what fits the project and how to send changes. To open an issue or a pull request, [create an account](https://git.skysparkle.cc/user/sign_up) on this Gitea.
|
||||
Bug reports, puzzle and opening fixes, translation fixes and pull requests are welcome in the [issue tracker](https://github.com/kalarina-bit/Matewave/issues). Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — it explains what fits the project and how to send changes.
|
||||
|
||||
## ☕ Support
|
||||
|
||||
Matewave is free, open source and has no ads. If it is useful to you, you can support the project on [Ko-fi](https://ko-fi.com/skysparkle) — donations pay for the Skysparkle server and the time spent on the apps.
|
||||
|
||||
<a href="https://ko-fi.com/skysparkle"><img src="https://ko-fi.com/img/githubbutton_sm.svg" alt="Support me on Ko-fi"></a>
|
||||
|
||||
## 📄 License
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ android {
|
||||
applicationId = "cc.skysparkle.matewave"
|
||||
minSdk = 26
|
||||
targetSdk = 36
|
||||
versionCode = 11
|
||||
versionName = "1.0.51"
|
||||
versionCode = 12
|
||||
versionName = "1.0.52"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
android:launchMode="singleTop"
|
||||
android:screenOrientation="portrait">
|
||||
android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboardHidden">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
|
||||
@@ -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.
|
||||
@@ -121,9 +122,12 @@ private fun AppNavHost() {
|
||||
onDispose { PresenceHub.release(context) }
|
||||
}
|
||||
|
||||
// New players start with the guide; everyone else goes straight to the menu
|
||||
val startRoute = remember { if (cc.skysparkle.matewave.ui.screens.Onboarding.needed(context)) "onboarding" else "menu" }
|
||||
|
||||
NavHost(
|
||||
navController = navController,
|
||||
startDestination = "menu",
|
||||
startDestination = startRoute,
|
||||
enterTransition = {
|
||||
if (isTabSwitch(initialState.destination.route, targetState.destination.route)) fadeThroughIn()
|
||||
else sharedAxisIn(forward = true)
|
||||
@@ -141,6 +145,22 @@ private fun AppNavHost() {
|
||||
else sharedAxisOut(forward = false)
|
||||
}
|
||||
) {
|
||||
composable("onboarding") {
|
||||
cc.skysparkle.matewave.ui.screens.OnboardingScreen(
|
||||
replay = false,
|
||||
onDone = {
|
||||
navController.navigate("menu") { popUpTo("onboarding") { inclusive = true } }
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
composable("guide") {
|
||||
cc.skysparkle.matewave.ui.screens.OnboardingScreen(
|
||||
replay = true,
|
||||
onDone = { navController.popBackStack() }
|
||||
)
|
||||
}
|
||||
|
||||
composable("menu") {
|
||||
MainMenuScreen(
|
||||
viewModel = viewModel,
|
||||
@@ -194,7 +214,8 @@ private fun AppNavHost() {
|
||||
onOpenPermissions = { navController.navigate("permissions") },
|
||||
onOpenAppearance = { navController.navigate("appearance") },
|
||||
onOpenLicenses = { navController.navigate("licenses") },
|
||||
onOpenShare = { navController.navigate("shareApk") }
|
||||
onOpenShare = { navController.navigate("shareApk") },
|
||||
onOpenGuide = { navController.navigate("guide") }
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
|
||||
@@ -6,8 +6,9 @@ import android.net.Uri
|
||||
|
||||
/** External links of the app, kept in one place. */
|
||||
object AppLinks {
|
||||
const val REPOSITORY = "https://git.skysparkle.cc/kalarina/Matewave"
|
||||
const val REPOSITORY_LABEL = "git.skysparkle.cc/kalarina/Matewave"
|
||||
const val REPOSITORY = "https://github.com/kalarina-bit/Matewave"
|
||||
const val REPOSITORY_LABEL = "github.com/kalarina-bit/Matewave"
|
||||
const val DONATE = "https://ko-fi.com/skysparkle"
|
||||
const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en"
|
||||
|
||||
/** Opens a link in the browser; does nothing if no app can open it. */
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
@@ -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<ImageBitmap>? = null
|
||||
@Volatile private var cache: Pair<PieceSet, Array<ImageBitmap>>? = null
|
||||
|
||||
fun get(context: Context): Array<ImageBitmap> {
|
||||
cache?.let { return it }
|
||||
fun get(context: Context, set: PieceSet = PieceSetState.current): Array<ImageBitmap> {
|
||||
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() }
|
||||
|
||||
|
||||
@@ -53,6 +53,72 @@ import cc.skysparkle.matewave.ui.theme.GlassShape
|
||||
import cc.skysparkle.matewave.ui.theme.PanelBorder
|
||||
import cc.skysparkle.matewave.ui.theme.TabletMaxContentWidth
|
||||
import cc.skysparkle.matewave.ui.theme.glass
|
||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.WindowInsetsSides
|
||||
import androidx.compose.foundation.layout.displayCutout
|
||||
import androidx.compose.foundation.layout.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.navigationBars
|
||||
import androidx.compose.foundation.layout.only
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.union
|
||||
import androidx.compose.foundation.layout.windowInsetsPadding
|
||||
import androidx.compose.runtime.ReadOnlyComposable
|
||||
import androidx.compose.ui.platform.LocalConfiguration
|
||||
import androidx.compose.ui.unit.min
|
||||
import cc.skysparkle.matewave.ui.theme.LandscapeMaxContentWidth
|
||||
|
||||
/** Landscape: a phone on its side or a tablet held wide. Board screens then put the board on the left. */
|
||||
@Composable
|
||||
@ReadOnlyComposable
|
||||
fun isLandscape(): Boolean {
|
||||
val config = LocalConfiguration.current
|
||||
return config.screenWidthDp > config.screenHeightDp
|
||||
}
|
||||
|
||||
/** Side insets in landscape: the camera cutout and a 3-button navigation bar sit on the left or right. */
|
||||
@Composable
|
||||
fun Modifier.horizontalSafePadding(): Modifier =
|
||||
windowInsetsPadding(WindowInsets.displayCutout.union(WindowInsets.navigationBars).only(WindowInsetsSides.Horizontal))
|
||||
|
||||
@Composable
|
||||
private fun ScaffoldTopBar(
|
||||
title: String,
|
||||
onBack: (() -> Unit)?,
|
||||
actions: @Composable RowScope.() -> Unit,
|
||||
titleContent: (@Composable RowScope.() -> Unit)?
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth().statusBarsPadding().padding(start = 4.dp, end = 4.dp, top = 8.dp, bottom = 8.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
if (onBack != null) {
|
||||
IconButton(onClick = onBack) {
|
||||
AppIcon(
|
||||
R.drawable.ic_arrow_back,
|
||||
size = 24.dp,
|
||||
tint = ChessGreen,
|
||||
contentDescription = stringResource(R.string.back)
|
||||
)
|
||||
}
|
||||
} else {
|
||||
Spacer(Modifier.width(16.dp))
|
||||
}
|
||||
if (titleContent != null) {
|
||||
Row(modifier = Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically, content = titleContent)
|
||||
} else {
|
||||
Text(
|
||||
title,
|
||||
color = ink,
|
||||
style = MaterialTheme.typography.headlineSmall,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
}
|
||||
actions()
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun GlassScaffold(
|
||||
@@ -64,38 +130,9 @@ fun GlassScaffold(
|
||||
titleContent: (@Composable RowScope.() -> Unit)? = null,
|
||||
content: @Composable ColumnScope.() -> Unit
|
||||
) {
|
||||
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
|
||||
Box(modifier = Modifier.fillMaxSize().horizontalSafePadding(), contentAlignment = Alignment.TopCenter) {
|
||||
Column(modifier = Modifier.fillMaxSize().widthIn(max = TabletMaxContentWidth)) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth().statusBarsPadding().padding(start = 4.dp, end = 4.dp, top = 8.dp, bottom = 8.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
if (onBack != null) {
|
||||
IconButton(onClick = onBack) {
|
||||
AppIcon(
|
||||
R.drawable.ic_arrow_back,
|
||||
size = 24.dp,
|
||||
tint = ChessGreen,
|
||||
contentDescription = stringResource(R.string.back)
|
||||
)
|
||||
}
|
||||
} else {
|
||||
Spacer(Modifier.width(16.dp))
|
||||
}
|
||||
if (titleContent != null) {
|
||||
Row(modifier = Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically, content = titleContent)
|
||||
} else {
|
||||
Text(
|
||||
title,
|
||||
color = ink,
|
||||
style = MaterialTheme.typography.headlineSmall,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
}
|
||||
actions()
|
||||
}
|
||||
ScaffoldTopBar(title, onBack, actions, titleContent)
|
||||
|
||||
val scrollState = rememberScrollState()
|
||||
|
||||
@@ -120,6 +157,65 @@ fun GlassScaffold(
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* A screen with a chess board. Portrait: [above], the board and [below] in one scrolling column,
|
||||
* as before. Landscape: the board on the left as large as the height allows, [above] and [below]
|
||||
* in a scrolling column on the right. [board] gets the modifier that sizes it.
|
||||
*/
|
||||
@Composable
|
||||
fun BoardScaffold(
|
||||
title: String,
|
||||
onBack: (() -> Unit)? = null,
|
||||
actions: @Composable RowScope.() -> Unit = {},
|
||||
titleContent: (@Composable RowScope.() -> Unit)? = null,
|
||||
above: @Composable ColumnScope.() -> Unit = {},
|
||||
board: (@Composable (Modifier) -> Unit)?,
|
||||
below: @Composable ColumnScope.() -> Unit = {}
|
||||
) {
|
||||
if (!isLandscape()) {
|
||||
GlassScaffold(title = title, onBack = onBack, actions = actions, titleContent = titleContent) {
|
||||
above()
|
||||
if (board != null) {
|
||||
Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.TopCenter) { board(Modifier) }
|
||||
}
|
||||
below()
|
||||
}
|
||||
return
|
||||
}
|
||||
Box(modifier = Modifier.fillMaxSize().horizontalSafePadding(), contentAlignment = Alignment.TopCenter) {
|
||||
Column(modifier = Modifier.fillMaxSize().widthIn(max = LandscapeMaxContentWidth)) {
|
||||
ScaffoldTopBar(title, onBack, actions, titleContent)
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.weight(1f)
|
||||
.navigationBarsPadding()
|
||||
.padding(start = 16.dp, end = 16.dp, bottom = 12.dp),
|
||||
horizontalArrangement = Arrangement.spacedBy(20.dp)
|
||||
) {
|
||||
if (board != null) {
|
||||
BoxWithConstraints(
|
||||
modifier = Modifier.weight(1f).fillMaxHeight(),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
board(Modifier.size(min(maxWidth, maxHeight)))
|
||||
}
|
||||
}
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.fillMaxHeight()
|
||||
.verticalScroll(rememberScrollState()),
|
||||
verticalArrangement = Arrangement.spacedBy(14.dp)
|
||||
) {
|
||||
above()
|
||||
below()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun Modifier.pressScale(interactionSource: MutableInteractionSource): Modifier {
|
||||
val pressed by interactionSource.collectIsPressedAsState()
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -102,7 +102,14 @@ fun GameScreen(viewModel: GameViewModel, onExit: () -> Unit) {
|
||||
else -> null
|
||||
}
|
||||
|
||||
GlassScaffold(
|
||||
val material = remember(state.board) { cc.skysparkle.matewave.engine.Material.balance(state.board) }
|
||||
val bottomColor = state.myColor
|
||||
val topColor = if (bottomColor == PieceColor.WHITE) PieceColor.BLACK else PieceColor.WHITE
|
||||
val kingInCheckSquare = remember(state.board) { ChessEngine.checkedKingSquare(state.board) }
|
||||
|
||||
// Portrait: opponent, board, you and the controls one under another.
|
||||
// Landscape: the board on the left, players and controls on the right.
|
||||
cc.skysparkle.matewave.ui.components.BoardScaffold(
|
||||
title = "",
|
||||
onBack = requestExit,
|
||||
actions = {
|
||||
@@ -112,32 +119,29 @@ fun GameScreen(viewModel: GameViewModel, onExit: () -> Unit) {
|
||||
},
|
||||
titleContent = if (showOpening && opening != null) {
|
||||
{ OpeningTitle("${opening.eco} · ${opening.name}", bookStatus, inBook) }
|
||||
} else null
|
||||
} else null,
|
||||
above = {
|
||||
if (state.mode == GameMode.VS_PLAYER_NETWORK) ConnectionBanner(state)
|
||||
TrustBanners(state)
|
||||
PlayerRow(state, topColor, isMe = false, material = material, clock = viewModel.clockState)
|
||||
},
|
||||
board = { boardModifier ->
|
||||
ChessBoardView(
|
||||
modifier = boardModifier,
|
||||
board = state.board,
|
||||
selectedSquare = state.selectedSquare,
|
||||
legalTargets = state.legalTargetsFromSelected,
|
||||
kingInCheckSquare = kingInCheckSquare,
|
||||
flipped = state.myColor == PieceColor.BLACK,
|
||||
onSquareClick = viewModel::onSquareClicked,
|
||||
lastMove = state.lastMove,
|
||||
interactionEnabled = state.status == GameStatus.ONGOING && state.pendingPromotion == null &&
|
||||
(state.mode != GameMode.VS_PLAYER_NETWORK ||
|
||||
(state.connectionState == ConnectionState.CONNECTED &&
|
||||
state.handshake == cc.skysparkle.matewave.viewmodel.HandshakeState.PLAYING))
|
||||
)
|
||||
}
|
||||
) {
|
||||
if (state.mode == GameMode.VS_PLAYER_NETWORK) ConnectionBanner(state)
|
||||
TrustBanners(state)
|
||||
|
||||
val material = remember(state.board) { cc.skysparkle.matewave.engine.Material.balance(state.board) }
|
||||
val bottomColor = state.myColor
|
||||
val topColor = if (bottomColor == PieceColor.WHITE) PieceColor.BLACK else PieceColor.WHITE
|
||||
val kingInCheckSquare = remember(state.board) { ChessEngine.checkedKingSquare(state.board) }
|
||||
|
||||
PlayerRow(state, topColor, isMe = false, material = material, clock = viewModel.clockState)
|
||||
|
||||
ChessBoardView(
|
||||
board = state.board,
|
||||
selectedSquare = state.selectedSquare,
|
||||
legalTargets = state.legalTargetsFromSelected,
|
||||
kingInCheckSquare = kingInCheckSquare,
|
||||
flipped = state.myColor == PieceColor.BLACK,
|
||||
onSquareClick = viewModel::onSquareClicked,
|
||||
lastMove = state.lastMove,
|
||||
interactionEnabled = state.status == GameStatus.ONGOING && state.pendingPromotion == null &&
|
||||
(state.mode != GameMode.VS_PLAYER_NETWORK ||
|
||||
(state.connectionState == ConnectionState.CONNECTED &&
|
||||
state.handshake == cc.skysparkle.matewave.viewmodel.HandshakeState.PLAYING))
|
||||
)
|
||||
|
||||
PlayerRow(state, bottomColor, isMe = true, material = material, clock = viewModel.clockState)
|
||||
|
||||
// The move ribbon: only moves here, the opening name lives in the top bar.
|
||||
|
||||
@@ -11,6 +11,7 @@ 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 cc.skysparkle.matewave.ui.components.horizontalSafePadding
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.navigationBarsPadding
|
||||
@@ -50,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
|
||||
@@ -98,7 +102,7 @@ fun MainMenuScreen(
|
||||
var showRatingGate by remember { mutableStateOf(false) }
|
||||
var showStats by remember { mutableStateOf(false) }
|
||||
|
||||
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
|
||||
Box(modifier = Modifier.fillMaxSize().horizontalSafePadding(), contentAlignment = Alignment.TopCenter) {
|
||||
Column(modifier = Modifier.fillMaxSize().widthIn(max = TabletMaxContentWidth)) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
@@ -258,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)
|
||||
@@ -279,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)
|
||||
|
||||
@@ -0,0 +1,365 @@
|
||||
package cc.skysparkle.matewave.ui.screens
|
||||
|
||||
import android.content.Context
|
||||
import androidx.activity.compose.BackHandler
|
||||
import androidx.annotation.DrawableRes
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.compose.animation.core.animateDpAsState
|
||||
import androidx.compose.foundation.Image
|
||||
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.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.imePadding
|
||||
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.widthIn
|
||||
import androidx.compose.foundation.pager.HorizontalPager
|
||||
import androidx.compose.foundation.pager.rememberPagerState
|
||||
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.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.testTag
|
||||
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.semantics
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import cc.skysparkle.matewave.R
|
||||
import cc.skysparkle.matewave.data.ProfileStore
|
||||
import cc.skysparkle.matewave.network.Transports
|
||||
import cc.skysparkle.matewave.ui.components.AppIcon
|
||||
import cc.skysparkle.matewave.ui.components.GlassButton
|
||||
import cc.skysparkle.matewave.ui.components.horizontalSafePadding
|
||||
import cc.skysparkle.matewave.ui.theme.ChessGreen
|
||||
import cc.skysparkle.matewave.ui.theme.PanelBorder
|
||||
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.ui.theme.whiteOutlinedTextFieldColors
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
/**
|
||||
* First-launch guide. New players see it once; Settings → «Show the guide» opens it again.
|
||||
* Anyone who already played before this version (a name, a chosen level or games against the
|
||||
* AI on record) is treated as having seen it.
|
||||
*/
|
||||
object Onboarding {
|
||||
private const val PREFS = "onboarding_prefs"
|
||||
private const val KEY_DONE = "done"
|
||||
|
||||
fun needed(context: Context): Boolean {
|
||||
val prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
|
||||
if (prefs.getBoolean(KEY_DONE, false)) return false
|
||||
val profile = context.getSharedPreferences("chess_profile_prefs", Context.MODE_PRIVATE)
|
||||
val stats = context.getSharedPreferences("chess_stats_prefs", Context.MODE_PRIVATE)
|
||||
val playedBefore = profile.contains("name") || profile.getBoolean("level_chosen", false) || stats.all.isNotEmpty()
|
||||
if (playedBefore) {
|
||||
markDone(context)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
fun markDone(context: Context) {
|
||||
context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putBoolean(KEY_DONE, true).apply()
|
||||
}
|
||||
}
|
||||
|
||||
private data class GuidePage(
|
||||
@param:DrawableRes val iconRes: Int,
|
||||
@param:StringRes val titleRes: Int,
|
||||
@param:StringRes val textRes: Int
|
||||
)
|
||||
|
||||
private val PAGES = listOf(
|
||||
GuidePage(R.drawable.ic_launcher_card, R.string.guide_welcome_title, R.string.guide_welcome_text),
|
||||
GuidePage(R.drawable.ic_puzzle, R.string.guide_play_title, R.string.guide_play_text),
|
||||
GuidePage(R.drawable.ic_bluetooth, R.string.guide_nearby_title, R.string.guide_nearby_text),
|
||||
// the last page asks for a name and a level
|
||||
GuidePage(R.drawable.ic_default_avatar, R.string.guide_you_title, R.string.guide_you_text)
|
||||
)
|
||||
|
||||
private data class GuideLevel(@param:StringRes val labelRes: Int, val elo: Int)
|
||||
|
||||
// The same levels as in the account screen
|
||||
private val LEVELS = listOf(
|
||||
GuideLevel(R.string.skill_novice, 800),
|
||||
GuideLevel(R.string.skill_amateur, 1200),
|
||||
GuideLevel(R.string.skill_pro, 1800),
|
||||
GuideLevel(R.string.skill_master, 2200)
|
||||
)
|
||||
|
||||
private const val MAX_NAME_LENGTH = 20
|
||||
|
||||
/**
|
||||
* @param replay opened from Settings: back on the first page closes it, and the level is not
|
||||
* asked again once chosen.
|
||||
*/
|
||||
@Composable
|
||||
fun OnboardingScreen(replay: Boolean, onDone: () -> Unit) {
|
||||
val context = LocalContext.current
|
||||
val scope = rememberCoroutineScope()
|
||||
val pager = rememberPagerState(pageCount = { PAGES.size })
|
||||
val last = pager.currentPage == PAGES.lastIndex
|
||||
|
||||
val profile = remember { ProfileStore.get() }
|
||||
val defaultName = stringResource(R.string.player_default_name)
|
||||
var name by rememberSaveable { mutableStateOf(if (profile.name == defaultName) "" else profile.name) }
|
||||
var level by rememberSaveable { mutableStateOf<Int?>(null) }
|
||||
val askLevel = !profile.levelChosen
|
||||
|
||||
val finish = {
|
||||
val trimmed = name.trim()
|
||||
var changed = false
|
||||
if (trimmed.isNotEmpty() && trimmed != profile.name) {
|
||||
ProfileStore.setName(trimmed)
|
||||
changed = true
|
||||
}
|
||||
val elo = level
|
||||
if (askLevel && elo != null) {
|
||||
ProfileStore.setStartingElo(elo)
|
||||
changed = true
|
||||
}
|
||||
// Nearby players see the new name and rating right away
|
||||
if (changed) {
|
||||
Transports.lan(context).republishProfile()
|
||||
Transports.ble(context).republishProfile()
|
||||
}
|
||||
Onboarding.markDone(context)
|
||||
onDone()
|
||||
}
|
||||
|
||||
BackHandler(enabled = pager.currentPage > 0 || replay) {
|
||||
if (pager.currentPage > 0) scope.launch { pager.animateScrollToPage(pager.currentPage - 1) } else onDone()
|
||||
}
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.horizontalSafePadding()
|
||||
.testTag("onboarding"),
|
||||
contentAlignment = Alignment.TopCenter
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.widthIn(max = TabletMaxContentWidth)
|
||||
.statusBarsPadding()
|
||||
.navigationBarsPadding()
|
||||
.imePadding()
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(56.dp)
|
||||
.padding(horizontal = 12.dp),
|
||||
contentAlignment = Alignment.CenterEnd
|
||||
) {
|
||||
if (!last) {
|
||||
Text(
|
||||
text = stringResource(R.string.guide_skip),
|
||||
color = ink.copy(alpha = 0.7f),
|
||||
style = MaterialTheme.typography.labelLarge,
|
||||
modifier = Modifier
|
||||
.clip(CircleShape)
|
||||
// Skipping still lands on the last page: the name and level are asked there
|
||||
.clickable(role = Role.Button) { scope.launch { pager.animateScrollToPage(PAGES.lastIndex) } }
|
||||
.padding(horizontal = 14.dp, vertical = 10.dp)
|
||||
.testTag("onboarding_skip")
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
HorizontalPager(
|
||||
state = pager,
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.fillMaxWidth()
|
||||
) { index ->
|
||||
val page = PAGES[index]
|
||||
PageColumn {
|
||||
PageIcon(page, isLogo = index == 0)
|
||||
Spacer(Modifier.height(32.dp))
|
||||
Text(
|
||||
text = stringResource(page.titleRes),
|
||||
color = ink,
|
||||
style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
Spacer(Modifier.height(12.dp))
|
||||
Text(
|
||||
text = stringResource(page.textRes),
|
||||
color = ink.copy(alpha = 0.7f),
|
||||
style = MaterialTheme.typography.bodyLarge.copy(lineHeight = 24.sp),
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
if (index == PAGES.lastIndex) {
|
||||
Spacer(Modifier.height(24.dp))
|
||||
AboutYou(
|
||||
name = name,
|
||||
onName = { if (it.length <= MAX_NAME_LENGTH) name = it },
|
||||
askLevel = askLevel,
|
||||
level = level,
|
||||
onLevel = { level = it }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Dots(count = PAGES.size, current = pager.currentPage)
|
||||
|
||||
GlassButton(
|
||||
onClick = { if (last) finish() else scope.launch { pager.animateScrollToPage(pager.currentPage + 1) } },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 24.dp, vertical = 20.dp)
|
||||
.testTag("onboarding_next")
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(if (last) R.string.guide_start else R.string.guide_next),
|
||||
style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun PageColumn(content: @Composable () -> Unit) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.verticalScroll(rememberScrollState())
|
||||
.padding(horizontal = 28.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center
|
||||
) {
|
||||
content()
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun PageIcon(page: GuidePage, isLogo: Boolean) {
|
||||
if (isLogo) {
|
||||
// The app icon picture, not a glyph
|
||||
Image(
|
||||
painter = painterResource(page.iconRes),
|
||||
contentDescription = null,
|
||||
contentScale = ContentScale.Crop,
|
||||
modifier = Modifier
|
||||
.size(120.dp)
|
||||
.clip(RoundedCornerShape(32.dp))
|
||||
.border(1.dp, PanelBorder, RoundedCornerShape(32.dp))
|
||||
)
|
||||
} else {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(120.dp)
|
||||
.clip(CircleShape)
|
||||
.background(Surface2)
|
||||
.border(1.dp, PanelBorder, CircleShape),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
AppIcon(page.iconRes, size = 52.dp, tint = ChessGreen)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun AboutYou(
|
||||
name: String,
|
||||
onName: (String) -> Unit,
|
||||
askLevel: Boolean,
|
||||
level: Int?,
|
||||
onLevel: (Int) -> Unit
|
||||
) {
|
||||
Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
Text(stringResource(R.string.account_name), color = ink.copy(alpha = 0.7f), style = MaterialTheme.typography.labelLarge)
|
||||
OutlinedTextField(
|
||||
value = name,
|
||||
onValueChange = onName,
|
||||
singleLine = true,
|
||||
placeholder = { Text(stringResource(R.string.player_default_name), color = ink.copy(alpha = 0.4f)) },
|
||||
colors = whiteOutlinedTextFieldColors(),
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.testTag("onboarding_name")
|
||||
)
|
||||
if (askLevel) {
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Text(stringResource(R.string.account_level_dialog_title), color = ink.copy(alpha = 0.7f), style = MaterialTheme.typography.labelLarge)
|
||||
LEVELS.forEach { option ->
|
||||
val selected = option.elo == level
|
||||
val shape = RoundedCornerShape(16.dp)
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(shape)
|
||||
.background(Surface2)
|
||||
.border(if (selected) 2.dp else 1.dp, if (selected) ChessGreen else PanelBorder, shape)
|
||||
.clickable(role = Role.RadioButton) { onLevel(option.elo) }
|
||||
.padding(horizontal = 16.dp, vertical = 14.dp),
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Text(stringResource(option.labelRes), color = ink, style = MaterialTheme.typography.titleMedium)
|
||||
Text("~${option.elo}", color = if (selected) ChessGreen else ink.copy(alpha = 0.7f), style = MaterialTheme.typography.titleMedium)
|
||||
}
|
||||
}
|
||||
Text(stringResource(R.string.guide_level_hint), color = ink.copy(alpha = 0.5f), style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun Dots(count: Int, current: Int) {
|
||||
val label = stringResource(R.string.guide_page_of, current + 1, count)
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.semantics { contentDescription = label },
|
||||
horizontalArrangement = Arrangement.Center,
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
repeat(count) { i ->
|
||||
val selected = i == current
|
||||
val width by animateDpAsState(if (selected) 22.dp else 8.dp, label = "guide_dot")
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.padding(horizontal = 4.dp)
|
||||
.size(width = width, height = 8.dp)
|
||||
.clip(CircleShape)
|
||||
.background(if (selected) ChessGreen else ink.copy(alpha = 0.2f))
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -43,45 +43,52 @@ fun OpeningTrainerScreen(viewModel: OpeningStudyViewModel, onBack: () -> Unit) {
|
||||
val sans = state.sans
|
||||
val opening = remember(sans) { OpeningBook.openingName(sans) }
|
||||
|
||||
GlassScaffold(title = course.name, onBack = onBack) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(
|
||||
stringResource(
|
||||
when (state.mode) {
|
||||
SessionMode.LEARN -> R.string.study_mode_learn
|
||||
SessionMode.REVIEW -> R.string.study_mode_review
|
||||
SessionMode.PRACTICE -> R.string.study_mode_practice
|
||||
}
|
||||
),
|
||||
color = ChessGreen,
|
||||
style = MaterialTheme.typography.labelLarge
|
||||
)
|
||||
Spacer(Modifier.weight(1f))
|
||||
val asked = state.asked.size
|
||||
if (asked > 0 && state.phase != TrainerPhase.COMPLETE) {
|
||||
// Landscape: the board on the left, progress, moves and the task on the right
|
||||
cc.skysparkle.matewave.ui.components.BoardScaffold(
|
||||
title = course.name,
|
||||
onBack = onBack,
|
||||
above = {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(
|
||||
stringResource(R.string.study_progress, minOf(state.answered + 1, asked), asked),
|
||||
color = ink.copy(alpha = 0.7f),
|
||||
style = MaterialTheme.typography.bodySmall
|
||||
stringResource(
|
||||
when (state.mode) {
|
||||
SessionMode.LEARN -> R.string.study_mode_learn
|
||||
SessionMode.REVIEW -> R.string.study_mode_review
|
||||
SessionMode.PRACTICE -> R.string.study_mode_practice
|
||||
}
|
||||
),
|
||||
color = ChessGreen,
|
||||
style = MaterialTheme.typography.labelLarge
|
||||
)
|
||||
Spacer(Modifier.weight(1f))
|
||||
val asked = state.asked.size
|
||||
if (asked > 0 && state.phase != TrainerPhase.COMPLETE) {
|
||||
Text(
|
||||
stringResource(R.string.study_progress, minOf(state.answered + 1, asked), asked),
|
||||
color = ink.copy(alpha = 0.7f),
|
||||
style = MaterialTheme.typography.bodySmall
|
||||
)
|
||||
}
|
||||
}
|
||||
ProgressBar(state.answered.toFloat() / state.asked.size.coerceAtLeast(1))
|
||||
|
||||
MovesBar(sans = sans, startBoard = startBoard, opening = opening)
|
||||
},
|
||||
board = { boardModifier ->
|
||||
ChessBoardView(
|
||||
modifier = boardModifier,
|
||||
board = state.board,
|
||||
selectedSquare = state.selectedSquare,
|
||||
legalTargets = state.legalTargets,
|
||||
kingInCheckSquare = null,
|
||||
flipped = course.side == PieceColor.BLACK,
|
||||
onSquareClick = { viewModel.onSquareClick(it) },
|
||||
lastMove = state.lastMove,
|
||||
hintSquare = state.hintSquare,
|
||||
interactionEnabled = state.phase == TrainerPhase.YOUR_MOVE || state.phase == TrainerPhase.WRONG
|
||||
)
|
||||
}
|
||||
ProgressBar(state.answered.toFloat() / state.asked.size.coerceAtLeast(1))
|
||||
|
||||
MovesBar(sans = sans, startBoard = startBoard, opening = opening)
|
||||
|
||||
ChessBoardView(
|
||||
board = state.board,
|
||||
selectedSquare = state.selectedSquare,
|
||||
legalTargets = state.legalTargets,
|
||||
kingInCheckSquare = null,
|
||||
flipped = course.side == PieceColor.BLACK,
|
||||
onSquareClick = { viewModel.onSquareClick(it) },
|
||||
lastMove = state.lastMove,
|
||||
hintSquare = state.hintSquare,
|
||||
interactionEnabled = state.phase == TrainerPhase.YOUR_MOVE || state.phase == TrainerPhase.WRONG
|
||||
)
|
||||
|
||||
) {
|
||||
when (state.phase) {
|
||||
TrainerPhase.YOUR_MOVE -> Text(
|
||||
stringResource(if (state.mode == SessionMode.LEARN) R.string.study_learn_prompt else R.string.study_recall_prompt),
|
||||
|
||||
@@ -71,7 +71,8 @@ fun PuzzleSolveScreen(viewModel: GameViewModel, onBack: () -> Unit, onNextPuzzle
|
||||
}
|
||||
val redSquare = if (state.puzzleFailedAttempt && state.puzzleAutoMoving) state.lastMove?.to else null
|
||||
|
||||
GlassScaffold(
|
||||
// Landscape: the board on the left, the task and buttons on the right
|
||||
cc.skysparkle.matewave.ui.components.BoardScaffold(
|
||||
title = puzzle?.let { stringResource(R.string.puzzle_title_rating, it.rating) } ?: stringResource(R.string.puzzle_title_fallback),
|
||||
onBack = onBack,
|
||||
actions = {
|
||||
@@ -88,24 +89,25 @@ fun PuzzleSolveScreen(viewModel: GameViewModel, onBack: () -> Unit, onNextPuzzle
|
||||
.padding(horizontal = 6.dp, vertical = 2.dp)
|
||||
)
|
||||
}
|
||||
},
|
||||
board = { boardModifier ->
|
||||
// On tablets the board is capped and centred, so the task and buttons fit without scrolling.
|
||||
ChessBoardView(
|
||||
board = state.board,
|
||||
selectedSquare = state.selectedSquare,
|
||||
legalTargets = state.legalTargetsFromSelected,
|
||||
kingInCheckSquare = remember(state.board) { ChessEngine.checkedKingSquare(state.board) },
|
||||
flipped = state.myColor == PieceColor.BLACK,
|
||||
onSquareClick = viewModel::onSquareClicked,
|
||||
modifier = boardModifier.widthIn(max = 560.dp),
|
||||
lastMove = state.lastMove,
|
||||
hintSquare = state.puzzleHintFrom,
|
||||
interactionEnabled = state.puzzleStarted && !state.puzzleAutoMoving && !state.puzzleSolved && state.pendingPromotion == null,
|
||||
flashSquare = redSquare ?: greenFlash,
|
||||
flashColor = if (redSquare != null) WrongRed.copy(alpha = 0.55f) else ChessGreen.copy(alpha = 0.55f)
|
||||
)
|
||||
}
|
||||
) {
|
||||
// On tablets the board is capped and centred, so the task and buttons fit without scrolling.
|
||||
ChessBoardView(
|
||||
board = state.board,
|
||||
selectedSquare = state.selectedSquare,
|
||||
legalTargets = state.legalTargetsFromSelected,
|
||||
kingInCheckSquare = remember(state.board) { ChessEngine.checkedKingSquare(state.board) },
|
||||
flipped = state.myColor == PieceColor.BLACK,
|
||||
onSquareClick = viewModel::onSquareClicked,
|
||||
modifier = Modifier.align(Alignment.CenterHorizontally).widthIn(max = 560.dp),
|
||||
lastMove = state.lastMove,
|
||||
hintSquare = state.puzzleHintFrom,
|
||||
interactionEnabled = state.puzzleStarted && !state.puzzleAutoMoving && !state.puzzleSolved && state.pendingPromotion == null,
|
||||
flashSquare = redSquare ?: greenFlash,
|
||||
flashColor = if (redSquare != null) WrongRed.copy(alpha = 0.55f) else ChessGreen.copy(alpha = 0.55f)
|
||||
)
|
||||
|
||||
// The task, in the same format as the status in a game: a dot in the side's colour.
|
||||
val (text, color) = when {
|
||||
state.puzzleSolved -> stringResource(R.string.puzzle_solved) to ChessGreen
|
||||
|
||||
@@ -57,7 +57,8 @@ fun SettingsScreen(
|
||||
onOpenPermissions: () -> Unit,
|
||||
onOpenAppearance: () -> Unit,
|
||||
onOpenLicenses: () -> Unit,
|
||||
onOpenShare: () -> Unit
|
||||
onOpenShare: () -> Unit,
|
||||
onOpenGuide: () -> Unit
|
||||
) {
|
||||
var musicOn by remember { mutableStateOf(SoundManager.musicEnabled) }
|
||||
var sfxOn by remember { mutableStateOf(SoundManager.sfxEnabled) }
|
||||
@@ -170,6 +171,14 @@ fun SettingsScreen(
|
||||
onClick = { cc.skysparkle.matewave.settings.AppLinks.open(context, cc.skysparkle.matewave.settings.AppLinks.PRIVACY_POLICY) }
|
||||
)
|
||||
ListDivider()
|
||||
ListRow(
|
||||
title = stringResource(R.string.guide_show),
|
||||
subtitle = stringResource(R.string.guide_show_subtitle),
|
||||
icon = R.drawable.ic_hint,
|
||||
chevron = true,
|
||||
onClick = onOpenGuide
|
||||
)
|
||||
ListDivider()
|
||||
ListRow(
|
||||
title = stringResource(R.string.about_section),
|
||||
icon = R.drawable.ic_info,
|
||||
@@ -178,6 +187,19 @@ fun SettingsScreen(
|
||||
onClick = { showAbout = true }
|
||||
)
|
||||
}
|
||||
|
||||
// Donation plaque, last on the screen so it never gets in the way. A heart rather than the
|
||||
// app icon: the logo already appears in the About dialog
|
||||
ListGroup {
|
||||
ListRow(
|
||||
title = stringResource(R.string.support_title),
|
||||
subtitle = stringResource(R.string.support_text),
|
||||
icon = R.drawable.ic_heart,
|
||||
iconTint = DonateRed,
|
||||
chevron = true,
|
||||
onClick = { cc.skysparkle.matewave.settings.AppLinks.open(context, cc.skysparkle.matewave.settings.AppLinks.DONATE) }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
if (showAbout) {
|
||||
@@ -242,6 +264,8 @@ fun SettingsScreen(
|
||||
}
|
||||
}
|
||||
|
||||
private val DonateRed = Color(0xFFFF6B8A)
|
||||
|
||||
@Composable
|
||||
private fun AboutRow(iconRes: Int, title: String, subtitle: String, onClick: () -> Unit) {
|
||||
val rowShape = RoundedCornerShape(12.dp)
|
||||
|
||||
@@ -88,35 +88,40 @@ fun SpectatorScreen(target: SpectateTarget, onBackToFriends: () -> Unit) {
|
||||
val view = state.view
|
||||
var resultHidden by remember(view?.gameId, state.phase) { mutableStateOf(false) }
|
||||
|
||||
GlassScaffold(
|
||||
val bottom = if (state.flipped) PieceColor.BLACK else PieceColor.WHITE
|
||||
val material = remember(view?.board) { view?.let { Material.balance(it.board) } }
|
||||
val checkSquare = remember(view?.board) { view?.let { ChessEngine.checkedKingSquare(it.board) } }
|
||||
|
||||
// Landscape: the board on the left, players, moves and buttons on the right
|
||||
cc.skysparkle.matewave.ui.components.BoardScaffold(
|
||||
title = stringResource(R.string.spectate_title),
|
||||
onBack = backToFriends,
|
||||
actions = { if (view != null) SpectatorBadge(state.spectators, state.max) }
|
||||
) {
|
||||
if (state.phase == SpectatePhase.CONNECTING) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
CircularProgressIndicator(color = ink, strokeWidth = 2.dp, modifier = Modifier.size(16.dp))
|
||||
Text(stringResource(R.string.spectate_joining), color = ink, style = MaterialTheme.typography.bodyMedium)
|
||||
actions = { if (view != null) SpectatorBadge(state.spectators, state.max) },
|
||||
above = {
|
||||
if (state.phase == SpectatePhase.CONNECTING) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
CircularProgressIndicator(color = ink, strokeWidth = 2.dp, modifier = Modifier.size(16.dp))
|
||||
Text(stringResource(R.string.spectate_joining), color = ink, style = MaterialTheme.typography.bodyMedium)
|
||||
}
|
||||
}
|
||||
if (view != null && material != null) SpectatorPlayerRow(view, bottom.opposite(), state, material)
|
||||
},
|
||||
board = { boardModifier ->
|
||||
if (view != null) ChessBoardView(
|
||||
modifier = boardModifier,
|
||||
board = view.board,
|
||||
selectedSquare = null,
|
||||
legalTargets = emptyList(),
|
||||
kingInCheckSquare = checkSquare,
|
||||
flipped = state.flipped,
|
||||
onSquareClick = {},
|
||||
lastMove = view.lastMove,
|
||||
interactionEnabled = false,
|
||||
highlightLastMove = true
|
||||
)
|
||||
}
|
||||
if (view == null) return@GlassScaffold
|
||||
|
||||
val bottom = if (state.flipped) PieceColor.BLACK else PieceColor.WHITE
|
||||
val material = remember(view.board) { Material.balance(view.board) }
|
||||
val checkSquare = remember(view.board) { ChessEngine.checkedKingSquare(view.board) }
|
||||
|
||||
SpectatorPlayerRow(view, bottom.opposite(), state, material)
|
||||
ChessBoardView(
|
||||
board = view.board,
|
||||
selectedSquare = null,
|
||||
legalTargets = emptyList(),
|
||||
kingInCheckSquare = checkSquare,
|
||||
flipped = state.flipped,
|
||||
onSquareClick = {},
|
||||
lastMove = view.lastMove,
|
||||
interactionEnabled = false,
|
||||
highlightLastMove = true
|
||||
)
|
||||
) {
|
||||
if (view == null || material == null) return@BoardScaffold
|
||||
SpectatorPlayerRow(view, bottom, state, material)
|
||||
|
||||
val bookPlies = remember(view.moveSans) { OpeningBook.bookDepth(view.moveSans) }
|
||||
|
||||
@@ -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<PieceColor>, 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()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,6 +15,8 @@ val UiCornerRadius = 22.dp
|
||||
val GlassShape: Shape = RoundedCornerShape(UiCornerRadius)
|
||||
|
||||
val TabletMaxContentWidth = 600.dp
|
||||
/** Landscape board screens: board and side panel together. */
|
||||
val LandscapeMaxContentWidth = 1200.dp
|
||||
|
||||
fun Modifier.glass(): Modifier = this
|
||||
.clip(GlassShape)
|
||||
|
||||
|
Before Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 6.5 KiB |
|
After Width: | Height: | Size: 6.4 KiB |
|
After Width: | Height: | Size: 6.3 KiB |
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 6.7 KiB |
|
After Width: | Height: | Size: 5.4 KiB |
|
After Width: | Height: | Size: 6.7 KiB |
|
After Width: | Height: | Size: 7.0 KiB |
|
After Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 5.6 KiB |
|
After Width: | Height: | Size: 7.1 KiB |
|
After Width: | Height: | Size: 5.6 KiB |
|
After Width: | Height: | Size: 7.9 KiB |
|
After Width: | Height: | Size: 7.8 KiB |
|
After Width: | Height: | Size: 9.2 KiB |
|
After Width: | Height: | Size: 6.7 KiB |
|
After Width: | Height: | Size: 8.3 KiB |
|
After Width: | Height: | Size: 7.1 KiB |
|
After Width: | Height: | Size: 8.2 KiB |
|
After Width: | Height: | Size: 8.1 KiB |
|
After Width: | Height: | Size: 9.9 KiB |
|
After Width: | Height: | Size: 7.2 KiB |
|
After Width: | Height: | Size: 8.9 KiB |
|
After Width: | Height: | Size: 7.5 KiB |
|
After Width: | Height: | Size: 7.7 KiB |
|
After Width: | Height: | Size: 8.0 KiB |
|
After Width: | Height: | Size: 9.3 KiB |
|
After Width: | Height: | Size: 7.0 KiB |
|
After Width: | Height: | Size: 8.8 KiB |
|
After Width: | Height: | Size: 8.5 KiB |
|
After Width: | Height: | Size: 8.6 KiB |
|
After Width: | Height: | Size: 9.1 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 7.3 KiB |
|
After Width: | Height: | Size: 9.5 KiB |
|
After Width: | Height: | Size: 8.5 KiB |
|
After Width: | Height: | Size: 8.4 KiB |
|
After Width: | Height: | Size: 8.5 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 6.9 KiB |
|
After Width: | Height: | Size: 8.4 KiB |
|
After Width: | Height: | Size: 7.3 KiB |
|
After Width: | Height: | Size: 8.9 KiB |
|
After Width: | Height: | Size: 9.5 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 7.4 KiB |
|
After Width: | Height: | Size: 9.5 KiB |
|
After Width: | Height: | Size: 8.3 KiB |
@@ -0,0 +1,10 @@
|
||||
<!-- Material Icons "favorite" by Google, Apache License 2.0 -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
|
||||
</vector>
|
||||
@@ -1,10 +0,0 @@
|
||||
<!-- Material Symbols "image" by Google, Apache License 2.0 -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm1-4h12l-3.75-5l-3 4L9 13z" />
|
||||
</vector>
|
||||
@@ -122,10 +122,14 @@
|
||||
<string name="app_style_device">Gerät</string>
|
||||
<string name="app_style_device_hint">Die Farben kommen aus deinem Hintergrundbild (Material You) und ändern sich mit ihm.</string>
|
||||
<string name="appearance_board_theme">Brettfarben</string>
|
||||
<string name="appearance_pieces">Figuren</string>
|
||||
<string name="piece_set_classic">Klassisch</string>
|
||||
<string name="piece_set_outline">Kontur</string>
|
||||
<string name="piece_set_pastel">Pastell</string>
|
||||
<string name="piece_set_wood">Holz</string>
|
||||
<string name="piece_set_flat">Flach</string>
|
||||
<string name="appearance_coordinates">Buchstaben und Zahlen auf dem Brett</string>
|
||||
<string name="appearance_coordinates_hint">Feldbeschriftung an den Rändern: a–h und 1–8</string>
|
||||
<string name="appearance_image_pieces">Figuren als Bilder</string>
|
||||
<string name="appearance_image_pieces_hint">Überall dasselbe Aussehen. Ohne das werden Figuren mit Schriftsymbolen gezeichnet und sehen auf manchen Geräten anders aus.</string>
|
||||
<string name="appearance_restart_hint">Änderungen gelten beim nächsten Öffnen des Bretts.</string>
|
||||
<string name="trust_first_meeting">Neuer Gegner. Fingerabdruck: %1$s – vergleiche ihn mit dem Gegner, wenn du sichergehen willst, dass er es ist</string>
|
||||
<string name="account_fingerprint">Fingerabdruck deines Schlüssels</string>
|
||||
@@ -375,4 +379,23 @@
|
||||
<string name="spectate_unreachable">Das Gerät, auf dem die Partie läuft, ist nicht erreichbar. Achte darauf, dass du im selben WLAN bist.</string>
|
||||
<string name="spectate_left_win">%1$s hat die Partie verlassen. %2$s gewinnt.</string>
|
||||
<string name="spectate_interrupted">Partie unterbrochen: Die Spieler haben die Verbindung verloren.</string>
|
||||
<string name="support_title">Matewave unterstützen</string>
|
||||
<string name="support_text">Kostenlos, quelloffen und werbefrei. Eine kleine Spende hilft, das Projekt weiterzuführen.</string>
|
||||
|
||||
<!-- first-launch guide -->
|
||||
<string name="guide_skip">Überspringen</string>
|
||||
<string name="guide_next">Weiter</string>
|
||||
<string name="guide_start">Los geht\'s</string>
|
||||
<string name="guide_page_of">Seite %1$d von %2$d</string>
|
||||
<string name="guide_welcome_title">Willkommen bei Matewave</string>
|
||||
<string name="guide_welcome_text">Schach ohne Konto, ohne Werbung und ohne Internet. Alles bleibt auf deinem Handy.</string>
|
||||
<string name="guide_play_title">Spielen und lernen</string>
|
||||
<string name="guide_play_text">Spiele gegen den Computer in vier Stufen, löse Aufgaben passend zu deiner Wertung und lerne Eröffnungen – die App erinnert dich ans Wiederholen.</string>
|
||||
<string name="guide_nearby_title">Mit Freunden in der Nähe</string>
|
||||
<string name="guide_nearby_text">Spielt euch gegenüber über Bluetooth oder dasselbe WLAN, ganz ohne Internet. Dein Freund braucht Matewave ebenfalls: schick es über Einstellungen → App teilen. Freunde können deine Partien auch zuschauen.</string>
|
||||
<string name="guide_you_title">Ein bisschen über dich</string>
|
||||
<string name="guide_you_text">Spieler in der Nähe sehen deinen Namen. Deine Stufe bestimmt die Startwertung und die Aufgaben, die du bekommst.</string>
|
||||
<string name="guide_level_hint">Deinen Namen kannst du später im Profil ändern.</string>
|
||||
<string name="guide_show">Anleitung anzeigen</string>
|
||||
<string name="guide_show_subtitle">Ein kurzer Rundgang durch die App</string>
|
||||
</resources>
|
||||
|
||||
@@ -122,10 +122,14 @@
|
||||
<string name="app_style_device">端末</string>
|
||||
<string name="app_style_device_hint">色は壁紙から取得され(Material You)、壁紙に合わせて変わります。</string>
|
||||
<string name="appearance_board_theme">盤の色</string>
|
||||
<string name="appearance_pieces">駒</string>
|
||||
<string name="piece_set_classic">クラシック</string>
|
||||
<string name="piece_set_outline">アウトライン</string>
|
||||
<string name="piece_set_pastel">パステル</string>
|
||||
<string name="piece_set_wood">木製</string>
|
||||
<string name="piece_set_flat">フラット</string>
|
||||
<string name="appearance_coordinates">盤上の文字と数字</string>
|
||||
<string name="appearance_coordinates_hint">盤の端のマス目ラベル: a〜h と 1〜8</string>
|
||||
<string name="appearance_image_pieces">駒を画像で表示</string>
|
||||
<string name="appearance_image_pieces_hint">どのスマホでも同じ見た目になります。オフの場合、駒はフォントの記号で描かれ、端末によって見た目が異なります。</string>
|
||||
<string name="appearance_restart_hint">変更は次に盤を開いたときに反映されます。</string>
|
||||
<string name="trust_first_meeting">新しい相手です。フィンガープリント: %1$s — 本人か確かめたい場合は、相手と照合してください</string>
|
||||
<string name="account_fingerprint">あなたの鍵のフィンガープリント</string>
|
||||
@@ -374,4 +378,23 @@
|
||||
<string name="spectate_unreachable">対局をホストしている端末に接続できません。同じWi-Fiネットワークに接続しているか確認してください。</string>
|
||||
<string name="spectate_left_win">%1$sが対局から退出しました。%2$sの勝ち</string>
|
||||
<string name="spectate_interrupted">対局が中断されました。プレイヤー間の接続が切れました。</string>
|
||||
<string name="support_title">Matewave を応援する</string>
|
||||
<string name="support_text">無料・オープンソースで広告なし。少額の寄付が開発の継続を支えます。</string>
|
||||
|
||||
<!-- first-launch guide -->
|
||||
<string name="guide_skip">スキップ</string>
|
||||
<string name="guide_next">次へ</string>
|
||||
<string name="guide_start">プレイを始める</string>
|
||||
<string name="guide_page_of">%2$dページ中%1$dページ</string>
|
||||
<string name="guide_welcome_title">Matewaveへようこそ</string>
|
||||
<string name="guide_welcome_text">アカウント不要、広告なし、インターネットも不要のチェス。データはすべてスマホの中に残ります。</string>
|
||||
<string name="guide_play_title">対局して学ぶ</string>
|
||||
<string name="guide_play_text">4段階のコンピューターと対局し、レーティングに合ったパズルを解き、定跡を学べます。復習のタイミングはアプリがお知らせします。</string>
|
||||
<string name="guide_nearby_title">近くの友だちと対局</string>
|
||||
<string name="guide_nearby_text">Bluetoothまたは同じWi-Fiで、インターネットなしで対面対局できます。相手にもMatewaveが必要です。「設定」→「アプリを共有」から送れます。友だちはあなたの対局を観戦することもできます。</string>
|
||||
<string name="guide_you_title">あなたについて</string>
|
||||
<string name="guide_you_text">近くのプレイヤーにはあなたの名前が表示されます。レベルによって初期レーティングと出題されるパズルが決まります。</string>
|
||||
<string name="guide_level_hint">名前はあとでプロフィールから変更できます。</string>
|
||||
<string name="guide_show">ガイドを表示</string>
|
||||
<string name="guide_show_subtitle">アプリのかんたんな紹介</string>
|
||||
</resources>
|
||||
|
||||
@@ -122,10 +122,14 @@
|
||||
<string name="app_style_device">Įrenginys</string>
|
||||
<string name="app_style_device_hint">Spalvos paimamos iš ekrano fono („Material You“) ir keičiasi kartu su juo.</string>
|
||||
<string name="appearance_board_theme">Lentos spalvos</string>
|
||||
<string name="appearance_pieces">Figūros</string>
|
||||
<string name="piece_set_classic">Klasikinės</string>
|
||||
<string name="piece_set_outline">Kontūrinės</string>
|
||||
<string name="piece_set_pastel">Pastelinės</string>
|
||||
<string name="piece_set_wood">Medinės</string>
|
||||
<string name="piece_set_flat">Plokščios</string>
|
||||
<string name="appearance_coordinates">Raidės ir skaičiai ant lentos</string>
|
||||
<string name="appearance_coordinates_hint">Langelių žymos pakraščiuose: a–h ir 1–8</string>
|
||||
<string name="appearance_image_pieces">Figūros paveikslėliais</string>
|
||||
<string name="appearance_image_pieces_hint">Vienoda išvaizda visuose telefonuose. Be šito figūros piešiamos šrifto simboliais ir kai kuriuose įrenginiuose atrodo kitaip.</string>
|
||||
<string name="appearance_restart_hint">Pakeitimai pritaikomi kitą kartą atidarius lentą.</string>
|
||||
<string name="trust_first_meeting">Naujas varžovas. Kontrolinis kodas: %1$s — palyginkite su juo, jei norite įsitikinti, kad tai jis</string>
|
||||
<string name="account_fingerprint">Jūsų rakto kontrolinis kodas</string>
|
||||
@@ -377,4 +381,23 @@
|
||||
<string name="spectate_unreachable">Nepavyksta pasiekti įrenginio, kuriame vyksta partija. Įsitikinkite, kad esate prisijungę prie to paties „Wi-Fi“ tinklo.</string>
|
||||
<string name="spectate_left_win">%1$s paliko partiją. Laimėjo %2$s.</string>
|
||||
<string name="spectate_interrupted">Partija nutraukta: žaidėjų ryšys nutrūko.</string>
|
||||
<string name="support_title">Paremti Matewave</string>
|
||||
<string name="support_text">Nemokama, atvirojo kodo ir be reklamų. Nedidelė auka padeda projektui gyvuoti.</string>
|
||||
|
||||
<!-- first-launch guide -->
|
||||
<string name="guide_skip">Praleisti</string>
|
||||
<string name="guide_next">Toliau</string>
|
||||
<string name="guide_start">Pradėti žaisti</string>
|
||||
<string name="guide_page_of">%1$d puslapis iš %2$d</string>
|
||||
<string name="guide_welcome_title">Sveiki atvykę į Matewave</string>
|
||||
<string name="guide_welcome_text">Šachmatai be paskyros, be reklamų ir be interneto. Viskas lieka jūsų telefone.</string>
|
||||
<string name="guide_play_title">Žaiskite ir mokykitės</string>
|
||||
<string name="guide_play_text">Žaiskite su kompiuteriu keturiais lygiais, spręskite jūsų reitingą atitinkančius uždavinius ir mokykitės debiutų – programėlė primins, kada juos pakartoti.</string>
|
||||
<string name="guide_nearby_title">Žaiskite su draugais šalia</string>
|
||||
<string name="guide_nearby_text">Žaiskite akis į akį per Bluetooth arba tą patį Wi-Fi, internetas nereikalingas. Draugui taip pat reikia Matewave: nusiųskite ją per Nustatymai → Dalytis programa. Draugai gali stebėti jūsų partijas.</string>
|
||||
<string name="guide_you_title">Šiek tiek apie jus</string>
|
||||
<string name="guide_you_text">Šalia esantys žaidėjai mato jūsų vardą. Pagal lygį nustatomas pradinis reitingas ir parenkami uždaviniai.</string>
|
||||
<string name="guide_level_hint">Vardą vėliau galėsite pakeisti profilyje.</string>
|
||||
<string name="guide_show">Rodyti gidą</string>
|
||||
<string name="guide_show_subtitle">Trumpa programėlės apžvalga</string>
|
||||
</resources>
|
||||
|
||||
@@ -127,10 +127,14 @@
|
||||
<string name="app_style_device">Устройство</string>
|
||||
<string name="app_style_device_hint">Цвета берутся из обоев (Material You) и меняются вместе с ними.</string>
|
||||
<string name="appearance_board_theme">Цвета доски</string>
|
||||
<string name="appearance_pieces">Фигуры</string>
|
||||
<string name="piece_set_classic">Классические</string>
|
||||
<string name="piece_set_outline">Контурные</string>
|
||||
<string name="piece_set_pastel">Пастельные</string>
|
||||
<string name="piece_set_wood">Деревянные</string>
|
||||
<string name="piece_set_flat">Плоские</string>
|
||||
<string name="appearance_coordinates">Буквы и цифры на доске</string>
|
||||
<string name="appearance_coordinates_hint">Подписи полей по краям: a–h и 1–8</string>
|
||||
<string name="appearance_image_pieces">Фигуры картинками</string>
|
||||
<string name="appearance_image_pieces_hint">Единый вид на всех телефонах. Без этого фигуры рисуются символами шрифта и на части устройств выглядят иначе.</string>
|
||||
<string name="appearance_restart_hint">Изменения применяются при следующем открытии доски.</string>
|
||||
<string name="trust_first_meeting">Новый соперник. Отпечаток: %1$s — сверьте с ним, если хотите убедиться, что это он</string>
|
||||
<string name="account_fingerprint">Отпечаток вашего ключа</string>
|
||||
@@ -383,4 +387,23 @@
|
||||
<string name="spectate_unreachable">Устройство, на котором идёт партия, недоступно. Убедитесь, что вы подключены к той же сети Wi-Fi.</string>
|
||||
<string name="spectate_left_win">%1$s покинули партию. Победили %2$s.</string>
|
||||
<string name="spectate_interrupted">Партия прервана: игроки потеряли связь.</string>
|
||||
<string name="support_title">Поддержать Matewave</string>
|
||||
<string name="support_text">Бесплатно, с открытым кодом и без рекламы. Небольшое пожертвование помогает проекту развиваться.</string>
|
||||
|
||||
<!-- first-launch guide -->
|
||||
<string name="guide_skip">Пропустить</string>
|
||||
<string name="guide_next">Далее</string>
|
||||
<string name="guide_start">Начать играть</string>
|
||||
<string name="guide_page_of">Страница %1$d из %2$d</string>
|
||||
<string name="guide_welcome_title">Добро пожаловать в Matewave</string>
|
||||
<string name="guide_welcome_text">Шахматы без аккаунта, рекламы и интернета. Всё остаётся на вашем телефоне.</string>
|
||||
<string name="guide_play_title">Играйте и учитесь</string>
|
||||
<string name="guide_play_text">Играйте с компьютером на четырёх уровнях, решайте задачи под ваш рейтинг и учите дебюты: приложение напомнит, когда пора повторить.</string>
|
||||
<string name="guide_nearby_title">Играйте с друзьями рядом</string>
|
||||
<string name="guide_nearby_text">Играйте лицом к лицу через Bluetooth или общий Wi-Fi, интернет не нужен. У друга тоже должен быть Matewave: отправьте его через Настройки → Поделиться приложением. Друзья могут смотреть ваши партии.</string>
|
||||
<string name="guide_you_title">Немного о вас</string>
|
||||
<string name="guide_you_text">Игроки рядом видят ваше имя. От уровня зависят начальный рейтинг и задачи, которые вам попадутся.</string>
|
||||
<string name="guide_level_hint">Имя можно поменять позже в профиле.</string>
|
||||
<string name="guide_show">Показать гид</string>
|
||||
<string name="guide_show_subtitle">Короткий обзор приложения</string>
|
||||
</resources>
|
||||
|
||||
@@ -122,10 +122,14 @@
|
||||
<string name="app_style_device">设备</string>
|
||||
<string name="app_style_device_hint">颜色取自壁纸(Material You),并随壁纸变化。</string>
|
||||
<string name="appearance_board_theme">棋盘颜色</string>
|
||||
<string name="appearance_pieces">棋子</string>
|
||||
<string name="piece_set_classic">经典</string>
|
||||
<string name="piece_set_outline">描边</string>
|
||||
<string name="piece_set_pastel">粉彩</string>
|
||||
<string name="piece_set_wood">木质</string>
|
||||
<string name="piece_set_flat">扁平</string>
|
||||
<string name="appearance_coordinates">棋盘上的字母和数字</string>
|
||||
<string name="appearance_coordinates_hint">边缘的格子标注:a–h 和 1–8</string>
|
||||
<string name="appearance_image_pieces">用图片显示棋子</string>
|
||||
<string name="appearance_image_pieces_hint">所有手机外观一致。关闭后棋子将用字体符号绘制,在部分设备上会显示不同。</string>
|
||||
<string name="appearance_restart_hint">更改将在下次打开棋盘时生效。</string>
|
||||
<string name="trust_first_meeting">新对手。指纹:%1$s — 如需确认是对方本人,请与其核对</string>
|
||||
<string name="account_fingerprint">你的密钥指纹</string>
|
||||
@@ -374,4 +378,23 @@
|
||||
<string name="spectate_unreachable">无法连接到主持对局的设备。请确认你们连接的是同一个 Wi-Fi 网络。</string>
|
||||
<string name="spectate_left_win">%1$s离开了对局,%2$s获胜。</string>
|
||||
<string name="spectate_interrupted">对局中断:玩家之间的连接已断开。</string>
|
||||
<string name="support_title">支持 Matewave</string>
|
||||
<string name="support_text">免费、开源、无广告。一笔小小的捐助能让项目持续下去。</string>
|
||||
|
||||
<!-- first-launch guide -->
|
||||
<string name="guide_skip">跳过</string>
|
||||
<string name="guide_next">下一步</string>
|
||||
<string name="guide_start">开始下棋</string>
|
||||
<string name="guide_page_of">第 %1$d 页,共 %2$d 页</string>
|
||||
<string name="guide_welcome_title">欢迎使用 Matewave</string>
|
||||
<string name="guide_welcome_text">无需账号、无广告、无需联网的国际象棋。所有数据都留在你的手机上。</string>
|
||||
<string name="guide_play_title">对弈与学习</string>
|
||||
<string name="guide_play_text">与四个难度的电脑对弈,解答符合你等级分的谜题,学习开局,应用会提醒你何时复习。</string>
|
||||
<string name="guide_nearby_title">与附近的朋友对弈</string>
|
||||
<string name="guide_nearby_text">通过蓝牙或同一 Wi-Fi 面对面对弈,无需联网。朋友也需要安装 Matewave:可在“设置”→“分享应用”中发送。朋友还可以观看你的对局。</string>
|
||||
<string name="guide_you_title">介绍一下你自己</string>
|
||||
<string name="guide_you_text">附近的玩家会看到你的名字。你的水平决定初始等级分和推送给你的谜题。</string>
|
||||
<string name="guide_level_hint">名字之后可以在个人资料中修改。</string>
|
||||
<string name="guide_show">显示使用指南</string>
|
||||
<string name="guide_show_subtitle">快速了解本应用</string>
|
||||
</resources>
|
||||
|
||||
@@ -122,10 +122,14 @@
|
||||
<string name="app_style_device">Device</string>
|
||||
<string name="app_style_device_hint">Colors are taken from your wallpaper (Material You) and change with it.</string>
|
||||
<string name="appearance_board_theme">Board colors</string>
|
||||
<string name="appearance_pieces">Pieces</string>
|
||||
<string name="piece_set_classic">Classic</string>
|
||||
<string name="piece_set_outline">Outline</string>
|
||||
<string name="piece_set_pastel">Pastel</string>
|
||||
<string name="piece_set_wood">Wooden</string>
|
||||
<string name="piece_set_flat">Flat</string>
|
||||
<string name="appearance_coordinates">Letters and numbers on the board</string>
|
||||
<string name="appearance_coordinates_hint">Square labels along the edges: a–h and 1–8</string>
|
||||
<string name="appearance_image_pieces">Pieces as images</string>
|
||||
<string name="appearance_image_pieces_hint">The same look on every phone. Without this, pieces are drawn with font symbols and look different on some devices.</string>
|
||||
<string name="appearance_restart_hint">Changes apply the next time the board is opened.</string>
|
||||
<string name="trust_first_meeting">New opponent. Fingerprint: %1$s — check it with them if you want to be sure it\'s really them</string>
|
||||
<string name="account_fingerprint">Your key fingerprint</string>
|
||||
@@ -375,4 +379,23 @@
|
||||
<string name="spectate_unreachable">The host\'s device can\'t be reached. Make sure you\'re on the same Wi-Fi network.</string>
|
||||
<string name="spectate_left_win">%1$s left the game. %2$s wins.</string>
|
||||
<string name="spectate_interrupted">Game interrupted: the players lost their connection.</string>
|
||||
<string name="support_title">Support Matewave</string>
|
||||
<string name="support_text">Free, open source and no ads. A small donation helps keep it going.</string>
|
||||
|
||||
<!-- first-launch guide -->
|
||||
<string name="guide_skip">Skip</string>
|
||||
<string name="guide_next">Next</string>
|
||||
<string name="guide_start">Start playing</string>
|
||||
<string name="guide_page_of">Page %1$d of %2$d</string>
|
||||
<string name="guide_welcome_title">Welcome to Matewave</string>
|
||||
<string name="guide_welcome_text">Chess with no account, no ads and no internet needed. Everything stays on your phone.</string>
|
||||
<string name="guide_play_title">Play and learn</string>
|
||||
<string name="guide_play_text">Play the computer at four levels, solve puzzles that match your rating and learn openings, with reminders when it\'s time to review them.</string>
|
||||
<string name="guide_nearby_title">Play friends nearby</string>
|
||||
<string name="guide_nearby_text">Play face to face over Bluetooth or the same Wi-Fi, no internet needed. Your friend needs Matewave too: send it from Settings → Share the app. Friends can also watch your games.</string>
|
||||
<string name="guide_you_title">A bit about you</string>
|
||||
<string name="guide_you_text">Players nearby see your name. Your level sets the starting rating and the puzzles you get.</string>
|
||||
<string name="guide_level_hint">You can change your name later in your profile.</string>
|
||||
<string name="guide_show">Show the guide</string>
|
||||
<string name="guide_show_subtitle">A quick tour of the app</string>
|
||||
</resources>
|
||||
|
||||
|
Before Width: | Height: | Size: 139 KiB |