Skip to content

Commit

Permalink
Translate card views to Hungarian
Browse files Browse the repository at this point in the history
  • Loading branch information
andras-adam committed Oct 13, 2022
1 parent b24ce9c commit a24bcd3
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import com.virtualtag.app.db.Card
import com.virtualtag.app.utils.formatHex
import com.virtualtag.app.R

@Composable
fun MifareClassicView(card: Card) {
Expand All @@ -17,10 +19,10 @@ fun MifareClassicView(card: Card) {
.replace("android.nfc.tech.", "")
.replace(",", ", ")
val type = when (card.mifareClassicType ?: MifareClassic.TYPE_UNKNOWN) {
MifareClassic.TYPE_CLASSIC -> "Classic"
MifareClassic.TYPE_PLUS -> "Plus"
MifareClassic.TYPE_PRO -> "Pro"
else -> "Unknown"
MifareClassic.TYPE_CLASSIC -> "MifareClassic Classic"
MifareClassic.TYPE_PLUS -> "MifareClassic Plus"
MifareClassic.TYPE_PRO -> "MifareClassic Pro"
else -> "MifareClassic ${stringResource(R.string.unknown)}"
}
val sectorCount = card.mifareClassicSectorCount ?: 0
val blockCount = card.mifareClassicBlockCount ?: 0
Expand All @@ -33,42 +35,71 @@ fun MifareClassicView(card: Card) {

LazyColumn(modifier = Modifier.fillMaxWidth()) {
item {
DataRow(title = "Serial number", content = id, icon = Icons.Filled.Key)
DataRow(
title = stringResource(R.string.serial_number),
content = id,
icon = Icons.Filled.Key)
}
item {
DataRow(title = "NFC technologies", content = techList, icon = Icons.Filled.Style)
DataRow(
title = stringResource(R.string.technologies),
content = techList,
icon = Icons.Filled.Style)
}
item {
DataRow(title = "MifareClassic type", content = type, icon = Icons.Filled.Category)
DataRow(
title = stringResource(R.string.type),
content = type,
icon = Icons.Filled.Category)
}
item {
DataRow(title = "Memory size", content = "$size bytes", icon = Icons.Filled.Save)
DataRow(
title = stringResource(R.string.mem_size),
content = "$size bytes",
icon = Icons.Filled.Save)
}
item {
DataRow(title = "Memory sector count", content = "$sectorCount", icon = Icons.Filled.Save)
DataRow(
title = stringResource(R.string.mem_sector_count),
content = "$sectorCount",
icon = Icons.Filled.Save)
}
item {
DataRow(title = "Memory block count", content = "$blockCount", icon = Icons.Filled.Save)
DataRow(
title = stringResource(R.string.mem_block_count),
content = "$blockCount",
icon = Icons.Filled.Save)
}
item {
DataRow(title = "Transcieve timeout", content = "$timeout ms", icon = Icons.Filled.Sensors)
DataRow(
title = stringResource(R.string.transcieve_timeout),
content = "$timeout ${stringResource(R.string.ms)}",
icon = Icons.Filled.Sensors)
}
item {
DataRow(title = "Transcieve max length", content = "$maxTranscieveLength bytes", icon = Icons.Filled.Sensors)
DataRow(
title = stringResource(R.string.transcieve_max_length),
content = "$maxTranscieveLength ${stringResource(R.string.bytes)}",
icon = Icons.Filled.Sensors)
}
item {
DataRow(title = "ATQA", content = atqa, icon = Icons.Filled.Code)
DataRow(
title = stringResource(R.string.atqa),
content = atqa,
icon = Icons.Filled.Code)
}
item {
DataRow(title = "SAK", content = "$sak", icon = Icons.Filled.Code)
DataRow(
title = stringResource(R.string.sak),
content = "$sak",
icon = Icons.Filled.Code)
}
if (data.isNotEmpty()) {
items(blockCount) { index ->
DataRow(
title = "Memory block ${index + 1}",
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)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import com.virtualtag.app.db.Card
import com.virtualtag.app.utils.formatHex
import com.virtualtag.app.R

@Composable
fun MifareUltralightView(card: Card) {
Expand All @@ -17,9 +19,9 @@ fun MifareUltralightView(card: Card) {
.replace("android.nfc.tech.", "")
.replace(",", ", ")
val type = when (card.mifareUltralightType ?: MifareUltralight.TYPE_UNKNOWN) {
MifareUltralight.TYPE_ULTRALIGHT -> "Ultralight"
MifareUltralight.TYPE_ULTRALIGHT_C -> "Ultralight C"
else -> "Unknown"
MifareUltralight.TYPE_ULTRALIGHT -> "MifareUltralight Ultralight"
MifareUltralight.TYPE_ULTRALIGHT_C -> "MifareUltralight Ultralight C"
else -> "MifareUltralight ${stringResource(R.string.unknown)}"
}
val size = when (card.mifareUltralightType ?: MifareUltralight.TYPE_UNKNOWN) {
MifareUltralight.TYPE_ULTRALIGHT -> 16 * MifareUltralight.PAGE_SIZE
Expand All @@ -35,36 +37,59 @@ fun MifareUltralightView(card: Card) {

LazyColumn(modifier = Modifier.fillMaxWidth()) {
item {
DataRow(title = "Serial number", content = id, icon = Icons.Filled.Key)
DataRow(
title = stringResource(R.string.serial_number),
content = id,
icon = Icons.Filled.Key)
}
item {
DataRow(title = "NFC technologies", content = techList, icon = Icons.Filled.Style)
DataRow(
title = stringResource(R.string.technologies),
content = techList,
icon = Icons.Filled.Style)
}
item {
DataRow(title = "MifareUltralight type", content = type, icon = Icons.Filled.Category)
DataRow(
title = stringResource(R.string.type),
content = type,
icon = Icons.Filled.Category)
}
item {
DataRow(title = "Memory size", content = "$size bytes", icon = Icons.Filled.Save)
DataRow(
title = stringResource(R.string.mem_size),
content = "$size bytes",
icon = Icons.Filled.Save)
}
item {
DataRow(title = "Transcieve timeout", content = "$timeout ms", icon = Icons.Filled.Sensors)
DataRow(
title = stringResource(R.string.transcieve_timeout),
content = "$timeout ${stringResource(R.string.ms)}",
icon = Icons.Filled.Sensors)
}
item {
DataRow(title = "Transcieve max length", content = "$maxTranscieveLength bytes", icon = Icons.Filled.Sensors)
DataRow(
title = stringResource(R.string.transcieve_max_length),
content = "$maxTranscieveLength ${stringResource(R.string.bytes)}",
icon = Icons.Filled.Sensors)
}
item {
DataRow(title = "ATQA", content = atqa, icon = Icons.Filled.Code)
DataRow(
title = stringResource(R.string.atqa),
content = atqa,
icon = Icons.Filled.Code)
}
item {
DataRow(title = "SAK", content = "$sak", icon = Icons.Filled.Code)
DataRow(
title = stringResource(R.string.sak),
content = "$sak",
icon = Icons.Filled.Code)
}
if (data.isNotEmpty()) {
items(dataPageCount) { index ->
DataRow(
title = "Memory page ${index + 1}",
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)
}
}
}
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,17 @@
<string name="delete">Törlés</string>
<string name="card_updated_success">Kártya sikeresen frissítve!</string>
<string name="clipboard">Vágólapra másolva!</string>
<string name="unknown">Ismeretlen</string>
<string name="serial_number">Sorozatszám</string>
<string name="technologies">NFC technológiák</string>
<string name="type">Típus</string>
<string name="transcieve_timeout">Maximum küldési idő</string>
<string name="transcieve_max_length">Maximum küldési méret</string>
<string name="mem_size">Memória méret</string>
<string name="mem_sector_count">Memória szektor szám</string>
<string name="mem_block_count">Memória blokk szám</string>
<string name="mem_block">Memória blokk</string>
<string name="mem_page">Memória oldal</string>
<string name="bytes">bájt</string>
<string name="ms">ms</string>
</resources>
15 changes: 15 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,19 @@
<string name="delete">Delete</string>
<string name="card_updated_success">Card updated successfully!</string>
<string name="clipboard">Copied to clipboard!</string>
<string name="unknown">Unknown</string>
<string name="serial_number">Serial number</string>
<string name="technologies">NFC technologies</string>
<string name="type">Type</string>
<string name="atqa" translatable="false">ATQA</string>
<string name="sak" translatable="false">SAK</string>
<string name="transcieve_timeout">Transcieve timeout</string>
<string name="transcieve_max_length">Transcieve max length</string>
<string name="mem_size">Memory size</string>
<string name="mem_block_count">Memory block count</string>
<string name="mem_sector_count">Memory sector count</string>
<string name="mem_block">Memory block</string>
<string name="mem_page">Memory page</string>
<string name="ms">ms</string>
<string name="bytes">bytes</string>
</resources>

0 comments on commit a24bcd3

Please sign in to comment.