Fix editing of cards

tamaskr · Oct 13, 2022 · 8d2ac1c · 8d2ac1c
1 parent a24bcd3
commit 8d2ac1c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 42 deletions.
diff --git a/app/src/main/java/com/virtualtag/app/db/CardDAO.kt b/app/src/main/java/com/virtualtag/app/db/CardDAO.kt
@@ -14,8 +14,8 @@ interface CardDao {
  @Insert(onConflict = OnConflictStrategy.REPLACE)
  fun addCard(card: Card)
 
- @Update
- fun updateCard(card: Card)
+ @Query("UPDATE card SET name = :name, color = :color WHERE card.id = :id")
+ fun updateCard(id: String, name: String, color: String)
 
  @Delete
  fun deleteCard(card: Card)

diff --git a/app/src/main/java/com/virtualtag/app/ui/screens/CardScreen.kt b/app/src/main/java/com/virtualtag/app/ui/screens/CardScreen.kt
@@ -51,7 +51,7 @@ fun CardScreen(
  }
  },
  actions = {
- IconButton(onClick = { editCard(card.value?.id ?: "0") }) {
+ IconButton(onClick = { editCard(card.value?.id ?: "") }) {
  Icon(Icons.Filled.Edit, null)
  }
  IconButton(onClick = { deleteDialogOpen = true }) {
@@ -74,7 +74,7 @@ fun CardScreen(
  } else if (card.value?.techList?.contains(MifareUltralight::class.java.name) == true) {
  MifareUltralightView(card = card.value!!)
  } else {
- Text("The card is not supported.")
+ Text(stringResource(R.string.not_supported))
  }
  }
  }
@@ -111,12 +111,12 @@ fun CardScreen(
  )
  }, confirmButton = {
  SecondaryButton(
- text = "Cancel",
+ text = stringResource(R.string.cancel),
  onClick = { deleteDialogOpen = false }, modifier = Modifier.padding(top = 4.dp)
  )
  }, dismissButton = {
  PrimaryButton(
- text = "OK",
+ text = stringResource(R.string.delete),
  onClick = {
  model.deleteCard(card.value!!)
  deleteDialogOpen = false

diff --git a/app/src/main/java/com/virtualtag/app/ui/screens/EditScreen.kt b/app/src/main/java/com/virtualtag/app/ui/screens/EditScreen.kt
@@ -24,34 +24,25 @@ import com.virtualtag.app.utils.stringToColor
 @Composable
 fun EditScreen(model: CardViewModel, id: String, goBack: () -> Unit, goHome: () -> Unit) {
  val context = LocalContext.current
- val card =
- model.getCardById(id)
- .observeAsState(
- Card(
- id = "0",
- name = "",
- color = "#fff8f8f8",
- techList = ""
- )
- )
+ val card = model.getCardById(id).observeAsState(null)
 
  var name by remember { mutableStateOf("") }
  var color by remember { mutableStateOf(colorToString(cardBackGroundColors[0])) }
 
  LaunchedEffect(key1 = card.value) {
- if (card.value.id == "0") return@LaunchedEffect
- name = card.value.name
- color = card.value.color
+ if (card.value == null) return@LaunchedEffect
+ name = card.value!!.name
+ color = card.value!!.color
  }
 
  fun editCardInDb() {
- model.updateCard(Card(id = card.value.id, name = name, color = color, techList = ""))
- Toast.makeText(
- context,
- context.getString(R.string.card_updated_success),
-  Toast.LENGTH_SHORT
- )
-  .show()
+ if (card.value == null) return
+ if (name == "") {
+ Toast.makeText(context, context.getString(R.string.empty_name_error), Toast.LENGTH_SHORT).show()
+ return
+ }
+ model.updateCard(card.value!!.id, name, color)
+ Toast.makeText(context, context.getString(R.string.card_updated_success), Toast.LENGTH_SHORT).show()
  goHome()
  }
 
@@ -61,10 +52,7 @@ fun EditScreen(model: CardViewModel, id: String, goBack: () -> Unit, goHome: ()
  title = { Text(stringResource(R.string.edit)) },
  navigationIcon = {
  IconButton(onClick = goBack) {
- Icon(
- Icons.Filled.ArrowBack,
- null
- )
+ Icon(Icons.Filled.ArrowBack, null)
  }
  }
  )
@@ -117,16 +105,11 @@ fun EditScreen(model: CardViewModel, id: String, goBack: () -> Unit, goHome: ()
  .weight(1f)
  .padding(start = 4.dp)
  ) {
- PrimaryButton(text = "Ok", onClick = {
- if (name == "") {
- return@PrimaryButton Toast.makeText(
- context,
- context.getString(R.string.empty_name_error),
- Toast.LENGTH_SHORT
- ).show()
- }
- editCardInDb()
- }, modifier = Modifier.padding(top = 8.dp, bottom = 8.dp))
+ PrimaryButton(
+ text = stringResource(R.string.ok),
+ onClick = { editCardInDb() },
+ modifier = Modifier.padding(top = 8.dp, bottom = 8.dp)
+ )
  }
  }
  }

diff --git a/app/src/main/java/com/virtualtag/app/viewmodels/CardViewModel.kt b/app/src/main/java/com/virtualtag/app/viewmodels/CardViewModel.kt
@@ -23,9 +23,9 @@ class CardViewModel(application: Application) : ViewModel() {
  }
  }
 
- fun updateCard(card: Card) {
+ fun updateCard(id: String, name: String, color: String) {
  CoroutineScope(Dispatchers.IO).launch {
- cardDB.cardDao().updateCard(card)
+ cardDB.cardDao().updateCard(id, name, color)
  }
  }
 

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
@@ -32,4 +32,5 @@
  <string name="mem_page">Memória oldal</string>
  <string name="bytes">bájt</string>
  <string name="ms">ms</string>
+ <string name="not_supported">Ez a kártya nem támogatott.</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -34,4 +34,6 @@
  <string name="mem_page">Memory page</string>
  <string name="ms">ms</string>
  <string name="bytes">bytes</string>
+ <string name="not_supported">The card is not supported.</string>
+ <string name="ok" translatable="false">OK</string>
 </resources>