working on web interface

desktop/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     kotlin("jvm")
+    // alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.compose)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
@@ -7,23 +8,18 @@ plugins {
 
 dependencies {
     implementation(project(":shared"))
-    implementation("com.composables:icons-material-icons-filled-cmp:2.2.1")
+    implementation(project(":shared_ui"))
+    // implementation(libs.compose.icons.material)
+    // implementation("com.composables:icons-material-icons-filled-cmp:2.2.1")
     implementation(libs.kotlinx.serialization)
-    implementation(project(":shared"))
     implementation(libs.ktor.serialization.kotlinx.json)
     implementation(libs.ktor.client.core)
     implementation(libs.ktor.client.cio)
     implementation(libs.ktor.client.content.negotiation)
-    implementation("com.composables:icons-material-icons-filled-cmp:2.2.1")
-    implementation("org.jetbrains.compose.material3:material3:1.9.0")
+    implementation(libs.compose.material3)
     implementation(compose.desktop.currentOs)
 }
 
-repositories {
-    mavenCentral()
-    google()
-}
-
 compose.desktop {
     application {
         mainClass = "dev.geekback.dopewars.desktop.Main3Kt"

desktop/src/main/kotlin/dev/geekback/dopewars/desktop/AppTheme.kt

@@ -1,42 +0,0 @@
-package dev.geekback.dopewars.desktop
-
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Card
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AppTheme(content: @Composable () -> Unit) {
-    Scaffold {
-        MaterialTheme {
-            content()
-        }
-    }
-}
-
-@Composable
-fun BorderedCard(title: String, content: @Composable () -> Unit) {
-    Card(modifier = Modifier
-        .border(BorderStroke(width = 1.dp, color = Color.Black))
-        .fillMaxWidth()
-        .padding(16.dp)) {
-        Column {
-            Text(
-                modifier = Modifier.padding(16.dp),
-                text = title,
-                style = MaterialTheme.typography.titleMedium)
-            content()
-        }
-    }
-}

desktop/src/main/kotlin/dev/geekback/dopewars/desktop/ClientState.kt

@@ -3,11 +3,8 @@ package dev.geekback.dopewars.desktop
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import dev.geekback.dopewars.desktop.ApiClient
 import dev.geekback.dopewars.shared.Player
 import dev.geekback.dopewars.shared.api.TravelRequest
-import dev.geekback.dopewars.shared.api.TravelResult
-import dev.geekback.dopewars.ui.PlayerUi
 
 class ClientState(player: Player) {
     var player by mutableStateOf(player)

desktop/src/main/kotlin/dev/geekback/dopewars/desktop/DemoMain3.kt

@@ -19,7 +19,6 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import dev.geekback.dopewars.shared.Drug
 import dev.geekback.dopewars.shared.DrugInfo
-import dev.geekback.dopewars.shared.Drugs
 import dev.geekback.dopewars.shared.Location
 import dev.geekback.dopewars.shared.Locations
 import dev.geekback.dopewars.shared.Market

desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main.kt

@@ -2,23 +2,15 @@ package dev.geekback.dopewars.desktop
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.Button
-import androidx.compose.material3.DrawerState
-import androidx.compose.material3.DrawerValue
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import com.composables.icons.materialicons.MaterialIcons
-import com.composables.icons.materialicons.filled.Menu
-import dev.geekback.dopewars.shared.Drug
 import dev.geekback.dopewars.shared.Location
 import dev.geekback.dopewars.shared.Player
-import kotlinx.coroutines.launch
+import dev.geekback.dopewars.ui.AppTheme
 
 
 fun main() {

desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main3.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
 import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
 import androidx.compose.material3.ModalDrawerSheet
 import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.material3.NavigationDrawerItem
@@ -22,8 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import com.composables.icons.materialicons.MaterialIcons
-import com.composables.icons.materialicons.filled.Login
+import dev.geekback.dopewars.ui.AppTheme
 import dev.geekback.dopewars.ui.PlayerUi
 import dev.geekback.dopewars.ui.TravelUi
 import kotlinx.coroutines.launch
@@ -58,11 +56,13 @@ fun App() {
                         NavigationDrawerItem(
                             label = {
                                 Row {
+                                    /*
                                     Icon(
                                         modifier = Modifier.padding(16.dp),
-                                        imageVector = MaterialIcons.Filled.Login,
+                                        imageVector = ,
                                         contentDescription = "Login Icon"
                                     )
+                                     */
                                     Text(
                                         modifier = Modifier.padding(16.dp),
                                         text = "Login"

desktop/src/main/kotlin/dev/geekback/dopewars/ui/DopeWarsModelUi.kt

@@ -1,36 +0,0 @@
-package dev.geekback.dopewars.ui
-
-import androidx.compose.runtime.Composable
-import dev.geekback.dopewars.shared.DrugInfo
-import dev.geekback.dopewars.ui.api.ApiUi
-
-interface DopeWarsModelUi<T> {
-    @Composable
-    fun view(model: T);
-    @Composable
-    fun form(model: T, onModelUpdate: (T) -> Unit)
-}
-
-data class DopeWarsUi(
-    val drug: DrugInfoUi,
-    val inventory: InventoryUi,
-    val inventoryItem: InventoryItemUi,
-    val location: LocationUi,
-    val market: MarketUi,
-    val player: PlayerUi,
-    val api: ApiUi
-) {
-    companion object {
-        fun new() : DopeWarsUi {
-            return DopeWarsUi(
-                drug = DrugInfoUi(),
-                inventory = InventoryUi(),
-                inventoryItem = InventoryItemUi(),
-                location = LocationUi(),
-                market = MarketUi(),
-                player = PlayerUi(),
-                api = ApiUi.new()
-            )
-        }
-    }
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/TravelUi.kt

@@ -1,90 +0,0 @@
-package dev.geekback.dopewars.ui
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.onClick
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Window
-import com.composables.icons.materialicons.MaterialIcons
-import com.composables.icons.materialicons.filled.Menu
-import dev.geekback.dopewars.shared.Location
-import dev.geekback.dopewars.shared.Locations
-import dev.geekback.dopewars.shared.Player
-import dev.geekback.dopewars.shared.api.TravelRequest
-
-class TravelUi {
-    /*
-        Wizard
-
-        Holds the users hand through picking a new location
-     */
-    @Composable
-    fun wizard(current: Player, onTicketPunched: (TravelRequest) -> Unit) {
-        var stage by remember { mutableStateOf(0) }
-        var pickedLocation by remember { mutableStateOf(0) }
-        val locations = Locations.all
-        var expanded by remember { mutableStateOf(false) }
-        Window(onCloseRequest = { onTicketPunched(TravelRequest(destination = current.location)) }, title = "Select New Location") {
-            Card(modifier = Modifier.padding(16.dp).fillMaxSize()) {
-                Column {
-                    Text("Wizard")
-                    var index = 0;
-                    when (stage) {
-                        0 -> {
-                            Text(text = locations[pickedLocation].name)
-                            IconButton(onClick = { expanded = !expanded }) {
-                                Icon(MaterialIcons.Filled.Menu, contentDescription = "More options")
-                            }
-                            DropdownMenu(
-                                expanded = expanded,
-                                onDismissRequest = { expanded = false }
-                            ) {
-                                locations.forEach {
-                                    DropdownMenuItem(
-                                        text = { Text("$it.name / $index")},
-                                        onClick = {
-                                            expanded = false
-                                            pickedLocation = (index - 1)
-                                            println("location index to $index")
-                                        }
-                                    )
-                                    index += 1;
-                                }
-                            }
-
-                            Button(onClick = {
-                                stage += 1
-                            }) {
-                                Text("Next Step")
-                            }
-                        }
-                        1 -> {
-                            Text("Stage 1")
-                            Button(onClick = {
-                                println("Selected Location - $pickedLocation")
-                                onTicketPunched(TravelRequest(locations[pickedLocation]))
-                            }) {
-                                Text("Finish")
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/ApiUi.kt

@@ -1,26 +0,0 @@
-package dev.geekback.dopewars.ui.api
-
-data class ApiUi(
-    val marketRequest: MarketRequestUi,
-    val marketResponse: MarketResponseUi,
-    val playerNameUpdateRequest: PlayerNameUpdateRequestUi,
-    val playerNameUpdateResponse: PlayerNameUpdateResponseUi,
-    val tradeRequest: TradeRequestUi,
-    // TODO: tradeResponse
-    val travelRequest: TravelRequestUi,
-    val travelResponse: TravelResponseUi,
-) {
-    companion object {
-        fun new(): ApiUi {
-            return ApiUi(
-                marketRequest = MarketRequestUi(),
-                marketResponse = MarketResponseUi(),
-                playerNameUpdateRequest = PlayerNameUpdateRequestUi(),
-                playerNameUpdateResponse = PlayerNameUpdateResponseUi(),
-                tradeRequest = TradeRequestUi(),
-                travelRequest = TravelRequestUi(),
-                travelResponse = TravelResponseUi()
-            )
-        }
-    }
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketRequestUi.kt

@@ -1,47 +0,0 @@
-package dev.geekback.dopewars.ui.api
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.shared.api.MarketRequest
-import dev.geekback.dopewars.ui.DopeWarsModelUi
-import dev.geekback.dopewars.ui.LocationUi
-
-class MarketRequestUi: DopeWarsModelUi<MarketRequest> {
-    @Composable
-    override fun view(model: MarketRequest) {
-        BorderedCard("Market Request for ${model.location.name}") {
-            LocationUi().view(model.location)
-        }
-    }
-
-    @Composable
-    override fun form(
-        model: MarketRequest,
-        onModelUpdate: (MarketRequest) -> Unit
-    ) {
-        var localModel by remember { mutableStateOf(model) }
-        BorderedCard("Market Request Form") {
-            Column {
-                LocationUi().form(model.location) {
-                    localModel = MarketRequest(location = it)
-                }
-                Row {
-                    Button(onClick = { onModelUpdate(localModel) }) {
-                        Text("Apply")
-                    }
-                    Button(onClick = { localModel = model }) {
-                        Text("Cancel")
-                    }
-                }
-            }
-        }
-    }
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketResponseUi.kt

@@ -1,29 +0,0 @@
-package dev.geekback.dopewars.ui.api
-
-import androidx.compose.runtime.Composable
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.shared.api.MarketResult
-import dev.geekback.dopewars.ui.DopeWarsModelUi
-import dev.geekback.dopewars.ui.MarketUi
-
-class MarketResponseUi: DopeWarsModelUi<MarketResult> {
-    @Composable
-    override fun view(model: MarketResult) {
-        BorderedCard("Market Result for ${model.market.location.name}") {
-            MarketUi().view(model.market)
-        }
-    }
-
-    @Composable
-    override fun form(
-        model: MarketResult,
-        onModelUpdate: (MarketResult) -> Unit
-    ) {
-        BorderedCard("Market Result Form") {
-            MarketUi().form(model.market) {
-                onModelUpdate(model)
-            }
-        }
-    }
-
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateRequestUi.kt

@@ -1,25 +0,0 @@
-package dev.geekback.dopewars.ui.api
-
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.ui.DopeWarsModelUi
-import dev.geekback.dopewars.shared.api.PlayerNameUpdateRequest
-
-class PlayerNameUpdateRequestUi(): DopeWarsModelUi<PlayerNameUpdateRequest> {
-    @Composable
-    override fun view(model: PlayerNameUpdateRequest) {
-        BorderedCard("Player Name Update Request for ${model.newName}") {
-        }
-    }
-
-    @Composable
-    override fun form(model: PlayerNameUpdateRequest, onModelUpdate: (PlayerNameUpdateRequest) -> Unit) {
-        Text("Player Name Update Request Form")
-        Button(onClick = { onModelUpdate(model) }) {
-            Text("Update with same data")
-        }
-    }
-
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateResponseUi.kt

@@ -1,26 +0,0 @@
-package dev.geekback.dopewars.ui.api
-
-import androidx.compose.runtime.Composable
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.ui.DopeWarsModelUi
-import dev.geekback.dopewars.ui.PlayerUi
-import dev.geekback.dopewars.shared.api.PlayerNameUpdateResponse
-
-class PlayerNameUpdateResponseUi: DopeWarsModelUi<PlayerNameUpdateResponse> {
-    @Composable
-    override fun view(model: PlayerNameUpdateResponse) {
-        BorderedCard("Player Name Update Response") {
-            PlayerUi().view(model.updatedPlayer)
-        }
-    }
-
-    @Composable
-    override fun form(
-        model: PlayerNameUpdateResponse,
-        onModelUpdate: (PlayerNameUpdateResponse) -> Unit
-    ) {
-        PlayerUi().form(model.updatedPlayer) {
-            onModelUpdate(model)
-        }
-    }
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TradeRequestUi.kt

@@ -1,50 +0,0 @@
-package dev.geekback.dopewars.ui.api
-
-import androidx.compose.foundation.layout.Row
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.shared.api.TradeRequest
-import dev.geekback.dopewars.ui.DopeWarsModelUi
-
-class TradeRequestUi: DopeWarsModelUi<TradeRequest> {
-    @Composable
-    override fun view(model: TradeRequest) {
-        BorderedCard("Trade Request for ${model.drug.name} / ${model.action} / ${model.quantity}") {
-
-        }
-    }
-
-    @Composable
-    override fun form(
-        model: TradeRequest,
-        onModelUpdate: (TradeRequest) -> Unit
-    ) {
-        var localModel by remember { mutableStateOf(model) }
-        var actionIndex by remember { mutableStateOf(0) }
-        var quantity by remember { mutableStateOf(model.quantity) }
-        var drug by remember { mutableStateOf(model.drug) }
-
-        BorderedCard("Trade Requesst Form") {
-            Row {
-                Button(onClick = {
-                    onModelUpdate(localModel)
-                    println("Trade Request Form Apply Clicked")
-                }) {
-                    Text("Apply")
-                }
-                Button(onClick = {
-                    localModel = model
-                }) {
-                    Text("Cancel")
-                }
-            }
-        }
-    }
-
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelRequestUi.kt

@@ -1,25 +0,0 @@
-package dev.geekback.dopewars.ui.api
-
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.ui.DopeWarsModelUi
-import dev.geekback.dopewars.shared.api.TravelRequest
-
-class TravelRequestUi: DopeWarsModelUi<TravelRequest> {
-    @Composable
-    override fun view(model: TravelRequest) {
-        BorderedCard("Travel Request to ${model.destination.name}") {
-        }
-    }
-
-    @Composable
-    override fun form(
-        model: TravelRequest,
-        onModelUpdate: (TravelRequest) -> Unit
-    ) {
-        BorderedCard("Travel Request Form") {
-            Text("Location Picker goes here.")
-        }
-    }
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelResponseUi.kt

@@ -1,54 +0,0 @@
-package dev.geekback.dopewars.ui.api
-
-import androidx.compose.foundation.layout.Row
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.shared.api.TravelResult
-import dev.geekback.dopewars.ui.DopeWarsModelUi
-import dev.geekback.dopewars.ui.LocationUi
-import dev.geekback.dopewars.ui.MarketUi
-
-class TravelResponseUi: DopeWarsModelUi<TravelResult> {
-
-    @Composable
-    override fun view(model: TravelResult) {
-        BorderedCard("Travel Result ${model.location.name}") {
-            LocationUi().view(model.location)
-            Text("Day: ${model.day}")
-            MarketUi().view(model.market)
-
-        }
-    }
-
-    @Composable
-    override fun form(model: TravelResult, onModelUpdate: (TravelResult) -> Unit) {
-        var day by remember { mutableStateOf(model.day) }
-        var location by remember { mutableStateOf(model.location) }
-        var market by remember { mutableStateOf(model.market) }
-        var localModel by remember { mutableStateOf(model) }
-
-        BorderedCard("Travel Result Form") {
-            LocationUi().form(model.location) {
-                println("Update location to $it")
-            }
-
-            Row {
-                Button(onClick = {}) {
-                    Text("Apply")
-                }
-
-                Button(onClick = {}) {
-                    Text("Cancel")
-                }
-            }
-
-        }
-    }
-
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/drug.kt

@@ -1,94 +0,0 @@
-package dev.geekback.dopewars.ui
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.material3.Button
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.RangeSlider
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.shared.DRUG_MAX_PRICE
-import dev.geekback.dopewars.shared.Drug
-import dev.geekback.dopewars.shared.DrugInfo
-
-class DrugInfoUi: DopeWarsModelUi<DrugInfo> {
-        @Composable
-        override fun view(model: DrugInfo) {
-            BorderedCard(model.drug.name) {
-                Column {
-                    Text("Price: ${model.minValue} - ${model.maxValue}")
-                }
-            }
-        }
-
-        @Composable
-        override fun form(
-            model: DrugInfo,
-            onModelUpdate: (DrugInfo) -> Unit
-        ) {
-            var drug by remember { mutableStateOf(model) }
-            var name by remember { mutableStateOf(model.drug.name) }
-            var minPrice by remember { mutableFloatStateOf(model.minValue) }
-            var maxPrice by remember { mutableFloatStateOf(model.maxValue) }
-
-            BorderedCard("Drug Form") {
-                Column {
-                    // Name
-                    TextField(
-                        value = name,
-                        onValueChange = { name = it },
-                        label = { Text("Name") },
-                    )
-
-                    Row {
-                        TextField(
-                            value = minPrice.toString(),
-                            onValueChange = { minPrice = it.toFloatOrNull() ?: minPrice },
-                            label = { Text("Min Price") },
-                        )
-
-                        TextField(
-                            value = maxPrice.toString(),
-                            onValueChange = { maxPrice = it.toFloatOrNull() ?: maxPrice },
-                            label = { Text("Max Price") },
-                        )
-                    }
-
-                    RangeSlider(
-                        value = (minPrice)..(maxPrice),
-                        onValueChangeFinished = { },
-                        valueRange = 1f..DRUG_MAX_PRICE,
-                        onValueChange = { it ->
-                            minPrice = it.start
-                            maxPrice = it.endInclusive
-                        }
-                    )
-
-                    Row {
-                        Button(onClick = {
-                            drug = DrugInfo(Drug.WEED , minPrice, maxPrice)
-                            onModelUpdate(drug)
-                        }) {
-                            Text("Apply")
-                        }
-
-                        Button(onClick = {
-                            name = Drug.WEED.name
-                            minPrice = drug.minValue
-                            maxPrice = drug.maxValue
-                        }) {
-                            Text("Cancel")
-                        }
-                    }
-                }
-            }
-
-        }
-    }

desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventory.kt

@@ -1,29 +0,0 @@
-package dev.geekback.dopewars.ui
-
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.shared.InventoryItem
-
-class InventoryUi: DopeWarsModelUi<List<InventoryItem>> {
-    @Composable
-    override fun view(model: List<InventoryItem>) {
-        BorderedCard("Inventory Items") {
-
-        }
-    }
-
-    @Composable
-    override fun form(
-        model: List<InventoryItem>,
-        onModelUpdate: (List<InventoryItem>) -> Unit
-    ) {
-        BorderedCard("Inventory Items Form") {
-            Button(onClick = { onModelUpdate(model) }) {
-                Text("Update")
-            }
-        }
-    }
-
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventoryItem.kt

@@ -1,19 +0,0 @@
-package dev.geekback.dopewars.ui
-
-import androidx.compose.runtime.Composable
-import dev.geekback.dopewars.shared.InventoryItem
-
-class InventoryItemUi: DopeWarsModelUi<InventoryItem> {
-    @Composable
-    override fun view(model: InventoryItem) {
-
-    }
-
-    @Composable
-    override fun form(
-        model: InventoryItem,
-        onModelUpdate: (InventoryItem) -> Unit
-    ) {
-        TODO("Not yet implemented")
-    }
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/location.kt

@@ -1,55 +0,0 @@
-package dev.geekback.dopewars.ui
-
-import androidx.compose.foundation.layout.Row
-import androidx.compose.material3.Button
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.shared.Location
-
-class LocationUi: DopeWarsModelUi<Location> {
-    @Composable
-    override fun view(model: Location) {
-        BorderedCard("Location - ${model.name}") {
-        }
-    }
-
-    @OptIn(ExperimentalMaterial3Api::class)
-    @Composable
-    override fun form(
-        model: Location,
-        onModelUpdate: (Location) -> Unit
-    ) {
-        var name by remember { mutableStateOf(model.name) }
-        var location by remember { mutableStateOf(model)}
-
-        BorderedCard("Location") {
-            TextField(value = name, label = {
-                Text("Location Name")
-            }, onValueChange = {
-                name = it
-            })
-
-            Row {
-                Button(onClick = {
-                    location.name = name;
-                    onModelUpdate(location)
-                }) {
-                    Text("Apply")
-                }
-
-                Button(onClick = {
-                    name = location.name
-                }) {
-                    Text("Cancel")
-                }
-            }
-        }
-    }
-}

desktop/src/main/kotlin/dev/geekback/dopewars/ui/market.kt

@@ -1,38 +0,0 @@
-package dev.geekback.dopewars.ui
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.shared.Market
-
-class MarketUi: DopeWarsModelUi<Market> {
-    @Composable
-    override fun view(model: Market) {
-        val prices = model.prices.toList()
-        BorderedCard("Market for ${model.location.name}") {
-            Column {
-                LazyColumn {
-                    items(prices.size) { index ->
-                        val item = prices[index];
-                        val name = item.first.name
-                        val price = item.second.toFloat()
-                        Text("Drug $name $${price}")
-                    }
-                }
-            }
-        }
-    }
-
-    @Composable
-    override fun form(
-        model: Market,
-        onModelUpdate: (Market) -> Unit
-    ) {
-        BorderedCard("Market for ${model.location.name}") {
-            Text("Market goes here.")
-        }
-    }
-}
-

desktop/src/main/kotlin/dev/geekback/dopewars/ui/player.kt

@@ -1,47 +0,0 @@
-package dev.geekback.dopewars.ui
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import dev.geekback.dopewars.desktop.BorderedCard
-import dev.geekback.dopewars.shared.Location
-import dev.geekback.dopewars.shared.Market
-import dev.geekback.dopewars.shared.Player
-import kotlin.time.Instant
-
-class PlayerUi: DopeWarsModelUi<Player> {
-    @Composable
-    override fun view(model: Player) {
-        BorderedCard(model.name) {
-            Column {
-                Text("ID: ${model.id}")
-                Text("Cash: $${model.cash}")
-                Text("Debt: $${model.debt}")
-                Text("Health: ${model.health}")
-                Text("Location: ${model.location.name}")
-                // TODO: this is an ugly memory hack
-                InventoryUi().view(model.inventory)
-                // marketView(model.lastMarket ?: Market(location = Location("Unknown"), prices = mapOf()))
-                val lastTime = Instant.fromEpochSeconds(model.lastActionTime)
-                Text("Last Action: $lastTime")
-            }
-        }
-    }
-
-    @Composable
-    override fun form(
-        model: Player,
-        onModelUpdate: (Player) -> Unit
-    ) {
-        BorderedCard("Player ${model.name}") {
-            Button(onClick = { onModelUpdate(model) }) {
-                Text("Update")
-            }
-        }
-    }
-}
-
-@Composable
-fun playerView(player: Player) {
-}