mirror of
https://github.com/kalarina-bit/Matewave.git
synced 2026-11-22 08:06:09 +00:00
Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
34e02314fd | ||
|
|
95f638a373 | ||
|
|
7a4d300220 | ||
|
|
eae878db09 | ||
|
|
c5587e9418 | ||
|
|
438f06bce2 | ||
|
|
21b39cbc80 | ||
|
|
05d4936c90 | ||
|
|
8a40e86d73 | ||
|
|
ef5af5c395 | ||
|
|
0d0daf8a45 | ||
|
|
6ed42e0bf3 | ||
|
|
cac575ed26 | ||
|
|
77c438ff66 |
@@ -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**
|
**Environment**
|
||||||
|
|
||||||
- App version:
|
- App version:
|
||||||
- Installed from: Gitea / GitHub / F-Droid / Google Play
|
- Installed from: GitHub / F-Droid / Google Play
|
||||||
- Device and Android version:
|
- Device and Android version:
|
||||||
- Mode: vs AI / puzzles / openings / Bluetooth / LAN
|
- Mode: vs AI / puzzles / openings / Bluetooth / LAN
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
blank_issues_enabled: true
|
blank_issues_enabled: true
|
||||||
contact_links:
|
contact_links:
|
||||||
- name: Main repository on git.skysparkle.cc
|
- name: Support the project on Ko-fi
|
||||||
url: https://git.skysparkle.cc/kalarina/Matewave
|
url: https://ko-fi.com/skysparkle
|
||||||
about: This GitHub repository is a mirror. Issues are welcome here and on Gitea.
|
about: Donations keep the apps and the Skysparkle server running.
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ Thanks for wanting to help! This guide explains where to contribute, what fits t
|
|||||||
|
|
||||||
## Where to contribute
|
## 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
|
## 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.
|
Play against the AI, solve puzzles, learn openings, or play friends nearby over Bluetooth and Wi-Fi/LAN.
|
||||||
</p>
|
</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]
|
> [!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]
|
> [!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).
|
> **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">
|
<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://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://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>
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
@@ -50,8 +53,8 @@
|
|||||||
## <img src="assets/icon-install.png" width="32" alt=""> Installation
|
## <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.
|
- **[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.
|
- **[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](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.
|
- **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
|
## <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
|
## 🤝 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
|
## 📄 License
|
||||||
|
|
||||||
|
|||||||
+15
-16
@@ -1,7 +1,6 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id("com.android.application")
|
alias(libs.plugins.android.application)
|
||||||
|
alias(libs.plugins.kotlin.compose)
|
||||||
id("org.jetbrains.kotlin.plugin.compose")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
@@ -13,8 +12,8 @@ android {
|
|||||||
applicationId = "cc.skysparkle.matewave"
|
applicationId = "cc.skysparkle.matewave"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 36
|
targetSdk = 36
|
||||||
versionCode = 9
|
versionCode = 12
|
||||||
versionName = "1.0.49"
|
versionName = "1.0.52"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
@@ -86,20 +85,20 @@ androidComponents {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(platform("androidx.compose:compose-bom:2026.09.00"))
|
implementation(platform(libs.androidx.compose.bom))
|
||||||
implementation("androidx.compose.material3:material3")
|
implementation(libs.androidx.compose.material3)
|
||||||
implementation("androidx.compose.ui:ui")
|
implementation(libs.androidx.compose.ui)
|
||||||
implementation("androidx.activity:activity-compose:1.13.0")
|
implementation(libs.androidx.activity.compose)
|
||||||
|
|
||||||
implementation("androidx.core:core-ktx:1.18.0")
|
implementation(libs.androidx.core.ktx)
|
||||||
implementation("androidx.navigation:navigation-compose:2.9.7")
|
implementation(libs.androidx.navigation.compose)
|
||||||
|
|
||||||
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0")
|
implementation(libs.androidx.lifecycle.viewmodel.compose)
|
||||||
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0")
|
implementation(libs.kotlinx.coroutines.android)
|
||||||
|
|
||||||
implementation("com.google.zxing:core:3.5.4")
|
implementation(libs.zxing.core)
|
||||||
|
|
||||||
testImplementation("junit:junit:4.13.2")
|
testImplementation(libs.junit)
|
||||||
testImplementation("org.json:json:20240303")
|
testImplementation(libs.org.json)
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+6
@@ -2,3 +2,9 @@
|
|||||||
# reflection. Only keep line numbers so release crash reports stay readable.
|
# reflection. Only keep line numbers so release crash reports stay readable.
|
||||||
-keepattributes SourceFile,LineNumberTable
|
-keepattributes SourceFile,LineNumberTable
|
||||||
-renamesourcefileattribute SourceFile
|
-renamesourcefileattribute SourceFile
|
||||||
|
|
||||||
|
# Debug and verbose logging (NetworkLog included) is stripped from release builds.
|
||||||
|
-assumenosideeffects class android.util.Log {
|
||||||
|
public static int d(...);
|
||||||
|
public static int v(...);
|
||||||
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:label="@string/app_title"
|
android:label="@string/app_title"
|
||||||
|
android:localeConfig="@xml/locales_config"
|
||||||
android:networkSecurityConfig="@xml/network_security_config"
|
android:networkSecurityConfig="@xml/network_security_config"
|
||||||
android:theme="@android:style/Theme.Material.NoActionBar"
|
android:theme="@android:style/Theme.Material.NoActionBar"
|
||||||
android:supportsRtl="true">
|
android:supportsRtl="true">
|
||||||
@@ -44,7 +45,7 @@
|
|||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:launchMode="singleTop"
|
android:launchMode="singleTop"
|
||||||
android:screenOrientation="portrait">
|
android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboardHidden">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ class MainActivity : ComponentActivity() {
|
|||||||
runCatching { cc.skysparkle.matewave.puzzles.PuzzleRepository.load(appContext) }
|
runCatching { cc.skysparkle.matewave.puzzles.PuzzleRepository.load(appContext) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cc.skysparkle.matewave.ui.theme.AppThemeState.load(this)
|
||||||
setContent {
|
setContent {
|
||||||
MatewaveTheme {
|
MatewaveTheme {
|
||||||
androidx.compose.foundation.layout.Box(
|
androidx.compose.foundation.layout.Box(
|
||||||
@@ -120,9 +121,12 @@ private fun AppNavHost() {
|
|||||||
onDispose { PresenceHub.release(context) }
|
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(
|
NavHost(
|
||||||
navController = navController,
|
navController = navController,
|
||||||
startDestination = "menu",
|
startDestination = startRoute,
|
||||||
enterTransition = {
|
enterTransition = {
|
||||||
if (isTabSwitch(initialState.destination.route, targetState.destination.route)) fadeThroughIn()
|
if (isTabSwitch(initialState.destination.route, targetState.destination.route)) fadeThroughIn()
|
||||||
else sharedAxisIn(forward = true)
|
else sharedAxisIn(forward = true)
|
||||||
@@ -140,6 +144,22 @@ private fun AppNavHost() {
|
|||||||
else sharedAxisOut(forward = false)
|
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") {
|
composable("menu") {
|
||||||
MainMenuScreen(
|
MainMenuScreen(
|
||||||
viewModel = viewModel,
|
viewModel = viewModel,
|
||||||
@@ -193,7 +213,8 @@ private fun AppNavHost() {
|
|||||||
onOpenPermissions = { navController.navigate("permissions") },
|
onOpenPermissions = { navController.navigate("permissions") },
|
||||||
onOpenAppearance = { navController.navigate("appearance") },
|
onOpenAppearance = { navController.navigate("appearance") },
|
||||||
onOpenLicenses = { navController.navigate("licenses") },
|
onOpenLicenses = { navController.navigate("licenses") },
|
||||||
onOpenShare = { navController.navigate("shareApk") }
|
onOpenShare = { navController.navigate("shareApk") },
|
||||||
|
onOpenGuide = { navController.navigate("guide") }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -332,9 +353,12 @@ private fun AppNavHost() {
|
|||||||
viewModel.startVsPlayerNetwork(transport, PieceColor.WHITE, timeControl, isHost = true)
|
viewModel.startVsPlayerNetwork(transport, PieceColor.WHITE, timeControl, isHost = true)
|
||||||
navController.navigate("game")
|
navController.navigate("game")
|
||||||
},
|
},
|
||||||
onJoin = { type, timeControl, targetId ->
|
onJoin = { type, timeControl, targetId, expectedUserId ->
|
||||||
val transport = if (type == TransportType.BLUETOOTH) bleTransport else lanTransport
|
val transport = if (type == TransportType.BLUETOOTH) bleTransport else lanTransport
|
||||||
viewModel.startVsPlayerNetwork(transport, PieceColor.BLACK, timeControl, isHost = false, targetId = targetId)
|
viewModel.startVsPlayerNetwork(
|
||||||
|
transport, PieceColor.BLACK, timeControl, isHost = false,
|
||||||
|
targetId = targetId, expectedUserId = expectedUserId
|
||||||
|
)
|
||||||
navController.navigate("game")
|
navController.navigate("game")
|
||||||
},
|
},
|
||||||
onBack = { navController.popBackStack() }
|
onBack = { navController.popBackStack() }
|
||||||
|
|||||||
@@ -98,6 +98,12 @@ class GameClock(private val timeControl: TimeControl, private val scope: Corouti
|
|||||||
publish()
|
publish()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Time left for [side] right now, including the part of the current second already used. */
|
||||||
|
fun remainingMillis(side: PieceColor): Long {
|
||||||
|
account()
|
||||||
|
return if (side == PieceColor.WHITE) whiteLeft else blackLeft
|
||||||
|
}
|
||||||
|
|
||||||
fun restore(whiteMillis: Long, blackMillis: Long) {
|
fun restore(whiteMillis: Long, blackMillis: Long) {
|
||||||
if (unlimited) return
|
if (unlimited) return
|
||||||
account()
|
account()
|
||||||
|
|||||||
@@ -2,8 +2,12 @@ package cc.skysparkle.matewave.data
|
|||||||
|
|
||||||
import cc.skysparkle.matewave.ai.AiDifficulty
|
import cc.skysparkle.matewave.ai.AiDifficulty
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import cc.skysparkle.matewave.network.PeerLimits
|
||||||
|
import cc.skysparkle.matewave.security.toHex
|
||||||
import org.json.JSONArray
|
import org.json.JSONArray
|
||||||
import org.json.JSONObject
|
import org.json.JSONObject
|
||||||
|
import java.io.File
|
||||||
|
import java.security.MessageDigest
|
||||||
import kotlin.math.pow
|
import kotlin.math.pow
|
||||||
import kotlin.math.roundToInt
|
import kotlin.math.roundToInt
|
||||||
|
|
||||||
@@ -111,6 +115,7 @@ object FriendsStore {
|
|||||||
private const val PREFS = "chess_friends_prefs"
|
private const val PREFS = "chess_friends_prefs"
|
||||||
private const val KEY_LIST = "friends_json"
|
private const val KEY_LIST = "friends_json"
|
||||||
private const val MAX_FRIENDS = 30
|
private const val MAX_FRIENDS = 30
|
||||||
|
private const val IMAGE_DIR = "friend_images"
|
||||||
|
|
||||||
private var appContext: Context? = null
|
private var appContext: Context? = null
|
||||||
|
|
||||||
@@ -125,6 +130,36 @@ object FriendsStore {
|
|||||||
|
|
||||||
private fun prefs() = appContext?.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
|
private fun prefs() = appContext?.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
|
||||||
|
|
||||||
|
// Avatars and backgrounds live in files, one per image: in the settings XML they made a file
|
||||||
|
// of up to tens of megabytes that was read at start and rewritten on every change.
|
||||||
|
private fun imageDir(): File? = appContext?.let { File(it.filesDir, IMAGE_DIR) }
|
||||||
|
|
||||||
|
private fun imageFile(userId: String, kind: String): File? {
|
||||||
|
val dir = imageDir() ?: return null
|
||||||
|
val digest = MessageDigest.getInstance("SHA-256").digest(userId.toByteArray(Charsets.UTF_8))
|
||||||
|
return File(dir, "${digest.toHex(16)}_$kind")
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun readImage(userId: String, kind: String): String? =
|
||||||
|
imageFile(userId, kind)?.takeIf { it.isFile }?.let { runCatching { it.readText() }.getOrNull() }
|
||||||
|
|
||||||
|
private fun writeImage(userId: String, kind: String, base64: String?) {
|
||||||
|
val file = imageFile(userId, kind) ?: return
|
||||||
|
if (base64 == null) {
|
||||||
|
file.delete()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
runCatching {
|
||||||
|
file.parentFile?.mkdirs()
|
||||||
|
val tmp = File(file.parentFile, file.name + ".tmp")
|
||||||
|
tmp.writeText(base64)
|
||||||
|
if (!tmp.renameTo(file)) {
|
||||||
|
file.delete()
|
||||||
|
tmp.renameTo(file)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun list(): List<FriendEntry> = synchronized(lock) { readAll() }
|
fun list(): List<FriendEntry> = synchronized(lock) { readAll() }
|
||||||
|
|
||||||
private fun readAll(): List<FriendEntry> {
|
private fun readAll(): List<FriendEntry> {
|
||||||
@@ -136,15 +171,21 @@ object FriendsStore {
|
|||||||
return emptyList()
|
return emptyList()
|
||||||
}
|
}
|
||||||
val result = ArrayList<FriendEntry>()
|
val result = ArrayList<FriendEntry>()
|
||||||
|
var hasInlineImages = false
|
||||||
for (i in 0 until arr.length()) {
|
for (i in 0 until arr.length()) {
|
||||||
try {
|
try {
|
||||||
val o = arr.getJSONObject(i)
|
val o = arr.getJSONObject(i)
|
||||||
|
val userId = o.optString("uid", "").ifBlank { o.getString("name") }
|
||||||
|
// Older versions kept the images inline; they move to files on the next write.
|
||||||
|
val inlineAvatar = if (o.has("avatar")) o.getString("avatar") else null
|
||||||
|
val inlineBackground = if (o.has("background")) o.getString("background") else null
|
||||||
|
if (inlineAvatar != null || inlineBackground != null) hasInlineImages = true
|
||||||
result.add(
|
result.add(
|
||||||
FriendEntry(
|
FriendEntry(
|
||||||
userId = o.optString("uid", "").ifBlank { o.getString("name") },
|
userId = userId,
|
||||||
name = o.getString("name"),
|
name = o.getString("name"),
|
||||||
avatarBase64 = if (o.has("avatar")) o.getString("avatar") else null,
|
avatarBase64 = inlineAvatar ?: if (o.optBoolean("a")) readImage(userId, "a") else null,
|
||||||
backgroundBase64 = if (o.has("background")) o.getString("background") else null,
|
backgroundBase64 = inlineBackground ?: if (o.optBoolean("b")) readImage(userId, "b") else null,
|
||||||
elo = o.optInt("elo", 1200),
|
elo = o.optInt("elo", 1200),
|
||||||
lastPlayedMs = o.optLong("t", 0),
|
lastPlayedMs = o.optLong("t", 0),
|
||||||
favorite = o.optBoolean("fav", false),
|
favorite = o.optBoolean("fav", false),
|
||||||
@@ -156,24 +197,35 @@ object FriendsStore {
|
|||||||
}
|
}
|
||||||
val sorted = result.sortedByDescending { it.lastPlayedMs }
|
val sorted = result.sortedByDescending { it.lastPlayedMs }
|
||||||
cached = sorted
|
cached = sorted
|
||||||
|
if (hasInlineImages) writeAll(sorted, previous = emptyList())
|
||||||
return sorted
|
return sorted
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun writeAll(entries: List<FriendEntry>) {
|
private fun writeAll(entries: List<FriendEntry>, previous: List<FriendEntry> = readAll()) {
|
||||||
val p = prefs() ?: return
|
val p = prefs() ?: return
|
||||||
|
val before = previous.associateBy { it.userId }
|
||||||
val arr = JSONArray()
|
val arr = JSONArray()
|
||||||
entries.forEach { f ->
|
entries.forEach { f ->
|
||||||
|
val old = before[f.userId]
|
||||||
|
// Image files are touched only when the image itself changed.
|
||||||
|
if (old == null || old.avatarBase64 != f.avatarBase64) writeImage(f.userId, "a", f.avatarBase64)
|
||||||
|
if (old == null || old.backgroundBase64 != f.backgroundBase64) writeImage(f.userId, "b", f.backgroundBase64)
|
||||||
val o = JSONObject()
|
val o = JSONObject()
|
||||||
o.put("uid", f.userId)
|
o.put("uid", f.userId)
|
||||||
o.put("name", f.name)
|
o.put("name", f.name)
|
||||||
if (f.avatarBase64 != null) o.put("avatar", f.avatarBase64)
|
if (f.avatarBase64 != null) o.put("a", true)
|
||||||
if (f.backgroundBase64 != null) o.put("background", f.backgroundBase64)
|
if (f.backgroundBase64 != null) o.put("b", true)
|
||||||
o.put("elo", f.elo)
|
o.put("elo", f.elo)
|
||||||
o.put("t", f.lastPlayedMs)
|
o.put("t", f.lastPlayedMs)
|
||||||
if (f.favorite) o.put("fav", true)
|
if (f.favorite) o.put("fav", true)
|
||||||
if (f.lastSeenMs > 0) o.put("s", f.lastSeenMs)
|
if (f.lastSeenMs > 0) o.put("s", f.lastSeenMs)
|
||||||
arr.put(o)
|
arr.put(o)
|
||||||
}
|
}
|
||||||
|
val kept = entries.mapTo(HashSet()) { it.userId }
|
||||||
|
previous.filter { it.userId !in kept }.forEach { gone ->
|
||||||
|
writeImage(gone.userId, "a", null)
|
||||||
|
writeImage(gone.userId, "b", null)
|
||||||
|
}
|
||||||
p.edit().putString(KEY_LIST, arr.toString()).apply()
|
p.edit().putString(KEY_LIST, arr.toString()).apply()
|
||||||
cached = entries.sortedByDescending { it.lastPlayedMs }
|
cached = entries.sortedByDescending { it.lastPlayedMs }
|
||||||
}
|
}
|
||||||
@@ -182,6 +234,11 @@ object FriendsStore {
|
|||||||
synchronized(lock) { readAll() }
|
synchronized(lock) { readAll() }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Names and ratings also arrive from presence announcements, so they are bounded here too.
|
||||||
|
private fun cleanName(name: String): String = name.filterNot { it.isISOControl() }.take(PeerLimits.MAX_NAME_CHARS)
|
||||||
|
|
||||||
|
private fun cleanElo(elo: Int): Int = elo.coerceIn(PeerLimits.MIN_ELO, PeerLimits.MAX_ELO)
|
||||||
|
|
||||||
fun updateProfile(
|
fun updateProfile(
|
||||||
userId: String,
|
userId: String,
|
||||||
name: String,
|
name: String,
|
||||||
@@ -192,8 +249,8 @@ object FriendsStore {
|
|||||||
synchronized(lock) {
|
synchronized(lock) {
|
||||||
val existing = readAll().firstOrNull { it.userId == userId } ?: return
|
val existing = readAll().firstOrNull { it.userId == userId } ?: return
|
||||||
val updated = existing.copy(
|
val updated = existing.copy(
|
||||||
name = name.ifBlank { existing.name },
|
name = cleanName(name).ifBlank { existing.name },
|
||||||
elo = if (elo > 0) elo else existing.elo,
|
elo = if (elo > 0) cleanElo(elo) else existing.elo,
|
||||||
avatarBase64 = avatarBase64 ?: existing.avatarBase64,
|
avatarBase64 = avatarBase64 ?: existing.avatarBase64,
|
||||||
backgroundBase64 = backgroundBase64 ?: existing.backgroundBase64
|
backgroundBase64 = backgroundBase64 ?: existing.backgroundBase64
|
||||||
)
|
)
|
||||||
@@ -217,12 +274,13 @@ object FriendsStore {
|
|||||||
backgroundBase64: String? = null
|
backgroundBase64: String? = null
|
||||||
): FriendEntry = synchronized(lock) {
|
): FriendEntry = synchronized(lock) {
|
||||||
val existing = readAll().firstOrNull { it.userId == userId }
|
val existing = readAll().firstOrNull { it.userId == userId }
|
||||||
|
val clean = cleanName(name)
|
||||||
val merged = FriendEntry(
|
val merged = FriendEntry(
|
||||||
userId = userId,
|
userId = userId,
|
||||||
name = name.ifBlank { existing?.name ?: name },
|
name = clean.ifBlank { existing?.name ?: clean },
|
||||||
avatarBase64 = avatarBase64 ?: existing?.avatarBase64,
|
avatarBase64 = avatarBase64 ?: existing?.avatarBase64,
|
||||||
backgroundBase64 = backgroundBase64 ?: existing?.backgroundBase64,
|
backgroundBase64 = backgroundBase64 ?: existing?.backgroundBase64,
|
||||||
elo = if (elo > 0) elo else (existing?.elo ?: 1200),
|
elo = if (elo > 0) cleanElo(elo) else (existing?.elo ?: 1200),
|
||||||
lastPlayedMs = System.currentTimeMillis(),
|
lastPlayedMs = System.currentTimeMillis(),
|
||||||
favorite = existing?.favorite ?: false,
|
favorite = existing?.favorite ?: false,
|
||||||
lastSeenMs = existing?.lastSeenMs ?: 0
|
lastSeenMs = existing?.lastSeenMs ?: 0
|
||||||
|
|||||||
@@ -73,6 +73,9 @@ class BleTransport(
|
|||||||
|
|
||||||
private const val INCOMPLETE_TTL_MS = 30_000L
|
private const val INCOMPLETE_TTL_MS = 30_000L
|
||||||
|
|
||||||
|
/** Messages being reassembled at once; each may grow to [MAX_MESSAGE_BYTES]. */
|
||||||
|
private const val MAX_PARTIAL_MESSAGES = 4
|
||||||
|
|
||||||
private const val CTRL_TOTAL_MARKER = 0
|
private const val CTRL_TOTAL_MARKER = 0
|
||||||
private const val CTRL_ACK = 1
|
private const val CTRL_ACK = 1
|
||||||
private const val CTRL_NACK = 2
|
private const val CTRL_NACK = 2
|
||||||
@@ -232,6 +235,8 @@ class BleTransport(
|
|||||||
role = Role.PERIPHERAL
|
role = Role.PERIPHERAL
|
||||||
hosting = true
|
hosting = true
|
||||||
|
|
||||||
|
// Presence may already be advertising in the low-power mode; restart it for hosting.
|
||||||
|
if (advertisingActive || advertiseCallback != null) startAdvertising()
|
||||||
startPresence()
|
startPresence()
|
||||||
_connectionState.value = ConnectionState.CONNECTING
|
_connectionState.value = ConnectionState.CONNECTING
|
||||||
}
|
}
|
||||||
@@ -300,10 +305,14 @@ class BleTransport(
|
|||||||
}
|
}
|
||||||
// One advertisement at a time: a second start would leak the first one.
|
// One advertisement at a time: a second start would leak the first one.
|
||||||
if (advertiseCallback != null) stopAdvertising()
|
if (advertiseCallback != null) stopAdvertising()
|
||||||
|
// A hosted game should be found at once; plain presence can save the battery.
|
||||||
val settings = AdvertiseSettings.Builder()
|
val settings = AdvertiseSettings.Builder()
|
||||||
|
.setAdvertiseMode(
|
||||||
.setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY)
|
if (hosting) AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY else AdvertiseSettings.ADVERTISE_MODE_BALANCED
|
||||||
.setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_HIGH)
|
)
|
||||||
|
.setTxPowerLevel(
|
||||||
|
if (hosting) AdvertiseSettings.ADVERTISE_TX_POWER_HIGH else AdvertiseSettings.ADVERTISE_TX_POWER_MEDIUM
|
||||||
|
)
|
||||||
.setConnectable(true)
|
.setConnectable(true)
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
@@ -790,6 +799,11 @@ class BleTransport(
|
|||||||
val now = System.currentTimeMillis()
|
val now = System.currentTimeMillis()
|
||||||
incoming.entries.removeAll { now - it.value.startedAt > INCOMPLETE_TTL_MS }
|
incoming.entries.removeAll { now - it.value.startedAt > INCOMPLETE_TTL_MS }
|
||||||
|
|
||||||
|
if (messageId !in incoming && incoming.size >= MAX_PARTIAL_MESSAGES) {
|
||||||
|
// A peer that starts many messages and never finishes them would fill the memory.
|
||||||
|
incoming.minByOrNull { it.value.startedAt }?.let { incoming.remove(it.key) }
|
||||||
|
NetworkLog.log("BLE", "Too many unfinished messages, oldest dropped")
|
||||||
|
}
|
||||||
val entry = incoming.getOrPut(messageId) { PartialMessage(total, now) }
|
val entry = incoming.getOrPut(messageId) { PartialMessage(total, now) }
|
||||||
if (entry.total != total) {
|
if (entry.total != total) {
|
||||||
incoming[messageId] = PartialMessage(total, now).also { it.parts[index] = payload }
|
incoming[messageId] = PartialMessage(total, now).also { it.parts[index] = payload }
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ data class LanPeer(
|
|||||||
val fingerprint: String = "",
|
val fingerprint: String = "",
|
||||||
|
|
||||||
val signature: String = "",
|
val signature: String = "",
|
||||||
|
/** When the announcement was signed, in epoch seconds; 0 if the peer sent none. */
|
||||||
|
val signedAtSeconds: Long = 0,
|
||||||
/** Raw NSD service name, used to remove the peer when the service is lost. */
|
/** Raw NSD service name, used to remove the peer when the service is lost. */
|
||||||
val serviceName: String = "",
|
val serviceName: String = "",
|
||||||
/** Tag of the LAN game the peer plays, empty when not in one. */
|
/** Tag of the LAN game the peer plays, empty when not in one. */
|
||||||
@@ -59,8 +61,22 @@ class LanTransport(
|
|||||||
|
|
||||||
const val RESOLVE_RETRY_MS = 400L
|
const val RESOLVE_RETRY_MS = 400L
|
||||||
|
|
||||||
fun presencePayload(playerId: String, name: String, elo: Int): String =
|
/**
|
||||||
"presence|$playerId|$name|$elo"
|
* Signed presence announcement. The signing time is part of it, so a recorded
|
||||||
|
* announcement stops being accepted after [PRESENCE_MAX_AGE_MS]; older versions, which
|
||||||
|
* signed without it, are no longer accepted at all.
|
||||||
|
*/
|
||||||
|
fun presencePayload(playerId: String, name: String, elo: Int, signedAtSeconds: Long): String =
|
||||||
|
"presence2|$playerId|$name|$elo|$signedAtSeconds"
|
||||||
|
|
||||||
|
/** How old (or how far ahead, for a clock set wrong) a signed announcement may be. */
|
||||||
|
const val PRESENCE_MAX_AGE_MS = 15 * 60_000L
|
||||||
|
|
||||||
|
/** The announcement is signed anew this often, well within [PRESENCE_MAX_AGE_MS]. */
|
||||||
|
const val PRESENCE_RESIGN_MS = 5 * 60_000L
|
||||||
|
|
||||||
|
fun isFreshPresence(signedAtSeconds: Long, nowMs: Long): Boolean =
|
||||||
|
signedAtSeconds > 0 && kotlin.math.abs(nowMs - signedAtSeconds * 1000L) <= PRESENCE_MAX_AGE_MS
|
||||||
}
|
}
|
||||||
|
|
||||||
override val type = TransportType.LAN
|
override val type = TransportType.LAN
|
||||||
@@ -72,7 +88,8 @@ class LanTransport(
|
|||||||
context.getSystemService(Context.NSD_SERVICE) as? NsdManager
|
context.getSystemService(Context.NSD_SERVICE) as? NsdManager
|
||||||
|
|
||||||
private var serverSocket: ServerSocket? = null
|
private var serverSocket: ServerSocket? = null
|
||||||
private var socket: Socket? = null
|
// Written by the connect and accept paths, read by the writer coroutine.
|
||||||
|
@Volatile private var socket: Socket? = null
|
||||||
|
|
||||||
private val socketLock = Any()
|
private val socketLock = Any()
|
||||||
|
|
||||||
@@ -82,7 +99,7 @@ class LanTransport(
|
|||||||
socket = candidate
|
socket = candidate
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
private var output: OutputStream? = null
|
@Volatile private var output: OutputStream? = null
|
||||||
private val dispatcher = MessageDispatcher()
|
private val dispatcher = MessageDispatcher()
|
||||||
|
|
||||||
@Volatile private var hosting = false
|
@Volatile private var hosting = false
|
||||||
@@ -91,6 +108,9 @@ class LanTransport(
|
|||||||
|
|
||||||
private var registeredServiceName: String? = null
|
private var registeredServiceName: String? = null
|
||||||
|
|
||||||
|
// Re-signs the announcement before it gets too old to be accepted.
|
||||||
|
private var resignJob: kotlinx.coroutines.Job? = null
|
||||||
|
|
||||||
private val ownServiceName: String by lazy {
|
private val ownServiceName: String by lazy {
|
||||||
val fingerprint = cc.skysparkle.matewave.security.DeviceKeys.publicKeyFingerprint(context)
|
val fingerprint = cc.skysparkle.matewave.security.DeviceKeys.publicKeyFingerprint(context)
|
||||||
?: cc.skysparkle.matewave.data.DeviceIdentity.deviceId(context).take(12)
|
?: cc.skysparkle.matewave.data.DeviceIdentity.deviceId(context).take(12)
|
||||||
@@ -211,13 +231,15 @@ class LanTransport(
|
|||||||
val profile = cc.skysparkle.matewave.data.ProfileStore.get()
|
val profile = cc.skysparkle.matewave.data.ProfileStore.get()
|
||||||
runCatching {
|
runCatching {
|
||||||
val shownName = profile.name.take(40)
|
val shownName = profile.name.take(40)
|
||||||
|
val signedAt = System.currentTimeMillis() / 1000L
|
||||||
setAttribute("id", profile.userId)
|
setAttribute("id", profile.userId)
|
||||||
setAttribute("name", shownName)
|
setAttribute("name", shownName)
|
||||||
setAttribute("elo", profile.elo.toString())
|
setAttribute("elo", profile.elo.toString())
|
||||||
setAttribute("fp", cc.skysparkle.matewave.security.DeviceKeys.publicKeyFingerprint(context) ?: "")
|
setAttribute("fp", cc.skysparkle.matewave.security.DeviceKeys.publicKeyFingerprint(context) ?: "")
|
||||||
|
setAttribute("ts", signedAt.toString())
|
||||||
|
|
||||||
cc.skysparkle.matewave.security.DeviceKeys.sign(
|
cc.skysparkle.matewave.security.DeviceKeys.sign(
|
||||||
context, presencePayload(profile.userId, shownName, profile.elo)
|
context, presencePayload(profile.userId, shownName, profile.elo, signedAt)
|
||||||
)?.let { setAttribute("sig", it) }
|
)?.let { setAttribute("sig", it) }
|
||||||
cc.skysparkle.matewave.spectate.SpectatorAdvert.attributes().forEach { (key, value) -> setAttribute(key, value) }
|
cc.skysparkle.matewave.spectate.SpectatorAdvert.attributes().forEach { (key, value) -> setAttribute(key, value) }
|
||||||
}
|
}
|
||||||
@@ -240,9 +262,15 @@ class LanTransport(
|
|||||||
nsd.registerService(info, NsdManager.PROTOCOL_DNS_SD, listener)
|
nsd.registerService(info, NsdManager.PROTOCOL_DNS_SD, listener)
|
||||||
} catch (_: Exception) {
|
} catch (_: Exception) {
|
||||||
}
|
}
|
||||||
|
resignJob = scope.launch {
|
||||||
|
kotlinx.coroutines.delay(PRESENCE_RESIGN_MS)
|
||||||
|
republishProfile()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun unregisterService() {
|
private fun unregisterService() {
|
||||||
|
resignJob?.cancel()
|
||||||
|
resignJob = null
|
||||||
val nsd = nsdManager ?: return
|
val nsd = nsdManager ?: return
|
||||||
registrationListener?.let {
|
registrationListener?.let {
|
||||||
try { nsd.unregisterService(it) } catch (_: Exception) {}
|
try { nsd.unregisterService(it) } catch (_: Exception) {}
|
||||||
@@ -362,6 +390,7 @@ class LanTransport(
|
|||||||
|
|
||||||
fingerprint = attr("fp").ifEmpty { fingerprintFromServiceName(info.serviceName ?: "") ?: "" },
|
fingerprint = attr("fp").ifEmpty { fingerprintFromServiceName(info.serviceName ?: "") ?: "" },
|
||||||
signature = attr("sig"),
|
signature = attr("sig"),
|
||||||
|
signedAtSeconds = attr("ts").toLongOrNull() ?: 0,
|
||||||
serviceName = info.serviceName ?: "",
|
serviceName = info.serviceName ?: "",
|
||||||
gameTag = game.gameTag,
|
gameTag = game.gameTag,
|
||||||
spectatePort = game.spectatePort
|
spectatePort = game.spectatePort
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package cc.skysparkle.matewave.network
|
package cc.skysparkle.matewave.network
|
||||||
|
|
||||||
|
import android.util.Log
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
import kotlinx.coroutines.flow.update
|
|
||||||
|
|
||||||
enum class DisconnectReason(val userText: String, val textRes: Int) {
|
enum class DisconnectReason(val userText: String, val textRes: Int) {
|
||||||
NONE("—", cc.skysparkle.matewave.R.string.reason_unknown),
|
NONE("—", cc.skysparkle.matewave.R.string.reason_unknown),
|
||||||
@@ -18,23 +18,13 @@ enum class DisconnectReason(val userText: String, val textRes: Int) {
|
|||||||
PORT_BUSY("Could not open port", cc.skysparkle.matewave.R.string.reason_port_busy)
|
PORT_BUSY("Could not open port", cc.skysparkle.matewave.R.string.reason_port_busy)
|
||||||
}
|
}
|
||||||
|
|
||||||
data class NetworkEvent(
|
|
||||||
val at: Long,
|
|
||||||
val transport: String,
|
|
||||||
val text: String
|
|
||||||
)
|
|
||||||
|
|
||||||
object NetworkLog {
|
object NetworkLog {
|
||||||
private const val CAPACITY = 60
|
|
||||||
|
|
||||||
private val _events = MutableStateFlow<List<NetworkEvent>>(emptyList())
|
|
||||||
|
|
||||||
private val _lastReason = MutableStateFlow(DisconnectReason.NONE)
|
private val _lastReason = MutableStateFlow(DisconnectReason.NONE)
|
||||||
val lastReason: StateFlow<DisconnectReason> = _lastReason
|
val lastReason: StateFlow<DisconnectReason> = _lastReason
|
||||||
|
|
||||||
|
/** Debug output only: release builds strip Log.d (see proguard-rules.pro). */
|
||||||
fun log(transport: String, text: String) {
|
fun log(transport: String, text: String) {
|
||||||
val event = NetworkEvent(System.currentTimeMillis(), transport, text)
|
Log.d("Matewave/$transport", text)
|
||||||
_events.update { (it + event).takeLast(CAPACITY) }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun reason(transport: String, reason: DisconnectReason, detail: String? = null) {
|
fun reason(transport: String, reason: DisconnectReason, detail: String? = null) {
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package cc.skysparkle.matewave.network
|
||||||
|
|
||||||
|
/** Bounds for what another device may send us; anything outside them is not stored or used. */
|
||||||
|
object PeerLimits {
|
||||||
|
const val MAX_NAME_CHARS = 40
|
||||||
|
const val MAX_USER_ID_CHARS = 64
|
||||||
|
const val MIN_ELO = 100
|
||||||
|
const val MAX_ELO = 3000
|
||||||
|
const val MAX_INITIAL_SECONDS = 3 * 60 * 60
|
||||||
|
const val MAX_INCREMENT_SECONDS = 180
|
||||||
|
|
||||||
|
/** "No time limit" is sent as Int.MAX_VALUE; 0 means the peer sent no time control. */
|
||||||
|
private fun isTimeControl(initialSeconds: Int, incrementSeconds: Int): Boolean =
|
||||||
|
(initialSeconds == 0 || initialSeconds == Int.MAX_VALUE || initialSeconds in 1..MAX_INITIAL_SECONDS) &&
|
||||||
|
incrementSeconds in 0..MAX_INCREMENT_SECONDS
|
||||||
|
|
||||||
|
fun isPlausibleName(name: String): Boolean =
|
||||||
|
name.isNotBlank() && name.length <= MAX_NAME_CHARS && name.none { it.isISOControl() }
|
||||||
|
|
||||||
|
fun isPlausibleUserId(userId: String): Boolean =
|
||||||
|
userId.isNotBlank() && userId.length <= MAX_USER_ID_CHARS && userId.none { it.isISOControl() }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checked before the profile is trusted or stored. The fields are signed as they are, so an
|
||||||
|
* out-of-range profile is refused rather than trimmed.
|
||||||
|
*/
|
||||||
|
fun isPlausibleProfile(msg: GameMessage.ProfileMsg): Boolean =
|
||||||
|
isPlausibleUserId(msg.userId) &&
|
||||||
|
isPlausibleName(msg.name) &&
|
||||||
|
msg.elo in MIN_ELO..MAX_ELO &&
|
||||||
|
isTimeControl(msg.initialSeconds, msg.incrementSeconds)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The most the opponent's clock may show after their move: what our clock gives them, plus
|
||||||
|
* the increment and some slack for network delay. A higher claim would mean time not spent.
|
||||||
|
*/
|
||||||
|
fun maxOpponentClockAfterMove(localRemainingMs: Long, incrementMs: Long, toleranceMs: Long): Long =
|
||||||
|
localRemainingMs.coerceAtLeast(0) + incrementMs + toleranceMs
|
||||||
|
}
|
||||||
@@ -141,13 +141,19 @@ class LocalPresence(
|
|||||||
|
|
||||||
val knownKey = knownPeers.publicKeyOf(id)
|
val knownKey = knownPeers.publicKeyOf(id)
|
||||||
if (knownKey != null) {
|
if (knownKey != null) {
|
||||||
val authentic = peer.signature.isNotEmpty() && DeviceKeys.verify(
|
// A known friend must send a fresh announcement signed with their key: an old one
|
||||||
|
// recorded and replayed by someone else is not accepted.
|
||||||
|
val authentic = peer.signature.isNotEmpty() &&
|
||||||
|
cc.skysparkle.matewave.network.LanTransport.isFreshPresence(peer.signedAtSeconds, lastResultAt) &&
|
||||||
|
DeviceKeys.verify(
|
||||||
knownKey,
|
knownKey,
|
||||||
cc.skysparkle.matewave.network.LanTransport.presencePayload(peer.playerId, peer.displayName, peer.elo),
|
cc.skysparkle.matewave.network.LanTransport.presencePayload(
|
||||||
|
peer.playerId, peer.displayName, peer.elo, peer.signedAtSeconds
|
||||||
|
),
|
||||||
peer.signature
|
peer.signature
|
||||||
)
|
)
|
||||||
if (!authentic) {
|
if (!authentic) {
|
||||||
NetworkLog.log("PRESENCE", "Announcement for $id failed signature check, hidden")
|
NetworkLog.log("PRESENCE", "Announcement for $id is stale or failed signature check, hidden")
|
||||||
return@forEach
|
return@forEach
|
||||||
}
|
}
|
||||||
FriendsStore.updateProfile(
|
FriendsStore.updateProfile(
|
||||||
|
|||||||
@@ -6,8 +6,9 @@ import android.net.Uri
|
|||||||
|
|
||||||
/** External links of the app, kept in one place. */
|
/** External links of the app, kept in one place. */
|
||||||
object AppLinks {
|
object AppLinks {
|
||||||
const val REPOSITORY = "https://git.skysparkle.cc/kalarina/Matewave"
|
const val REPOSITORY = "https://github.com/kalarina-bit/Matewave"
|
||||||
const val REPOSITORY_LABEL = "git.skysparkle.cc/kalarina/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"
|
const val PRIVACY_POLICY = "https://skysparkle.cc/privacy?lang=en"
|
||||||
|
|
||||||
/** Opens a link in the browser; does nothing if no app can open it. */
|
/** Opens a link in the browser; does nothing if no app can open it. */
|
||||||
|
|||||||
@@ -5,10 +5,12 @@ import java.io.File
|
|||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.io.OutputStream
|
import java.io.OutputStream
|
||||||
import java.net.Inet4Address
|
import java.net.Inet4Address
|
||||||
|
import java.net.InetSocketAddress
|
||||||
import java.net.NetworkInterface
|
import java.net.NetworkInterface
|
||||||
import java.net.ServerSocket
|
import java.net.ServerSocket
|
||||||
import java.net.Socket
|
import java.net.Socket
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger
|
||||||
import kotlin.concurrent.thread
|
import kotlin.concurrent.thread
|
||||||
|
|
||||||
class ApkShareServer(private val apk: File, private val appName: String) {
|
class ApkShareServer(private val apk: File, private val appName: String) {
|
||||||
@@ -17,8 +19,13 @@ class ApkShareServer(private val apk: File, private val appName: String) {
|
|||||||
@Volatile
|
@Volatile
|
||||||
private var server: ServerSocket? = null
|
private var server: ServerSocket? = null
|
||||||
|
|
||||||
|
private val activeClients = AtomicInteger()
|
||||||
|
|
||||||
|
/** Listens on the Wi-Fi address only (all interfaces if none is found), so the APK is not served elsewhere. */
|
||||||
fun start(): Int {
|
fun start(): Int {
|
||||||
val socket = ServerSocket(0)
|
val socket = ServerSocket()
|
||||||
|
socket.reuseAddress = true
|
||||||
|
socket.bind(InetSocketAddress(LocalNetwork.wifiInet4(), 0))
|
||||||
server = socket
|
server = socket
|
||||||
thread(name = "apk-share-accept", isDaemon = true) {
|
thread(name = "apk-share-accept", isDaemon = true) {
|
||||||
while (!socket.isClosed) {
|
while (!socket.isClosed) {
|
||||||
@@ -27,7 +34,19 @@ class ApkShareServer(private val apk: File, private val appName: String) {
|
|||||||
} catch (e: IOException) {
|
} catch (e: IOException) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
thread(name = "apk-share-client", isDaemon = true) { serve(client) }
|
// A handful of downloads at a time is plenty; more connections are refused.
|
||||||
|
if (activeClients.incrementAndGet() > MAX_CLIENTS) {
|
||||||
|
activeClients.decrementAndGet()
|
||||||
|
runCatching { client.close() }
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
thread(name = "apk-share-client", isDaemon = true) {
|
||||||
|
try {
|
||||||
|
serve(client)
|
||||||
|
} finally {
|
||||||
|
activeClients.decrementAndGet()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return socket.localPort
|
return socket.localPort
|
||||||
@@ -78,6 +97,10 @@ class ApkShareServer(private val apk: File, private val appName: String) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private companion object {
|
||||||
|
const val MAX_CLIENTS = 4
|
||||||
|
}
|
||||||
|
|
||||||
private fun sendText(out: OutputStream, code: Int, reason: String, text: String, withBody: Boolean) {
|
private fun sendText(out: OutputStream, code: Int, reason: String, text: String, withBody: Boolean) {
|
||||||
val body = text.toByteArray(Charsets.UTF_8)
|
val body = text.toByteArray(Charsets.UTF_8)
|
||||||
writeHeader(out, code, reason, "text/plain; charset=utf-8", body.size.toLong())
|
writeHeader(out, code, reason, "text/plain; charset=utf-8", body.size.toLong())
|
||||||
@@ -117,12 +140,13 @@ class ApkShareServer(private val apk: File, private val appName: String) {
|
|||||||
object LocalNetwork {
|
object LocalNetwork {
|
||||||
private val WIFI_PREFIXES = listOf("wlan", "swlan", "ap", "softap", "eth")
|
private val WIFI_PREFIXES = listOf("wlan", "swlan", "ap", "softap", "eth")
|
||||||
|
|
||||||
fun wifiIpv4(): String? = runCatching {
|
fun wifiInet4(): Inet4Address? = runCatching {
|
||||||
NetworkInterface.getNetworkInterfaces()?.toList().orEmpty()
|
NetworkInterface.getNetworkInterfaces()?.toList().orEmpty()
|
||||||
.filter { nif -> nif.isUp && !nif.isLoopback && WIFI_PREFIXES.any { nif.name.startsWith(it) } }
|
.filter { nif -> nif.isUp && !nif.isLoopback && WIFI_PREFIXES.any { nif.name.startsWith(it) } }
|
||||||
.flatMap { nif -> nif.inetAddresses.toList() }
|
.flatMap { nif -> nif.inetAddresses.toList() }
|
||||||
.filterIsInstance<Inet4Address>()
|
.filterIsInstance<Inet4Address>()
|
||||||
.firstOrNull { it.isSiteLocalAddress }
|
.firstOrNull { it.isSiteLocalAddress }
|
||||||
?.hostAddress
|
|
||||||
}.getOrNull()
|
}.getOrNull()
|
||||||
|
|
||||||
|
fun wifiIpv4(): String? = wifiInet4()?.hostAddress
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import androidx.compose.ui.layout.ContentScale
|
|||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import cc.skysparkle.matewave.R
|
import cc.skysparkle.matewave.R
|
||||||
import cc.skysparkle.matewave.ui.theme.AppBackground
|
import cc.skysparkle.matewave.ui.theme.AppBackground
|
||||||
|
import cc.skysparkle.matewave.ui.theme.AppThemeState
|
||||||
import cc.skysparkle.matewave.ui.theme.ChessGreen
|
import cc.skysparkle.matewave.ui.theme.ChessGreen
|
||||||
import cc.skysparkle.matewave.ui.theme.Lime
|
import cc.skysparkle.matewave.ui.theme.Lime
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
@@ -73,6 +74,9 @@ private val ForestTint = ColorFilter.colorMatrix(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
/** For the other styles the forest turns almost grey, so it never fights their colours. */
|
||||||
|
private val NeutralForestTint = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0.12f) })
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The misty forest artwork, deeply darkened so it reads as texture: the mist stays
|
* The misty forest artwork, deeply darkened so it reads as texture: the mist stays
|
||||||
* visible behind the headings at the top and fades into near-black lower down.
|
* visible behind the headings at the top and fades into near-black lower down.
|
||||||
@@ -95,7 +99,7 @@ fun AppBackdrop() {
|
|||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
modifier = Modifier.fillMaxSize(),
|
modifier = Modifier.fillMaxSize(),
|
||||||
contentScale = ContentScale.Crop,
|
contentScale = ContentScale.Crop,
|
||||||
colorFilter = ForestTint
|
colorFilter = if (AppThemeState.palette.greenBackdrop) ForestTint else NeutralForestTint
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Box(
|
Box(
|
||||||
|
|||||||
@@ -50,8 +50,8 @@ import androidx.compose.ui.graphics.Color
|
|||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.window.Dialog
|
import androidx.compose.ui.window.Dialog
|
||||||
|
|
||||||
val DialogSurface = cc.skysparkle.matewave.ui.theme.Surface1
|
val DialogSurface: Color get() = cc.skysparkle.matewave.ui.theme.Surface1
|
||||||
val DialogAccent = cc.skysparkle.matewave.ui.theme.ChessGreen
|
val DialogAccent: Color get() = cc.skysparkle.matewave.ui.theme.ChessGreen
|
||||||
val DialogShape = RoundedCornerShape(28.dp)
|
val DialogShape = RoundedCornerShape(28.dp)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
|||||||
@@ -86,21 +86,46 @@ private object DecodedImageCache {
|
|||||||
fun put(key: String, bitmap: Bitmap) { cache.put(key, bitmap) }
|
fun put(key: String, bitmap: Bitmap) { cache.put(key, bitmap) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Larger images (from the opponent) are refused; ours never exceed [MAX_DIMENSION_PX]. */
|
||||||
|
const val MAX_INCOMING_IMAGE_PX = 4096
|
||||||
|
|
||||||
|
/** Upper bound for the decoded size when the caller does not ask for a smaller one. */
|
||||||
|
private const val DEFAULT_DECODE_PX = 1280
|
||||||
|
|
||||||
|
/** Width and height of an encoded image, or null if it is not a readable image. */
|
||||||
|
private fun imageBounds(bytes: ByteArray): Pair<Int, Int>? {
|
||||||
|
val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
|
||||||
|
BitmapFactory.decodeByteArray(bytes, 0, bytes.size, bounds)
|
||||||
|
return if (bounds.outWidth > 0 && bounds.outHeight > 0) bounds.outWidth to bounds.outHeight else null
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks an image received from another device before it is shown or stored: it must be a
|
||||||
|
* readable image no larger than [MAX_INCOMING_IMAGE_PX] on either side. A small file can
|
||||||
|
* declare a huge resolution, and decoding it at full size would run out of memory.
|
||||||
|
*/
|
||||||
|
fun isAcceptableIncomingImage(base64: String): Boolean = try {
|
||||||
|
val size = imageBounds(Base64.decode(base64, Base64.NO_WRAP))
|
||||||
|
size != null && size.first <= MAX_INCOMING_IMAGE_PX && size.second <= MAX_INCOMING_IMAGE_PX
|
||||||
|
} catch (e: Exception) {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
fun decodeChatImage(base64: String, maxDimension: Int = 0): Bitmap? {
|
fun decodeChatImage(base64: String, maxDimension: Int = 0): Bitmap? {
|
||||||
return try {
|
return try {
|
||||||
val bytes = Base64.decode(base64, Base64.NO_WRAP)
|
val bytes = Base64.decode(base64, Base64.NO_WRAP)
|
||||||
if (maxDimension <= 0) {
|
// The size is always checked first: the image may come from another device.
|
||||||
BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
|
val (width, height) = imageBounds(bytes) ?: return null
|
||||||
} else {
|
if (width > MAX_INCOMING_IMAGE_PX || height > MAX_INCOMING_IMAGE_PX) return null
|
||||||
val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
|
val target = if (maxDimension > 0) maxDimension else DEFAULT_DECODE_PX
|
||||||
BitmapFactory.decodeByteArray(bytes, 0, bytes.size, bounds)
|
|
||||||
var sample = 1
|
var sample = 1
|
||||||
while (maxOf(bounds.outWidth, bounds.outHeight) / (sample * 2) >= maxDimension) sample *= 2
|
while (maxOf(width, height) / (sample * 2) >= target) sample *= 2
|
||||||
val options = BitmapFactory.Options().apply { inSampleSize = sample }
|
val options = BitmapFactory.Options().apply { inSampleSize = sample }
|
||||||
BitmapFactory.decodeByteArray(bytes, 0, bytes.size, options)
|
BitmapFactory.decodeByteArray(bytes, 0, bytes.size, options)
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
null
|
null
|
||||||
|
} catch (e: OutOfMemoryError) {
|
||||||
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,19 +53,41 @@ import cc.skysparkle.matewave.ui.theme.GlassShape
|
|||||||
import cc.skysparkle.matewave.ui.theme.PanelBorder
|
import cc.skysparkle.matewave.ui.theme.PanelBorder
|
||||||
import cc.skysparkle.matewave.ui.theme.TabletMaxContentWidth
|
import cc.skysparkle.matewave.ui.theme.TabletMaxContentWidth
|
||||||
import cc.skysparkle.matewave.ui.theme.glass
|
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
|
@Composable
|
||||||
fun GlassScaffold(
|
private fun ScaffoldTopBar(
|
||||||
title: String,
|
title: String,
|
||||||
onBack: (() -> Unit)? = null,
|
onBack: (() -> Unit)?,
|
||||||
actions: @Composable RowScope.() -> Unit = {},
|
actions: @Composable RowScope.() -> Unit,
|
||||||
bottomBar: (@Composable () -> Unit)? = null,
|
titleContent: (@Composable RowScope.() -> Unit)?
|
||||||
/** Replaces the plain title, e.g. with the opening name and its status badge. */
|
|
||||||
titleContent: (@Composable RowScope.() -> Unit)? = null,
|
|
||||||
content: @Composable ColumnScope.() -> Unit
|
|
||||||
) {
|
) {
|
||||||
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
|
|
||||||
Column(modifier = Modifier.fillMaxSize().widthIn(max = TabletMaxContentWidth)) {
|
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxWidth().statusBarsPadding().padding(start = 4.dp, end = 4.dp, top = 8.dp, bottom = 8.dp),
|
modifier = Modifier.fillMaxWidth().statusBarsPadding().padding(start = 4.dp, end = 4.dp, top = 8.dp, bottom = 8.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
@@ -96,6 +118,21 @@ fun GlassScaffold(
|
|||||||
}
|
}
|
||||||
actions()
|
actions()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun GlassScaffold(
|
||||||
|
title: String,
|
||||||
|
onBack: (() -> Unit)? = null,
|
||||||
|
actions: @Composable RowScope.() -> Unit = {},
|
||||||
|
bottomBar: (@Composable () -> Unit)? = null,
|
||||||
|
/** Replaces the plain title, e.g. with the opening name and its status badge. */
|
||||||
|
titleContent: (@Composable RowScope.() -> Unit)? = null,
|
||||||
|
content: @Composable ColumnScope.() -> Unit
|
||||||
|
) {
|
||||||
|
Box(modifier = Modifier.fillMaxSize().horizontalSafePadding(), contentAlignment = Alignment.TopCenter) {
|
||||||
|
Column(modifier = Modifier.fillMaxSize().widthIn(max = TabletMaxContentWidth)) {
|
||||||
|
ScaffoldTopBar(title, onBack, actions, titleContent)
|
||||||
|
|
||||||
val scrollState = rememberScrollState()
|
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
|
@Composable
|
||||||
private fun Modifier.pressScale(interactionSource: MutableInteractionSource): Modifier {
|
private fun Modifier.pressScale(interactionSource: MutableInteractionSource): Modifier {
|
||||||
val pressed by interactionSource.collectIsPressedAsState()
|
val pressed by interactionSource.collectIsPressedAsState()
|
||||||
@@ -156,7 +252,7 @@ fun GlassButton(
|
|||||||
onClick = onClick
|
onClick = onClick
|
||||||
) else Modifier
|
) else Modifier
|
||||||
)
|
)
|
||||||
.padding(horizontal = 22.dp, vertical = 15.dp),
|
.padding(horizontal = 16.dp, vertical = 15.dp),
|
||||||
horizontalArrangement = Arrangement.Center,
|
horizontalArrangement = Arrangement.Center,
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
content = content
|
content = content
|
||||||
@@ -186,7 +282,7 @@ fun GlassOutlinedButton(
|
|||||||
onClick = onClick
|
onClick = onClick
|
||||||
) else Modifier
|
) else Modifier
|
||||||
)
|
)
|
||||||
.padding(horizontal = 22.dp, vertical = 15.dp),
|
.padding(horizontal = 16.dp, vertical = 15.dp),
|
||||||
horizontalArrangement = Arrangement.Center,
|
horizontalArrangement = Arrangement.Center,
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
content = content
|
content = content
|
||||||
|
|||||||
@@ -12,6 +12,13 @@ import androidx.compose.foundation.layout.Row
|
|||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
|
import cc.skysparkle.matewave.ui.theme.AppPalette
|
||||||
|
import cc.skysparkle.matewave.ui.theme.AppStyle
|
||||||
|
import cc.skysparkle.matewave.ui.theme.AppThemeState
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Switch
|
import androidx.compose.material3.Switch
|
||||||
@@ -25,7 +32,6 @@ import androidx.compose.runtime.setValue
|
|||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
@@ -51,6 +57,13 @@ fun AppearanceScreen(onBack: () -> Unit) {
|
|||||||
var openingBar by remember { mutableStateOf(appearance.showOpening) }
|
var openingBar by remember { mutableStateOf(appearance.showOpening) }
|
||||||
|
|
||||||
GlassScaffold(title = stringResource(R.string.appearance_title), onBack = onBack) {
|
GlassScaffold(title = stringResource(R.string.appearance_title), onBack = onBack) {
|
||||||
|
Text(
|
||||||
|
stringResource(R.string.app_style_title),
|
||||||
|
color = ink,
|
||||||
|
style = MaterialTheme.typography.titleMedium
|
||||||
|
)
|
||||||
|
StylePicker()
|
||||||
|
|
||||||
Text(
|
Text(
|
||||||
stringResource(R.string.appearance_board_theme),
|
stringResource(R.string.appearance_board_theme),
|
||||||
color = ink,
|
color = ink,
|
||||||
@@ -77,7 +90,7 @@ fun AppearanceScreen(onBack: () -> Unit) {
|
|||||||
)
|
)
|
||||||
if (candidate == theme) {
|
if (candidate == theme) {
|
||||||
cc.skysparkle.matewave.ui.components.AppIcon(
|
cc.skysparkle.matewave.ui.components.AppIcon(
|
||||||
R.drawable.ic_check_box, size = 20.dp, tint = Color(0xFF7BE495)
|
R.drawable.ic_check_box, size = 20.dp, tint = cc.skysparkle.matewave.ui.theme.ChessGreen
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -127,6 +140,85 @@ fun AppearanceScreen(onBack: () -> Unit) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** App colour styles as swatches, three per row; the device style follows the wallpaper. */
|
||||||
|
@Composable
|
||||||
|
private fun StylePicker() {
|
||||||
|
val context = LocalContext.current
|
||||||
|
val selected = AppThemeState.style
|
||||||
|
val styles = remember { AppStyle.available }
|
||||||
|
Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||||
|
styles.chunked(3).forEach { row ->
|
||||||
|
Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||||
|
row.forEach { style ->
|
||||||
|
StyleSwatch(
|
||||||
|
style = style,
|
||||||
|
palette = remember(style) { AppThemeState.paletteFor(context, style) },
|
||||||
|
selected = style == selected,
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
onClick = { AppThemeState.select(context, style) }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
repeat(3 - row.size) { Spacer(Modifier.weight(1f)) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (selected == AppStyle.DEVICE) {
|
||||||
|
Text(
|
||||||
|
stringResource(R.string.app_style_device_hint),
|
||||||
|
color = ink.copy(alpha = 0.6f),
|
||||||
|
style = MaterialTheme.typography.bodySmall
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun StyleSwatch(
|
||||||
|
style: AppStyle,
|
||||||
|
palette: AppPalette,
|
||||||
|
selected: Boolean,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
onClick: () -> Unit
|
||||||
|
) {
|
||||||
|
val shape = RoundedCornerShape(18.dp)
|
||||||
|
Column(
|
||||||
|
modifier = modifier
|
||||||
|
.clip(shape)
|
||||||
|
.background(palette.surface1)
|
||||||
|
.border(if (selected) 2.dp else 1.dp, if (selected) palette.accent else PanelBorder, shape)
|
||||||
|
.clickable(onClick = onClick)
|
||||||
|
.padding(vertical = 12.dp, horizontal = 6.dp),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally
|
||||||
|
) {
|
||||||
|
Box(contentAlignment = Alignment.BottomEnd) {
|
||||||
|
Box(
|
||||||
|
modifier = Modifier.size(44.dp).clip(CircleShape).background(palette.accent),
|
||||||
|
contentAlignment = Alignment.Center
|
||||||
|
) {
|
||||||
|
if (selected) {
|
||||||
|
cc.skysparkle.matewave.ui.components.AppIcon(
|
||||||
|
R.drawable.ic_check_box, size = 20.dp, tint = palette.onAccent
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.size(20.dp)
|
||||||
|
.clip(CircleShape)
|
||||||
|
.background(palette.action)
|
||||||
|
.border(2.dp, palette.surface1, CircleShape)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Spacer(Modifier.height(8.dp))
|
||||||
|
Text(
|
||||||
|
stringResource(style.titleRes),
|
||||||
|
color = ink,
|
||||||
|
style = MaterialTheme.typography.labelLarge,
|
||||||
|
maxLines = 1,
|
||||||
|
overflow = TextOverflow.Ellipsis
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun ThemePreview(theme: BoardTheme, showPieces: Boolean) {
|
private fun ThemePreview(theme: BoardTheme, showPieces: Boolean) {
|
||||||
val shape = RoundedCornerShape(6.dp)
|
val shape = RoundedCornerShape(6.dp)
|
||||||
|
|||||||
@@ -77,14 +77,16 @@ private data class NearbyEntry(
|
|||||||
val elo: Int?,
|
val elo: Int?,
|
||||||
val type: TransportType,
|
val type: TransportType,
|
||||||
val address: String,
|
val address: String,
|
||||||
val avatar: String?
|
val avatar: String?,
|
||||||
|
/** Player id from the signed Wi-Fi announcement; checked against the profile after connecting. */
|
||||||
|
val playerId: String? = null
|
||||||
)
|
)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ConnectionScreen(
|
fun ConnectionScreen(
|
||||||
presence: LocalPresence,
|
presence: LocalPresence,
|
||||||
onStartHost: (TimeControl) -> Unit,
|
onStartHost: (TimeControl) -> Unit,
|
||||||
onJoin: (TransportType, TimeControl, targetId: String) -> Unit,
|
onJoin: (TransportType, TimeControl, targetId: String, expectedUserId: String?) -> Unit,
|
||||||
onBack: () -> Unit
|
onBack: () -> Unit
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
@@ -146,7 +148,8 @@ fun ConnectionScreen(
|
|||||||
elo = peer.elo,
|
elo = peer.elo,
|
||||||
type = TransportType.LAN,
|
type = TransportType.LAN,
|
||||||
address = peer.address,
|
address = peer.address,
|
||||||
avatar = friends.firstOrNull { it.userId == peer.playerId }?.avatarBase64
|
avatar = friends.firstOrNull { it.userId == peer.playerId }?.avatarBase64,
|
||||||
|
playerId = peer.playerId
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
val lanFingerprints = peers.values.map { it.fingerprint }.filter { it.isNotEmpty() }
|
val lanFingerprints = peers.values.map { it.fingerprint }.filter { it.isNotEmpty() }
|
||||||
@@ -263,7 +266,7 @@ fun ConnectionScreen(
|
|||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.clip(RoundedCornerShape(50))
|
.clip(RoundedCornerShape(50))
|
||||||
.background(Lime)
|
.background(Lime)
|
||||||
.clickable { onJoin(entry.type, timeControl, entry.address) }
|
.clickable { onJoin(entry.type, timeControl, entry.address, entry.playerId) }
|
||||||
.padding(horizontal = 14.dp, vertical = 6.dp)
|
.padding(horizontal = 14.dp, vertical = 6.dp)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -102,7 +102,14 @@ fun GameScreen(viewModel: GameViewModel, onExit: () -> Unit) {
|
|||||||
else -> null
|
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 = "",
|
title = "",
|
||||||
onBack = requestExit,
|
onBack = requestExit,
|
||||||
actions = {
|
actions = {
|
||||||
@@ -112,19 +119,15 @@ fun GameScreen(viewModel: GameViewModel, onExit: () -> Unit) {
|
|||||||
},
|
},
|
||||||
titleContent = if (showOpening && opening != null) {
|
titleContent = if (showOpening && opening != null) {
|
||||||
{ OpeningTitle("${opening.eco} · ${opening.name}", bookStatus, inBook) }
|
{ OpeningTitle("${opening.eco} · ${opening.name}", bookStatus, inBook) }
|
||||||
} else null
|
} else null,
|
||||||
) {
|
above = {
|
||||||
if (state.mode == GameMode.VS_PLAYER_NETWORK) ConnectionBanner(state)
|
if (state.mode == GameMode.VS_PLAYER_NETWORK) ConnectionBanner(state)
|
||||||
TrustBanners(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)
|
PlayerRow(state, topColor, isMe = false, material = material, clock = viewModel.clockState)
|
||||||
|
},
|
||||||
|
board = { boardModifier ->
|
||||||
ChessBoardView(
|
ChessBoardView(
|
||||||
|
modifier = boardModifier,
|
||||||
board = state.board,
|
board = state.board,
|
||||||
selectedSquare = state.selectedSquare,
|
selectedSquare = state.selectedSquare,
|
||||||
legalTargets = state.legalTargetsFromSelected,
|
legalTargets = state.legalTargetsFromSelected,
|
||||||
@@ -137,7 +140,8 @@ fun GameScreen(viewModel: GameViewModel, onExit: () -> Unit) {
|
|||||||
(state.connectionState == ConnectionState.CONNECTED &&
|
(state.connectionState == ConnectionState.CONNECTED &&
|
||||||
state.handshake == cc.skysparkle.matewave.viewmodel.HandshakeState.PLAYING))
|
state.handshake == cc.skysparkle.matewave.viewmodel.HandshakeState.PLAYING))
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
) {
|
||||||
PlayerRow(state, bottomColor, isMe = true, material = material, clock = viewModel.clockState)
|
PlayerRow(state, bottomColor, isMe = true, material = material, clock = viewModel.clockState)
|
||||||
|
|
||||||
// The move ribbon: only moves here, the opening name lives in the top bar.
|
// The move ribbon: only moves here, the opening name lives in the top bar.
|
||||||
@@ -179,12 +183,14 @@ fun GameScreen(viewModel: GameViewModel, onExit: () -> Unit) {
|
|||||||
Text(
|
Text(
|
||||||
if (state.drawOfferSentByMe) stringResource(R.string.draw_offer_waiting) else stringResource(R.string.offer_draw),
|
if (state.drawOfferSentByMe) stringResource(R.string.draw_offer_waiting) else stringResource(R.string.offer_draw),
|
||||||
color = ink,
|
color = ink,
|
||||||
maxLines = 1
|
style = MaterialTheme.typography.labelLarge,
|
||||||
|
maxLines = 1,
|
||||||
|
overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
GlassOutlinedButton(onClick = { confirmResign = true }, modifier = Modifier.weight(1f)) {
|
GlassOutlinedButton(onClick = { confirmResign = true }, modifier = Modifier.weight(1f)) {
|
||||||
ButtonIcon(R.drawable.ic_flag)
|
ButtonIcon(R.drawable.ic_flag)
|
||||||
Text(stringResource(R.string.resign), color = ink, maxLines = 1)
|
Text(stringResource(R.string.resign), color = ink, style = MaterialTheme.typography.labelLarge, maxLines = 1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ChatButton(
|
ChatButton(
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Row
|
|||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
import androidx.compose.foundation.layout.fillMaxHeight
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
|
import cc.skysparkle.matewave.ui.components.horizontalSafePadding
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.navigationBarsPadding
|
import androidx.compose.foundation.layout.navigationBarsPadding
|
||||||
@@ -98,7 +99,7 @@ fun MainMenuScreen(
|
|||||||
var showRatingGate by remember { mutableStateOf(false) }
|
var showRatingGate by remember { mutableStateOf(false) }
|
||||||
var showStats 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)) {
|
Column(modifier = Modifier.fillMaxSize().widthIn(max = TabletMaxContentWidth)) {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
@@ -130,7 +131,6 @@ fun MainMenuScreen(
|
|||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.clip(RoundedCornerShape(50))
|
.clip(RoundedCornerShape(50))
|
||||||
.background(Surface2)
|
.background(Surface2)
|
||||||
.clickable { showStats = true }
|
|
||||||
.padding(start = 10.dp, end = 14.dp, top = 8.dp, bottom = 8.dp),
|
.padding(start = 10.dp, end = 14.dp, top = 8.dp, bottom = 8.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -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,7 +43,11 @@ fun OpeningTrainerScreen(viewModel: OpeningStudyViewModel, onBack: () -> Unit) {
|
|||||||
val sans = state.sans
|
val sans = state.sans
|
||||||
val opening = remember(sans) { OpeningBook.openingName(sans) }
|
val opening = remember(sans) { OpeningBook.openingName(sans) }
|
||||||
|
|
||||||
GlassScaffold(title = course.name, onBack = onBack) {
|
// 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) {
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
Text(
|
Text(
|
||||||
stringResource(
|
stringResource(
|
||||||
@@ -69,8 +73,10 @@ fun OpeningTrainerScreen(viewModel: OpeningStudyViewModel, onBack: () -> Unit) {
|
|||||||
ProgressBar(state.answered.toFloat() / state.asked.size.coerceAtLeast(1))
|
ProgressBar(state.answered.toFloat() / state.asked.size.coerceAtLeast(1))
|
||||||
|
|
||||||
MovesBar(sans = sans, startBoard = startBoard, opening = opening)
|
MovesBar(sans = sans, startBoard = startBoard, opening = opening)
|
||||||
|
},
|
||||||
|
board = { boardModifier ->
|
||||||
ChessBoardView(
|
ChessBoardView(
|
||||||
|
modifier = boardModifier,
|
||||||
board = state.board,
|
board = state.board,
|
||||||
selectedSquare = state.selectedSquare,
|
selectedSquare = state.selectedSquare,
|
||||||
legalTargets = state.legalTargets,
|
legalTargets = state.legalTargets,
|
||||||
@@ -81,7 +87,8 @@ fun OpeningTrainerScreen(viewModel: OpeningStudyViewModel, onBack: () -> Unit) {
|
|||||||
hintSquare = state.hintSquare,
|
hintSquare = state.hintSquare,
|
||||||
interactionEnabled = state.phase == TrainerPhase.YOUR_MOVE || state.phase == TrainerPhase.WRONG
|
interactionEnabled = state.phase == TrainerPhase.YOUR_MOVE || state.phase == TrainerPhase.WRONG
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
) {
|
||||||
when (state.phase) {
|
when (state.phase) {
|
||||||
TrainerPhase.YOUR_MOVE -> Text(
|
TrainerPhase.YOUR_MOVE -> Text(
|
||||||
stringResource(if (state.mode == SessionMode.LEARN) R.string.study_learn_prompt else R.string.study_recall_prompt),
|
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
|
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),
|
title = puzzle?.let { stringResource(R.string.puzzle_title_rating, it.rating) } ?: stringResource(R.string.puzzle_title_fallback),
|
||||||
onBack = onBack,
|
onBack = onBack,
|
||||||
actions = {
|
actions = {
|
||||||
@@ -88,8 +89,8 @@ fun PuzzleSolveScreen(viewModel: GameViewModel, onBack: () -> Unit, onNextPuzzle
|
|||||||
.padding(horizontal = 6.dp, vertical = 2.dp)
|
.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.
|
// On tablets the board is capped and centred, so the task and buttons fit without scrolling.
|
||||||
ChessBoardView(
|
ChessBoardView(
|
||||||
board = state.board,
|
board = state.board,
|
||||||
@@ -98,14 +99,15 @@ fun PuzzleSolveScreen(viewModel: GameViewModel, onBack: () -> Unit, onNextPuzzle
|
|||||||
kingInCheckSquare = remember(state.board) { ChessEngine.checkedKingSquare(state.board) },
|
kingInCheckSquare = remember(state.board) { ChessEngine.checkedKingSquare(state.board) },
|
||||||
flipped = state.myColor == PieceColor.BLACK,
|
flipped = state.myColor == PieceColor.BLACK,
|
||||||
onSquareClick = viewModel::onSquareClicked,
|
onSquareClick = viewModel::onSquareClicked,
|
||||||
modifier = Modifier.align(Alignment.CenterHorizontally).widthIn(max = 560.dp),
|
modifier = boardModifier.widthIn(max = 560.dp),
|
||||||
lastMove = state.lastMove,
|
lastMove = state.lastMove,
|
||||||
hintSquare = state.puzzleHintFrom,
|
hintSquare = state.puzzleHintFrom,
|
||||||
interactionEnabled = state.puzzleStarted && !state.puzzleAutoMoving && !state.puzzleSolved && state.pendingPromotion == null,
|
interactionEnabled = state.puzzleStarted && !state.puzzleAutoMoving && !state.puzzleSolved && state.pendingPromotion == null,
|
||||||
flashSquare = redSquare ?: greenFlash,
|
flashSquare = redSquare ?: greenFlash,
|
||||||
flashColor = if (redSquare != null) WrongRed.copy(alpha = 0.55f) else ChessGreen.copy(alpha = 0.55f)
|
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.
|
// The task, in the same format as the status in a game: a dot in the side's colour.
|
||||||
val (text, color) = when {
|
val (text, color) = when {
|
||||||
state.puzzleSolved -> stringResource(R.string.puzzle_solved) to ChessGreen
|
state.puzzleSolved -> stringResource(R.string.puzzle_solved) to ChessGreen
|
||||||
|
|||||||
@@ -57,7 +57,8 @@ fun SettingsScreen(
|
|||||||
onOpenPermissions: () -> Unit,
|
onOpenPermissions: () -> Unit,
|
||||||
onOpenAppearance: () -> Unit,
|
onOpenAppearance: () -> Unit,
|
||||||
onOpenLicenses: () -> Unit,
|
onOpenLicenses: () -> Unit,
|
||||||
onOpenShare: () -> Unit
|
onOpenShare: () -> Unit,
|
||||||
|
onOpenGuide: () -> Unit
|
||||||
) {
|
) {
|
||||||
var musicOn by remember { mutableStateOf(SoundManager.musicEnabled) }
|
var musicOn by remember { mutableStateOf(SoundManager.musicEnabled) }
|
||||||
var sfxOn by remember { mutableStateOf(SoundManager.sfxEnabled) }
|
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) }
|
onClick = { cc.skysparkle.matewave.settings.AppLinks.open(context, cc.skysparkle.matewave.settings.AppLinks.PRIVACY_POLICY) }
|
||||||
)
|
)
|
||||||
ListDivider()
|
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(
|
ListRow(
|
||||||
title = stringResource(R.string.about_section),
|
title = stringResource(R.string.about_section),
|
||||||
icon = R.drawable.ic_info,
|
icon = R.drawable.ic_info,
|
||||||
@@ -178,6 +187,19 @@ fun SettingsScreen(
|
|||||||
onClick = { showAbout = true }
|
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) {
|
if (showAbout) {
|
||||||
@@ -242,6 +264,8 @@ fun SettingsScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val DonateRed = Color(0xFFFF6B8A)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun AboutRow(iconRes: Int, title: String, subtitle: String, onClick: () -> Unit) {
|
private fun AboutRow(iconRes: Int, title: String, subtitle: String, onClick: () -> Unit) {
|
||||||
val rowShape = RoundedCornerShape(12.dp)
|
val rowShape = RoundedCornerShape(12.dp)
|
||||||
|
|||||||
@@ -88,25 +88,27 @@ fun SpectatorScreen(target: SpectateTarget, onBackToFriends: () -> Unit) {
|
|||||||
val view = state.view
|
val view = state.view
|
||||||
var resultHidden by remember(view?.gameId, state.phase) { mutableStateOf(false) }
|
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),
|
title = stringResource(R.string.spectate_title),
|
||||||
onBack = backToFriends,
|
onBack = backToFriends,
|
||||||
actions = { if (view != null) SpectatorBadge(state.spectators, state.max) }
|
actions = { if (view != null) SpectatorBadge(state.spectators, state.max) },
|
||||||
) {
|
above = {
|
||||||
if (state.phase == SpectatePhase.CONNECTING) {
|
if (state.phase == SpectatePhase.CONNECTING) {
|
||||||
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
CircularProgressIndicator(color = ink, strokeWidth = 2.dp, modifier = Modifier.size(16.dp))
|
CircularProgressIndicator(color = ink, strokeWidth = 2.dp, modifier = Modifier.size(16.dp))
|
||||||
Text(stringResource(R.string.spectate_joining), color = ink, style = MaterialTheme.typography.bodyMedium)
|
Text(stringResource(R.string.spectate_joining), color = ink, style = MaterialTheme.typography.bodyMedium)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (view == null) return@GlassScaffold
|
if (view != null && material != null) SpectatorPlayerRow(view, bottom.opposite(), state, material)
|
||||||
|
},
|
||||||
val bottom = if (state.flipped) PieceColor.BLACK else PieceColor.WHITE
|
board = { boardModifier ->
|
||||||
val material = remember(view.board) { Material.balance(view.board) }
|
if (view != null) ChessBoardView(
|
||||||
val checkSquare = remember(view.board) { ChessEngine.checkedKingSquare(view.board) }
|
modifier = boardModifier,
|
||||||
|
|
||||||
SpectatorPlayerRow(view, bottom.opposite(), state, material)
|
|
||||||
ChessBoardView(
|
|
||||||
board = view.board,
|
board = view.board,
|
||||||
selectedSquare = null,
|
selectedSquare = null,
|
||||||
legalTargets = emptyList(),
|
legalTargets = emptyList(),
|
||||||
@@ -117,6 +119,9 @@ fun SpectatorScreen(target: SpectateTarget, onBackToFriends: () -> Unit) {
|
|||||||
interactionEnabled = false,
|
interactionEnabled = false,
|
||||||
highlightLastMove = true
|
highlightLastMove = true
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
if (view == null || material == null) return@BoardScaffold
|
||||||
SpectatorPlayerRow(view, bottom, state, material)
|
SpectatorPlayerRow(view, bottom, state, material)
|
||||||
|
|
||||||
val bookPlies = remember(view.moveSans) { OpeningBook.bookDepth(view.moveSans) }
|
val bookPlies = remember(view.moveSans) { OpeningBook.bookDepth(view.moveSans) }
|
||||||
|
|||||||
@@ -0,0 +1,144 @@
|
|||||||
|
package cc.skysparkle.matewave.ui.theme
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.os.Build
|
||||||
|
import androidx.compose.material3.dynamicDarkColorScheme
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import cc.skysparkle.matewave.R
|
||||||
|
|
||||||
|
/** The colours every screen is drawn with. The app stays dark in every style. */
|
||||||
|
data class AppPalette(
|
||||||
|
/** Highlights, selected states, progress. */
|
||||||
|
val accent: Color,
|
||||||
|
/** The one main action on a screen. */
|
||||||
|
val action: Color,
|
||||||
|
/** Text and icons on top of [accent] or [action]. */
|
||||||
|
val onAccent: Color,
|
||||||
|
val background: Color,
|
||||||
|
val surface1: Color,
|
||||||
|
val surface2: Color,
|
||||||
|
/** The forest backdrop keeps its green cast only with the original colours. */
|
||||||
|
val greenBackdrop: Boolean = false
|
||||||
|
)
|
||||||
|
|
||||||
|
enum class AppStyle(val titleRes: Int) {
|
||||||
|
MATEWAVE(R.string.app_style_matewave),
|
||||||
|
LAVENDER(R.string.app_style_lavender),
|
||||||
|
PEACH(R.string.app_style_peach),
|
||||||
|
MINT(R.string.app_style_mint),
|
||||||
|
SKY(R.string.app_style_sky),
|
||||||
|
DEVICE(R.string.app_style_device);
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
/** Wallpaper colours exist from Android 12. */
|
||||||
|
val deviceSupported: Boolean get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
|
||||||
|
|
||||||
|
val available: List<AppStyle> get() = entries.filter { it != DEVICE || deviceSupported }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val MatewavePalette = AppPalette(
|
||||||
|
accent = Color(0xFF35E07E),
|
||||||
|
action = Color(0xFFE3F84B),
|
||||||
|
onAccent = Color(0xFF0B1610),
|
||||||
|
background = Color(0xFF0C0F0E),
|
||||||
|
surface1 = Color(0xFF161B19),
|
||||||
|
surface2 = Color(0xFF1F2623),
|
||||||
|
greenBackdrop = true
|
||||||
|
)
|
||||||
|
|
||||||
|
private val LavenderPalette = AppPalette(
|
||||||
|
accent = Color(0xFFC8B6FF),
|
||||||
|
action = Color(0xFFFFC6E5),
|
||||||
|
onAccent = Color(0xFF1E1630),
|
||||||
|
background = Color(0xFF0F0E14),
|
||||||
|
surface1 = Color(0xFF1A1822),
|
||||||
|
surface2 = Color(0xFF25222F)
|
||||||
|
)
|
||||||
|
|
||||||
|
private val PeachPalette = AppPalette(
|
||||||
|
accent = Color(0xFFFFB59E),
|
||||||
|
action = Color(0xFFFFE08A),
|
||||||
|
onAccent = Color(0xFF2A1710),
|
||||||
|
background = Color(0xFF12100E),
|
||||||
|
surface1 = Color(0xFF1D1A17),
|
||||||
|
surface2 = Color(0xFF28231F)
|
||||||
|
)
|
||||||
|
|
||||||
|
private val MintPalette = AppPalette(
|
||||||
|
accent = Color(0xFF9EE7C8),
|
||||||
|
action = Color(0xFFD8F5A8),
|
||||||
|
onAccent = Color(0xFF0F231B),
|
||||||
|
background = Color(0xFF0D110F),
|
||||||
|
surface1 = Color(0xFF171C1A),
|
||||||
|
surface2 = Color(0xFF202724)
|
||||||
|
)
|
||||||
|
|
||||||
|
private val SkyPalette = AppPalette(
|
||||||
|
accent = Color(0xFFA5CBFF),
|
||||||
|
action = Color(0xFFB8F1EE),
|
||||||
|
onAccent = Color(0xFF0F1A2A),
|
||||||
|
background = Color(0xFF0D1014),
|
||||||
|
surface1 = Color(0xFF171B21),
|
||||||
|
surface2 = Color(0xFF20252D)
|
||||||
|
)
|
||||||
|
|
||||||
|
/** The selected style, kept in compose state so every screen recolours at once. */
|
||||||
|
object AppThemeState {
|
||||||
|
private const val PREFS = "app_theme"
|
||||||
|
private const val KEY_STYLE = "style"
|
||||||
|
|
||||||
|
var style by mutableStateOf(AppStyle.MATEWAVE)
|
||||||
|
private set
|
||||||
|
|
||||||
|
var palette by mutableStateOf(MatewavePalette)
|
||||||
|
private set
|
||||||
|
|
||||||
|
/** Reads the saved style; call once before the first frame. */
|
||||||
|
fun load(context: Context) {
|
||||||
|
val saved = context.applicationContext
|
||||||
|
.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
|
||||||
|
.getString(KEY_STYLE, null)
|
||||||
|
val style = AppStyle.entries.firstOrNull { it.name == saved } ?: AppStyle.MATEWAVE
|
||||||
|
applyStyle(context, style)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun select(context: Context, style: AppStyle) {
|
||||||
|
context.applicationContext
|
||||||
|
.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
|
||||||
|
.edit().putString(KEY_STYLE, style.name).apply()
|
||||||
|
applyStyle(context, style)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun applyStyle(context: Context, requested: AppStyle) {
|
||||||
|
val style = if (requested == AppStyle.DEVICE && !AppStyle.deviceSupported) AppStyle.MATEWAVE else requested
|
||||||
|
this.style = style
|
||||||
|
palette = paletteFor(context, style)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Preview colours for the style picker. */
|
||||||
|
fun paletteFor(context: Context, style: AppStyle): AppPalette = when (style) {
|
||||||
|
AppStyle.MATEWAVE -> MatewavePalette
|
||||||
|
AppStyle.LAVENDER -> LavenderPalette
|
||||||
|
AppStyle.PEACH -> PeachPalette
|
||||||
|
AppStyle.MINT -> MintPalette
|
||||||
|
AppStyle.SKY -> SkyPalette
|
||||||
|
AppStyle.DEVICE -> devicePalette(context)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun devicePalette(context: Context): AppPalette {
|
||||||
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return MatewavePalette
|
||||||
|
val scheme = dynamicDarkColorScheme(context)
|
||||||
|
return AppPalette(
|
||||||
|
accent = scheme.primary,
|
||||||
|
action = scheme.tertiary,
|
||||||
|
onAccent = scheme.onPrimary,
|
||||||
|
background = scheme.background,
|
||||||
|
surface1 = scheme.surfaceContainer,
|
||||||
|
surface2 = scheme.surfaceContainerHigh
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,13 +8,15 @@ import androidx.compose.ui.graphics.Color
|
|||||||
import androidx.compose.ui.graphics.Shape
|
import androidx.compose.ui.graphics.Shape
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
|
|
||||||
val PanelFill = Surface1
|
val PanelFill: Color get() = Surface1
|
||||||
val PanelBorder = Color.White.copy(alpha = 0.06f)
|
val PanelBorder = Color.White.copy(alpha = 0.06f)
|
||||||
|
|
||||||
val UiCornerRadius = 22.dp
|
val UiCornerRadius = 22.dp
|
||||||
val GlassShape: Shape = RoundedCornerShape(UiCornerRadius)
|
val GlassShape: Shape = RoundedCornerShape(UiCornerRadius)
|
||||||
|
|
||||||
val TabletMaxContentWidth = 600.dp
|
val TabletMaxContentWidth = 600.dp
|
||||||
|
/** Landscape board screens: board and side panel together. */
|
||||||
|
val LandscapeMaxContentWidth = 1200.dp
|
||||||
|
|
||||||
fun Modifier.glass(): Modifier = this
|
fun Modifier.glass(): Modifier = this
|
||||||
.clip(GlassShape)
|
.clip(GlassShape)
|
||||||
@@ -22,4 +24,4 @@ fun Modifier.glass(): Modifier = this
|
|||||||
|
|
||||||
val DialogScrimColor = Color.Black.copy(alpha = 0.70f)
|
val DialogScrimColor = Color.Black.copy(alpha = 0.70f)
|
||||||
|
|
||||||
val FloatingBarFill = Surface2
|
val FloatingBarFill: Color get() = Surface2
|
||||||
|
|||||||
@@ -15,35 +15,27 @@ import androidx.compose.ui.text.font.FontWeight
|
|||||||
import cc.skysparkle.matewave.R
|
import cc.skysparkle.matewave.R
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
|
|
||||||
/** Neon green: the brand accent for highlights, selected states and progress. */
|
// The interface colours follow the selected style (see AppPalette); reading them in
|
||||||
val ChessGreen = Color(0xFF35E07E)
|
// composition subscribes the screen, so a new style recolours everything at once.
|
||||||
val ChessGreenDark = Color(0xFF123D25)
|
|
||||||
|
|
||||||
/** Lime: the one colour for the main action on a screen. */
|
/** Accent: highlights, selected states and progress. Neon green in the original style. */
|
||||||
val Lime = Color(0xFFE3F84B)
|
val ChessGreen: Color get() = AppThemeState.palette.accent
|
||||||
|
|
||||||
|
/** The one colour for the main action on a screen. Lime in the original style. */
|
||||||
|
val Lime: Color get() = AppThemeState.palette.action
|
||||||
|
|
||||||
/** Text and icons on top of [ChessGreen] or [Lime]. */
|
/** Text and icons on top of [ChessGreen] or [Lime]. */
|
||||||
val OnAccent = Color(0xFF0B1610)
|
val OnAccent: Color get() = AppThemeState.palette.onAccent
|
||||||
|
|
||||||
val AppBackground = Color(0xFF0C0F0E)
|
val AppBackground: Color get() = AppThemeState.palette.background
|
||||||
val Surface1 = Color(0xFF161B19)
|
val Surface1: Color get() = AppThemeState.palette.surface1
|
||||||
val Surface2 = Color(0xFF1F2623)
|
val Surface2: Color get() = AppThemeState.palette.surface2
|
||||||
|
|
||||||
val HighlightMove = Color(0x8858A6FF)
|
val HighlightMove = Color(0x8858A6FF)
|
||||||
val HighlightCheck = Color(0x88E53935)
|
val HighlightCheck = Color(0x88E53935)
|
||||||
val HighlightLastMove = Color(0x664FC3F7)
|
val HighlightLastMove = Color(0x664FC3F7)
|
||||||
val HighlightHint = Color(0x88FFC107)
|
val HighlightHint = Color(0x88FFC107)
|
||||||
|
|
||||||
private val DarkScheme = darkColorScheme(
|
|
||||||
primary = ChessGreen,
|
|
||||||
onPrimary = OnAccent,
|
|
||||||
secondary = Lime,
|
|
||||||
onSecondary = OnAccent,
|
|
||||||
background = AppBackground,
|
|
||||||
surface = Surface1,
|
|
||||||
surfaceVariant = Surface2
|
|
||||||
)
|
|
||||||
|
|
||||||
/** Wide display face for the big headings: the brand voice of the app. */
|
/** Wide display face for the big headings: the brand voice of the app. */
|
||||||
val DisplayFont = FontFamily(
|
val DisplayFont = FontFamily(
|
||||||
Font(R.font.unbounded_semibold, FontWeight.SemiBold),
|
Font(R.font.unbounded_semibold, FontWeight.SemiBold),
|
||||||
@@ -95,7 +87,16 @@ val HeroTextStyle = TextStyle(
|
|||||||
/** The app has a single dark theme; system bars are set up in MainActivity. */
|
/** The app has a single dark theme; system bars are set up in MainActivity. */
|
||||||
@Composable
|
@Composable
|
||||||
fun MatewaveTheme(content: @Composable () -> Unit) {
|
fun MatewaveTheme(content: @Composable () -> Unit) {
|
||||||
MaterialTheme(colorScheme = DarkScheme, typography = AppTypography) {
|
val scheme = darkColorScheme(
|
||||||
|
primary = ChessGreen,
|
||||||
|
onPrimary = OnAccent,
|
||||||
|
secondary = Lime,
|
||||||
|
onSecondary = OnAccent,
|
||||||
|
background = AppBackground,
|
||||||
|
surface = Surface1,
|
||||||
|
surfaceVariant = Surface2
|
||||||
|
)
|
||||||
|
MaterialTheme(colorScheme = scheme, typography = AppTypography) {
|
||||||
// Text and icons without their own colour are light, so nothing turns black on the dark background
|
// Text and icons without their own colour are light, so nothing turns black on the dark background
|
||||||
CompositionLocalProvider(LocalContentColor provides Color.White, content = content)
|
CompositionLocalProvider(LocalContentColor provides Color.White, content = content)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import cc.skysparkle.matewave.network.ConnectionTransport
|
|||||||
import cc.skysparkle.matewave.network.GameMessage
|
import cc.skysparkle.matewave.network.GameMessage
|
||||||
import cc.skysparkle.matewave.network.NetworkLog
|
import cc.skysparkle.matewave.network.NetworkLog
|
||||||
import cc.skysparkle.matewave.network.NetworkMetrics
|
import cc.skysparkle.matewave.network.NetworkMetrics
|
||||||
|
import cc.skysparkle.matewave.network.PeerLimits
|
||||||
import cc.skysparkle.matewave.network.TransportType
|
import cc.skysparkle.matewave.network.TransportType
|
||||||
import cc.skysparkle.matewave.puzzles.Puzzle
|
import cc.skysparkle.matewave.puzzles.Puzzle
|
||||||
import cc.skysparkle.matewave.security.DeviceKeys
|
import cc.skysparkle.matewave.security.DeviceKeys
|
||||||
@@ -43,6 +44,7 @@ import cc.skysparkle.matewave.spectate.SpectatorResult
|
|||||||
import cc.skysparkle.matewave.spectate.SpectatorResults
|
import cc.skysparkle.matewave.spectate.SpectatorResults
|
||||||
import cc.skysparkle.matewave.spectate.SpectatorSnapshot
|
import cc.skysparkle.matewave.spectate.SpectatorSnapshot
|
||||||
import cc.skysparkle.matewave.stats.Stats
|
import cc.skysparkle.matewave.stats.Stats
|
||||||
|
import cc.skysparkle.matewave.ui.components.isAcceptableIncomingImage
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
@@ -185,8 +187,10 @@ class GameViewModel : ViewModel() {
|
|||||||
private var sessionGeneration = 0
|
private var sessionGeneration = 0
|
||||||
private var networkGameId: String = ""
|
private var networkGameId: String = ""
|
||||||
private var pendingOpponentImages: Pair<String?, String?>? = null
|
private var pendingOpponentImages: Pair<String?, String?>? = null
|
||||||
|
|
||||||
|
// The player picked in the nearby list; whoever answers must be that player.
|
||||||
|
private var expectedOpponentUserId: String? = null
|
||||||
private var currentPly: Int = 0
|
private var currentPly: Int = 0
|
||||||
private var lastOpponentRemaining: Long = Long.MAX_VALUE
|
|
||||||
|
|
||||||
// Spectating: the host serves spectators, both players announce the game's tag.
|
// Spectating: the host serves spectators, both players announce the game's tag.
|
||||||
private var spectators: SpectatorBroadcaster? = null
|
private var spectators: SpectatorBroadcaster? = null
|
||||||
@@ -711,7 +715,8 @@ class GameViewModel : ViewModel() {
|
|||||||
myColor: PieceColor,
|
myColor: PieceColor,
|
||||||
timeControl: TimeControl,
|
timeControl: TimeControl,
|
||||||
isHost: Boolean,
|
isHost: Boolean,
|
||||||
targetId: String? = null
|
targetId: String? = null,
|
||||||
|
expectedUserId: String? = null
|
||||||
) {
|
) {
|
||||||
pendingLeave?.let { (job, oldTransport) ->
|
pendingLeave?.let { (job, oldTransport) ->
|
||||||
job.cancel()
|
job.cancel()
|
||||||
@@ -730,6 +735,7 @@ class GameViewModel : ViewModel() {
|
|||||||
this.transport = transport
|
this.transport = transport
|
||||||
lastNetworkTimeControl = timeControl
|
lastNetworkTimeControl = timeControl
|
||||||
isNetworkHost = isHost
|
isNetworkHost = isHost
|
||||||
|
expectedOpponentUserId = expectedUserId?.takeIf { it.isNotBlank() }
|
||||||
|
|
||||||
ephemeralKeys = DeviceKeys.generateEphemeral()
|
ephemeralKeys = DeviceKeys.generateEphemeral()
|
||||||
|
|
||||||
@@ -739,7 +745,6 @@ class GameViewModel : ViewModel() {
|
|||||||
opponentFlagJob = null
|
opponentFlagJob = null
|
||||||
networkGameId = if (isHost) java.util.UUID.randomUUID().toString() else ""
|
networkGameId = if (isHost) java.util.UUID.randomUUID().toString() else ""
|
||||||
currentPly = 0
|
currentPly = 0
|
||||||
lastOpponentRemaining = Long.MAX_VALUE
|
|
||||||
|
|
||||||
_clockState.value = null
|
_clockState.value = null
|
||||||
_uiState.value = GameUiState(
|
_uiState.value = GameUiState(
|
||||||
@@ -848,6 +853,13 @@ class GameViewModel : ViewModel() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The image if it may be shown and stored, otherwise null (and a log line). */
|
||||||
|
private fun acceptedIncomingImage(base64: String): String? {
|
||||||
|
if (base64.length <= MAX_CHAT_IMAGE_CHARS && isAcceptableIncomingImage(base64)) return base64
|
||||||
|
NetworkLog.log("GAME", "Unreadable or oversized profile image rejected")
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
private fun belongsToCurrentGame(gameId: String): Boolean =
|
private fun belongsToCurrentGame(gameId: String): Boolean =
|
||||||
gameId.isEmpty() || networkGameId.isEmpty() || gameId == networkGameId
|
gameId.isEmpty() || networkGameId.isEmpty() || gameId == networkGameId
|
||||||
|
|
||||||
@@ -901,9 +913,14 @@ class GameViewModel : ViewModel() {
|
|||||||
NetworkLog.log("GAME", "Oversized chat message rejected")
|
NetworkLog.log("GAME", "Oversized chat message rejected")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if (msg.imageBase64 != null && !isAcceptableIncomingImage(msg.imageBase64)) {
|
||||||
|
NetworkLog.log("GAME", "Unreadable or oversized chat image rejected")
|
||||||
|
return
|
||||||
|
}
|
||||||
val state = _uiState.value
|
val state = _uiState.value
|
||||||
_uiState.value = state.copy(
|
_uiState.value = state.copy(
|
||||||
chatMessages = state.chatMessages + ChatEntry(msg.text, msg.imageBase64, fromMe = false),
|
chatMessages = (state.chatMessages + ChatEntry(msg.text, msg.imageBase64, fromMe = false))
|
||||||
|
.takeLast(MAX_CHAT_ENTRIES),
|
||||||
unreadChatCount = state.unreadChatCount + 1
|
unreadChatCount = state.unreadChatCount + 1
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -976,8 +993,8 @@ class GameViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
is GameMessage.ProfileImagesMsg -> {
|
is GameMessage.ProfileImagesMsg -> {
|
||||||
if (!belongsToCurrentGame(msg.gameId)) return
|
if (!belongsToCurrentGame(msg.gameId)) return
|
||||||
val avatar = msg.avatarBase64?.takeIf { it.length <= MAX_CHAT_IMAGE_CHARS }
|
val avatar = msg.avatarBase64?.let(::acceptedIncomingImage)
|
||||||
val background = msg.backgroundBase64?.takeIf { it.length <= MAX_CHAT_IMAGE_CHARS }
|
val background = msg.backgroundBase64?.let(::acceptedIncomingImage)
|
||||||
if (avatar == null && background == null) return
|
if (avatar == null && background == null) return
|
||||||
val current = _uiState.value.opponentProfile
|
val current = _uiState.value.opponentProfile
|
||||||
if (current == null) {
|
if (current == null) {
|
||||||
@@ -1051,17 +1068,17 @@ class GameViewModel : ViewModel() {
|
|||||||
|
|
||||||
val limit = lastNetworkTimeControl?.let { it.initialSeconds * 1000L + 60_000L }
|
val limit = lastNetworkTimeControl?.let { it.initialSeconds * 1000L + 60_000L }
|
||||||
val increment = lastNetworkTimeControl?.let { it.incrementSeconds * 1000L } ?: 0L
|
val increment = lastNetworkTimeControl?.let { it.incrementSeconds * 1000L } ?: 0L
|
||||||
val allowedMax = if (lastOpponentRemaining == Long.MAX_VALUE) {
|
// Our own clock has been running the opponent's time while they thought, so their claim
|
||||||
limit ?: Long.MAX_VALUE
|
// may not exceed it by more than the increment and network slack.
|
||||||
} else {
|
val allowedMax = clock?.remainingMillis(opponentColor)
|
||||||
lastOpponentRemaining + increment + CLOCK_TOLERANCE_MS
|
?.let { PeerLimits.maxOpponentClockAfterMove(it, increment, CLOCK_TOLERANCE_MS) }
|
||||||
}
|
?: limit ?: Long.MAX_VALUE
|
||||||
if (msg.remainingMillisSelf >= 0 &&
|
if (msg.remainingMillisSelf >= 0 &&
|
||||||
(limit == null || msg.remainingMillisSelf <= limit) &&
|
(limit == null || msg.remainingMillisSelf <= limit) &&
|
||||||
msg.remainingMillisSelf <= allowedMax
|
msg.remainingMillisSelf <= allowedMax
|
||||||
) {
|
) {
|
||||||
lastOpponentRemaining = msg.remainingMillisSelf
|
// The reported time already includes the increment; makeMove below adds it again.
|
||||||
clock?.applyRemoteTime(opponentColor, msg.remainingMillisSelf)
|
clock?.applyRemoteTime(opponentColor, (msg.remainingMillisSelf - increment).coerceAtLeast(0))
|
||||||
} else if (msg.remainingMillisSelf > 0) {
|
} else if (msg.remainingMillisSelf > 0) {
|
||||||
NetworkLog.log("GAME", "Invalid clock value from opponent rejected: ${msg.remainingMillisSelf}")
|
NetworkLog.log("GAME", "Invalid clock value from opponent rejected: ${msg.remainingMillisSelf}")
|
||||||
}
|
}
|
||||||
@@ -1077,6 +1094,12 @@ class GameViewModel : ViewModel() {
|
|||||||
NetworkLog.log("GAME", "Repeated profile in current session ignored")
|
NetworkLog.log("GAME", "Repeated profile in current session ignored")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if (!PeerLimits.isPlausibleProfile(msg)) {
|
||||||
|
// Nothing of it is stored: no key, no friend entry. The connection is closed.
|
||||||
|
NetworkLog.log("GAME", "Profile with out-of-range fields rejected, disconnecting")
|
||||||
|
transport?.disconnect()
|
||||||
|
return
|
||||||
|
}
|
||||||
val peers = knownPeers
|
val peers = knownPeers
|
||||||
if (peers == null) {
|
if (peers == null) {
|
||||||
NetworkLog.log("GAME", "Key store not ready, profile rejected")
|
NetworkLog.log("GAME", "Key store not ready, profile rejected")
|
||||||
@@ -1125,7 +1148,11 @@ class GameViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
markReadyIfPossible()
|
markReadyIfPossible()
|
||||||
|
|
||||||
_uiState.value = _uiState.value.copy(opponentUnverified = trust == TrustResult.UNSIGNED)
|
val unexpected = expectedOpponentUserId?.let { it != msg.userId } == true
|
||||||
|
if (unexpected) {
|
||||||
|
NetworkLog.log("GAME", "Opponent is not the player picked in the nearby list")
|
||||||
|
}
|
||||||
|
_uiState.value = _uiState.value.copy(opponentUnverified = trust == TrustResult.UNSIGNED || unexpected)
|
||||||
|
|
||||||
val pending = pendingOpponentImages
|
val pending = pendingOpponentImages
|
||||||
pendingOpponentImages = null
|
pendingOpponentImages = null
|
||||||
@@ -1133,8 +1160,8 @@ class GameViewModel : ViewModel() {
|
|||||||
userId = msg.userId,
|
userId = msg.userId,
|
||||||
name = msg.name,
|
name = msg.name,
|
||||||
elo = msg.elo,
|
elo = msg.elo,
|
||||||
avatarBase64 = msg.avatarBase64 ?: pending?.first,
|
avatarBase64 = msg.avatarBase64?.let(::acceptedIncomingImage) ?: pending?.first,
|
||||||
backgroundBase64 = msg.backgroundBase64 ?: pending?.second
|
backgroundBase64 = msg.backgroundBase64?.let(::acceptedIncomingImage) ?: pending?.second
|
||||||
)
|
)
|
||||||
_uiState.value = _uiState.value.copy(
|
_uiState.value = _uiState.value.copy(
|
||||||
opponentProfile = Profile(
|
opponentProfile = Profile(
|
||||||
@@ -1240,7 +1267,6 @@ class GameViewModel : ViewModel() {
|
|||||||
opponentFlagJob?.cancel()
|
opponentFlagJob?.cancel()
|
||||||
opponentFlagJob = null
|
opponentFlagJob = null
|
||||||
currentPly = 0
|
currentPly = 0
|
||||||
lastOpponentRemaining = Long.MAX_VALUE
|
|
||||||
val start = Board.startPosition()
|
val start = Board.startPosition()
|
||||||
resetHistory(start)
|
resetHistory(start)
|
||||||
|
|
||||||
@@ -1349,7 +1375,8 @@ class GameViewModel : ViewModel() {
|
|||||||
val trimmed = text.trim().take(MAX_CHAT_TEXT_CHARS)
|
val trimmed = text.trim().take(MAX_CHAT_TEXT_CHARS)
|
||||||
if (!sendGameMessage(GameMessage.ChatMsg(text = trimmed, gameId = networkGameId))) return
|
if (!sendGameMessage(GameMessage.ChatMsg(text = trimmed, gameId = networkGameId))) return
|
||||||
_uiState.value = _uiState.value.copy(
|
_uiState.value = _uiState.value.copy(
|
||||||
chatMessages = _uiState.value.chatMessages + ChatEntry(trimmed, null, fromMe = true)
|
chatMessages = (_uiState.value.chatMessages + ChatEntry(trimmed, null, fromMe = true))
|
||||||
|
.takeLast(MAX_CHAT_ENTRIES)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1362,7 +1389,8 @@ class GameViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
if (!sendGameMessage(GameMessage.ChatMsg(imageBase64 = base64, gameId = networkGameId))) return
|
if (!sendGameMessage(GameMessage.ChatMsg(imageBase64 = base64, gameId = networkGameId))) return
|
||||||
_uiState.value = _uiState.value.copy(
|
_uiState.value = _uiState.value.copy(
|
||||||
chatMessages = _uiState.value.chatMessages + ChatEntry(null, base64, fromMe = true)
|
chatMessages = (_uiState.value.chatMessages + ChatEntry(null, base64, fromMe = true))
|
||||||
|
.takeLast(MAX_CHAT_ENTRIES)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1400,7 +1428,10 @@ class GameViewModel : ViewModel() {
|
|||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
var serving = false
|
var serving = false
|
||||||
try {
|
try {
|
||||||
val port = withContext(Dispatchers.IO) { runCatching { hub.start() }.getOrNull() }
|
// Spectators come over Wi-Fi; other interfaces (mobile data) are not listened on.
|
||||||
|
val port = withContext(Dispatchers.IO) {
|
||||||
|
runCatching { hub.start(cc.skysparkle.matewave.share.LocalNetwork.wifiInet4()) }.getOrNull()
|
||||||
|
}
|
||||||
if (port == null) NetworkLog.log("SPECTATE", "Could not open the spectator port")
|
if (port == null) NetworkLog.log("SPECTATE", "Could not open the spectator port")
|
||||||
// The game may have ended while the port was opening.
|
// The game may have ended while the port was opening.
|
||||||
if (port == null || generation != sessionGeneration || !spectatingDecided || spectateTag.isEmpty()) return@launch
|
if (port == null || generation != sessionGeneration || !spectatingDecided || spectateTag.isEmpty()) return@launch
|
||||||
@@ -1589,6 +1620,7 @@ class GameViewModel : ViewModel() {
|
|||||||
const val MAX_CHAT_TEXT_CHARS = 8_000
|
const val MAX_CHAT_TEXT_CHARS = 8_000
|
||||||
const val MAX_CHAT_IMAGE_CHARS = 400_000
|
const val MAX_CHAT_IMAGE_CHARS = 400_000
|
||||||
const val CLOCK_TOLERANCE_MS = 2_000L
|
const val CLOCK_TOLERANCE_MS = 2_000L
|
||||||
|
const val MAX_CHAT_ENTRIES = 200
|
||||||
const val HANDSHAKE_TIMEOUT_MS = 20_000L
|
const val HANDSHAKE_TIMEOUT_MS = 20_000L
|
||||||
const val OPPONENT_FLAG_GRACE_MS = 4_000L
|
const val OPPONENT_FLAG_GRACE_MS = 4_000L
|
||||||
const val LEAVE_FLUSH_MS = 700L
|
const val LEAVE_FLUSH_MS = 700L
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -7,13 +7,11 @@
|
|||||||
<string name="greeting_night">Gute Nacht</string>
|
<string name="greeting_night">Gute Nacht</string>
|
||||||
<string name="continue_game_title">Partie fortsetzen</string>
|
<string name="continue_game_title">Partie fortsetzen</string>
|
||||||
<string name="quick_game_title">Schnelles Spiel</string>
|
<string name="quick_game_title">Schnelles Spiel</string>
|
||||||
<string name="quick_game_subtitle">Wie beim letzten Mal: %1$s · %2$s</string>
|
|
||||||
<string name="mode_ai_title">Gegen die KI</string>
|
<string name="mode_ai_title">Gegen die KI</string>
|
||||||
<string name="mode_ai_subtitle">Schwierigkeit wählen</string>
|
<string name="mode_ai_subtitle">Schwierigkeit wählen</string>
|
||||||
<string name="mode_online_title">Mit einem Freund</string>
|
<string name="mode_online_title">Mit einem Freund</string>
|
||||||
<string name="mode_online_subtitle">Per Bluetooth oder WLAN in der Nähe</string>
|
<string name="mode_online_subtitle">Per Bluetooth oder WLAN in der Nähe</string>
|
||||||
<string name="puzzles_title">Schachaufgaben</string>
|
<string name="puzzles_title">Schachaufgaben</string>
|
||||||
<string name="puzzles_subtitle">Aufgaben passend zu deiner Wertung</string>
|
|
||||||
<string name="stats_dialog_title">Statistik</string>
|
<string name="stats_dialog_title">Statistik</string>
|
||||||
<string name="stats_dialog_summary">%1$d Siege · %2$d%% · Serie: %3$d</string>
|
<string name="stats_dialog_summary">%1$d Siege · %2$d%% · Serie: %3$d</string>
|
||||||
<string name="stats_min">Min.: %1$d</string>
|
<string name="stats_min">Min.: %1$d</string>
|
||||||
@@ -113,8 +111,16 @@
|
|||||||
<string name="rating_gate_text">Die Wertung wird gebraucht, um einen passenden Gegner zu wählen und dich anderen Spielern zu zeigen. Es dauert nur ein paar Sekunden.</string>
|
<string name="rating_gate_text">Die Wertung wird gebraucht, um einen passenden Gegner zu wählen und dich anderen Spielern zu zeigen. Es dauert nur ein paar Sekunden.</string>
|
||||||
<string name="rating_gate_open">Niveau angeben</string>
|
<string name="rating_gate_open">Niveau angeben</string>
|
||||||
<string name="about_section">Über die App</string>
|
<string name="about_section">Über die App</string>
|
||||||
<string name="appearance_title">Aussehen des Bretts</string>
|
<string name="appearance_title">Darstellung</string>
|
||||||
<string name="appearance_subtitle">Brettfarben, Koordinaten, Figurenstil</string>
|
<string name="appearance_subtitle">App-Farben, Brett, Figuren</string>
|
||||||
|
<string name="app_style_title">App-Farben</string>
|
||||||
|
<string name="app_style_matewave">Matewave</string>
|
||||||
|
<string name="app_style_lavender">Lavendel</string>
|
||||||
|
<string name="app_style_peach">Pfirsich</string>
|
||||||
|
<string name="app_style_mint">Minze</string>
|
||||||
|
<string name="app_style_sky">Himmel</string>
|
||||||
|
<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_board_theme">Brettfarben</string>
|
||||||
<string name="appearance_coordinates">Buchstaben und Zahlen auf dem Brett</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_coordinates_hint">Feldbeschriftung an den Rändern: a–h und 1–8</string>
|
||||||
@@ -128,7 +134,6 @@
|
|||||||
<string name="account_forget_keys_confirm">Du kannst einen bekannten Gegner dann nicht mehr von jemandem unterscheiden, der seinen Namen benutzt, bis ihr euch erneut trefft. Nötig, wenn der Gegner die App neu installiert hat.</string>
|
<string name="account_forget_keys_confirm">Du kannst einen bekannten Gegner dann nicht mehr von jemandem unterscheiden, der seinen Namen benutzt, bis ihr euch erneut trefft. Nötig, wenn der Gegner die App neu installiert hat.</string>
|
||||||
<string name="account_confirm">Vergessen</string>
|
<string name="account_confirm">Vergessen</string>
|
||||||
<string name="account_cancel">Abbrechen</string>
|
<string name="account_cancel">Abbrechen</string>
|
||||||
<string name="greeting_ready">Bereit für eine neue Partie?</string>
|
|
||||||
<string name="account_trusted_keys_hint">Werden beim ersten Treffen mit einem neuen Spieler automatisch gespeichert</string>
|
<string name="account_trusted_keys_hint">Werden beim ersten Treffen mit einem neuen Spieler automatisch gespeichert</string>
|
||||||
<string name="account_fingerprint_explain">Eindeutiger Fingerabdruck des Schlüssels dieses Geräts. Dein Gegner kann ihn beim ersten Treffen mit deinem vergleichen.</string>
|
<string name="account_fingerprint_explain">Eindeutiger Fingerabdruck des Schlüssels dieses Geräts. Dein Gegner kann ihn beim ersten Treffen mit deinem vergleichen.</string>
|
||||||
<string name="friends_online">Online</string>
|
<string name="friends_online">Online</string>
|
||||||
@@ -323,7 +328,6 @@
|
|||||||
<string name="settings_section_system">System</string>
|
<string name="settings_section_system">System</string>
|
||||||
<string name="permissions_card_ok_short">Alles bereit</string>
|
<string name="permissions_card_ok_short">Alles bereit</string>
|
||||||
<string name="permissions_card_blocked_short">Aktion nötig</string>
|
<string name="permissions_card_blocked_short">Aktion nötig</string>
|
||||||
<string name="account_header_summary">Wertung %1$d · Partien: %2$d</string>
|
|
||||||
<string name="account_progress">Fortschritt</string>
|
<string name="account_progress">Fortschritt</string>
|
||||||
<string name="account_rating_row">Wertung</string>
|
<string name="account_rating_row">Wertung</string>
|
||||||
<string name="account_device_key">Geräteschlüssel</string>
|
<string name="account_device_key">Geräteschlüssel</string>
|
||||||
@@ -371,4 +375,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_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_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="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>
|
</resources>
|
||||||
|
|||||||
@@ -7,13 +7,11 @@
|
|||||||
<string name="greeting_night">おやすみなさい</string>
|
<string name="greeting_night">おやすみなさい</string>
|
||||||
<string name="continue_game_title">対局を続ける</string>
|
<string name="continue_game_title">対局を続ける</string>
|
||||||
<string name="quick_game_title">クイックゲーム</string>
|
<string name="quick_game_title">クイックゲーム</string>
|
||||||
<string name="quick_game_subtitle">前回と同じ:%1$s・%2$s</string>
|
|
||||||
<string name="mode_ai_title">AIと対戦</string>
|
<string name="mode_ai_title">AIと対戦</string>
|
||||||
<string name="mode_ai_subtitle">難易度を選択</string>
|
<string name="mode_ai_subtitle">難易度を選択</string>
|
||||||
<string name="mode_online_title">友達と対戦</string>
|
<string name="mode_online_title">友達と対戦</string>
|
||||||
<string name="mode_online_subtitle">近くでBluetoothまたはWi-Fiで</string>
|
<string name="mode_online_subtitle">近くでBluetoothまたはWi-Fiで</string>
|
||||||
<string name="puzzles_title">チェスパズル</string>
|
<string name="puzzles_title">チェスパズル</string>
|
||||||
<string name="puzzles_subtitle">あなたのレーティングに合った問題</string>
|
|
||||||
<string name="stats_dialog_title">成績</string>
|
<string name="stats_dialog_title">成績</string>
|
||||||
<string name="stats_dialog_summary">%1$d勝 · %2$d%% · 連勝: %3$d</string>
|
<string name="stats_dialog_summary">%1$d勝 · %2$d%% · 連勝: %3$d</string>
|
||||||
<string name="stats_min">最小: %1$d</string>
|
<string name="stats_min">最小: %1$d</string>
|
||||||
@@ -113,8 +111,16 @@
|
|||||||
<string name="rating_gate_text">レーティングは、適切な相手の選択と他のプレイヤーへの表示に必要です。数秒で完了します。</string>
|
<string name="rating_gate_text">レーティングは、適切な相手の選択と他のプレイヤーへの表示に必要です。数秒で完了します。</string>
|
||||||
<string name="rating_gate_open">レベルを指定</string>
|
<string name="rating_gate_open">レベルを指定</string>
|
||||||
<string name="about_section">このアプリについて</string>
|
<string name="about_section">このアプリについて</string>
|
||||||
<string name="appearance_title">盤の見た目</string>
|
<string name="appearance_title">外観</string>
|
||||||
<string name="appearance_subtitle">盤の色、座標、駒のスタイル</string>
|
<string name="appearance_subtitle">アプリの色、盤、駒</string>
|
||||||
|
<string name="app_style_title">アプリの色</string>
|
||||||
|
<string name="app_style_matewave">Matewave</string>
|
||||||
|
<string name="app_style_lavender">ラベンダー</string>
|
||||||
|
<string name="app_style_peach">ピーチ</string>
|
||||||
|
<string name="app_style_mint">ミント</string>
|
||||||
|
<string name="app_style_sky">スカイ</string>
|
||||||
|
<string name="app_style_device">端末</string>
|
||||||
|
<string name="app_style_device_hint">色は壁紙から取得され(Material You)、壁紙に合わせて変わります。</string>
|
||||||
<string name="appearance_board_theme">盤の色</string>
|
<string name="appearance_board_theme">盤の色</string>
|
||||||
<string name="appearance_coordinates">盤上の文字と数字</string>
|
<string name="appearance_coordinates">盤上の文字と数字</string>
|
||||||
<string name="appearance_coordinates_hint">盤の端のマス目ラベル: a〜h と 1〜8</string>
|
<string name="appearance_coordinates_hint">盤の端のマス目ラベル: a〜h と 1〜8</string>
|
||||||
@@ -128,7 +134,6 @@
|
|||||||
<string name="account_forget_keys_confirm">再び会うまで、知っている相手とその名前を名乗る人を区別できなくなります。相手がアプリを再インストールした場合に必要です。</string>
|
<string name="account_forget_keys_confirm">再び会うまで、知っている相手とその名前を名乗る人を区別できなくなります。相手がアプリを再インストールした場合に必要です。</string>
|
||||||
<string name="account_confirm">忘れる</string>
|
<string name="account_confirm">忘れる</string>
|
||||||
<string name="account_cancel">キャンセル</string>
|
<string name="account_cancel">キャンセル</string>
|
||||||
<string name="greeting_ready">新しい対局の準備はできましたか?</string>
|
|
||||||
<string name="account_trusted_keys_hint">新しいプレイヤーと初めて会ったときに自動で保存されます</string>
|
<string name="account_trusted_keys_hint">新しいプレイヤーと初めて会ったときに自動で保存されます</string>
|
||||||
<string name="account_fingerprint_explain">この端末の鍵の固有のフィンガープリントです。初めて会ったとき、相手があなたのものと照合できます。</string>
|
<string name="account_fingerprint_explain">この端末の鍵の固有のフィンガープリントです。初めて会ったとき、相手があなたのものと照合できます。</string>
|
||||||
<string name="friends_online">オンライン</string>
|
<string name="friends_online">オンライン</string>
|
||||||
@@ -322,7 +327,6 @@
|
|||||||
<string name="settings_section_system">システム</string>
|
<string name="settings_section_system">システム</string>
|
||||||
<string name="permissions_card_ok_short">準備完了</string>
|
<string name="permissions_card_ok_short">準備完了</string>
|
||||||
<string name="permissions_card_blocked_short">要対応</string>
|
<string name="permissions_card_blocked_short">要対応</string>
|
||||||
<string name="account_header_summary">レーティング %1$d · 対局: %2$d</string>
|
|
||||||
<string name="account_progress">進捗</string>
|
<string name="account_progress">進捗</string>
|
||||||
<string name="account_rating_row">レーティング</string>
|
<string name="account_rating_row">レーティング</string>
|
||||||
<string name="account_device_key">端末の鍵</string>
|
<string name="account_device_key">端末の鍵</string>
|
||||||
@@ -370,4 +374,23 @@
|
|||||||
<string name="spectate_unreachable">対局をホストしている端末に接続できません。同じWi-Fiネットワークに接続しているか確認してください。</string>
|
<string name="spectate_unreachable">対局をホストしている端末に接続できません。同じWi-Fiネットワークに接続しているか確認してください。</string>
|
||||||
<string name="spectate_left_win">%1$sが対局から退出しました。%2$sの勝ち</string>
|
<string name="spectate_left_win">%1$sが対局から退出しました。%2$sの勝ち</string>
|
||||||
<string name="spectate_interrupted">対局が中断されました。プレイヤー間の接続が切れました。</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>
|
</resources>
|
||||||
|
|||||||
@@ -7,13 +7,11 @@
|
|||||||
<string name="greeting_night">Labos nakties</string>
|
<string name="greeting_night">Labos nakties</string>
|
||||||
<string name="continue_game_title">Tęsti partiją</string>
|
<string name="continue_game_title">Tęsti partiją</string>
|
||||||
<string name="quick_game_title">Greitas žaidimas</string>
|
<string name="quick_game_title">Greitas žaidimas</string>
|
||||||
<string name="quick_game_subtitle">Kaip praėjusį kartą: %1$s · %2$s</string>
|
|
||||||
<string name="mode_ai_title">Prieš DI</string>
|
<string name="mode_ai_title">Prieš DI</string>
|
||||||
<string name="mode_ai_subtitle">Pasirinkite sudėtingumą</string>
|
<string name="mode_ai_subtitle">Pasirinkite sudėtingumą</string>
|
||||||
<string name="mode_online_title">Su draugu</string>
|
<string name="mode_online_title">Su draugu</string>
|
||||||
<string name="mode_online_subtitle">Per „Bluetooth“ arba „Wi-Fi“ netoliese</string>
|
<string name="mode_online_subtitle">Per „Bluetooth“ arba „Wi-Fi“ netoliese</string>
|
||||||
<string name="puzzles_title">Šachmatų galvosūkiai</string>
|
<string name="puzzles_title">Šachmatų galvosūkiai</string>
|
||||||
<string name="puzzles_subtitle">Užduotys pagal jūsų reitingą</string>
|
|
||||||
<string name="stats_dialog_title">Statistika</string>
|
<string name="stats_dialog_title">Statistika</string>
|
||||||
<string name="stats_dialog_summary">%1$d pergalių · %2$d%% · serija: %3$d</string>
|
<string name="stats_dialog_summary">%1$d pergalių · %2$d%% · serija: %3$d</string>
|
||||||
<string name="stats_min">Min.: %1$d</string>
|
<string name="stats_min">Min.: %1$d</string>
|
||||||
@@ -113,8 +111,16 @@
|
|||||||
<string name="rating_gate_text">Reitingas reikalingas tinkamam varžovui parinkti ir kitiems žaidėjams jus parodyti. Tai užtrunka porą sekundžių.</string>
|
<string name="rating_gate_text">Reitingas reikalingas tinkamam varžovui parinkti ir kitiems žaidėjams jus parodyti. Tai užtrunka porą sekundžių.</string>
|
||||||
<string name="rating_gate_open">Nurodyti lygį</string>
|
<string name="rating_gate_open">Nurodyti lygį</string>
|
||||||
<string name="about_section">Apie programą</string>
|
<string name="about_section">Apie programą</string>
|
||||||
<string name="appearance_title">Lentos išvaizda</string>
|
<string name="appearance_title">Išvaizda</string>
|
||||||
<string name="appearance_subtitle">Lentos spalvos, koordinatės, figūrų stilius</string>
|
<string name="appearance_subtitle">Programėlės spalvos, lenta, figūros</string>
|
||||||
|
<string name="app_style_title">Programėlės spalvos</string>
|
||||||
|
<string name="app_style_matewave">Matewave</string>
|
||||||
|
<string name="app_style_lavender">Levanda</string>
|
||||||
|
<string name="app_style_peach">Persikas</string>
|
||||||
|
<string name="app_style_mint">Mėta</string>
|
||||||
|
<string name="app_style_sky">Dangus</string>
|
||||||
|
<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_board_theme">Lentos spalvos</string>
|
||||||
<string name="appearance_coordinates">Raidės ir skaičiai ant lentos</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_coordinates_hint">Langelių žymos pakraščiuose: a–h ir 1–8</string>
|
||||||
@@ -128,7 +134,6 @@
|
|||||||
<string name="account_forget_keys_confirm">Nebegalėsite atskirti pažįstamo varžovo nuo to, kas naudoja jo vardą, kol vėl nesusitiksite. Reikia, jei varžovas iš naujo įdiegė programą.</string>
|
<string name="account_forget_keys_confirm">Nebegalėsite atskirti pažįstamo varžovo nuo to, kas naudoja jo vardą, kol vėl nesusitiksite. Reikia, jei varžovas iš naujo įdiegė programą.</string>
|
||||||
<string name="account_confirm">Pamiršti</string>
|
<string name="account_confirm">Pamiršti</string>
|
||||||
<string name="account_cancel">Atšaukti</string>
|
<string name="account_cancel">Atšaukti</string>
|
||||||
<string name="greeting_ready">Pasiruošę naujai partijai?</string>
|
|
||||||
<string name="account_trusted_keys_hint">Išsaugomi automatiškai pirmą kartą sutikus naują žaidėją</string>
|
<string name="account_trusted_keys_hint">Išsaugomi automatiškai pirmą kartą sutikus naują žaidėją</string>
|
||||||
<string name="account_fingerprint_explain">Unikalus šio įrenginio rakto kontrolinis kodas. Pirmą kartą susitikęs varžovas gali jį palyginti su jūsų.</string>
|
<string name="account_fingerprint_explain">Unikalus šio įrenginio rakto kontrolinis kodas. Pirmą kartą susitikęs varžovas gali jį palyginti su jūsų.</string>
|
||||||
<string name="friends_online">Prisijungęs</string>
|
<string name="friends_online">Prisijungęs</string>
|
||||||
@@ -325,7 +330,6 @@
|
|||||||
<string name="settings_section_system">Sistema</string>
|
<string name="settings_section_system">Sistema</string>
|
||||||
<string name="permissions_card_ok_short">Viskas paruošta</string>
|
<string name="permissions_card_ok_short">Viskas paruošta</string>
|
||||||
<string name="permissions_card_blocked_short">Reikia veiksmo</string>
|
<string name="permissions_card_blocked_short">Reikia veiksmo</string>
|
||||||
<string name="account_header_summary">Reitingas %1$d · Partijų: %2$d</string>
|
|
||||||
<string name="account_progress">Pažanga</string>
|
<string name="account_progress">Pažanga</string>
|
||||||
<string name="account_rating_row">Reitingas</string>
|
<string name="account_rating_row">Reitingas</string>
|
||||||
<string name="account_device_key">Įrenginio raktas</string>
|
<string name="account_device_key">Įrenginio raktas</string>
|
||||||
@@ -373,4 +377,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_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_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="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>
|
</resources>
|
||||||
|
|||||||
@@ -9,14 +9,12 @@
|
|||||||
|
|
||||||
<string name="continue_game_title">Продолжить партию</string>
|
<string name="continue_game_title">Продолжить партию</string>
|
||||||
<string name="quick_game_title">Быстрая игра</string>
|
<string name="quick_game_title">Быстрая игра</string>
|
||||||
<string name="quick_game_subtitle">Как в прошлый раз: %1$s · %2$s</string>
|
|
||||||
<string name="mode_ai_title">Против ИИ</string>
|
<string name="mode_ai_title">Против ИИ</string>
|
||||||
<string name="mode_ai_subtitle">Выберите сложность</string>
|
<string name="mode_ai_subtitle">Выберите сложность</string>
|
||||||
<string name="mode_online_title">С другом</string>
|
<string name="mode_online_title">С другом</string>
|
||||||
<string name="mode_online_subtitle">По Bluetooth или Wi-Fi рядом</string>
|
<string name="mode_online_subtitle">По Bluetooth или Wi-Fi рядом</string>
|
||||||
|
|
||||||
<string name="puzzles_title">Шахматные задачи</string>
|
<string name="puzzles_title">Шахматные задачи</string>
|
||||||
<string name="puzzles_subtitle">Задачи под ваш рейтинг</string>
|
|
||||||
<string name="stats_dialog_title">Статистика</string>
|
<string name="stats_dialog_title">Статистика</string>
|
||||||
<string name="stats_dialog_summary">%1$d побед · %2$d%% · серия: %3$d</string>
|
<string name="stats_dialog_summary">%1$d побед · %2$d%% · серия: %3$d</string>
|
||||||
<string name="stats_min">Мин: %1$d</string>
|
<string name="stats_min">Мин: %1$d</string>
|
||||||
@@ -118,8 +116,16 @@
|
|||||||
<string name="rating_gate_text">Рейтинг нужен, чтобы подобрать сложность соперника и показать вас другим игрокам. Это займёт пару секунд.</string>
|
<string name="rating_gate_text">Рейтинг нужен, чтобы подобрать сложность соперника и показать вас другим игрокам. Это займёт пару секунд.</string>
|
||||||
<string name="rating_gate_open">Указать уровень</string>
|
<string name="rating_gate_open">Указать уровень</string>
|
||||||
<string name="about_section">О программе</string>
|
<string name="about_section">О программе</string>
|
||||||
<string name="appearance_title">Внешний вид доски</string>
|
<string name="appearance_title">Оформление</string>
|
||||||
<string name="appearance_subtitle">Цвета доски, координаты, вид фигур</string>
|
<string name="appearance_subtitle">Цвета приложения, доска, фигуры</string>
|
||||||
|
<string name="app_style_title">Цвета приложения</string>
|
||||||
|
<string name="app_style_matewave">Matewave</string>
|
||||||
|
<string name="app_style_lavender">Лаванда</string>
|
||||||
|
<string name="app_style_peach">Персик</string>
|
||||||
|
<string name="app_style_mint">Мята</string>
|
||||||
|
<string name="app_style_sky">Небо</string>
|
||||||
|
<string name="app_style_device">Устройство</string>
|
||||||
|
<string name="app_style_device_hint">Цвета берутся из обоев (Material You) и меняются вместе с ними.</string>
|
||||||
<string name="appearance_board_theme">Цвета доски</string>
|
<string name="appearance_board_theme">Цвета доски</string>
|
||||||
<string name="appearance_coordinates">Буквы и цифры на доске</string>
|
<string name="appearance_coordinates">Буквы и цифры на доске</string>
|
||||||
<string name="appearance_coordinates_hint">Подписи полей по краям: a–h и 1–8</string>
|
<string name="appearance_coordinates_hint">Подписи полей по краям: a–h и 1–8</string>
|
||||||
@@ -133,7 +139,6 @@
|
|||||||
<string name="account_forget_keys_confirm">Вы перестанете отличать знакомого соперника от того, кто назвался его именем, пока не встретитесь с ним заново. Нужно, если соперник переустановил приложение.</string>
|
<string name="account_forget_keys_confirm">Вы перестанете отличать знакомого соперника от того, кто назвался его именем, пока не встретитесь с ним заново. Нужно, если соперник переустановил приложение.</string>
|
||||||
<string name="account_confirm">Забыть</string>
|
<string name="account_confirm">Забыть</string>
|
||||||
<string name="account_cancel">Отмена</string>
|
<string name="account_cancel">Отмена</string>
|
||||||
<string name="greeting_ready">Готовы к новой партии?</string>
|
|
||||||
<string name="account_trusted_keys_hint">Запоминаются автоматически при первой встрече с новым игроком</string>
|
<string name="account_trusted_keys_hint">Запоминаются автоматически при первой встрече с новым игроком</string>
|
||||||
<string name="account_fingerprint_explain">Уникальный отпечаток ключа этого устройства. Соперник может сверить его с вашим при первой встрече.</string>
|
<string name="account_fingerprint_explain">Уникальный отпечаток ключа этого устройства. Соперник может сверить его с вашим при первой встрече.</string>
|
||||||
<string name="friends_online">В сети</string>
|
<string name="friends_online">В сети</string>
|
||||||
@@ -331,7 +336,6 @@
|
|||||||
<string name="settings_section_system">Система</string>
|
<string name="settings_section_system">Система</string>
|
||||||
<string name="permissions_card_ok_short">Всё готово</string>
|
<string name="permissions_card_ok_short">Всё готово</string>
|
||||||
<string name="permissions_card_blocked_short">Нужно действие</string>
|
<string name="permissions_card_blocked_short">Нужно действие</string>
|
||||||
<string name="account_header_summary">Рейтинг %1$d · Партий: %2$d</string>
|
|
||||||
<string name="account_progress">Прогресс</string>
|
<string name="account_progress">Прогресс</string>
|
||||||
<string name="account_rating_row">Рейтинг</string>
|
<string name="account_rating_row">Рейтинг</string>
|
||||||
<string name="account_device_key">Ключ устройства</string>
|
<string name="account_device_key">Ключ устройства</string>
|
||||||
@@ -379,4 +383,23 @@
|
|||||||
<string name="spectate_unreachable">Устройство, на котором идёт партия, недоступно. Убедитесь, что вы подключены к той же сети Wi-Fi.</string>
|
<string name="spectate_unreachable">Устройство, на котором идёт партия, недоступно. Убедитесь, что вы подключены к той же сети Wi-Fi.</string>
|
||||||
<string name="spectate_left_win">%1$s покинули партию. Победили %2$s.</string>
|
<string name="spectate_left_win">%1$s покинули партию. Победили %2$s.</string>
|
||||||
<string name="spectate_interrupted">Партия прервана: игроки потеряли связь.</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>
|
</resources>
|
||||||
|
|||||||
@@ -7,13 +7,11 @@
|
|||||||
<string name="greeting_night">晚安</string>
|
<string name="greeting_night">晚安</string>
|
||||||
<string name="continue_game_title">继续对局</string>
|
<string name="continue_game_title">继续对局</string>
|
||||||
<string name="quick_game_title">快速对局</string>
|
<string name="quick_game_title">快速对局</string>
|
||||||
<string name="quick_game_subtitle">与上次相同:%1$s · %2$s</string>
|
|
||||||
<string name="mode_ai_title">对战 AI</string>
|
<string name="mode_ai_title">对战 AI</string>
|
||||||
<string name="mode_ai_subtitle">选择难度</string>
|
<string name="mode_ai_subtitle">选择难度</string>
|
||||||
<string name="mode_online_title">好友对战</string>
|
<string name="mode_online_title">好友对战</string>
|
||||||
<string name="mode_online_subtitle">通过蓝牙或附近的 Wi-Fi</string>
|
<string name="mode_online_subtitle">通过蓝牙或附近的 Wi-Fi</string>
|
||||||
<string name="puzzles_title">国际象棋谜题</string>
|
<string name="puzzles_title">国际象棋谜题</string>
|
||||||
<string name="puzzles_subtitle">按你的等级分挑选的谜题</string>
|
|
||||||
<string name="stats_dialog_title">统计</string>
|
<string name="stats_dialog_title">统计</string>
|
||||||
<string name="stats_dialog_summary">%1$d 胜 · %2$d%% · 连胜:%3$d</string>
|
<string name="stats_dialog_summary">%1$d 胜 · %2$d%% · 连胜:%3$d</string>
|
||||||
<string name="stats_min">最低:%1$d</string>
|
<string name="stats_min">最低:%1$d</string>
|
||||||
@@ -113,8 +111,16 @@
|
|||||||
<string name="rating_gate_text">需要等级分来匹配合适的对手,并向其他玩家展示你。只需几秒钟。</string>
|
<string name="rating_gate_text">需要等级分来匹配合适的对手,并向其他玩家展示你。只需几秒钟。</string>
|
||||||
<string name="rating_gate_open">设置水平</string>
|
<string name="rating_gate_open">设置水平</string>
|
||||||
<string name="about_section">关于</string>
|
<string name="about_section">关于</string>
|
||||||
<string name="appearance_title">棋盘外观</string>
|
<string name="appearance_title">外观</string>
|
||||||
<string name="appearance_subtitle">棋盘颜色、坐标、棋子样式</string>
|
<string name="appearance_subtitle">应用配色、棋盘、棋子</string>
|
||||||
|
<string name="app_style_title">应用配色</string>
|
||||||
|
<string name="app_style_matewave">Matewave</string>
|
||||||
|
<string name="app_style_lavender">薰衣草</string>
|
||||||
|
<string name="app_style_peach">蜜桃</string>
|
||||||
|
<string name="app_style_mint">薄荷</string>
|
||||||
|
<string name="app_style_sky">天空</string>
|
||||||
|
<string name="app_style_device">设备</string>
|
||||||
|
<string name="app_style_device_hint">颜色取自壁纸(Material You),并随壁纸变化。</string>
|
||||||
<string name="appearance_board_theme">棋盘颜色</string>
|
<string name="appearance_board_theme">棋盘颜色</string>
|
||||||
<string name="appearance_coordinates">棋盘上的字母和数字</string>
|
<string name="appearance_coordinates">棋盘上的字母和数字</string>
|
||||||
<string name="appearance_coordinates_hint">边缘的格子标注:a–h 和 1–8</string>
|
<string name="appearance_coordinates_hint">边缘的格子标注:a–h 和 1–8</string>
|
||||||
@@ -128,7 +134,6 @@
|
|||||||
<string name="account_forget_keys_confirm">在再次见面之前,你将无法区分熟悉的对手和冒用其名字的人。如果对手重装了应用,则需要这样做。</string>
|
<string name="account_forget_keys_confirm">在再次见面之前,你将无法区分熟悉的对手和冒用其名字的人。如果对手重装了应用,则需要这样做。</string>
|
||||||
<string name="account_confirm">忘记</string>
|
<string name="account_confirm">忘记</string>
|
||||||
<string name="account_cancel">取消</string>
|
<string name="account_cancel">取消</string>
|
||||||
<string name="greeting_ready">准备好开始新对局了吗?</string>
|
|
||||||
<string name="account_trusted_keys_hint">首次遇到新玩家时自动保存</string>
|
<string name="account_trusted_keys_hint">首次遇到新玩家时自动保存</string>
|
||||||
<string name="account_fingerprint_explain">此设备密钥的唯一指纹。首次见面时,对手可以将其与你的核对。</string>
|
<string name="account_fingerprint_explain">此设备密钥的唯一指纹。首次见面时,对手可以将其与你的核对。</string>
|
||||||
<string name="friends_online">在线</string>
|
<string name="friends_online">在线</string>
|
||||||
@@ -322,7 +327,6 @@
|
|||||||
<string name="settings_section_system">系统</string>
|
<string name="settings_section_system">系统</string>
|
||||||
<string name="permissions_card_ok_short">已就绪</string>
|
<string name="permissions_card_ok_short">已就绪</string>
|
||||||
<string name="permissions_card_blocked_short">需要处理</string>
|
<string name="permissions_card_blocked_short">需要处理</string>
|
||||||
<string name="account_header_summary">等级分 %1$d · 对局:%2$d</string>
|
|
||||||
<string name="account_progress">进度</string>
|
<string name="account_progress">进度</string>
|
||||||
<string name="account_rating_row">等级分</string>
|
<string name="account_rating_row">等级分</string>
|
||||||
<string name="account_device_key">设备密钥</string>
|
<string name="account_device_key">设备密钥</string>
|
||||||
@@ -370,4 +374,23 @@
|
|||||||
<string name="spectate_unreachable">无法连接到主持对局的设备。请确认你们连接的是同一个 Wi-Fi 网络。</string>
|
<string name="spectate_unreachable">无法连接到主持对局的设备。请确认你们连接的是同一个 Wi-Fi 网络。</string>
|
||||||
<string name="spectate_left_win">%1$s离开了对局,%2$s获胜。</string>
|
<string name="spectate_left_win">%1$s离开了对局,%2$s获胜。</string>
|
||||||
<string name="spectate_interrupted">对局中断:玩家之间的连接已断开。</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>
|
</resources>
|
||||||
|
|||||||
@@ -7,13 +7,11 @@
|
|||||||
<string name="greeting_night">Good night</string>
|
<string name="greeting_night">Good night</string>
|
||||||
<string name="continue_game_title">Continue game</string>
|
<string name="continue_game_title">Continue game</string>
|
||||||
<string name="quick_game_title">Quick game</string>
|
<string name="quick_game_title">Quick game</string>
|
||||||
<string name="quick_game_subtitle">Same as last time: %1$s · %2$s</string>
|
|
||||||
<string name="mode_ai_title">Vs AI</string>
|
<string name="mode_ai_title">Vs AI</string>
|
||||||
<string name="mode_ai_subtitle">Choose difficulty</string>
|
<string name="mode_ai_subtitle">Choose difficulty</string>
|
||||||
<string name="mode_online_title">Vs a friend</string>
|
<string name="mode_online_title">Vs a friend</string>
|
||||||
<string name="mode_online_subtitle">Over Bluetooth or Wi-Fi nearby</string>
|
<string name="mode_online_subtitle">Over Bluetooth or Wi-Fi nearby</string>
|
||||||
<string name="puzzles_title">Chess puzzles</string>
|
<string name="puzzles_title">Chess puzzles</string>
|
||||||
<string name="puzzles_subtitle">Puzzles picked for your rating</string>
|
|
||||||
<string name="stats_dialog_title">Statistics</string>
|
<string name="stats_dialog_title">Statistics</string>
|
||||||
<string name="stats_dialog_summary">%1$d wins · %2$d%% · streak: %3$d</string>
|
<string name="stats_dialog_summary">%1$d wins · %2$d%% · streak: %3$d</string>
|
||||||
<string name="stats_min">Min: %1$d</string>
|
<string name="stats_min">Min: %1$d</string>
|
||||||
@@ -113,8 +111,16 @@
|
|||||||
<string name="rating_gate_text">Your rating is needed to pick a suitable opponent and to show you to other players. It takes a couple of seconds.</string>
|
<string name="rating_gate_text">Your rating is needed to pick a suitable opponent and to show you to other players. It takes a couple of seconds.</string>
|
||||||
<string name="rating_gate_open">Set level</string>
|
<string name="rating_gate_open">Set level</string>
|
||||||
<string name="about_section">About</string>
|
<string name="about_section">About</string>
|
||||||
<string name="appearance_title">Board appearance</string>
|
<string name="appearance_title">Appearance</string>
|
||||||
<string name="appearance_subtitle">Board colors, coordinates, piece style</string>
|
<string name="appearance_subtitle">App colors, board, pieces</string>
|
||||||
|
<string name="app_style_title">App colors</string>
|
||||||
|
<string name="app_style_matewave">Matewave</string>
|
||||||
|
<string name="app_style_lavender">Lavender</string>
|
||||||
|
<string name="app_style_peach">Peach</string>
|
||||||
|
<string name="app_style_mint">Mint</string>
|
||||||
|
<string name="app_style_sky">Sky</string>
|
||||||
|
<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_board_theme">Board colors</string>
|
||||||
<string name="appearance_coordinates">Letters and numbers on the board</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_coordinates_hint">Square labels along the edges: a–h and 1–8</string>
|
||||||
@@ -128,7 +134,6 @@
|
|||||||
<string name="account_forget_keys_confirm">You will no longer be able to tell a familiar opponent from someone using their name until you meet again. Needed if the opponent reinstalled the app.</string>
|
<string name="account_forget_keys_confirm">You will no longer be able to tell a familiar opponent from someone using their name until you meet again. Needed if the opponent reinstalled the app.</string>
|
||||||
<string name="account_confirm">Forget</string>
|
<string name="account_confirm">Forget</string>
|
||||||
<string name="account_cancel">Cancel</string>
|
<string name="account_cancel">Cancel</string>
|
||||||
<string name="greeting_ready">Ready for a new game?</string>
|
|
||||||
<string name="account_trusted_keys_hint">Saved automatically the first time you meet a new player</string>
|
<string name="account_trusted_keys_hint">Saved automatically the first time you meet a new player</string>
|
||||||
<string name="account_fingerprint_explain">The unique fingerprint of this device\'s key. Your opponent can compare it with yours when you first meet.</string>
|
<string name="account_fingerprint_explain">The unique fingerprint of this device\'s key. Your opponent can compare it with yours when you first meet.</string>
|
||||||
<string name="friends_online">Online</string>
|
<string name="friends_online">Online</string>
|
||||||
@@ -323,7 +328,6 @@
|
|||||||
<string name="settings_section_system">System</string>
|
<string name="settings_section_system">System</string>
|
||||||
<string name="permissions_card_ok_short">All set</string>
|
<string name="permissions_card_ok_short">All set</string>
|
||||||
<string name="permissions_card_blocked_short">Action needed</string>
|
<string name="permissions_card_blocked_short">Action needed</string>
|
||||||
<string name="account_header_summary">Rating %1$d · Games: %2$d</string>
|
|
||||||
<string name="account_progress">Progress</string>
|
<string name="account_progress">Progress</string>
|
||||||
<string name="account_rating_row">Rating</string>
|
<string name="account_rating_row">Rating</string>
|
||||||
<string name="account_device_key">Device key</string>
|
<string name="account_device_key">Device key</string>
|
||||||
@@ -371,4 +375,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_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_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="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>
|
</resources>
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<locale android:name="en" />
|
||||||
|
<locale android:name="de" />
|
||||||
|
<locale android:name="ja" />
|
||||||
|
<locale android:name="lt" />
|
||||||
|
<locale android:name="ru" />
|
||||||
|
<locale android:name="zh" />
|
||||||
|
</locale-config>
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
package cc.skysparkle.matewave
|
||||||
|
|
||||||
|
import cc.skysparkle.matewave.network.GameMessage
|
||||||
|
import cc.skysparkle.matewave.network.PeerLimits
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertFalse
|
||||||
|
import org.junit.Assert.assertTrue
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
class PeerLimitsTest {
|
||||||
|
private fun profile(
|
||||||
|
userId: String = "6f1c2a9e-0b3d-4c5e-8f70-1a2b3c4d5e6f",
|
||||||
|
name: String = "Vladimir",
|
||||||
|
elo: Int = 1350,
|
||||||
|
initialSeconds: Int = 300,
|
||||||
|
incrementSeconds: Int = 3
|
||||||
|
) = GameMessage.ProfileMsg(
|
||||||
|
userId = userId, name = name, avatarBase64 = null, backgroundBase64 = null, elo = elo,
|
||||||
|
initialSeconds = initialSeconds, incrementSeconds = incrementSeconds
|
||||||
|
)
|
||||||
|
|
||||||
|
@Test fun ordinaryProfileIsAccepted() = assertTrue(PeerLimits.isPlausibleProfile(profile()))
|
||||||
|
|
||||||
|
@Test fun joiningPlayerWithoutTimeControlIsAccepted() =
|
||||||
|
assertTrue(PeerLimits.isPlausibleProfile(profile(initialSeconds = 0, incrementSeconds = 0)))
|
||||||
|
|
||||||
|
@Test fun unlimitedGameIsAccepted() =
|
||||||
|
assertTrue(PeerLimits.isPlausibleProfile(profile(initialSeconds = Int.MAX_VALUE, incrementSeconds = 0)))
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun oversizedOrEmptyFieldsAreRefused() {
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(name = "x".repeat(PeerLimits.MAX_NAME_CHARS + 1))))
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(name = " ")))
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(name = "a\u0000b")))
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(userId = "u".repeat(PeerLimits.MAX_USER_ID_CHARS + 1))))
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(userId = "")))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun ratingAndTimeControlMustBeInRange() {
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(elo = 99)))
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(elo = 3001)))
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(initialSeconds = -1)))
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(initialSeconds = PeerLimits.MAX_INITIAL_SECONDS + 1)))
|
||||||
|
assertFalse(PeerLimits.isPlausibleProfile(profile(incrementSeconds = PeerLimits.MAX_INCREMENT_SECONDS + 1)))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun opponentClockMayNotGrowBeyondIncrementAndSlack() {
|
||||||
|
assertEquals(47_000L, PeerLimits.maxOpponentClockAfterMove(42_000, 3_000, 2_000))
|
||||||
|
// A flagged opponent (0 ms locally) may still have had a little time on their side.
|
||||||
|
assertEquals(5_000L, PeerLimits.maxOpponentClockAfterMove(0, 3_000, 2_000))
|
||||||
|
assertEquals(2_000L, PeerLimits.maxOpponentClockAfterMove(-50, 0, 2_000))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package cc.skysparkle.matewave
|
||||||
|
|
||||||
|
import cc.skysparkle.matewave.network.LanTransport
|
||||||
|
import org.junit.Assert.assertFalse
|
||||||
|
import org.junit.Assert.assertNotEquals
|
||||||
|
import org.junit.Assert.assertTrue
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
class PresenceSignatureTest {
|
||||||
|
private val now = 1_800_000_000_000L
|
||||||
|
private val nowSeconds = now / 1000
|
||||||
|
|
||||||
|
@Test fun recentAnnouncementIsFresh() =
|
||||||
|
assertTrue(LanTransport.isFreshPresence(nowSeconds - 4 * 60, now))
|
||||||
|
|
||||||
|
@Test fun slightlyFastClockIsTolerated() =
|
||||||
|
assertTrue(LanTransport.isFreshPresence(nowSeconds + 5 * 60, now))
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun oldMissingOrFarFutureAnnouncementsAreRejected() {
|
||||||
|
assertFalse(LanTransport.isFreshPresence(nowSeconds - 16 * 60, now))
|
||||||
|
assertFalse(LanTransport.isFreshPresence(nowSeconds + 16 * 60, now))
|
||||||
|
assertFalse(LanTransport.isFreshPresence(0, now))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun signingTimeIsPartOfTheSignedText() = assertNotEquals(
|
||||||
|
LanTransport.presencePayload("u1", "Vladimir", 1350, nowSeconds),
|
||||||
|
LanTransport.presencePayload("u1", "Vladimir", 1350, nowSeconds - 60)
|
||||||
|
)
|
||||||
|
}
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 139 KiB |
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id("com.android.application") version "9.2.0" apply false
|
alias(libs.plugins.android.application) apply false
|
||||||
id("org.jetbrains.kotlin.plugin.compose") version "2.4.20" apply false
|
alias(libs.plugins.kotlin.compose) apply false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
• Darstellung: App-Farben wählbar — Matewave, die Pastelltöne Lavendel, Pfirsich, Minze und Himmel oder Gerätefarben aus dem Hintergrundbild (Material You, Android 12+)
|
||||||
|
• Die Wertung auf dem Startbildschirm öffnet keine Statistik mehr
|
||||||
|
• Die Beschriftungen von Remis- und Aufgabe-Schaltfläche werden nicht mehr abgeschnitten
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
• Bilder des Gegners werden geprüft: zu große Avatare, Hintergründe oder Chatbilder bringen die App nicht mehr zum Absturz
|
||||||
|
• Der Gegner kann verbrauchte Zeit nicht verbergen; sein Inkrement zählt nicht mehr doppelt
|
||||||
|
• Warnung, wenn nicht der gewählte Spieler in der Nähe antwortet
|
||||||
|
• App-Sprache in den Android-Einstellungen wählbar (Android 13+)
|
||||||
|
• Schnellerer Start mit vielen Freunden, weniger Akku für Bluetooth
|
||||||
|
• WLAN-Präsenz ist nicht mit 1.0.50 kompatibel: beide Handys aktualisieren
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
• Unterstützungskarte mit Ko-fi-Button unten in den Einstellungen
|
||||||
|
• Links zum Quellcode führen jetzt zu GitHub
|
||||||
|
• Eine kurze Anleitung beim ersten Start mit Name und Spielstärke; erneut aufrufbar in den Einstellungen
|
||||||
|
• Querformat und Tablets: Brett links, Spieler und Züge rechts
|
||||||
@@ -2,4 +2,3 @@
|
|||||||
• Verbindungsprotokoll und Netzwerkzähler aus dem Bildschirm „Berechtigungen“ entfernt
|
• Verbindungsprotokoll und Netzwerkzähler aus dem Bildschirm „Berechtigungen“ entfernt
|
||||||
• Keine Prüfung und Warnungen mehr wegen veralteter App beim Verbinden mit dem Gegner oder Zuschauen bei Freunden
|
• Keine Prüfung und Warnungen mehr wegen veralteter App beim Verbinden mit dem Gegner oder Zuschauen bei Freunden
|
||||||
• Symbole für alle Optionen unter „Aussehen des Bretts“
|
• Symbole für alle Optionen unter „Aussehen des Bretts“
|
||||||
• Matewave gibt es auch auf meinem eigenen Gitea: https://git.skysparkle.cc/kalarina/Matewave
|
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
• Appearance: choose the app colors — Matewave, pastel Lavender, Peach, Mint and Sky, or Device colors from your wallpaper (Material You, Android 12+)
|
||||||
|
• The rating on the home screen no longer opens statistics
|
||||||
|
• Labels on the draw and resign buttons are no longer cut off
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
• Pictures from the opponent are checked first: an oversized avatar, background or chat image no longer crashes the app
|
||||||
|
• The opponent's clock can't hide time spent; their increment is no longer counted twice
|
||||||
|
• A warning if someone other than the chosen nearby player answers
|
||||||
|
• App language can be set in Android settings (Android 13+)
|
||||||
|
• Faster start with many friends, less battery for Bluetooth presence
|
||||||
|
• Wi-Fi presence is not compatible with 1.0.50: update both phones
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
• Support card with a Ko-fi button at the bottom of Settings
|
||||||
|
• Source code links now lead to GitHub
|
||||||
|
• A short guide on first launch, with your name and level; open it again from Settings
|
||||||
|
• Landscape and tablets: the board on the left, players and moves on the right
|
||||||
@@ -2,4 +2,3 @@
|
|||||||
• Removed the connection log and network counters from the Permissions screen
|
• Removed the connection log and network counters from the Permissions screen
|
||||||
• No more outdated-app check and warnings when connecting to an opponent or watching a friend's game
|
• No more outdated-app check and warnings when connecting to an opponent or watching a friend's game
|
||||||
• Icons for every option in Board appearance
|
• Icons for every option in Board appearance
|
||||||
• Matewave is also on my own Gitea: https://git.skysparkle.cc/kalarina/Matewave
|
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
• 外観:アプリの色を選択可能に — Matewave、パステルのラベンダー・ピーチ・ミント・スカイ、または壁紙から取得する端末の色(Material You、Android 12 以降)
|
||||||
|
• ホーム画面のレーティングをタップしても統計が開かなくなりました
|
||||||
|
• 引き分け・投了ボタンの文字が切れにくくなりました
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
• 相手の画像を事前に確認:巨大なアバター、背景、チャット画像でアプリが落ちなくなりました
|
||||||
|
• 相手が消費時間を隠せなくなり、相手の加算時間が二重に数えられなくなりました
|
||||||
|
• 近くで選んだ相手以外が応答したときに警告
|
||||||
|
• Android の設定でアプリの言語を選択可能に(Android 13 以降)
|
||||||
|
• 友達が多くても起動が速く、Bluetooth の電池消費も減少
|
||||||
|
• Wi-Fi の在席表示は 1.0.50 と互換性がありません:両方の端末を更新してください
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
• 設定の下部にKo-fiボタン付きの支援カード
|
||||||
|
• ソースコードへのリンクはGitHubに変更
|
||||||
|
• 初回起動時の簡単なガイド(名前とレベルの設定つき)。設定から再表示できます
|
||||||
|
• 横向き・タブレット対応:盤面を左、プレイヤーと棋譜を右に表示
|
||||||
@@ -2,4 +2,3 @@
|
|||||||
• 「権限」画面から接続ログとネットワークカウンターを削除
|
• 「権限」画面から接続ログとネットワークカウンターを削除
|
||||||
• 対戦相手への接続時や友達の対局観戦時の、アプリが古いかどうかのチェックと警告を削除
|
• 対戦相手への接続時や友達の対局観戦時の、アプリが古いかどうかのチェックと警告を削除
|
||||||
• 「盤の見た目」のすべての項目にアイコンを追加
|
• 「盤の見た目」のすべての項目にアイコンを追加
|
||||||
• Matewave は私の Gitea でも公開しています: https://git.skysparkle.cc/kalarina/Matewave
|
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
• Išvaizda: galima pasirinkti programėlės spalvas — Matewave, pastelines Levandą, Persiką, Mėtą ir Dangų arba įrenginio spalvas iš ekrano fono („Material You“, Android 12+)
|
||||||
|
• Reitingas pagrindiniame ekrane nebeatidaro statistikos
|
||||||
|
• Lygiųjų ir pasidavimo mygtukų užrašai nebenukerpami
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
• Varžovo paveikslėliai tikrinami: per didelis avataras, fonas ar pokalbio paveikslėlis nebeužlaužia programėlės
|
||||||
|
• Varžovas negali nuslėpti sunaudoto laiko; jo priedas nebeskaičiuojamas dukart
|
||||||
|
• Įspėjimas, jei atsiliepė ne tas netoliese pasirinktas žaidėjas
|
||||||
|
• Programėlės kalbą galima pasirinkti Android nustatymuose (13+)
|
||||||
|
• Greitesnis paleidimas su daug draugų, mažiau baterijos per Bluetooth
|
||||||
|
• Buvimas per Wi-Fi nesuderinamas su 1.0.50: atnaujinkite abu telefonus
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
• Paramos kortelė su Ko-fi mygtuku nustatymų apačioje
|
||||||
|
• Nuorodos į išeitinį kodą dabar veda į GitHub
|
||||||
|
• Trumpas gidas pirmą kartą paleidus, su vardu ir lygiu; jį vėl rasite nustatymuose
|
||||||
|
• Gulsčias ekranas ir planšetės: lenta kairėje, žaidėjai ir ėjimai dešinėje
|
||||||
@@ -2,4 +2,3 @@
|
|||||||
• Iš ekrano „Leidimai“ pašalintas ryšio žurnalas ir tinklo skaitikliai
|
• Iš ekrano „Leidimai“ pašalintas ryšio žurnalas ir tinklo skaitikliai
|
||||||
• Pašalintas pasenusios programos tikrinimas ir jo įspėjimai jungiantis prie varžovo ar stebint draugo partiją
|
• Pašalintas pasenusios programos tikrinimas ir jo įspėjimai jungiantis prie varžovo ar stebint draugo partiją
|
||||||
• Piktogramos prie visų parinkčių skiltyje „Lentos išvaizda“
|
• Piktogramos prie visų parinkčių skiltyje „Lentos išvaizda“
|
||||||
• Matewave taip pat yra mano Gitea: https://git.skysparkle.cc/kalarina/Matewave
|
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
• Оформление: выбор цветов приложения — Matewave, пастельные Лаванда, Персик, Мята и Небо или цвета устройства из обоев (Material You, Android 12+)
|
||||||
|
• Рейтинг на главном экране больше не открывает статистику
|
||||||
|
• Подписи на кнопках ничьей и сдачи больше не обрезаются
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
• Картинки соперника проверяются: огромный аватар, фон или картинка в чате больше не роняют приложение
|
||||||
|
• Соперник не может скрыть потраченное время; его инкремент больше не учитывается дважды
|
||||||
|
• Предупреждение, если ответил не тот игрок, которого вы выбрали рядом
|
||||||
|
• Язык приложения можно выбрать в настройках Android (13+)
|
||||||
|
• Быстрее запуск со многими друзьями, меньше расход батареи по Bluetooth
|
||||||
|
• Присутствие по Wi-Fi несовместимо с 1.0.50: обновите оба телефона
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
• Карточка поддержки с кнопкой Ko-fi внизу настроек
|
||||||
|
• Ссылки на исходный код теперь ведут на GitHub
|
||||||
|
• Короткий гид при первом запуске с выбором имени и уровня; его можно открыть снова в настройках
|
||||||
|
• Альбомный режим и планшеты: доска слева, игроки и ходы справа
|
||||||
@@ -2,4 +2,3 @@
|
|||||||
• С экрана «Разрешения» убраны журнал подключений и сетевые счётчики
|
• С экрана «Разрешения» убраны журнал подключений и сетевые счётчики
|
||||||
• Убраны проверка на устаревшее приложение и её предупреждения при подключении к сопернику и просмотре партии друга
|
• Убраны проверка на устаревшее приложение и её предупреждения при подключении к сопернику и просмотре партии друга
|
||||||
• Иконки у всех пунктов в «Внешнем виде доски»
|
• Иконки у всех пунктов в «Внешнем виде доски»
|
||||||
• Matewave также есть на моём Gitea: https://git.skysparkle.cc/kalarina/Matewave
|
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
• 外观:可选择应用配色 — Matewave、柔和的薰衣草、蜜桃、薄荷和天空,或取自壁纸的设备颜色(Material You,Android 12 及以上)
|
||||||
|
• 点击主页上的等级分不再打开统计
|
||||||
|
• 提议和棋与认输按钮的文字不再被截断
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
• 先检查对手发来的图片:过大的头像、背景或聊天图片不再导致应用崩溃
|
||||||
|
• 对手无法隐瞒已用时间;对手的加秒不再被重复计算
|
||||||
|
• 应答者不是附近列表中所选玩家时会发出警告
|
||||||
|
• 可在 Android 设置中选择应用语言(Android 13 及以上)
|
||||||
|
• 好友多时启动更快,蓝牙在线显示更省电
|
||||||
|
• Wi-Fi 在线显示与 1.0.50 不兼容:请更新双方手机
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
• 设置底部新增带 Ko-fi 按钮的支持卡片
|
||||||
|
• 源代码链接现在指向 GitHub
|
||||||
|
• 首次启动时的简短指南,可设置名字和水平;可在设置中再次打开
|
||||||
|
• 横屏和平板:棋盘在左,玩家和着法在右
|
||||||
@@ -2,4 +2,3 @@
|
|||||||
• 从“权限”页面移除了连接日志和网络计数器
|
• 从“权限”页面移除了连接日志和网络计数器
|
||||||
• 连接对手或观战好友对局时,不再检查应用是否过旧,也不再显示相关提示
|
• 连接对手或观战好友对局时,不再检查应用是否过旧,也不再显示相关提示
|
||||||
• “棋盘外观”中的每个选项都有了图标
|
• “棋盘外观”中的每个选项都有了图标
|
||||||
• Matewave 也发布在我自己的 Gitea 上:https://git.skysparkle.cc/kalarina/Matewave
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
[versions]
|
||||||
|
agp = "9.2.0"
|
||||||
|
kotlin = "2.4.20"
|
||||||
|
composeBom = "2026.09.00"
|
||||||
|
activityCompose = "1.13.0"
|
||||||
|
coreKtx = "1.18.0"
|
||||||
|
navigationCompose = "2.9.7"
|
||||||
|
lifecycleViewmodelCompose = "2.11.0"
|
||||||
|
kotlinxCoroutines = "1.11.0"
|
||||||
|
zxing = "3.5.4"
|
||||||
|
junit = "4.13.2"
|
||||||
|
orgJson = "20240303"
|
||||||
|
|
||||||
|
[libraries]
|
||||||
|
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
|
||||||
|
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
|
||||||
|
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
|
||||||
|
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
|
||||||
|
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
||||||
|
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
|
||||||
|
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
|
||||||
|
kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
|
||||||
|
zxing-core = { group = "com.google.zxing", name = "core", version.ref = "zxing" }
|
||||||
|
junit = { group = "junit", name = "junit", version.ref = "junit" }
|
||||||
|
org-json = { group = "org.json", name = "json", version.ref = "orgJson" }
|
||||||
|
|
||||||
|
[plugins]
|
||||||
|
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||||
|
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
||||||
+1
@@ -1,5 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
|
distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
Reference in New Issue
Block a user