mirror of
https://github.com/kalarina-bit/Matewave.git
synced 2026-11-22 08:06:09 +00:00
Compare commits
5
Commits
v1.0.47
...
f1995cceaa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f1995cceaa | ||
|
|
7e8ca1ec48 | ||
|
|
2751461fa0 | ||
|
|
f8fce1675f | ||
|
|
74ae8458d1 |
@@ -0,0 +1,27 @@
|
|||||||
|
---
|
||||||
|
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 / GitHub / F-Droid / Google Play
|
||||||
|
- Device and Android version:
|
||||||
|
- Mode: vs AI / puzzles / openings / Bluetooth / LAN
|
||||||
|
|
||||||
|
**Screenshots or logs** (optional)
|
||||||
|
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
blank_issues_enabled: true
|
||||||
|
contact_links:
|
||||||
|
- name: Main repository on git.skysparkle.cc
|
||||||
|
url: https://git.skysparkle.cc/kalarina/Matewave
|
||||||
|
about: This GitHub repository is a mirror. Issues are welcome here and on Gitea.
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
---
|
||||||
|
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
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
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:
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
---
|
||||||
|
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:
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
## 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
|
||||||
@@ -9,6 +9,9 @@
|
|||||||
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>
|
||||||
|
|
||||||
|
> [!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).
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://github.com/kalarina-bit/Matewave/releases/latest"><img src="https://img.shields.io/github/v/release/kalarina-bit/Matewave?style=for-the-badge&label=release&labelColor=1b1b1b&color=2e7d32" alt="Latest release"></a>
|
<a href="https://github.com/kalarina-bit/Matewave/releases/latest"><img src="https://img.shields.io/github/v/release/kalarina-bit/Matewave?style=for-the-badge&label=release&labelColor=1b1b1b&color=2e7d32" alt="Latest release"></a>
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ android {
|
|||||||
applicationId = "cc.skysparkle.matewave"
|
applicationId = "cc.skysparkle.matewave"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 36
|
targetSdk = 36
|
||||||
versionCode = 5
|
versionCode = 6
|
||||||
versionName = "1.0.47"
|
versionName = "1.0.48"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ enum class ConnectionState { DISCONNECTED, CONNECTING, CONNECTED, FAILED }
|
|||||||
/**
|
/**
|
||||||
* Wire protocol shared by all transports: one JSON object per message.
|
* Wire protocol shared by all transports: one JSON object per message.
|
||||||
* Game messages travel inside [SignedMsg] once the handshake is done; only
|
* Game messages travel inside [SignedMsg] once the handshake is done; only
|
||||||
* [ProfileMsg] and [PingMsg] are sent in the clear. Bump [PROTOCOL_VERSION] on any
|
* [ProfileMsg] and [PingMsg] are sent in the clear. [PROTOCOL_VERSION] is sent in the
|
||||||
* incompatible change: peers with an older version are rejected during the handshake.
|
* profile for information only; peers are not rejected by version.
|
||||||
*/
|
*/
|
||||||
sealed class GameMessage {
|
sealed class GameMessage {
|
||||||
data class MoveMsg(
|
data class MoveMsg(
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ data class NetworkEvent(
|
|||||||
val text: String
|
val text: String
|
||||||
)
|
)
|
||||||
|
|
||||||
/** In-memory connection log, copied into the diagnostics report from Settings. */
|
|
||||||
object NetworkLog {
|
object NetworkLog {
|
||||||
private const val CAPACITY = 60
|
private const val CAPACITY = 60
|
||||||
|
|
||||||
@@ -42,11 +41,4 @@ object NetworkLog {
|
|||||||
_lastReason.value = reason
|
_lastReason.value = reason
|
||||||
log(transport, reason.userText + (detail?.let { ": $it" } ?: ""))
|
log(transport, reason.userText + (detail?.let { ": $it" } ?: ""))
|
||||||
}
|
}
|
||||||
|
|
||||||
fun asText(): String {
|
|
||||||
val format = java.text.SimpleDateFormat("HH:mm:ss", java.util.Locale.getDefault())
|
|
||||||
return _events.value.joinToString("\n") { e ->
|
|
||||||
"${format.format(java.util.Date(e.at))} [${e.transport}] ${e.text}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,22 +37,4 @@ object NetworkMetrics {
|
|||||||
fun duplicateChunk() { duplicateChunks.incrementAndGet() }
|
fun duplicateChunk() { duplicateChunks.incrementAndGet() }
|
||||||
fun messageCorrupted() { corruptedMessages.incrementAndGet(); touch() }
|
fun messageCorrupted() { corruptedMessages.incrementAndGet(); touch() }
|
||||||
fun messageDropped() { messagesDropped.incrementAndGet(); touch() }
|
fun messageDropped() { messagesDropped.incrementAndGet(); touch() }
|
||||||
|
|
||||||
private fun retryPercent(): Int {
|
|
||||||
val sent = chunksSent.get()
|
|
||||||
if (sent == 0L) return 0
|
|
||||||
return ((chunkRetries.get() * 100) / sent).toInt()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun asText(res: android.content.res.Resources): String = buildString {
|
|
||||||
appendLine(res.getString(cc.skysparkle.matewave.R.string.metrics_connect_attempts,
|
|
||||||
connectAttempts.get(), connectSuccesses.get()))
|
|
||||||
val last = lastConnectMillis.get()
|
|
||||||
if (last > 0) appendLine(res.getString(cc.skysparkle.matewave.R.string.metrics_last_connect, last))
|
|
||||||
appendLine(res.getString(cc.skysparkle.matewave.R.string.metrics_chunks,
|
|
||||||
chunksSent.get(), chunkRetries.get(), retryPercent()))
|
|
||||||
appendLine(res.getString(cc.skysparkle.matewave.R.string.metrics_duplicates, duplicateChunks.get()))
|
|
||||||
appendLine(res.getString(cc.skysparkle.matewave.R.string.metrics_corrupted, corruptedMessages.get()))
|
|
||||||
appendLine(res.getString(cc.skysparkle.matewave.R.string.metrics_dropped, messagesDropped.get()))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class SpectatorClient(
|
|||||||
) {
|
) {
|
||||||
data class Timing(val connectTimeoutMs: Int = 5_000, val silenceTimeoutMs: Int = 15_000)
|
data class Timing(val connectTimeoutMs: Int = 5_000, val silenceTimeoutMs: Int = 15_000)
|
||||||
|
|
||||||
enum class Failure { UNREACHABLE, FULL, NO_GAME, UPDATE_THIS_APP, UPDATE_HOST_APP }
|
enum class Failure { UNREACHABLE, FULL, NO_GAME }
|
||||||
|
|
||||||
sealed class Event {
|
sealed class Event {
|
||||||
data class Joined(val welcome: SpectatorMessage.Welcome) : Event()
|
data class Joined(val welcome: SpectatorMessage.Welcome) : Event()
|
||||||
@@ -97,15 +97,10 @@ class SpectatorClient(
|
|||||||
val envelope = SpectatorProtocol.decode(read.text) ?: continue
|
val envelope = SpectatorProtocol.decode(read.text) ?: continue
|
||||||
val message = envelope.message
|
val message = envelope.message
|
||||||
if (!joined) {
|
if (!joined) {
|
||||||
// reject keeps its shape across versions, so read it before the version gate.
|
|
||||||
if (message is SpectatorMessage.Reject) {
|
if (message is SpectatorMessage.Reject) {
|
||||||
emit(Event.JoinFailed(failureOf(message)))
|
emit(Event.JoinFailed(failureOf(message)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (envelope.version < minVersion) {
|
|
||||||
emit(Event.JoinFailed(Failure.UPDATE_HOST_APP))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (message is SpectatorMessage.Welcome) {
|
if (message is SpectatorMessage.Welcome) {
|
||||||
joined = true
|
joined = true
|
||||||
emit(Event.Joined(message))
|
emit(Event.Joined(message))
|
||||||
@@ -133,8 +128,6 @@ class SpectatorClient(
|
|||||||
private fun failureOf(reject: SpectatorMessage.Reject): Failure = when (reject.reason) {
|
private fun failureOf(reject: SpectatorMessage.Reject): Failure = when (reject.reason) {
|
||||||
RejectReason.FULL -> Failure.FULL
|
RejectReason.FULL -> Failure.FULL
|
||||||
RejectReason.NO_GAME -> Failure.NO_GAME
|
RejectReason.NO_GAME -> Failure.NO_GAME
|
||||||
RejectReason.UPDATE_REQUIRED ->
|
|
||||||
if (version < reject.minVersion) Failure.UPDATE_THIS_APP else Failure.UPDATE_HOST_APP
|
|
||||||
RejectReason.OTHER -> Failure.UNREACHABLE
|
RejectReason.OTHER -> Failure.UNREACHABLE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -141,14 +141,7 @@ class SpectatorHub(
|
|||||||
val envelope = (first as? LineResult.Line)?.let { SpectatorProtocol.decode(it.text) }
|
val envelope = (first as? LineResult.Line)?.let { SpectatorProtocol.decode(it.text) }
|
||||||
when (envelope?.message) {
|
when (envelope?.message) {
|
||||||
SpectatorMessage.StatusQuery -> reply(client, status())
|
SpectatorMessage.StatusQuery -> reply(client, status())
|
||||||
is SpectatorMessage.Hello -> {
|
is SpectatorMessage.Hello -> { spectator = admit(client) }
|
||||||
if (envelope.version < SpectatorProtocol.MIN_COMPATIBLE_VERSION) {
|
|
||||||
log("Spectator with protocol ${envelope.version} told to update")
|
|
||||||
reply(client, SpectatorMessage.Reject(RejectReason.UPDATE_REQUIRED, SpectatorProtocol.MIN_COMPATIBLE_VERSION))
|
|
||||||
} else {
|
|
||||||
spectator = admit(client)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else -> Unit
|
else -> Unit
|
||||||
}
|
}
|
||||||
} catch (e: IOException) {
|
} catch (e: IOException) {
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ data class SpectatorSnapshot(
|
|||||||
|
|
||||||
enum class RejectReason(val wire: String) {
|
enum class RejectReason(val wire: String) {
|
||||||
FULL("full"),
|
FULL("full"),
|
||||||
UPDATE_REQUIRED("update"),
|
|
||||||
NO_GAME("no_game"),
|
NO_GAME("no_game"),
|
||||||
OTHER("other");
|
OTHER("other");
|
||||||
|
|
||||||
@@ -94,11 +93,7 @@ data class SpectatorEnvelope(val version: Int, val message: SpectatorMessage?)
|
|||||||
* the sender's protocol version in "sv". Unknown types are skipped, never fatal.
|
* the sender's protocol version in "sv". Unknown types are skipped, never fatal.
|
||||||
*/
|
*/
|
||||||
object SpectatorProtocol {
|
object SpectatorProtocol {
|
||||||
/**
|
/** Sent with every message for information only; no version is ever refused. */
|
||||||
* Bump on incompatible changes and raise [MIN_COMPATIBLE_VERSION] to the oldest version still
|
|
||||||
* understood. hello, status and reject keep their shape so any two versions can still tell
|
|
||||||
* each other that an update is required.
|
|
||||||
*/
|
|
||||||
const val VERSION = 1
|
const val VERSION = 1
|
||||||
const val MIN_COMPATIBLE_VERSION = 1
|
const val MIN_COMPATIBLE_VERSION = 1
|
||||||
|
|
||||||
|
|||||||
@@ -85,30 +85,35 @@ fun AppearanceScreen(onBack: () -> Unit) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AppearanceToggle(
|
AppearanceToggle(
|
||||||
|
icon = R.drawable.ic_coordinates,
|
||||||
title = stringResource(R.string.appearance_coordinates),
|
title = stringResource(R.string.appearance_coordinates),
|
||||||
subtitle = stringResource(R.string.appearance_coordinates_hint),
|
subtitle = stringResource(R.string.appearance_coordinates_hint),
|
||||||
checked = coords
|
checked = coords
|
||||||
) { coords = it; appearance.showCoordinates = it }
|
) { coords = it; appearance.showCoordinates = it }
|
||||||
|
|
||||||
AppearanceToggle(
|
AppearanceToggle(
|
||||||
|
icon = R.drawable.ic_image_pieces,
|
||||||
title = stringResource(R.string.appearance_image_pieces),
|
title = stringResource(R.string.appearance_image_pieces),
|
||||||
subtitle = stringResource(R.string.appearance_image_pieces_hint),
|
subtitle = stringResource(R.string.appearance_image_pieces_hint),
|
||||||
checked = images
|
checked = images
|
||||||
) { images = it; appearance.useImagePieces = it }
|
) { images = it; appearance.useImagePieces = it }
|
||||||
|
|
||||||
AppearanceToggle(
|
AppearanceToggle(
|
||||||
|
icon = R.drawable.ic_last_move,
|
||||||
title = stringResource(R.string.appearance_last_move),
|
title = stringResource(R.string.appearance_last_move),
|
||||||
subtitle = stringResource(R.string.appearance_last_move_hint),
|
subtitle = stringResource(R.string.appearance_last_move_hint),
|
||||||
checked = lastMove
|
checked = lastMove
|
||||||
) { lastMove = it; appearance.showLastMove = it }
|
) { lastMove = it; appearance.showLastMove = it }
|
||||||
|
|
||||||
AppearanceToggle(
|
AppearanceToggle(
|
||||||
|
icon = R.drawable.ic_check_alert,
|
||||||
title = stringResource(R.string.appearance_check),
|
title = stringResource(R.string.appearance_check),
|
||||||
subtitle = stringResource(R.string.appearance_check_hint),
|
subtitle = stringResource(R.string.appearance_check_hint),
|
||||||
checked = checkGlow
|
checked = checkGlow
|
||||||
) { checkGlow = it; appearance.showCheckHighlight = it }
|
) { checkGlow = it; appearance.showCheckHighlight = it }
|
||||||
|
|
||||||
AppearanceToggle(
|
AppearanceToggle(
|
||||||
|
icon = R.drawable.ic_move_list,
|
||||||
title = stringResource(R.string.appearance_opening_in_game),
|
title = stringResource(R.string.appearance_opening_in_game),
|
||||||
subtitle = stringResource(R.string.appearance_opening_in_game_hint),
|
subtitle = stringResource(R.string.appearance_opening_in_game_hint),
|
||||||
checked = openingBar
|
checked = openingBar
|
||||||
@@ -160,6 +165,7 @@ private fun ThemePreview(theme: BoardTheme, showPieces: Boolean) {
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun AppearanceToggle(
|
private fun AppearanceToggle(
|
||||||
|
icon: Int,
|
||||||
title: String,
|
title: String,
|
||||||
subtitle: String,
|
subtitle: String,
|
||||||
checked: Boolean,
|
checked: Boolean,
|
||||||
@@ -167,6 +173,7 @@ private fun AppearanceToggle(
|
|||||||
) {
|
) {
|
||||||
GlassCard(modifier = Modifier.fillMaxWidth()) {
|
GlassCard(modifier = Modifier.fillMaxWidth()) {
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
|
cc.skysparkle.matewave.ui.components.ButtonIcon(icon, size = 24.dp)
|
||||||
Column(modifier = Modifier.weight(1f)) {
|
Column(modifier = Modifier.weight(1f)) {
|
||||||
Text(title, color = ink, style = MaterialTheme.typography.titleMedium)
|
Text(title, color = ink, style = MaterialTheme.typography.titleMedium)
|
||||||
Text(subtitle, color = ink.copy(alpha = 0.7f), style = MaterialTheme.typography.bodySmall)
|
Text(subtitle, color = ink.copy(alpha = 0.7f), style = MaterialTheme.typography.bodySmall)
|
||||||
|
|||||||
@@ -558,7 +558,6 @@ private fun ConnectionBanner(state: GameUiState) {
|
|||||||
private fun TrustBanners(state: GameUiState) {
|
private fun TrustBanners(state: GameUiState) {
|
||||||
val (icon, text, color) = when {
|
val (icon, text, color) = when {
|
||||||
state.opponentUntrusted -> Triple(R.drawable.ic_no_encryption, stringResource(R.string.trust_impersonation), Color(0xFFFF6B6B))
|
state.opponentUntrusted -> Triple(R.drawable.ic_no_encryption, stringResource(R.string.trust_impersonation), Color(0xFFFF6B6B))
|
||||||
state.opponentOutdated -> Triple(R.drawable.ic_error, stringResource(R.string.trust_outdated), Color(0xFFFF6B6B))
|
|
||||||
state.opponentUnverified -> Triple(R.drawable.ic_no_encryption, stringResource(R.string.trust_unverified), Color(0xFFFFC46B))
|
state.opponentUnverified -> Triple(R.drawable.ic_no_encryption, stringResource(R.string.trust_unverified), Color(0xFFFFC46B))
|
||||||
else -> Triple(0, null, Color.Unspecified)
|
else -> Triple(0, null, Color.Unspecified)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import androidx.compose.material3.SwitchDefaults
|
|||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
@@ -26,10 +25,7 @@ import androidx.compose.ui.unit.dp
|
|||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import cc.skysparkle.matewave.R
|
import cc.skysparkle.matewave.R
|
||||||
import cc.skysparkle.matewave.settings.FeedbackSettings
|
|
||||||
import cc.skysparkle.matewave.network.AppPermissions
|
import cc.skysparkle.matewave.network.AppPermissions
|
||||||
import cc.skysparkle.matewave.network.DisconnectReason
|
|
||||||
import cc.skysparkle.matewave.network.NetworkLog
|
|
||||||
import cc.skysparkle.matewave.network.NetworkRequirements
|
import cc.skysparkle.matewave.network.NetworkRequirements
|
||||||
import cc.skysparkle.matewave.ui.components.GlassCard
|
import cc.skysparkle.matewave.ui.components.GlassCard
|
||||||
import cc.skysparkle.matewave.ui.components.GlassOutlinedButton
|
import cc.skysparkle.matewave.ui.components.GlassOutlinedButton
|
||||||
@@ -95,37 +91,6 @@ fun PermissionsScreen(onBack: () -> Unit) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val feedbackSettings = remember { FeedbackSettings(context) }
|
|
||||||
var vibration by remember { mutableStateOf(feedbackSettings.vibrationEnabled) }
|
|
||||||
GlassCard(modifier = Modifier.fillMaxWidth()) {
|
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
cc.skysparkle.matewave.ui.components.ButtonIcon(R.drawable.ic_vibration, size = 24.dp)
|
|
||||||
Column(modifier = Modifier.weight(1f)) {
|
|
||||||
Text(
|
|
||||||
stringResource(R.string.perm_vibration_title),
|
|
||||||
color = ink,
|
|
||||||
style = MaterialTheme.typography.titleMedium
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
stringResource(R.string.perm_vibration_text),
|
|
||||||
color = ink.copy(alpha = 0.7f),
|
|
||||||
style = MaterialTheme.typography.bodySmall
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Switch(
|
|
||||||
checked = vibration,
|
|
||||||
onCheckedChange = {
|
|
||||||
vibration = it
|
|
||||||
feedbackSettings.vibrationEnabled = it
|
|
||||||
},
|
|
||||||
colors = SwitchDefaults.colors(
|
|
||||||
checkedThumbColor = Color.White,
|
|
||||||
checkedTrackColor = Color(0xFF4F8A5B)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var background by remember { mutableStateOf(presenceSettings.backgroundEnabled) }
|
var background by remember { mutableStateOf(presenceSettings.backgroundEnabled) }
|
||||||
val requestNotifications = rememberPermissionRequester(
|
val requestNotifications = rememberPermissionRequester(
|
||||||
permissions = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
|
permissions = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
|
||||||
@@ -214,53 +179,6 @@ fun PermissionsScreen(onBack: () -> Unit) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val lastReason by NetworkLog.lastReason.collectAsState()
|
|
||||||
if (lastReason != DisconnectReason.NONE) {
|
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
|
||||||
cc.skysparkle.matewave.ui.components.ButtonIcon(
|
|
||||||
R.drawable.ic_error, tint = Color(0xFFFFC46B), size = 16.dp
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
stringResource(R.string.diag_last_reason, stringResource(lastReason.textRes)),
|
|
||||||
color = Color(0xFFFFC46B),
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
modifier = Modifier.weight(1f)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val metricsTick by cc.skysparkle.matewave.network.NetworkMetrics.updated.collectAsState()
|
|
||||||
val metricsText = remember(metricsTick) {
|
|
||||||
cc.skysparkle.matewave.network.NetworkMetrics.asText(context.resources)
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
metricsText.trim(),
|
|
||||||
color = ink.copy(alpha = 0.7f),
|
|
||||||
style = MaterialTheme.typography.bodySmall
|
|
||||||
)
|
|
||||||
|
|
||||||
GlassOutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
val clipboard = context.getSystemService(android.content.Context.CLIPBOARD_SERVICE)
|
|
||||||
as android.content.ClipboardManager
|
|
||||||
|
|
||||||
val report = buildString {
|
|
||||||
appendLine(context.getString(R.string.diag_report_counters))
|
|
||||||
append(cc.skysparkle.matewave.network.NetworkMetrics.asText(context.resources))
|
|
||||||
appendLine()
|
|
||||||
appendLine(context.getString(R.string.diag_report_events))
|
|
||||||
append(NetworkLog.asText().ifBlank { context.getString(R.string.diag_log_empty) })
|
|
||||||
}
|
|
||||||
clipboard.setPrimaryClip(
|
|
||||||
android.content.ClipData.newPlainText("network report", report)
|
|
||||||
)
|
|
||||||
},
|
|
||||||
modifier = Modifier.fillMaxWidth()
|
|
||||||
) {
|
|
||||||
cc.skysparkle.matewave.ui.components.ButtonIcon(R.drawable.ic_copy)
|
|
||||||
Text(stringResource(R.string.diag_copy_log), color = ink)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -133,7 +133,8 @@ fun SettingsScreen(
|
|||||||
)
|
)
|
||||||
ListDivider()
|
ListDivider()
|
||||||
ListRow(
|
ListRow(
|
||||||
title = stringResource(R.string.perm_vibration_title),
|
title = stringResource(R.string.settings_vibration),
|
||||||
|
subtitle = stringResource(R.string.settings_vibration_subtitle),
|
||||||
icon = R.drawable.ic_vibration,
|
icon = R.drawable.ic_vibration,
|
||||||
trailing = { SettingSwitch(vibrationOn) { vibrationOn = it; feedback.vibrationEnabled = it } }
|
trailing = { SettingSwitch(vibrationOn) { vibrationOn = it; feedback.vibrationEnabled = it } }
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -182,10 +182,6 @@ fun SpectatorScreen(target: SpectateTarget, onBackToFriends: () -> Unit) {
|
|||||||
private fun failureTexts(failure: SpectatorClient.Failure?, max: Int): Pair<String, String> = when (failure) {
|
private fun failureTexts(failure: SpectatorClient.Failure?, max: Int): Pair<String, String> = when (failure) {
|
||||||
SpectatorClient.Failure.FULL ->
|
SpectatorClient.Failure.FULL ->
|
||||||
stringResource(R.string.spectate_full_title) to stringResource(R.string.spectate_full_text, max)
|
stringResource(R.string.spectate_full_title) to stringResource(R.string.spectate_full_text, max)
|
||||||
SpectatorClient.Failure.UPDATE_THIS_APP ->
|
|
||||||
stringResource(R.string.spectate_update_title) to stringResource(R.string.spectate_update_this)
|
|
||||||
SpectatorClient.Failure.UPDATE_HOST_APP ->
|
|
||||||
stringResource(R.string.spectate_update_title) to stringResource(R.string.spectate_update_host)
|
|
||||||
SpectatorClient.Failure.NO_GAME ->
|
SpectatorClient.Failure.NO_GAME ->
|
||||||
stringResource(R.string.spectate_failed_title) to stringResource(R.string.spectate_no_game)
|
stringResource(R.string.spectate_failed_title) to stringResource(R.string.spectate_no_game)
|
||||||
SpectatorClient.Failure.UNREACHABLE, null ->
|
SpectatorClient.Failure.UNREACHABLE, null ->
|
||||||
|
|||||||
@@ -84,7 +84,6 @@ data class GameUiState(
|
|||||||
|
|
||||||
val opponentUntrusted: Boolean = false,
|
val opponentUntrusted: Boolean = false,
|
||||||
val opponentUnverified: Boolean = false,
|
val opponentUnverified: Boolean = false,
|
||||||
val opponentOutdated: Boolean = false,
|
|
||||||
val handshake: HandshakeState = HandshakeState.DISCONNECTED,
|
val handshake: HandshakeState = HandshakeState.DISCONNECTED,
|
||||||
val newPeerFingerprint: String? = null,
|
val newPeerFingerprint: String? = null,
|
||||||
|
|
||||||
@@ -1078,13 +1077,6 @@ class GameViewModel : ViewModel() {
|
|||||||
NetworkLog.log("GAME", "Repeated profile in current session ignored")
|
NetworkLog.log("GAME", "Repeated profile in current session ignored")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (msg.protocolVersion < GameMessage.PROTOCOL_VERSION) {
|
|
||||||
NetworkLog.log(
|
|
||||||
"GAME", "Opponent protocol version ${msg.protocolVersion} < ${GameMessage.PROTOCOL_VERSION}, incompatible"
|
|
||||||
)
|
|
||||||
_uiState.value = _uiState.value.copy(opponentOutdated = true)
|
|
||||||
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")
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<!-- Material Symbols "crisis-alert" 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="M8.1 21.213q-1.825-.788-3.175-2.138T2.788 15.9T2 12q0-2.85 1.488-5.262T7.525 3.05q.025.475.1.963t.25 1.137q-1.8 1.1-2.838 2.913T4 12q0 3.35 2.325 5.675T12 20t5.675-2.325T20 12q0-2.125-1.037-3.95T16.1 5.125q.175-.65.25-1.137t.125-.938q2.55 1.275 4.038 3.675T22 12q0 2.075-.788 3.9t-2.137 3.175t-3.175 2.138T12 22t-3.9-.788m-.35-4.962Q6 14.5 6 12q0-1.45.638-2.725T8.45 7.15q.125.375.275.863t.4 1.212q-.55.575-.837 1.275T8 12q0 1.65 1.175 2.825T12 16t2.825-1.175T16 12q0-.8-.288-1.5t-.837-1.275q.2-.6.363-1.112t.287-.963Q16.7 8 17.35 9.275T18 12q0 2.5-1.75 4.25T12 18t-4.25-1.75M11 8.5q-.925-2.8-1.213-3.937T9.5 2.5q0-1.05.725-1.775T12 0t1.775.725T14.5 2.5q0 .925-.288 2.063T13 8.5zm-.413 4.913Q10 12.825 10 12t.588-1.412T12 10t1.413.588T14 12t-.587 1.413T12 14t-1.412-.587" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<!-- Material Symbols "grid-on" by Google, Apache License 2.0 -->
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M5 21h2.675v-4.675H3V19q0 .825.588 1.413T5 21m4.675 0h4.65v-4.675h-4.65zm6.65 0H19q.825 0 1.413-.587T21 19v-2.675h-4.675zM3 14.325h4.675v-4.65H3zm6.675 0h4.65v-4.65h-4.65zm6.65 0H21v-4.65h-4.675zM3 7.675h4.675V3H5q-.825 0-1.412.588T3 5zm6.675 0h4.65V3h-4.65zm6.65 0H21V5q0-.825-.587-1.412T19 3h-2.675z" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<!-- Material Symbols "image" by Google, Apache License 2.0 -->
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm1-4h12l-3.75-5l-3 4L9 13z" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<!-- Material Symbols "moving" 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="M3.4 18L2 16.6l5.3-5.3q.875-.875 2.125-.875t2.125.875l1.15 1.15q.3.3.713.3t.712-.3L18.575 8H16V6h6v6h-2V9.425l-4.475 4.45q-.875.875-2.125.875t-2.125-.875L10.1 12.7q-.275-.275-.7-.275t-.7.275z" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<!-- Material Symbols "format-list-numbered" 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="M3 22v-1.5h2.5v-.75H4v-1.5h1.5v-.75H3V16h3q.425 0 .713.288T7 17v1q0 .425-.288.713T6 19q.425 0 .713.288T7 20v1q0 .425-.288.713T6 22zm0-7v-2.75q0-.425.288-.712T4 11.25h1.5v-.75H3V9h3q.425 0 .713.288T7 10v1.75q0 .425-.288.713T6 12.75H4.5v.75H7V15zm1.5-7V3.5H3V2h3v6zM9 19v-2h12v2zm0-6v-2h12v2zm0-6V5h12v2z" />
|
||||||
|
</vector>
|
||||||
@@ -104,11 +104,8 @@
|
|||||||
<string name="mesh_permission_title">Berechtigungen für Spiele in der Nähe</string>
|
<string name="mesh_permission_title">Berechtigungen für Spiele in der Nähe</string>
|
||||||
<string name="mesh_permission_text">Um Spieler in der Nähe zu finden und ohne Internet mit ihnen zu spielen, braucht die App Zugriff auf Bluetooth. Die Suche läuft nur, solange der Bildschirm „Spiel in der Nähe“ geöffnet ist.</string>
|
<string name="mesh_permission_text">Um Spieler in der Nähe zu finden und ohne Internet mit ihnen zu spielen, braucht die App Zugriff auf Bluetooth. Die Suche läuft nur, solange der Bildschirm „Spiel in der Nähe“ geöffnet ist.</string>
|
||||||
<string name="permissions_card_title">Berechtigungen</string>
|
<string name="permissions_card_title">Berechtigungen</string>
|
||||||
<string name="diag_last_reason">Letzter Verbindungsfehler: %1$s</string>
|
|
||||||
<string name="diag_copy_log">Verbindungsprotokoll kopieren</string>
|
|
||||||
<string name="trust_impersonation">Dieser Spieler gibt sich als jemand anderes aus – Daten abgelehnt</string>
|
<string name="trust_impersonation">Dieser Spieler gibt sich als jemand anderes aus – Daten abgelehnt</string>
|
||||||
<string name="trust_unverified">Die Identität des Gegners ist nicht bestätigt (er hat eine alte App-Version)</string>
|
<string name="trust_unverified">Die Identität des Gegners ist nicht bestätigt</string>
|
||||||
<string name="trust_outdated">Die App des Gegners ist veraltet – sicheres Spielen ist nicht möglich. Beide sollten die App aktualisieren.</string>
|
|
||||||
<string name="perm_grant">Erlauben</string>
|
<string name="perm_grant">Erlauben</string>
|
||||||
<string name="perm_nearby_title">Verbindung zu Geräten in der Nähe</string>
|
<string name="perm_nearby_title">Verbindung zu Geräten in der Nähe</string>
|
||||||
<string name="perm_nearby_text">Nötig, um Spieler in der Nähe zu finden und ohne Internet zu spielen.</string>
|
<string name="perm_nearby_text">Nötig, um Spieler in der Nähe zu finden und ohne Internet zu spielen.</string>
|
||||||
@@ -197,8 +194,8 @@
|
|||||||
<string name="share_no_wifi">Kein WLAN gefunden. Verbinde dich mit einem WLAN oder schalte einen Hotspot ein und öffne diese Seite erneut.</string>
|
<string name="share_no_wifi">Kein WLAN gefunden. Verbinde dich mit einem WLAN oder schalte einen Hotspot ein und öffne diese Seite erneut.</string>
|
||||||
<string name="share_split_warning">Diese App wurde als Paket aus mehreren Teilen installiert (z. B. über Google Play). Die geteilte Datei lässt sich deshalb eventuell auf einem anderen Handy nicht installieren.</string>
|
<string name="share_split_warning">Diese App wurde als Paket aus mehreren Teilen installiert (z. B. über Google Play). Die geteilte Datei lässt sich deshalb eventuell auf einem anderen Handy nicht installieren.</string>
|
||||||
<string name="share_failed">Die Datei konnte nicht zum Teilen vorbereitet werden.</string>
|
<string name="share_failed">Die Datei konnte nicht zum Teilen vorbereitet werden.</string>
|
||||||
<string name="perm_vibration_title">Vibration</string>
|
<string name="settings_vibration">Vibration</string>
|
||||||
<string name="perm_vibration_text">Ein kurzes Vibrieren beim Wählen einer Figur, beim Ziehen und Schlagen, ein doppeltes bei Schach und am Ende der Partie. Schalte es aus, wenn du es nicht möchtest.</string>
|
<string name="settings_vibration_subtitle">Zug, Schlagen und Schach</string>
|
||||||
<string name="appearance_last_move">Letzten Zug hervorheben</string>
|
<string name="appearance_last_move">Letzten Zug hervorheben</string>
|
||||||
<string name="appearance_last_move_hint">Färbt die Felder, von und auf die der letzte Zug ging</string>
|
<string name="appearance_last_move_hint">Färbt die Felder, von und auf die der letzte Zug ging</string>
|
||||||
<string name="appearance_check">Schach hervorheben</string>
|
<string name="appearance_check">Schach hervorheben</string>
|
||||||
@@ -215,15 +212,6 @@
|
|||||||
<string name="reason_remote_disconnected">Der Gegner hat die Verbindung getrennt</string>
|
<string name="reason_remote_disconnected">Der Gegner hat die Verbindung getrennt</string>
|
||||||
<string name="reason_port_busy">Port konnte nicht geöffnet werden</string>
|
<string name="reason_port_busy">Port konnte nicht geöffnet werden</string>
|
||||||
<string name="reason_unknown">Unbekannter Verbindungsfehler</string>
|
<string name="reason_unknown">Unbekannter Verbindungsfehler</string>
|
||||||
<string name="metrics_connect_attempts">Verbindungsversuche: %1$d, erfolgreich: %2$d</string>
|
|
||||||
<string name="metrics_last_connect">Letzte Verbindung dauerte: %1$d ms</string>
|
|
||||||
<string name="metrics_chunks">Teile gesendet: %1$d, erneut: %2$d (%3$d%%)</string>
|
|
||||||
<string name="metrics_duplicates">Doppelte Teile empfangen: %1$d</string>
|
|
||||||
<string name="metrics_corrupted">Beschädigte Nachrichten: %1$d</string>
|
|
||||||
<string name="metrics_dropped">Verlorene Nachrichten: %1$d</string>
|
|
||||||
<string name="diag_report_counters">=== Netzwerkzähler ===</string>
|
|
||||||
<string name="diag_report_events">=== Ereignisse ===</string>
|
|
||||||
<string name="diag_log_empty">Protokoll ist leer</string>
|
|
||||||
<string name="nearby_player_default">Spieler in der Nähe</string>
|
<string name="nearby_player_default">Spieler in der Nähe</string>
|
||||||
<string name="player_default_name">Spieler</string>
|
<string name="player_default_name">Spieler</string>
|
||||||
<string name="time_no_limit">Ohne Zeitkontrolle</string>
|
<string name="time_no_limit">Ohne Zeitkontrolle</string>
|
||||||
@@ -372,9 +360,6 @@
|
|||||||
<string name="spectate_lost_text">Das Gerät, auf dem die Partie läuft, ist nicht mehr erreichbar.</string>
|
<string name="spectate_lost_text">Das Gerät, auf dem die Partie läuft, ist nicht mehr erreichbar.</string>
|
||||||
<string name="spectate_full_title">Partie ist voll</string>
|
<string name="spectate_full_title">Partie ist voll</string>
|
||||||
<string name="spectate_full_text">Diese Partie hat bereits die maximale Zahl von %1$d Zuschauern. Versuch es später noch einmal.</string>
|
<string name="spectate_full_text">Diese Partie hat bereits die maximale Zahl von %1$d Zuschauern. Versuch es später noch einmal.</string>
|
||||||
<string name="spectate_update_title">Update erforderlich</string>
|
|
||||||
<string name="spectate_update_this">Aktualisiere Matewave, um diese Partie anzusehen.</string>
|
|
||||||
<string name="spectate_update_host">Der Spieler, der diese Partie ausrichtet, muss Matewave aktualisieren, bevor man zuschauen kann.</string>
|
|
||||||
<string name="spectate_failed_title">Zuschauen nicht möglich</string>
|
<string name="spectate_failed_title">Zuschauen nicht möglich</string>
|
||||||
<string name="spectate_no_game">Diese Partie ist nicht mehr verfügbar.</string>
|
<string name="spectate_no_game">Diese Partie ist nicht mehr verfügbar.</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_unreachable">Das Gerät, auf dem die Partie läuft, ist nicht erreichbar. Achte darauf, dass du im selben WLAN bist.</string>
|
||||||
|
|||||||
@@ -104,11 +104,8 @@
|
|||||||
<string name="mesh_permission_title">近くで対戦するための権限</string>
|
<string name="mesh_permission_title">近くで対戦するための権限</string>
|
||||||
<string name="mesh_permission_text">近くのプレイヤーを見つけてインターネットなしで対戦するには、Bluetoothへのアクセスが必要です。検索は「近くで対戦」画面を開いている間だけ行われます。</string>
|
<string name="mesh_permission_text">近くのプレイヤーを見つけてインターネットなしで対戦するには、Bluetoothへのアクセスが必要です。検索は「近くで対戦」画面を開いている間だけ行われます。</string>
|
||||||
<string name="permissions_card_title">権限</string>
|
<string name="permissions_card_title">権限</string>
|
||||||
<string name="diag_last_reason">直近の通信エラー: %1$s</string>
|
|
||||||
<string name="diag_copy_log">通信ログをコピー</string>
|
|
||||||
<string name="trust_impersonation">このプレイヤーは他人になりすましています — データを拒否しました</string>
|
<string name="trust_impersonation">このプレイヤーは他人になりすましています — データを拒否しました</string>
|
||||||
<string name="trust_unverified">相手の本人確認ができていません(古いバージョンのアプリです)</string>
|
<string name="trust_unverified">相手の本人確認ができていません</string>
|
||||||
<string name="trust_outdated">相手のアプリが古いため、安全に対局できません。両方のアプリを更新してください。</string>
|
|
||||||
<string name="perm_grant">許可</string>
|
<string name="perm_grant">許可</string>
|
||||||
<string name="perm_nearby_title">近くのデバイスとの通信</string>
|
<string name="perm_nearby_title">近くのデバイスとの通信</string>
|
||||||
<string name="perm_nearby_text">近くのプレイヤーを見つけ、インターネットなしで対戦するために必要です。</string>
|
<string name="perm_nearby_text">近くのプレイヤーを見つけ、インターネットなしで対戦するために必要です。</string>
|
||||||
@@ -197,8 +194,8 @@
|
|||||||
<string name="share_no_wifi">Wi-Fiネットワークが見つかりません。Wi-Fiに接続するかテザリングをオンにして、この画面を開き直してください。</string>
|
<string name="share_no_wifi">Wi-Fiネットワークが見つかりません。Wi-Fiに接続するかテザリングをオンにして、この画面を開き直してください。</string>
|
||||||
<string name="share_split_warning">このアプリは分割パッケージ(例: Google Play)としてインストールされているため、共有したファイルは別のスマホにインストールできない場合があります。</string>
|
<string name="share_split_warning">このアプリは分割パッケージ(例: Google Play)としてインストールされているため、共有したファイルは別のスマホにインストールできない場合があります。</string>
|
||||||
<string name="share_failed">共有用のファイルを準備できませんでした。</string>
|
<string name="share_failed">共有用のファイルを準備できませんでした。</string>
|
||||||
<string name="perm_vibration_title">バイブレーション</string>
|
<string name="settings_vibration">バイブレーション</string>
|
||||||
<string name="perm_vibration_text">駒の選択、移動、駒を取ったときに短く振動し、チェックや対局終了時には2回振動します。不要ならオフにしてください。</string>
|
<string name="settings_vibration_subtitle">移動、駒を取る、王手</string>
|
||||||
<string name="appearance_last_move">直前の手をハイライト</string>
|
<string name="appearance_last_move">直前の手をハイライト</string>
|
||||||
<string name="appearance_last_move_hint">直前の手の移動元と移動先のマスに色を付けます</string>
|
<string name="appearance_last_move_hint">直前の手の移動元と移動先のマスに色を付けます</string>
|
||||||
<string name="appearance_check">チェックをハイライト</string>
|
<string name="appearance_check">チェックをハイライト</string>
|
||||||
@@ -215,15 +212,6 @@
|
|||||||
<string name="reason_remote_disconnected">相手が切断しました</string>
|
<string name="reason_remote_disconnected">相手が切断しました</string>
|
||||||
<string name="reason_port_busy">ポートを開けませんでした</string>
|
<string name="reason_port_busy">ポートを開けませんでした</string>
|
||||||
<string name="reason_unknown">不明な通信エラー</string>
|
<string name="reason_unknown">不明な通信エラー</string>
|
||||||
<string name="metrics_connect_attempts">接続試行: %1$d 回、成功: %2$d 回</string>
|
|
||||||
<string name="metrics_last_connect">直近の接続時間: %1$d ms</string>
|
|
||||||
<string name="metrics_chunks">送信パート: %1$d、再送: %2$d (%3$d%%)</string>
|
|
||||||
<string name="metrics_duplicates">重複受信パート: %1$d</string>
|
|
||||||
<string name="metrics_corrupted">破損したメッセージ: %1$d</string>
|
|
||||||
<string name="metrics_dropped">失われたメッセージ: %1$d</string>
|
|
||||||
<string name="diag_report_counters">=== ネットワークカウンター ===</string>
|
|
||||||
<string name="diag_report_events">=== イベント ===</string>
|
|
||||||
<string name="diag_log_empty">ログは空です</string>
|
|
||||||
<string name="nearby_player_default">近くのプレイヤー</string>
|
<string name="nearby_player_default">近くのプレイヤー</string>
|
||||||
<string name="player_default_name">プレイヤー</string>
|
<string name="player_default_name">プレイヤー</string>
|
||||||
<string name="time_no_limit">時間制限なし</string>
|
<string name="time_no_limit">時間制限なし</string>
|
||||||
@@ -371,9 +359,6 @@
|
|||||||
<string name="spectate_lost_text">対局をホストしている端末に接続できなくなりました。</string>
|
<string name="spectate_lost_text">対局をホストしている端末に接続できなくなりました。</string>
|
||||||
<string name="spectate_full_title">満員です</string>
|
<string name="spectate_full_title">満員です</string>
|
||||||
<string name="spectate_full_text">この対局の観戦者はすでに上限の%1$d人です。しばらくしてからもう一度お試しください。</string>
|
<string name="spectate_full_text">この対局の観戦者はすでに上限の%1$d人です。しばらくしてからもう一度お試しください。</string>
|
||||||
<string name="spectate_update_title">アップデートが必要です</string>
|
|
||||||
<string name="spectate_update_this">この対局を観戦するには Matewave をアップデートしてください。</string>
|
|
||||||
<string name="spectate_update_host">この対局を観戦するには、対局をホストしているプレイヤーが Matewave をアップデートする必要があります。</string>
|
|
||||||
<string name="spectate_failed_title">観戦できません</string>
|
<string name="spectate_failed_title">観戦できません</string>
|
||||||
<string name="spectate_no_game">この対局はもう観戦できません。</string>
|
<string name="spectate_no_game">この対局はもう観戦できません。</string>
|
||||||
<string name="spectate_unreachable">対局をホストしている端末に接続できません。同じWi-Fiネットワークに接続しているか確認してください。</string>
|
<string name="spectate_unreachable">対局をホストしている端末に接続できません。同じWi-Fiネットワークに接続しているか確認してください。</string>
|
||||||
|
|||||||
@@ -104,11 +104,8 @@
|
|||||||
<string name="mesh_permission_title">Leidimai žaidimui netoliese</string>
|
<string name="mesh_permission_title">Leidimai žaidimui netoliese</string>
|
||||||
<string name="mesh_permission_text">Kad rastų netoliese esančius žaidėjus ir galėtų su jais žaisti be interneto, programai reikia prieigos prie „Bluetooth“. Paieška vyksta tik kol atidarytas ekranas „Žaidimas netoliese“.</string>
|
<string name="mesh_permission_text">Kad rastų netoliese esančius žaidėjus ir galėtų su jais žaisti be interneto, programai reikia prieigos prie „Bluetooth“. Paieška vyksta tik kol atidarytas ekranas „Žaidimas netoliese“.</string>
|
||||||
<string name="permissions_card_title">Leidimai</string>
|
<string name="permissions_card_title">Leidimai</string>
|
||||||
<string name="diag_last_reason">Paskutinė ryšio klaida: %1$s</string>
|
|
||||||
<string name="diag_copy_log">Kopijuoti ryšio žurnalą</string>
|
|
||||||
<string name="trust_impersonation">Šis žaidėjas apsimeta kitu — duomenys atmesti</string>
|
<string name="trust_impersonation">Šis žaidėjas apsimeta kitu — duomenys atmesti</string>
|
||||||
<string name="trust_unverified">Varžovo tapatybė nepatvirtinta (jis turi seną programos versiją)</string>
|
<string name="trust_unverified">Varžovo tapatybė nepatvirtinta</string>
|
||||||
<string name="trust_outdated">Varžovo programa pasenusi – saugus žaidimas neįmanomas. Atnaujinkite programą abiem.</string>
|
|
||||||
<string name="perm_grant">Leisti</string>
|
<string name="perm_grant">Leisti</string>
|
||||||
<string name="perm_nearby_title">Ryšys su netoliese esančiais įrenginiais</string>
|
<string name="perm_nearby_title">Ryšys su netoliese esančiais įrenginiais</string>
|
||||||
<string name="perm_nearby_text">Reikalinga, kad rastumėte žaidėjų netoliese ir žaistumėte be interneto.</string>
|
<string name="perm_nearby_text">Reikalinga, kad rastumėte žaidėjų netoliese ir žaistumėte be interneto.</string>
|
||||||
@@ -197,8 +194,8 @@
|
|||||||
<string name="share_no_wifi">Wi-Fi tinklo nerasta. Prisijunkite prie Wi-Fi arba įjunkite viešosios prieigos tašką ir vėl atidarykite šį ekraną.</string>
|
<string name="share_no_wifi">Wi-Fi tinklo nerasta. Prisijunkite prie Wi-Fi arba įjunkite viešosios prieigos tašką ir vėl atidarykite šį ekraną.</string>
|
||||||
<string name="share_split_warning">Ši programa įdiegta kaip dalių rinkinys (pavyzdžiui, iš „Google Play“), todėl bendrinamas failas gali neįsidiegti kitame telefone.</string>
|
<string name="share_split_warning">Ši programa įdiegta kaip dalių rinkinys (pavyzdžiui, iš „Google Play“), todėl bendrinamas failas gali neįsidiegti kitame telefone.</string>
|
||||||
<string name="share_failed">Nepavyko paruošti failo dalijimuisi.</string>
|
<string name="share_failed">Nepavyko paruošti failo dalijimuisi.</string>
|
||||||
<string name="perm_vibration_title">Vibracija</string>
|
<string name="settings_vibration">Vibracija</string>
|
||||||
<string name="perm_vibration_text">Trumpas virptelėjimas pasirinkus figūrą, einant ir kertant, dvigubas – esant šachui ir pasibaigus partijai. Išjunkite, jei jo nenorite.</string>
|
<string name="settings_vibration_subtitle">Ėjimas, paėmimas ir šachas</string>
|
||||||
<string name="appearance_last_move">Paryškinti paskutinį ėjimą</string>
|
<string name="appearance_last_move">Paryškinti paskutinį ėjimą</string>
|
||||||
<string name="appearance_last_move_hint">Nuspalvina langelius, iš kurio ir į kurį padarytas paskutinis ėjimas</string>
|
<string name="appearance_last_move_hint">Nuspalvina langelius, iš kurio ir į kurį padarytas paskutinis ėjimas</string>
|
||||||
<string name="appearance_check">Paryškinti šachą</string>
|
<string name="appearance_check">Paryškinti šachą</string>
|
||||||
@@ -215,15 +212,6 @@
|
|||||||
<string name="reason_remote_disconnected">Varžovas atsijungė</string>
|
<string name="reason_remote_disconnected">Varžovas atsijungė</string>
|
||||||
<string name="reason_port_busy">Nepavyko atidaryti prievado</string>
|
<string name="reason_port_busy">Nepavyko atidaryti prievado</string>
|
||||||
<string name="reason_unknown">Nežinoma ryšio klaida</string>
|
<string name="reason_unknown">Nežinoma ryšio klaida</string>
|
||||||
<string name="metrics_connect_attempts">Bandymų prisijungti: %1$d, sėkmingų: %2$d</string>
|
|
||||||
<string name="metrics_last_connect">Paskutinis prisijungimas užtruko: %1$d ms</string>
|
|
||||||
<string name="metrics_chunks">Išsiųsta dalių: %1$d, pakartotinai: %2$d (%3$d%%)</string>
|
|
||||||
<string name="metrics_duplicates">Gauta pasikartojančių dalių: %1$d</string>
|
|
||||||
<string name="metrics_corrupted">Sugadintų pranešimų: %1$d</string>
|
|
||||||
<string name="metrics_dropped">Prarastų pranešimų: %1$d</string>
|
|
||||||
<string name="diag_report_counters">=== Tinklo skaitikliai ===</string>
|
|
||||||
<string name="diag_report_events">=== Įvykiai ===</string>
|
|
||||||
<string name="diag_log_empty">žurnalas tuščias</string>
|
|
||||||
<string name="nearby_player_default">Netoliese esantis žaidėjas</string>
|
<string name="nearby_player_default">Netoliese esantis žaidėjas</string>
|
||||||
<string name="player_default_name">Žaidėjas</string>
|
<string name="player_default_name">Žaidėjas</string>
|
||||||
<string name="time_no_limit">Be laiko kontrolės</string>
|
<string name="time_no_limit">Be laiko kontrolės</string>
|
||||||
@@ -374,9 +362,6 @@
|
|||||||
<string name="spectate_lost_text">Įrenginio, kuriame vyksta partija, nebepavyksta pasiekti.</string>
|
<string name="spectate_lost_text">Įrenginio, kuriame vyksta partija, nebepavyksta pasiekti.</string>
|
||||||
<string name="spectate_full_title">Vietų nebėra</string>
|
<string name="spectate_full_title">Vietų nebėra</string>
|
||||||
<string name="spectate_full_text">Šią partiją jau stebi didžiausias leidžiamas žiūrovų skaičius (%1$d). Pabandykite vėliau.</string>
|
<string name="spectate_full_text">Šią partiją jau stebi didžiausias leidžiamas žiūrovų skaičius (%1$d). Pabandykite vėliau.</string>
|
||||||
<string name="spectate_update_title">Reikia atnaujinti</string>
|
|
||||||
<string name="spectate_update_this">Atnaujinkite Matewave, kad galėtumėte stebėti šią partiją.</string>
|
|
||||||
<string name="spectate_update_host">Partiją rengiantis žaidėjas turi atnaujinti Matewave, kad ją būtų galima stebėti.</string>
|
|
||||||
<string name="spectate_failed_title">Šios partijos stebėti negalima</string>
|
<string name="spectate_failed_title">Šios partijos stebėti negalima</string>
|
||||||
<string name="spectate_no_game">Ši partija nebepasiekiama.</string>
|
<string name="spectate_no_game">Ši partija nebepasiekiama.</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_unreachable">Nepavyksta pasiekti įrenginio, kuriame vyksta partija. Įsitikinkite, kad esate prisijungę prie to paties „Wi-Fi“ tinklo.</string>
|
||||||
|
|||||||
@@ -109,11 +109,8 @@
|
|||||||
<string name="mesh_permission_title">Разрешения для связи поблизости</string>
|
<string name="mesh_permission_title">Разрешения для связи поблизости</string>
|
||||||
<string name="mesh_permission_text">Чтобы находить игроков рядом и играть с ними без интернета, приложению нужен доступ к Bluetooth. Поиск идёт, только пока открыт экран «Игра рядом».</string>
|
<string name="mesh_permission_text">Чтобы находить игроков рядом и играть с ними без интернета, приложению нужен доступ к Bluetooth. Поиск идёт, только пока открыт экран «Игра рядом».</string>
|
||||||
<string name="permissions_card_title">Разрешения</string>
|
<string name="permissions_card_title">Разрешения</string>
|
||||||
<string name="diag_last_reason">Последняя ошибка связи: %1$s</string>
|
|
||||||
<string name="diag_copy_log">Скопировать журнал связи</string>
|
|
||||||
<string name="trust_impersonation">Этот игрок выдаёт себя за другого — данные не приняты</string>
|
<string name="trust_impersonation">Этот игрок выдаёт себя за другого — данные не приняты</string>
|
||||||
<string name="trust_unverified">Личность соперника не подтверждена (у него старая версия приложения)</string>
|
<string name="trust_unverified">Личность соперника не подтверждена</string>
|
||||||
<string name="trust_outdated">У соперника устаревшая версия приложения — безопасная игра невозможна. Обновите приложение у обоих.</string>
|
|
||||||
<string name="perm_grant">Разрешить</string>
|
<string name="perm_grant">Разрешить</string>
|
||||||
<string name="perm_nearby_title">Связь с устройствами рядом</string>
|
<string name="perm_nearby_title">Связь с устройствами рядом</string>
|
||||||
<string name="perm_nearby_text">Нужна, чтобы находить игроков поблизости и играть без интернета.</string>
|
<string name="perm_nearby_text">Нужна, чтобы находить игроков поблизости и играть без интернета.</string>
|
||||||
@@ -203,8 +200,8 @@
|
|||||||
<string name="share_no_wifi">Сеть Wi-Fi не найдена. Подключитесь к Wi-Fi или включите точку доступа и откройте экран заново.</string>
|
<string name="share_no_wifi">Сеть Wi-Fi не найдена. Подключитесь к Wi-Fi или включите точку доступа и откройте экран заново.</string>
|
||||||
<string name="share_split_warning">Это приложение установлено как набор частей (например, из Google Play), поэтому переданный файл может не установиться на другой телефон.</string>
|
<string name="share_split_warning">Это приложение установлено как набор частей (например, из Google Play), поэтому переданный файл может не установиться на другой телефон.</string>
|
||||||
<string name="share_failed">Не удалось подготовить файл для передачи.</string>
|
<string name="share_failed">Не удалось подготовить файл для передачи.</string>
|
||||||
<string name="perm_vibration_title">Вибрация</string>
|
<string name="settings_vibration">Вибрация</string>
|
||||||
<string name="perm_vibration_text">Короткая вибрация при выборе фигуры, ходе и взятии, двойная — при шахе и в конце партии. Выключите, если она не нужна.</string>
|
<string name="settings_vibration_subtitle">Ход, взятие и шах</string>
|
||||||
<string name="appearance_last_move">Подсвечивать последний ход</string>
|
<string name="appearance_last_move">Подсвечивать последний ход</string>
|
||||||
<string name="appearance_last_move_hint">Закрашивает клетки, с которой и на которую сделан последний ход</string>
|
<string name="appearance_last_move_hint">Закрашивает клетки, с которой и на которую сделан последний ход</string>
|
||||||
<string name="appearance_check">Подсвечивать шах</string>
|
<string name="appearance_check">Подсвечивать шах</string>
|
||||||
@@ -221,15 +218,6 @@
|
|||||||
<string name="reason_remote_disconnected">Соперник отключился</string>
|
<string name="reason_remote_disconnected">Соперник отключился</string>
|
||||||
<string name="reason_port_busy">Не удалось открыть порт</string>
|
<string name="reason_port_busy">Не удалось открыть порт</string>
|
||||||
<string name="reason_unknown">Неизвестная ошибка связи</string>
|
<string name="reason_unknown">Неизвестная ошибка связи</string>
|
||||||
<string name="metrics_connect_attempts">Попыток подключения: %1$d, успешных: %2$d</string>
|
|
||||||
<string name="metrics_last_connect">Последнее подключение заняло: %1$d мс</string>
|
|
||||||
<string name="metrics_chunks">Частей отправлено: %1$d, повторно: %2$d (%3$d%%)</string>
|
|
||||||
<string name="metrics_duplicates">Повторных частей принято: %1$d</string>
|
|
||||||
<string name="metrics_corrupted">Повреждённых сообщений: %1$d</string>
|
|
||||||
<string name="metrics_dropped">Сообщений потеряно: %1$d</string>
|
|
||||||
<string name="diag_report_counters">=== Счётчики сети ===</string>
|
|
||||||
<string name="diag_report_events">=== События ===</string>
|
|
||||||
<string name="diag_log_empty">журнал пуст</string>
|
|
||||||
<string name="nearby_player_default">Игрок поблизости</string>
|
<string name="nearby_player_default">Игрок поблизости</string>
|
||||||
<string name="player_default_name">Игрок</string>
|
<string name="player_default_name">Игрок</string>
|
||||||
<string name="time_no_limit">Без контроля времени</string>
|
<string name="time_no_limit">Без контроля времени</string>
|
||||||
@@ -380,9 +368,6 @@
|
|||||||
<string name="spectate_lost_text">Устройство, на котором идёт партия, больше недоступно.</string>
|
<string name="spectate_lost_text">Устройство, на котором идёт партия, больше недоступно.</string>
|
||||||
<string name="spectate_full_title">Мест нет</string>
|
<string name="spectate_full_title">Мест нет</string>
|
||||||
<string name="spectate_full_text">У этой партии уже максимум зрителей (%1$d). Попробуйте позже.</string>
|
<string name="spectate_full_text">У этой партии уже максимум зрителей (%1$d). Попробуйте позже.</string>
|
||||||
<string name="spectate_update_title">Требуется обновление</string>
|
|
||||||
<string name="spectate_update_this">Обновите Matewave, чтобы смотреть эту партию.</string>
|
|
||||||
<string name="spectate_update_host">Игроку, который проводит эту партию, нужно обновить Matewave, чтобы её можно было смотреть.</string>
|
|
||||||
<string name="spectate_failed_title">Не удаётся посмотреть партию</string>
|
<string name="spectate_failed_title">Не удаётся посмотреть партию</string>
|
||||||
<string name="spectate_no_game">Эта партия больше недоступна.</string>
|
<string name="spectate_no_game">Эта партия больше недоступна.</string>
|
||||||
<string name="spectate_unreachable">Устройство, на котором идёт партия, недоступно. Убедитесь, что вы подключены к той же сети Wi-Fi.</string>
|
<string name="spectate_unreachable">Устройство, на котором идёт партия, недоступно. Убедитесь, что вы подключены к той же сети Wi-Fi.</string>
|
||||||
|
|||||||
@@ -104,11 +104,8 @@
|
|||||||
<string name="mesh_permission_title">附近对战所需的权限</string>
|
<string name="mesh_permission_title">附近对战所需的权限</string>
|
||||||
<string name="mesh_permission_text">要查找附近的玩家并在无网络时与他们对战,应用需要蓝牙权限。仅在“附近对战”页面打开时进行搜索。</string>
|
<string name="mesh_permission_text">要查找附近的玩家并在无网络时与他们对战,应用需要蓝牙权限。仅在“附近对战”页面打开时进行搜索。</string>
|
||||||
<string name="permissions_card_title">权限</string>
|
<string name="permissions_card_title">权限</string>
|
||||||
<string name="diag_last_reason">最近一次连接错误:%1$s</string>
|
|
||||||
<string name="diag_copy_log">复制连接日志</string>
|
|
||||||
<string name="trust_impersonation">该玩家冒充他人 — 数据已拒绝</string>
|
<string name="trust_impersonation">该玩家冒充他人 — 数据已拒绝</string>
|
||||||
<string name="trust_unverified">对手身份未验证(对方使用的是旧版应用)</string>
|
<string name="trust_unverified">对手身份未验证</string>
|
||||||
<string name="trust_outdated">对手的应用版本过旧,无法安全对局。请双方都更新应用。</string>
|
|
||||||
<string name="perm_grant">允许</string>
|
<string name="perm_grant">允许</string>
|
||||||
<string name="perm_nearby_title">与附近设备通信</string>
|
<string name="perm_nearby_title">与附近设备通信</string>
|
||||||
<string name="perm_nearby_text">用于发现附近的玩家并在无网络时对战。</string>
|
<string name="perm_nearby_text">用于发现附近的玩家并在无网络时对战。</string>
|
||||||
@@ -197,8 +194,8 @@
|
|||||||
<string name="share_no_wifi">未找到 Wi-Fi 网络。请连接 Wi-Fi 或开启热点,然后重新打开此页面。</string>
|
<string name="share_no_wifi">未找到 Wi-Fi 网络。请连接 Wi-Fi 或开启热点,然后重新打开此页面。</string>
|
||||||
<string name="share_split_warning">此应用是以拆分包形式安装的(例如来自 Google Play),因此分享的文件可能无法在另一部手机上安装。</string>
|
<string name="share_split_warning">此应用是以拆分包形式安装的(例如来自 Google Play),因此分享的文件可能无法在另一部手机上安装。</string>
|
||||||
<string name="share_failed">无法准备要分享的文件。</string>
|
<string name="share_failed">无法准备要分享的文件。</string>
|
||||||
<string name="perm_vibration_title">振动</string>
|
<string name="settings_vibration">振动</string>
|
||||||
<string name="perm_vibration_text">选子、走子和吃子时短振一下,将军或对局结束时振动两下。如不需要,可以关闭。</string>
|
<string name="settings_vibration_subtitle">走子、吃子和将军</string>
|
||||||
<string name="appearance_last_move">高亮上一步</string>
|
<string name="appearance_last_move">高亮上一步</string>
|
||||||
<string name="appearance_last_move_hint">为上一步走出和落下的格子上色</string>
|
<string name="appearance_last_move_hint">为上一步走出和落下的格子上色</string>
|
||||||
<string name="appearance_check">高亮将军</string>
|
<string name="appearance_check">高亮将军</string>
|
||||||
@@ -215,15 +212,6 @@
|
|||||||
<string name="reason_remote_disconnected">对手已断开连接</string>
|
<string name="reason_remote_disconnected">对手已断开连接</string>
|
||||||
<string name="reason_port_busy">无法打开端口</string>
|
<string name="reason_port_busy">无法打开端口</string>
|
||||||
<string name="reason_unknown">未知连接错误</string>
|
<string name="reason_unknown">未知连接错误</string>
|
||||||
<string name="metrics_connect_attempts">连接尝试:%1$d 次,成功:%2$d 次</string>
|
|
||||||
<string name="metrics_last_connect">上次连接用时:%1$d 毫秒</string>
|
|
||||||
<string name="metrics_chunks">已发送分片:%1$d,重发:%2$d(%3$d%%)</string>
|
|
||||||
<string name="metrics_duplicates">收到重复分片:%1$d</string>
|
|
||||||
<string name="metrics_corrupted">损坏的消息:%1$d</string>
|
|
||||||
<string name="metrics_dropped">丢失的消息:%1$d</string>
|
|
||||||
<string name="diag_report_counters">=== 网络计数 ===</string>
|
|
||||||
<string name="diag_report_events">=== 事件 ===</string>
|
|
||||||
<string name="diag_log_empty">日志为空</string>
|
|
||||||
<string name="nearby_player_default">附近的玩家</string>
|
<string name="nearby_player_default">附近的玩家</string>
|
||||||
<string name="player_default_name">玩家</string>
|
<string name="player_default_name">玩家</string>
|
||||||
<string name="time_no_limit">无时间限制</string>
|
<string name="time_no_limit">无时间限制</string>
|
||||||
@@ -371,9 +359,6 @@
|
|||||||
<string name="spectate_lost_text">无法再连接到主持对局的设备。</string>
|
<string name="spectate_lost_text">无法再连接到主持对局的设备。</string>
|
||||||
<string name="spectate_full_title">观战人数已满</string>
|
<string name="spectate_full_title">观战人数已满</string>
|
||||||
<string name="spectate_full_text">此对局的观战人数已达上限(%1$d 人),请稍后再试。</string>
|
<string name="spectate_full_text">此对局的观战人数已达上限(%1$d 人),请稍后再试。</string>
|
||||||
<string name="spectate_update_title">需要更新</string>
|
|
||||||
<string name="spectate_update_this">请更新 Matewave 以观看此对局。</string>
|
|
||||||
<string name="spectate_update_host">主持此对局的玩家需要更新 Matewave 后才能观战。</string>
|
|
||||||
<string name="spectate_failed_title">无法观看此对局</string>
|
<string name="spectate_failed_title">无法观看此对局</string>
|
||||||
<string name="spectate_no_game">此对局已不可观看。</string>
|
<string name="spectate_no_game">此对局已不可观看。</string>
|
||||||
<string name="spectate_unreachable">无法连接到主持对局的设备。请确认你们连接的是同一个 Wi-Fi 网络。</string>
|
<string name="spectate_unreachable">无法连接到主持对局的设备。请确认你们连接的是同一个 Wi-Fi 网络。</string>
|
||||||
|
|||||||
@@ -104,11 +104,8 @@
|
|||||||
<string name="mesh_permission_title">Permissions for nearby play</string>
|
<string name="mesh_permission_title">Permissions for nearby play</string>
|
||||||
<string name="mesh_permission_text">To find players nearby and play with them without the internet, the app needs Bluetooth access. Searching runs only while the nearby play screen is open.</string>
|
<string name="mesh_permission_text">To find players nearby and play with them without the internet, the app needs Bluetooth access. Searching runs only while the nearby play screen is open.</string>
|
||||||
<string name="permissions_card_title">Permissions</string>
|
<string name="permissions_card_title">Permissions</string>
|
||||||
<string name="diag_last_reason">Last connection error: %1$s</string>
|
|
||||||
<string name="diag_copy_log">Copy connection log</string>
|
|
||||||
<string name="trust_impersonation">This player is impersonating someone else — data rejected</string>
|
<string name="trust_impersonation">This player is impersonating someone else — data rejected</string>
|
||||||
<string name="trust_unverified">The opponent\'s identity isn\'t verified (they have an old version of the app)</string>
|
<string name="trust_unverified">The opponent\'s identity isn\'t verified</string>
|
||||||
<string name="trust_outdated">The opponent\'s app is outdated and can\'t play securely with yours. Both players need to update.</string>
|
|
||||||
<string name="perm_grant">Allow</string>
|
<string name="perm_grant">Allow</string>
|
||||||
<string name="perm_nearby_title">Nearby device connection</string>
|
<string name="perm_nearby_title">Nearby device connection</string>
|
||||||
<string name="perm_nearby_text">Needed to find players nearby and play without the internet.</string>
|
<string name="perm_nearby_text">Needed to find players nearby and play without the internet.</string>
|
||||||
@@ -197,8 +194,8 @@
|
|||||||
<string name="share_no_wifi">No Wi-Fi network found. Connect to Wi-Fi or turn on a hotspot, then reopen this screen.</string>
|
<string name="share_no_wifi">No Wi-Fi network found. Connect to Wi-Fi or turn on a hotspot, then reopen this screen.</string>
|
||||||
<string name="share_split_warning">This copy was installed as a split bundle (for example, from Google Play), so the shared file may not install on another phone.</string>
|
<string name="share_split_warning">This copy was installed as a split bundle (for example, from Google Play), so the shared file may not install on another phone.</string>
|
||||||
<string name="share_failed">Couldn\'t prepare the file for sharing.</string>
|
<string name="share_failed">Couldn\'t prepare the file for sharing.</string>
|
||||||
<string name="perm_vibration_title">Vibration</string>
|
<string name="settings_vibration">Vibration</string>
|
||||||
<string name="perm_vibration_text">A short vibration when you select a piece, move or capture, and a double one on check or when the game ends. Turn it off if you don\'t want it.</string>
|
<string name="settings_vibration_subtitle">Moves, captures and check</string>
|
||||||
<string name="appearance_last_move">Highlight the last move</string>
|
<string name="appearance_last_move">Highlight the last move</string>
|
||||||
<string name="appearance_last_move_hint">Colors the squares the last move was played from and to</string>
|
<string name="appearance_last_move_hint">Colors the squares the last move was played from and to</string>
|
||||||
<string name="appearance_check">Highlight check</string>
|
<string name="appearance_check">Highlight check</string>
|
||||||
@@ -215,15 +212,6 @@
|
|||||||
<string name="reason_remote_disconnected">The opponent disconnected</string>
|
<string name="reason_remote_disconnected">The opponent disconnected</string>
|
||||||
<string name="reason_port_busy">Couldn\'t open a port</string>
|
<string name="reason_port_busy">Couldn\'t open a port</string>
|
||||||
<string name="reason_unknown">Unknown connection error</string>
|
<string name="reason_unknown">Unknown connection error</string>
|
||||||
<string name="metrics_connect_attempts">Connection attempts: %1$d, successful: %2$d</string>
|
|
||||||
<string name="metrics_last_connect">Last connection took: %1$d ms</string>
|
|
||||||
<string name="metrics_chunks">Parts sent: %1$d, resent: %2$d (%3$d%%)</string>
|
|
||||||
<string name="metrics_duplicates">Duplicate parts received: %1$d</string>
|
|
||||||
<string name="metrics_corrupted">Corrupted messages: %1$d</string>
|
|
||||||
<string name="metrics_dropped">Messages lost: %1$d</string>
|
|
||||||
<string name="diag_report_counters">=== Network counters ===</string>
|
|
||||||
<string name="diag_report_events">=== Events ===</string>
|
|
||||||
<string name="diag_log_empty">log is empty</string>
|
|
||||||
<string name="nearby_player_default">Nearby player</string>
|
<string name="nearby_player_default">Nearby player</string>
|
||||||
<string name="player_default_name">Player</string>
|
<string name="player_default_name">Player</string>
|
||||||
<string name="time_no_limit">No time limit</string>
|
<string name="time_no_limit">No time limit</string>
|
||||||
@@ -372,9 +360,6 @@
|
|||||||
<string name="spectate_lost_text">The host\'s device can no longer be reached.</string>
|
<string name="spectate_lost_text">The host\'s device can no longer be reached.</string>
|
||||||
<string name="spectate_full_title">Game is full</string>
|
<string name="spectate_full_title">Game is full</string>
|
||||||
<string name="spectate_full_text">This game already has the maximum of %1$d spectators. Try again later.</string>
|
<string name="spectate_full_text">This game already has the maximum of %1$d spectators. Try again later.</string>
|
||||||
<string name="spectate_update_title">Update required</string>
|
|
||||||
<string name="spectate_update_this">Update Matewave to watch this game.</string>
|
|
||||||
<string name="spectate_update_host">The player hosting this game needs to update Matewave before it can be watched.</string>
|
|
||||||
<string name="spectate_failed_title">Can\'t watch this game</string>
|
<string name="spectate_failed_title">Can\'t watch this game</string>
|
||||||
<string name="spectate_no_game">This game is no longer available.</string>
|
<string name="spectate_no_game">This game is no longer available.</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_unreachable">The host\'s device can\'t be reached. Make sure you\'re on the same Wi-Fi network.</string>
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package cc.skysparkle.matewave
|
|||||||
|
|
||||||
import cc.skysparkle.matewave.engine.PieceColor
|
import cc.skysparkle.matewave.engine.PieceColor
|
||||||
import cc.skysparkle.matewave.spectate.MAX_SPECTATORS
|
import cc.skysparkle.matewave.spectate.MAX_SPECTATORS
|
||||||
import cc.skysparkle.matewave.spectate.RejectReason
|
|
||||||
import cc.skysparkle.matewave.spectate.SpectatorBroadcaster
|
import cc.skysparkle.matewave.spectate.SpectatorBroadcaster
|
||||||
import cc.skysparkle.matewave.spectate.SpectatorClient
|
import cc.skysparkle.matewave.spectate.SpectatorClient
|
||||||
import cc.skysparkle.matewave.spectate.SpectatorClient.Event
|
import cc.skysparkle.matewave.spectate.SpectatorClient.Event
|
||||||
@@ -24,10 +23,8 @@ import org.junit.Assert.assertNotNull
|
|||||||
import org.junit.Assert.assertTrue
|
import org.junit.Assert.assertTrue
|
||||||
import org.junit.Assert.fail
|
import org.junit.Assert.fail
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
import java.io.BufferedReader
|
|
||||||
import java.io.Closeable
|
import java.io.Closeable
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.io.InputStreamReader
|
|
||||||
import java.net.InetAddress
|
import java.net.InetAddress
|
||||||
import java.net.ServerSocket
|
import java.net.ServerSocket
|
||||||
import java.net.Socket
|
import java.net.Socket
|
||||||
@@ -271,35 +268,6 @@ class SpectatorHubTest {
|
|||||||
assertTrue("publish took $elapsedMs ms", elapsedMs < 1_000)
|
assertTrue("publish took $elapsedMs ms", elapsedMs < 1_000)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
fun outdatedSpectatorIsToldToUpdate() {
|
|
||||||
val hub = hub()
|
|
||||||
val (_, recorder) = watch(hub.port, version = 0, minVersion = 0)
|
|
||||||
assertEquals(Event.JoinFailed(Failure.UPDATE_THIS_APP), recorder.next())
|
|
||||||
assertEquals(0, hub.count.value)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun outdatedHostIsReported() {
|
|
||||||
val hub = hub()
|
|
||||||
val newer = SpectatorProtocol.VERSION + 1
|
|
||||||
val (_, recorder) = watch(hub.port, version = newer, minVersion = newer)
|
|
||||||
assertEquals(Event.JoinFailed(Failure.UPDATE_HOST_APP), recorder.next())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun rawOldClientGetsAClearRejectInsteadOfACrash() {
|
|
||||||
val hub = hub()
|
|
||||||
Socket(loopback, hub.port).use { s ->
|
|
||||||
s.soTimeout = 2_000
|
|
||||||
s.getOutputStream().write("{\"type\":\"hello\",\"sv\":0}\n".toByteArray())
|
|
||||||
val reply = BufferedReader(InputStreamReader(s.getInputStream())).readLine()
|
|
||||||
val reject = SpectatorProtocol.decode(reply)!!.message as SpectatorMessage.Reject
|
|
||||||
assertEquals(RejectReason.UPDATE_REQUIRED, reject.reason)
|
|
||||||
assertEquals(SpectatorProtocol.MIN_COMPATIBLE_VERSION, reject.minVersion)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun garbageAndOversizedInputCloseOnlyThatConnection() {
|
fun garbageAndOversizedInputCloseOnlyThatConnection() {
|
||||||
val hub = hub()
|
val hub = hub()
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• Vibration wird jetzt nur noch an einer Stelle geschaltet: Einstellungen → Ton
|
||||||
|
• 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
|
||||||
|
• 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,5 @@
|
|||||||
|
• Vibration is now switched on and off in one place only: Settings → Sound
|
||||||
|
• 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
|
||||||
|
• Icons for every option in Board appearance
|
||||||
|
• Matewave is also on my own Gitea: https://git.skysparkle.cc/kalarina/Matewave
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• バイブレーションの設定は「設定 → サウンド」の一か所だけになりました
|
||||||
|
• 「権限」画面から接続ログとネットワークカウンターを削除
|
||||||
|
• 対戦相手への接続時や友達の対局観戦時の、アプリが古いかどうかのチェックと警告を削除
|
||||||
|
• 「盤の見た目」のすべての項目にアイコンを追加
|
||||||
|
• Matewave は私の Gitea でも公開しています: https://git.skysparkle.cc/kalarina/Matewave
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• Vibracija dabar įjungiama ir išjungiama tik vienoje vietoje: Nustatymai → Garsas
|
||||||
|
• 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ą
|
||||||
|
• Piktogramos prie visų parinkčių skiltyje „Lentos išvaizda“
|
||||||
|
• Matewave taip pat yra mano Gitea: https://git.skysparkle.cc/kalarina/Matewave
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• Вибрация теперь включается и выключается только в одном месте: Настройки → Звук
|
||||||
|
• С экрана «Разрешения» убраны журнал подключений и сетевые счётчики
|
||||||
|
• Убраны проверка на устаревшее приложение и её предупреждения при подключении к сопернику и просмотре партии друга
|
||||||
|
• Иконки у всех пунктов в «Внешнем виде доски»
|
||||||
|
• Matewave также есть на моём Gitea: https://git.skysparkle.cc/kalarina/Matewave
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
• 振动开关现在只在一个位置:设置 → 声音
|
||||||
|
• 从“权限”页面移除了连接日志和网络计数器
|
||||||
|
• 连接对手或观战好友对局时,不再检查应用是否过旧,也不再显示相关提示
|
||||||
|
• “棋盘外观”中的每个选项都有了图标
|
||||||
|
• Matewave 也发布在我自己的 Gitea 上:https://git.skysparkle.cc/kalarina/Matewave
|
||||||
Reference in New Issue
Block a user