Orbit
Enter the code shown on the TV in Settings › Channels › Create a channel › On your phone.
${note?.let { "${esc(it)}
" }.orEmpty()}diff --git a/android/app/src/main/java/tv/orbit/classic/CreateChannel.kt b/android/app/src/main/java/tv/orbit/classic/CreateChannel.kt index 3e53bca5..07bc4d97 100644 --- a/android/app/src/main/java/tv/orbit/classic/CreateChannel.kt +++ b/android/app/src/main/java/tv/orbit/classic/CreateChannel.kt @@ -200,7 +200,7 @@ private fun PhoneCard(modifier: Modifier) { } Text(PhoneLink.active?.let { "Connected: $it" } ?: "Same Wi-Fi as this TV. The code works once, for two minutes.", color = if (PhoneLink.active != null) Mint else Muted, fontSize = 11.sp) // The phone asks for the After Dark PIN next, which is also four digits: say so here, so it isn't mistaken for this code. - if (PhoneLink.active == null && AfterDarkLock.pinSet) Text("Then your phone asks for your Grown-ups PIN, the one for After Dark.", color = Muted, fontSize = 11.sp) + if (PhoneLink.active == null && AfterDarkLock.pinSet) Text("Then your phone asks for your Adult PIN, the one for After Dark.", color = Muted, fontSize = 11.sp) } } diff --git a/android/app/src/main/java/tv/orbit/classic/MainActivity.kt b/android/app/src/main/java/tv/orbit/classic/MainActivity.kt index 71152b93..5e75678f 100644 --- a/android/app/src/main/java/tv/orbit/classic/MainActivity.kt +++ b/android/app/src/main/java/tv/orbit/classic/MainActivity.kt @@ -134,7 +134,7 @@ private fun OrbitApp() { kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { RememberedConnectionStore.get(context).load() } == null) Onboarding.start(tour = false) } val onboarding = Onboarding.step != null - // With no Kids profile there's no one to ask: Grown-ups goes straight in. + // With no Kids profile there's no one to ask: Adult goes straight in. LaunchedEffect(realChannelAvailable, profile, Profiles.kidsOn, onboarding) { if (realChannelAvailable && profile == null && !Profiles.kidsOn && !onboarding) Profiles.current = Profiles.all.first { it.kind == ProfileKind.Grown } } @@ -174,7 +174,7 @@ private fun OrbitApp() { } // The sections sit centred on the screen, over the centred page below; the logo keeps the left, the clock the right. if (picking) WhosWatching(onClose = { activity?.finish() }) - // At the end of the flow the one who set Orbit up starts watching as Grown-ups; the tour goes back to Settings. + // At the end of the flow the one who set Orbit up starts watching as Adult; the tour goes back to Settings. if (onboarding) OnboardingScreen(signedIn = realChannelAvailable) { tour -> if (!tour) { section = if (realChannelAvailable) "Home" else "Connect Emby"; Profiles.current = Profiles.all.first { it.kind == ProfileKind.Grown } } } diff --git a/android/app/src/main/java/tv/orbit/classic/Onboarding.kt b/android/app/src/main/java/tv/orbit/classic/Onboarding.kt index 3f660e4a..e59db174 100644 --- a/android/app/src/main/java/tv/orbit/classic/Onboarding.kt +++ b/android/app/src/main/java/tv/orbit/classic/Onboarding.kt @@ -36,7 +36,7 @@ import kotlin.math.sin /** * First launch for a new user (Paul, 5 November 2026, from the approved design; Emby first, the other servers later). Welcome * with Ollie, choose the server, sign in (Orbit's own sign-in), pick the channels while Drift sets them up and shows what went - * where, who watches (the Grown-ups PIN and Kids), and You're on air. It runs once, for a box that has never been signed in. + * where, who watches (the Adult PIN and Kids), and You're on air. It runs once, for a box that has never been signed in. * Settings › Emby account can show it again as a tour, which changes nothing. Ollie rolls in and blinks; Drift bobs and blinks; * at the end the cast floats right through the stars. All still with Reduce motion on. */ @@ -303,7 +303,7 @@ private fun WhoWatchesStep(onNext: () -> Unit) { LaunchedEffect(pinStep) { if (pinStep == 0) runCatching { go.requestFocus() } } Column(Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp)) { Text("Who watches?", color = Ink, fontFamily = Anton, fontSize = 32.sp) - Text("Set a PIN for Grown-ups, and keep a Kids profile if there are little ones about.", color = Muted, fontSize = 15.sp) + Text("Set a PIN for the Adult profile, and keep a Kids profile if there are little ones about.", color = Muted, fontSize = 15.sp) if (pinStep > 0) { if (pinStep == 1) key(1) { PinEntry("Choose a four-digit PIN", null, onDone = { first = it; pinStep = 2 }, onCancel = { pinStep = 0 }) } else key(2) { PinEntry("Enter it again", null, onDone = { pin -> @@ -315,7 +315,7 @@ private fun WhoWatchesStep(onNext: () -> Unit) { Row(horizontalArrangement = Arrangement.spacedBy(28.dp), modifier = Modifier.padding(top = 10.dp)) { Column(Modifier.width(280.dp).background(Panel, RoundedCornerShape(14.dp)).padding(18.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) { ProfileAvatar("sil-blue", 90.dp) - Text("Grown-ups", color = Ink, fontSize = 20.sp, fontWeight = FontWeight.SemiBold) + Text("Adult", color = Ink, fontSize = 20.sp, fontWeight = FontWeight.SemiBold) Text("Everything, including After Dark", color = Muted, fontSize = 13.sp) OrbitButton(if (AfterDarkLock.pinSet) "PIN set: change it" else "Set a PIN", Modifier.focusRequester(go), onClick = { note = null; pinStep = 1 }) } @@ -328,7 +328,7 @@ private fun WhoWatchesStep(onNext: () -> Unit) { } note?.let { Text(it, color = Yellow, fontSize = 14.sp) } OrbitButton("Next", Modifier.padding(top = 8.dp).width(200.dp), onClick = onNext) - Text("You can skip this: with no PIN, Grown-ups opens without one. Change both in Settings › Profiles.", color = Muted, fontSize = 12.sp) + Text("You can skip this: with no PIN, Adult opens without one. Change both in Settings › Profiles.", color = Muted, fontSize = 12.sp) } } diff --git a/android/app/src/main/java/tv/orbit/classic/PhoneLink.kt b/android/app/src/main/java/tv/orbit/classic/PhoneLink.kt index a63e511f..83dbeb1d 100644 --- a/android/app/src/main/java/tv/orbit/classic/PhoneLink.kt +++ b/android/app/src/main/java/tv/orbit/classic/PhoneLink.kt @@ -28,7 +28,7 @@ import java.util.concurrent.Executors * on the home Wi-Fi, which a phone opens by scanning a QR code on the TV. No app, no account, and the Emby sign-in never * leaves the TV. The rules: * - Only addresses on the home network are answered; anything else is closed unread. - * - A phone joins with a one-time code from the TV, good for two minutes and five tries, and the Grown-ups PIN if one is set + * - A phone joins with a one-time code from the TV, good for two minutes and five tries, and the Adult PIN if one is set * (three tries). Each phone address also has its own limit: five wrong answers in ten minutes and it's refused for ten. * - Requests must name the TV by its address (Host is an IP), so a web page elsewhere can't reach it through a borrowed name. * - A phone's token works only on the TV that issued it, and the phone page carries catalogue metadata only: titles, years, diff --git a/android/app/src/main/java/tv/orbit/classic/PhonePages.kt b/android/app/src/main/java/tv/orbit/classic/PhonePages.kt index df18cef9..e72e92d8 100644 --- a/android/app/src/main/java/tv/orbit/classic/PhonePages.kt +++ b/android/app/src/main/java/tv/orbit/classic/PhonePages.kt @@ -11,8 +11,8 @@ background:#ffde59;color:#071632;font-size:18px;font-weight:700}.note{color:#ffd fun join(note: String?) = """
Enter the code shown on the TV in Settings › Channels › Create a channel › On your phone.
${note?.let { "${esc(it)}
" }.orEmpty()}The code worked. Making channels is for Grown-ups, so now enter your Grown-ups PIN: the four digits that unlock After Dark on the TV.
+ fun pin(k: String?, code: String?, wrong: Boolean) = """The code worked. Making channels is for adults, so now enter your Adult PIN: the four digits that unlock After Dark on the TV.
It isn't the code on the TV screen.
${if (wrong) "That PIN didn't match. It's the After Dark PIN, not the TV's code.
" else ""}