refactor: remove all Builder classes

app/src/commonMain/kotlin/com/codebutler/farebot/shared/ui/screen/CardAdvancedScreen.kt

@@ -130,7 +130,7 @@ private fun TreeItemView(
 
             Column(modifier = Modifier.weight(1f)) {
                 Text(
-                    text = item.title.orEmpty(),
+                    text = item.title.resolve(),
                     style = MaterialTheme.typography.bodyMedium,
                 )
                 if (item.value != null) {

app/src/commonTest/kotlin/com/codebutler/farebot/test/ClipperTransitTest.kt

@@ -106,104 +106,95 @@ class ClipperTransitTest {
     fun testClipperTripModeDetection_BART() {
         // BART with transportCode 0x6f -> METRO
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x04) // AGENCY_BART
-                .transportCode(0x6f)
-                .build()
+            ClipperTrip(
+                agency = 0x04, // AGENCY_BART
+                transportCode = 0x6f,
+            )
         assertEquals(Trip.Mode.METRO, trip.mode)
     }
 
     @Test
     fun testClipperTripModeDetection_MuniLightRail() {
         // Muni with transportCode 0x62 -> TRAM (default)
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x12) // AGENCY_MUNI
-                .transportCode(0x62)
-                .build()
+            ClipperTrip(
+                agency = 0x12, // AGENCY_MUNI
+                transportCode = 0x62,
+            )
         assertEquals(Trip.Mode.TRAM, trip.mode)
     }
 
     @Test
     fun testClipperTripModeDetection_Caltrain() {
         // Caltrain with transportCode 0x62 -> TRAIN
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x06) // AGENCY_CALTRAIN
-                .transportCode(0x62)
-                .build()
+            ClipperTrip(
+                agency = 0x06, // AGENCY_CALTRAIN
+                transportCode = 0x62,
+            )
         assertEquals(Trip.Mode.TRAIN, trip.mode)
     }
 
     @Test
     fun testClipperTripModeDetection_SMART() {
         // SMART with transportCode 0x62 -> TRAIN
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x0c) // AGENCY_SMART
-                .transportCode(0x62)
-                .build()
+            ClipperTrip(
+                agency = 0x0c, // AGENCY_SMART
+                transportCode = 0x62,
+            )
         assertEquals(Trip.Mode.TRAIN, trip.mode)
     }
 
     @Test
     fun testClipperTripModeDetection_GGFerry() {
         // GG Ferry with transportCode 0x62 -> FERRY
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x19) // AGENCY_GG_FERRY
-                .transportCode(0x62)
-                .build()
+            ClipperTrip(
+                agency = 0x19, // AGENCY_GG_FERRY
+                transportCode = 0x62,
+            )
         assertEquals(Trip.Mode.FERRY, trip.mode)
     }
 
     @Test
     fun testClipperTripModeDetection_SFBayFerry() {
         // SF Bay Ferry with transportCode 0x62 -> FERRY
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x1b) // AGENCY_SF_BAY_FERRY
-                .transportCode(0x62)
-                .build()
+            ClipperTrip(
+                agency = 0x1b, // AGENCY_SF_BAY_FERRY
+                transportCode = 0x62,
+            )
         assertEquals(Trip.Mode.FERRY, trip.mode)
     }
 
     @Test
     fun testClipperTripModeDetection_Bus() {
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x01) // AGENCY_ACTRAN
-                .transportCode(0x61)
-                .build()
+            ClipperTrip(
+                agency = 0x01, // AGENCY_ACTRAN
+                transportCode = 0x61,
+            )
         assertEquals(Trip.Mode.BUS, trip.mode)
     }
 
     @Test
     fun testClipperTripModeDetection_Unknown() {
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x04) // AGENCY_BART
-                .transportCode(0xFF)
-                .build()
+            ClipperTrip(
+                agency = 0x04, // AGENCY_BART
+                transportCode = 0xFF,
+            )
         assertEquals(Trip.Mode.OTHER, trip.mode)
     }
 
     @Test
     fun testClipperTripFareCurrency() {
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x04)
-                .fare(350)
-                .build()
+            ClipperTrip(
+                agency = 0x04,
+                fareValue = 350,
+            )
         val fareStr = trip.fare?.formatCurrencyString() ?: ""
         // Should format as USD
         assertTrue(
@@ -215,12 +206,11 @@ class ClipperTransitTest {
     @Test
     fun testClipperTripWithBalance() {
         val trip =
-            ClipperTrip
-                .builder()
-                .agency(0x04)
-                .fare(200)
-                .balance(1000)
-                .build()
+            ClipperTrip(
+                agency = 0x04,
+                fareValue = 200,
+                balance = 1000,
+            )
         val updated = trip.withBalance(500)
         assertEquals(500L, updated.getBalance())
     }
@@ -297,87 +287,78 @@ class ClipperTransitTest {
     fun testVehicleNumbers() {
         // Test null vehicle number (0)
         val trip0 =
-            ClipperTrip
-                .builder()
-                .agency(0x12) // Muni
-                .vehicleNum(0)
-                .build()
+            ClipperTrip(
+                agency = 0x12, // Muni
+                vehicleNum = 0,
+            )
         assertNull(trip0.vehicleID)
 
         // Test null vehicle number (0xffff)
         val tripFfff =
-            ClipperTrip
-                .builder()
-                .agency(0x12)
-                .vehicleNum(0xffff)
-                .build()
+            ClipperTrip(
+                agency = 0x12,
+                vehicleNum = 0xffff,
+            )
         assertNull(tripFfff.vehicleID)
 
         // Test regular vehicle number
         val trip1058 =
-            ClipperTrip
-                .builder()
-                .agency(0x12)
-                .vehicleNum(1058)
-                .build()
+            ClipperTrip(
+                agency = 0x12,
+                vehicleNum = 1058,
+            )
         assertEquals("1058", trip1058.vehicleID)
 
         // Test regular vehicle number
         val trip1525 =
-            ClipperTrip
-                .builder()
-                .agency(0x12)
-                .vehicleNum(1525)
-                .build()
+            ClipperTrip(
+                agency = 0x12,
+                vehicleNum = 1525,
+            )
         assertEquals("1525", trip1525.vehicleID)
 
         // Test LRV4 Muni vehicle numbers (5 digits, encoded as number*10 + letter)
         // 2010A = 20100 + 1 - 1 = 20101? No, the encoding is: number/10 gives the vehicle, %10 gives letter offset
         // 20101: 20101/10 = 2010, 20101%10 = 1, letter = 9+1 = A (in hex, 10 = A)
         val trip2010A =
-            ClipperTrip
-                .builder()
-                .agency(0x12)
-                .vehicleNum(20101)
-                .build()
+            ClipperTrip(
+                agency = 0x12,
+                vehicleNum = 20101,
+            )
         assertEquals("2010A", trip2010A.vehicleID)
 
         // 2061B = vehicle/10 = 2061, letter offset = 2 -> 9+2 = B (11 in hex = B)
         val trip2061B =
-            ClipperTrip
-                .builder()
-                .agency(0x12)
-                .vehicleNum(20612)
-                .build()
+            ClipperTrip(
+                agency = 0x12,
+                vehicleNum = 20612,
+            )
         assertEquals("2061B", trip2061B.vehicleID)
     }
 
     @Test
     fun testHumanReadableRouteID() {
         // Golden Gate Ferry should display route ID in hex
         val ggFerryTrip =
-            ClipperTrip
-                .builder()
-                .agency(0x19) // AGENCY_GG_FERRY
-                .route(0x1234)
-                .build()
+            ClipperTrip(
+                agency = 0x19, // AGENCY_GG_FERRY
+                route = 0x1234,
+            )
         assertEquals("0x1234", ggFerryTrip.humanReadableRouteID)
 
         // Other agencies should not have humanReadableRouteID
         val bartTrip =
-            ClipperTrip
-                .builder()
-                .agency(0x04) // AGENCY_BART
-                .route(0x5678)
-                .build()
+            ClipperTrip(
+                agency = 0x04, // AGENCY_BART
+                route = 0x5678,
+            )
         assertNull(bartTrip.humanReadableRouteID)
 
         val muniTrip =
-            ClipperTrip
-                .builder()
-                .agency(0x12) // AGENCY_MUNI
-                .route(0xABCD)
-                .build()
+            ClipperTrip(
+                agency = 0x12, // AGENCY_MUNI
+                route = 0xABCD,
+            )
         assertNull(muniTrip.humanReadableRouteID)
     }
 

base/src/commonMain/kotlin/com/codebutler/farebot/base/ui/FareBotUiTree.kt

@@ -1,96 +1,13 @@
 package com.codebutler.farebot.base.ui
 
 import com.codebutler.farebot.base.util.FormattedString
-import kotlinx.serialization.Contextual
-import kotlinx.serialization.Serializable
-import org.jetbrains.compose.resources.StringResource
 
-@Serializable
 data class FareBotUiTree(
     val items: List<Item>,
 ) {
-    companion object {
-        fun builder(): Builder = Builder()
-
-        private suspend fun buildItems(itemBuilders: List<Item.Builder>): List<Item> = itemBuilders.map { it.build() }
-    }
-
-    class Builder {
-        private val itemBuilders = mutableListOf<Item.Builder>()
-
-        fun item(): Item.Builder {
-            val builder = Item.builder()
-            itemBuilders.add(builder)
-            return builder
-        }
-
-        suspend fun build(): FareBotUiTree = FareBotUiTree(buildItems(itemBuilders))
-    }
-
-    @Serializable
     data class Item(
-        val title: String,
-        @Contextual val value: Any?,
-        val children: List<Item>,
-    ) {
-        companion object {
-            fun builder(): Builder = Builder()
-        }
-
-        class Builder {
-            private var title: FormattedString = FormattedString("")
-            private var value: Any? = null
-            private val childBuilders = mutableListOf<Builder>()
-
-            fun title(text: String): Builder {
-                this.title = FormattedString(text)
-                return this
-            }
-
-            fun title(textRes: StringResource): Builder {
-                this.title = FormattedString(textRes)
-                return this
-            }
-
-            fun title(formattedString: FormattedString): Builder {
-                this.title = formattedString
-                return this
-            }
-
-            fun value(value: Any?): Builder {
-                this.value = value
-                return this
-            }
-
-            fun item(): Builder {
-                val builder = Item.builder()
-                childBuilders.add(builder)
-                return builder
-            }
-
-            fun item(
-                title: String,
-                value: Any?,
-            ): Builder =
-                item()
-                    .title(title)
-                    .value(value)
-
-            fun item(
-                title: StringResource,
-                value: Any?,
-            ): Builder =
-                item().also {
-                    it.title = FormattedString(title)
-                    it.value(value)
-                }
-
-            suspend fun build(): Item =
-                Item(
-                    title = title.resolveAsync(),
-                    value = value,
-                    children = buildItems(childBuilders),
-                )
-        }
-    }
+        val title: FormattedString,
+        val value: Any? = null,
+        val children: List<Item> = emptyList(),
+    )
 }