more cleanup + fix intendation

tamaskr · Oct 15, 2022 · 22cef8f · 22cef8f
1 parent 53b5c11
commit 22cef8f
Show file tree

Hide file tree

Showing 10 changed files with 191 additions and 142 deletions.
diff --git a/app/src/main/java/com/virtualtag/app/MainActivity.kt b/app/src/main/java/com/virtualtag/app/MainActivity.kt
@@ -73,7 +73,8 @@ class MainActivity : ComponentActivity() {
  goHome = goHome
  )
  }
- composable("edit/{id}",
+ composable(
+ "edit/{id}",
  arguments = listOf(navArgument("id") {
  type = NavType.StringType
  })

diff --git a/app/src/main/java/com/virtualtag/app/ui/components/CardContainer.kt b/app/src/main/java/com/virtualtag/app/ui/components/CardContainer.kt
@@ -23,8 +23,7 @@ fun CardContainer(
  elevation = 2.dp,
  modifier = Modifier
  .fillMaxWidth()
- .padding(top = 8.dp, bottom = 8.dp)
- .padding(horizontal = 12.dp),
+ .padding(vertical = 8.dp),
  onClick = onClick,
  backgroundColor = color,
  enabled = enabled

diff --git a/app/src/main/java/com/virtualtag/app/ui/components/DataRow.kt b/app/src/main/java/com/virtualtag/app/ui/components/DataRow.kt
@@ -8,6 +8,7 @@ import androidx.compose.material.Divider
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -24,26 +25,42 @@ import com.virtualtag.app.R
 fun DataRow(title: String, content: String, icon: ImageVector) {
  val context = LocalContext.current
  val clipboardManager: ClipboardManager = LocalClipboardManager.current
- Column(modifier = Modifier
- .fillMaxWidth()
- .combinedClickable(
- onLongClick = {
- clipboardManager.setText(AnnotatedString(content))
- Toast
- .makeText(context, context.getString(R.string.clipboard), Toast.LENGTH_SHORT)
- .show()
- },
- onClick = { /* do nothing */ })) {
- Row(modifier = Modifier
+ Column(
+ modifier = Modifier
  .fillMaxWidth()
- .padding(top = 8.dp)) {
- Icon(icon, contentDescription = null, modifier = Modifier
- .size(48.dp)
- .padding(horizontal = 4.dp))
- Column(modifier = Modifier
+ .combinedClickable(
+ onLongClick = {
+ clipboardManager.setText(AnnotatedString(content))
+ Toast
+ .makeText(
+ context,
+ context.getString(R.string.clipboard),
+ Toast.LENGTH_SHORT
+ )
+ .show()
+ },
+ onClick = { /* do nothing */ })
+ ) {
+ Row(
+ modifier = Modifier
  .fillMaxWidth()
- .padding(top = 2.dp, end = 16.dp)) {
- Text(title, fontWeight = FontWeight.Bold, modifier = Modifier.padding(bottom = 4.dp))
+ .padding(top = 8.dp), verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ icon, contentDescription = null, modifier = Modifier
+ .size(48.dp)
+ .padding(vertical = 4.dp)
+ )
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(top = 2.dp, end = 16.dp)
+ ) {
+ Text(
+ title,
+ fontWeight = FontWeight.Bold,
+ modifier = Modifier.padding(bottom = 4.dp)
+ )
  Text(content, modifier = Modifier.padding(bottom = 8.dp))
  }
  }

diff --git a/app/src/main/java/com/virtualtag/app/ui/components/MifareClassicView.kt b/app/src/main/java/com/virtualtag/app/ui/components/MifareClassicView.kt
@@ -38,68 +38,79 @@ fun MifareClassicView(card: Card) {
  DataRow(
  title = stringResource(R.string.serial_number),
  content = serialNumber,
- icon = Icons.Filled.Key)
+ icon = Icons.Filled.Key
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.technologies),
  content = techList,
- icon = Icons.Filled.Style)
+ icon = Icons.Filled.Style
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.type),
  content = type,
- icon = Icons.Filled.Category)
+ icon = Icons.Filled.Category
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.mem_size),
  content = "$size bytes",
- icon = Icons.Filled.Save)
+ icon = Icons.Filled.Save
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.mem_sector_count),
  content = "$sectorCount",
- icon = Icons.Filled.Save)
+ icon = Icons.Filled.Save
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.mem_block_count),
  content = "$blockCount",
- icon = Icons.Filled.Save)
+ icon = Icons.Filled.Save
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.transcieve_timeout),
  content = "$timeout ${stringResource(R.string.ms)}",
- icon = Icons.Filled.Sensors)
+ icon = Icons.Filled.Sensors
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.transcieve_max_length),
  content = "$maxTranscieveLength ${stringResource(R.string.bytes)}",
- icon = Icons.Filled.Sensors)
+ icon = Icons.Filled.Sensors
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.atqa),
  content = atqa,
- icon = Icons.Filled.Code)
+ icon = Icons.Filled.Code
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.sak),
  content = "$sak",
- icon = Icons.Filled.Code)
+ icon = Icons.Filled.Code
+ )
  }
  if (data.isNotEmpty()) {
  items(blockCount) { index ->
  DataRow(
  title = "${stringResource(R.string.mem_block)} ${index + 1}",
  content = formatHex(data.substring(index * 32, index * 32 + 32)),
- icon = Icons.Filled.Memory)
+ icon = Icons.Filled.Memory
+ )
  }
  }
  }

diff --git a/app/src/main/java/com/virtualtag/app/ui/components/MifareUltralightView.kt b/app/src/main/java/com/virtualtag/app/ui/components/MifareUltralightView.kt
@@ -40,56 +40,65 @@ fun MifareUltralightView(card: Card) {
  DataRow(
  title = stringResource(R.string.serial_number),
  content = serialNumber,
- icon = Icons.Filled.Key)
+ icon = Icons.Filled.Key
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.technologies),
  content = techList,
- icon = Icons.Filled.Style)
+ icon = Icons.Filled.Style
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.type),
  content = type,
- icon = Icons.Filled.Category)
+ icon = Icons.Filled.Category
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.mem_size),
  content = "$size bytes",
- icon = Icons.Filled.Save)
+ icon = Icons.Filled.Save
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.transcieve_timeout),
  content = "$timeout ${stringResource(R.string.ms)}",
- icon = Icons.Filled.Sensors)
+ icon = Icons.Filled.Sensors
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.transcieve_max_length),
  content = "$maxTranscieveLength ${stringResource(R.string.bytes)}",
- icon = Icons.Filled.Sensors)
+ icon = Icons.Filled.Sensors
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.atqa),
  content = atqa,
- icon = Icons.Filled.Code)
+ icon = Icons.Filled.Code
+ )
  }
  item {
  DataRow(
  title = stringResource(R.string.sak),
  content = "$sak",
- icon = Icons.Filled.Code)
+ icon = Icons.Filled.Code
+ )
  }
  if (data.isNotEmpty()) {
  items(dataPageCount) { index ->
  DataRow(
  title = "${stringResource(R.string.mem_page)} ${index + 1}",
  content = formatHex(data.substring(index * 8, index * 8 + 8)),
- icon = Icons.Filled.Memory)
+ icon = Icons.Filled.Memory
+ )
  }
  }
  }

diff --git a/app/src/main/java/com/virtualtag/app/ui/screens/AddScreen.kt b/app/src/main/java/com/virtualtag/app/ui/screens/AddScreen.kt
@@ -43,35 +43,42 @@ fun AddScreen(
 
  fun addCardToDb() {
  if (name.text == "") {
- Toast.makeText(context, context.getString(R.string.empty_name_error), Toast.LENGTH_SHORT).show()
+ Toast.makeText(
+ context,
+ context.getString(R.string.empty_name_error),
+ Toast.LENGTH_SHORT
+ ).show()
  return
  }
- model.addCard(Card(
- id = 0,
- name = name.text,
- color = color,
- // Tag properties
- serialNumber = scannedTag.value?.id?.toHex() ?: "0",
- techList = scannedTag.value?.techList?.joinToString(",") ?: "",
- // MifareClassic properties
- mifareClassicAtqa = mifareClassicInfo.value?.atqa,
- mifareClassicSak = mifareClassicInfo.value?.sak,
- mifareClassicTimeout = mifareClassicInfo.value?.timeout,
- mifareClassicMaxTransceiveLength = mifareClassicInfo.value?.maxTransceiveLength,
- mifareClassicSize = mifareClassicInfo.value?.size,
- mifareClassicType = mifareClassicInfo.value?.type,
- mifareClassicSectorCount = mifareClassicInfo.value?.sectorCount,
- mifareClassicBlockCount = mifareClassicInfo.value?.blockCount,
- mifareClassicData = mifareClassicInfo.value?.data,
- // MifareUltralight properties
- mifareUltralightType = mifareUltralightInfo.value?.type,
- mifareUltralightTimeout = mifareUltralightInfo.value?.timeout,
- mifareUltralightMaxTransceiveLength = mifareUltralightInfo.value?.maxTransceiveLength,
- mifareUltralightAtqa = mifareUltralightInfo.value?.atqa,
- mifareUltralightSak = mifareUltralightInfo.value?.sak,
- mifareUltralightData = mifareUltralightInfo.value?.data,
- ))
- Toast.makeText(context, context.getString(R.string.card_added_success), Toast.LENGTH_SHORT).show()
+ model.addCard(
+ Card(
+ id = 0,
+ name = name.text,
+ color = color,
+ // Tag properties
+ serialNumber = scannedTag.value?.id?.toHex() ?: "0",
+ techList = scannedTag.value?.techList?.joinToString(",") ?: "",
+ // MifareClassic properties
+ mifareClassicAtqa = mifareClassicInfo.value?.atqa,
+ mifareClassicSak = mifareClassicInfo.value?.sak,
+ mifareClassicTimeout = mifareClassicInfo.value?.timeout,
+ mifareClassicMaxTransceiveLength = mifareClassicInfo.value?.maxTransceiveLength,
+ mifareClassicSize = mifareClassicInfo.value?.size,
+ mifareClassicType = mifareClassicInfo.value?.type,
+ mifareClassicSectorCount = mifareClassicInfo.value?.sectorCount,
+ mifareClassicBlockCount = mifareClassicInfo.value?.blockCount,
+ mifareClassicData = mifareClassicInfo.value?.data,
+ // MifareUltralight properties
+ mifareUltralightType = mifareUltralightInfo.value?.type,
+ mifareUltralightTimeout = mifareUltralightInfo.value?.timeout,
+ mifareUltralightMaxTransceiveLength = mifareUltralightInfo.value?.maxTransceiveLength,
+ mifareUltralightAtqa = mifareUltralightInfo.value?.atqa,
+ mifareUltralightSak = mifareUltralightInfo.value?.sak,
+ mifareUltralightData = mifareUltralightInfo.value?.data,
+ )
+ )
+ Toast.makeText(context, context.getString(R.string.card_added_success), Toast.LENGTH_SHORT)
+ .show()
  goHome()
  }
 
@@ -155,7 +162,7 @@ fun AddScreen(
  SecondaryButton(
  text = stringResource(R.string.cancel),
  onClick = goHome,
- modifier = Modifier.padding(top = 8.dp, bottom = 8.dp)
+ modifier = Modifier.padding(vertical = 8.dp)
  )
  }
  Column(
@@ -166,7 +173,8 @@ fun AddScreen(
  PrimaryButton(
  text = stringResource(R.string.ok),
  onClick = { addCardToDb() },
- modifier = Modifier.padding(top = 8.dp, bottom = 8.dp))
+ modifier = Modifier.padding(vertical = 8.dp)
+ )
  }
  }
  }