Veri gud

app/src/main/java/com/flyinpancake/dndspells/ProfileActivity.kt

 package com.flyinpancake.dndspells
 
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.flyinpancake.dndspells.adapter.ProfileSpellRecyclerViewAdapter
-import com.flyinpancake.dndspells.model.Spell
 import com.flyinpancake.dndspells.databinding.ActivityProfileBinding
 import com.flyinpancake.dndspells.databinding.RecyclerviewSpellRowBinding
+import com.flyinpancake.dndspells.model.Spell
 import com.flyinpancake.dndspells.viewmodel.SpellViewModel
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 
 class ProfileActivity : AppCompatActivity(), ProfileSpellRecyclerViewAdapter.SpellListItemClickListener {
     companion object {

app/src/main/java/com/flyinpancake/dndspells/SelectSpellsActivity.kt

@@ -7,9 +7,10 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.*
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.ViewModelProvider
@@ -27,26 +28,50 @@ class SelectSpellsActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         setContent {
             val vmp = ViewModelProvider(this)
-            val spells = vmp[SpellViewModel::class.java].allSpells.observeAsState().value?: listOf()
+            val spells =
+                vmp[SpellViewModel::class.java].allSpells.observeAsState().value ?: listOf()
             val characterName = intent.getStringExtra(KEY_NAME) ?: ""
-            val character = vmp[CharacterViewModel::class.java].get(characterName).observeAsState().value?: DndCharacter()
+            val character =
+                vmp[CharacterViewModel::class.java].get(characterName).observeAsState().value
+                    ?: DndCharacter()
             MyApp {
-                SelectSpellsContent(spells = spells, character = character)
+                SelectSpellsContent(
+                    spells = spells,
+                    character = character,
+                    updateCharacter = { vmp[CharacterViewModel::class.java].update(it) })
             }
         }
     }
 }
 
 @Composable
-fun SelectSpellsContent(spells: List<Spell>, character: DndCharacter) {
+fun SelectSpellsContent(
+    spells: List<Spell>,
+    character: DndCharacter,
+    updateCharacter: (DndCharacter) -> Unit = {}
+) {
     Scaffold(
         topBar = { DndTopBar("${character.name} - select spells") }
     ) {
         LazyColumn {
             items(
                 items = spells.toList(),
-                itemContent = {
-                    SpellCardWithCheckBox(spell = it, checked = false, onCheck = {})
+                itemContent = { spell ->
+                    var selectedState by remember { mutableStateOf( character.spellList?.contains(spell) ?: false)}
+                    SpellCardWithCheckBox(
+                        spell = spell,
+                        checked = selectedState,
+                        onCheck = { newContains ->
+                            val newSpellList = character.spellList?.toMutableList()?: mutableListOf()
+                            if (newContains) {
+                                newSpellList.add(spell)
+                            } else {
+                                newSpellList.remove(spell)
+                            }
+                            selectedState = !selectedState
+                            character.spellList = newSpellList
+                            updateCharacter(character)
+                        })
                 })
         }
 
@@ -58,14 +83,24 @@ fun SelectSpellsContent(spells: List<Spell>, character: DndCharacter) {
 private fun SpellCardWithCheckBox(
     spell: Spell,
     checked: Boolean,
-    onCheck: (Boolean) -> Unit) {
+    onCheck: (Boolean) -> Unit
+) {
     Card(
         modifier = Modifier
             .fillMaxWidth()
             .padding(horizontal = 25.dp, vertical = 5.dp)
     ) {
-        Row(horizontalArrangement = Arrangement.Start) {
-            Checkbox(checked = checked, onCheckedChange = {onCheck(it)})
+        Row(
+            Modifier
+                .fillMaxSize()
+                .padding(10.dp),
+
+            ) {
+            Checkbox(
+                checked = checked,
+                onCheckedChange = { onCheck(it) },
+                Modifier.padding(end = 2.dp)
+            )
             SpellContent(spell = spell)
         }
     }
@@ -73,15 +108,42 @@ private fun SpellCardWithCheckBox(
 
 @Composable
 private fun SpellContent(spell: Spell) {
+    val textPadding = Modifier.padding(horizontal = 5.dp)
     Column(
-        Modifier.fillMaxWidth()
+        Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center
     ) {
-        Row (horizontalArrangement = Arrangement.SpaceBetween) {
-            Text(text = spell.name, style = MaterialTheme.typography.h6)
-            Text(text = "${spell.level}", style = MaterialTheme.typography.body1)
-        }
-        Row {
-
+        Row(
+            Modifier.fillMaxSize(),
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            Text(
+                text = spell.name,
+                modifier = textPadding,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                style = MaterialTheme.typography.h6
+            )
+            Text(
+                text = "Level ${spell.level}",
+                modifier = textPadding,
+                maxLines = 1,
+                style = MaterialTheme.typography.h6
+            )
+        }
+        Row(
+            Modifier.fillMaxSize(),
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            Text(text = spell.range, modifier = textPadding, style = MaterialTheme.typography.body1)
+            Text(text = spell.time, modifier = textPadding, style = MaterialTheme.typography.body1)
+            Text(
+                text = spell.components,
+                style = MaterialTheme.typography.body1,
+                modifier = textPadding,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
         }
     }
 }
@@ -94,7 +156,29 @@ private fun SelectableSpellList(spells: List<Spell>, character: DndCharacter) {
 @Preview(showBackground = true)
 @Composable
 fun DefaultPreview() {
+
+    val samplespells = listOf(
+        Spell(
+            name = "Power Word Kill",
+            level = 9,
+            classes = "Wizard",
+            components = "V",
+            desc = "Kil",
+            duration = "1 action",
+            range = "240 ft",
+            ritual = false,
+            school = "E",
+            time = "instantanius"
+        )
+    )
+
+    val sampleCharacter = DndCharacter(
+        name = "Ba'luk",
+        level = 4,
+        dndClass = DndCharacter.DndClass.Druid
+    )
+
     DndSpellsTheme {
-        SelectSpellsContent(spells = listOf(), character = DndCharacter())
+        SelectSpellsContent(spells = samplespells, character = sampleCharacter)
     }
 }

app/src/main/java/com/flyinpancake/dndspells/database/CharacterDao.kt

@@ -18,7 +18,7 @@ interface CharacterDao {
     fun getCharacterLiveDataByName(name: String): LiveData<RoomCharacter>
 
     @Update
-    fun updateCharacter(roomCharacter: RoomCharacter)
+    fun updateCharacter(roomCharacter: RoomCharacter): Int
 
     @Delete
     fun deleteCharacter(

app/src/main/java/com/flyinpancake/dndspells/repository/CharacterRepository.kt

@@ -5,9 +5,7 @@ import androidx.lifecycle.map
 import com.flyinpancake.dndspells.DndApplication
 import com.flyinpancake.dndspells.database.CharacterDao
 import com.flyinpancake.dndspells.database.RoomCharacter
-import com.flyinpancake.dndspells.database.SpellDao
 import com.flyinpancake.dndspells.model.DndCharacter
-import com.flyinpancake.dndspells.model.Spell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -33,6 +31,11 @@ class CharacterRepository(
     fun get(name: String): LiveData<DndCharacter> {
         return characterDao.getCharacterLiveDataByName(name).map { it.toDomainModel() }
     }
+
+    suspend fun update(character: DndCharacter) = withContext(Dispatchers.IO) {
+        val roomCharacter = character.toRoomDomain()
+        characterDao.updateCharacter(roomCharacter)
+    }
 }
 
 private fun DndCharacter.toRoomDomain(): RoomCharacter {

app/src/main/java/com/flyinpancake/dndspells/viewmodel/CharacterViewModel.kt

@@ -30,4 +30,8 @@ class CharacterViewModel: ViewModel() {
     fun get(name: String): LiveData<DndCharacter> {
         return repo.get(name)
     }
+
+    fun update(character: DndCharacter) = viewModelScope.launch {
+        repo.update(character)
+    }
 }
\ No newline at end of file