diff --git a/app/src/main/java/it/panov/musyx/tv/state/SignInState.kt b/app/src/main/java/it/panov/musyx/tv/state/SignInState.kt
index fa1dfb1..b79a87b 100644
--- a/app/src/main/java/it/panov/musyx/tv/state/SignInState.kt
+++ b/app/src/main/java/it/panov/musyx/tv/state/SignInState.kt
@@ -123,9 +123,5 @@ class SignInState(private val scope: CoroutineScope, private val onGranted: (Cre
else -> R.string.signin_error_unexpected
},
)
-
- /** `ABCD1234` → `ABCD 1234` for easier reading; codes with separators stay as they are. */
- fun spaced(code: String): String =
- if (code.length == 8 && code.all { it.isLetterOrDigit() && it.code < 128 }) "${code.take(4)} ${code.drop(4)}" else code
}
}
diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt b/app/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt
index ea8b17c..fe4fc1a 100644
--- a/app/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt
+++ b/app/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt
@@ -49,6 +49,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.em
import androidx.tv.material3.Text
import com.google.zxing.BarcodeFormat
import com.google.zxing.EncodeHintType
@@ -182,9 +183,11 @@ private fun Steps(signIn: SignInState, stage: SignInState.Stage.Waiting, focus:
Badge(2)
Column(verticalArrangement = Arrangement.spacedBy(MusyxTheme.space.s)) {
Text(stringResource(R.string.signin_step_code), style = MusyxTheme.type.bodyMedium, color = c.fg)
+ // Shown exactly as it must be typed: a space or capital here ends up on the phone,
+ // and Yandex rejects the code. Letter spacing keeps it readable without one.
Text(
- SignInState.spaced(code.userCode),
- style = MusyxTheme.type.displayS,
+ code.userCode,
+ style = MusyxTheme.type.displayS.copy(letterSpacing = 0.12.em),
color = c.fg,
maxLines = 1,
softWrap = false,
@@ -193,6 +196,7 @@ private fun Steps(signIn: SignInState, stage: SignInState.Stage.Waiting, focus:
.border(BorderStroke(1.dp, c.line), RoundedCornerShape(MusyxTheme.radius.card))
.padding(horizontal = 20.dp, vertical = 8.dp),
)
+ Text(stringResource(R.string.signin_step_code_hint), style = MusyxTheme.type.small, color = c.muted)
}
}
Step(3, stringResource(R.string.signin_step_back), stringResource(R.string.signin_step_back_hint))
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c695a02..bf42637 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -24,6 +24,7 @@
Откройте %1$s
На телефоне или компьютере. Можно и отсканировать QR-код.
Введите этот код
+ Строчными буквами, без пробелов. Если телефон сделает букву заглавной или исправит слово, верните как было.
Вернитесь сюда
Musyx войдёт, как только вы разрешите доступ.
Ждём подтверждения · код действует ещё %1$s
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 403191f..5f72f09 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,6 +28,7 @@
Open %1$s
On your phone or computer. You can also scan the QR code.
Enter this code
+ Lowercase, no spaces. If your phone capitalises or autocorrects it, fix it before you continue.
Come back here
Musyx signs you in as soon as you allow access.
Waiting for confirmation · code expires in %1$s
diff --git a/app/src/test/java/it/panov/musyx/tv/state/StateTest.kt b/app/src/test/java/it/panov/musyx/tv/state/StateTest.kt
index b823f63..56bff10 100644
--- a/app/src/test/java/it/panov/musyx/tv/state/StateTest.kt
+++ b/app/src/test/java/it/panov/musyx/tv/state/StateTest.kt
@@ -62,11 +62,4 @@ class StateTest {
assertSame("a no-op keeps the list", removed, removed.with(Track.bare("2"), true))
assertSame(Liked.NotLoaded, Liked.NotLoaded.with(Track.bare("9"), true))
}
-
- @Test
- fun spacedCodes() {
- assertEquals("QX7K 29PM", SignInState.spaced("QX7K29PM"))
- assertEquals("QX7-K29", SignInState.spaced("QX7-K29"))
- assertEquals("1234567", SignInState.spaced("1234567"))
- }
}