justinzeus/wolfskin
1
0
Fork 0
Code Issues 2 Pull requests 5 Releases 3 Packages Activity

Restore household colours on the cold-start profile picker
All checks were successful
review/code-claude Code APPROVE: key change only, auth ids untouched
Details
review/design-claude Design PASS: Justin blue, Mindel orange, Shared green
Details

Browse source
This commit is contained in:
justinzeus 2026-11-07 23:38:37 +01:00
parent 4af1898fd2
commit 27b7554fc1
3 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

31
app/src/test/java/org/justinvisser/wolfskin/tv/WolfskinSetupNavigationTest.kt
View file

@ -2,6 +2,7 @@
package org.justinvisser.wolfskin.tv
import android.app.Application
import android.graphics.BitmapFactory
import android.content.Intent
import android.os.Looper
import android.view.View
@ -11,6 +12,7 @@ import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.snapshots.Snapshot
import org.robolectric.Shadows
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.test.*
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.datastore.core.DataStore
@ -46,6 +48,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.justinvisser.wolfskin.conductarr.MemoryCacheStore
import org.robolectric.RobolectricTestRunner
import org.justinvisser.wolfskin.design.WolfskinTokens
import org.robolectric.annotation.Config
import org.robolectric.annotation.GraphicsMode
@ -137,6 +140,34 @@ class WolfskinSetupNavigationTest {
coVerify(exactly = 0) { repository.switchServerOrUser() }
}
@GraphicsMode(GraphicsMode.Mode.NATIVE)
@Test fun coldStartSavedPeopleKeepTheirOwnColorsWithoutConductarr() {
val saved = listOf(user, user.copy(id = UUID.randomUUID(), name = "Mindel"),
user.copy(id = UUID.randomUUID(), name = "Shared"))
every { repository.serverDao.getServer(server.id) } returns JellyfinServerUsers(server, saved)
runBlocking { appModel().handleAppStart() }
mount()
assertOwnPicker()
saved.forEach { rule.onNodeWithText(it.name!!).assertIsDisplayed() }
rule.mainClock.advanceTimeBy(1_000)
rule.waitForIdle()
val people = model.picker!!.people
val bounds = people.map { rule.onNodeWithTag("picker-person:${it.key}").fetchSemanticsNode().boundsInRoot }
val directory = File(requireNotNull(System.getProperty("wolfskin.captureDirectory")), "setup").apply { mkdirs() }
val frame = File(directory, "cold-start-people.png")
rule.onRoot().captureRoboImage(frame)
val bitmap = BitmapFactory.decodeFile(frame.absolutePath)
try {
val fills = bounds.map { bitmap.getPixel(it.center.x.toInt(), (it.top + it.width / 5).toInt()) }
assertEquals(listOf(WolfskinTokens.PersonColor.justin.toArgb(),
WolfskinTokens.PersonColor.mindel.toArgb(), WolfskinTokens.PersonColor.shared.toArgb()), fills)
} finally {
bitmap.recycle()
}
assertNull(conductarr.identity.value)
assertEquals(saved.map { it.id.toString() }, people.map { it.jellyfinUserId })
}
@GraphicsMode(GraphicsMode.Mode.NATIVE)
@Test fun unreachableSelectionRendersWolfskinRecoveryFrame() {
stack[0] = SetupDestination.UserList(server)

2
app/src/wolfskin/java/org/justinvisser/wolfskin/tv/WolfskinSetupViewModel.kt
View file

@ -80,7 +80,7 @@ class WolfskinSetupViewModel @Inject constructor(
if (users.isEmpty()) {
showLogin(null)
} else {
val people = users.map { ShellPerson(it.id.toString(), it.name.orEmpty(), it.name.orEmpty().take(1).uppercase(), false, it.id.toString()) }
val people = users.map { ShellPerson(it.name.orEmpty().lowercase(), it.name.orEmpty(), it.name.orEmpty().take(1).uppercase(), false, it.id.toString()) }
picker = ShellState(people, people.first().key) { onAction(it) }
stage = Stage.Picker
}