fimkov/OmniCards
1
0
Fork 0
forked from omni/OmniCards
Code Pull Requests Activity

feat: added russian translations

Browse Source
This commit is contained in:
omni
2026-06-15 17:18:36 +03:00
parent 5cf7e2b7b2
commit 36abc10972
9 changed files with 133 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/java/ru/omni_devel/cards/BackupActivity.kt
+11 -11
View File
@@ -24,7 +24,7 @@ import kotlinx.serialization.json.Json
import ru.omni_devel.cards.ui.theme.OmniCardsTheme
import androidx.compose.runtime.getValue
import androidx.compose.runtime.setValue
import kotlinx.serialization.decodeFromString
import androidx.compose.ui.res.stringResource
class BackupActivity : ComponentActivity() {
private lateinit var db: DbHelper
@@ -65,12 +65,12 @@ fun BackupPage(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
context.contentResolver.openOutputStream(it)?.use { outputStream ->
outputStream.write(jsonData.toByteArray())
Toast.makeText(context, "Backup successfully saved", Toast.LENGTH_SHORT).show()
Toast.makeText(context, context.getString(R.string.backup_successfully_saved), Toast.LENGTH_SHORT).show()
activityContext!!.finish()
}
} catch (e: Exception) {
Toast.makeText(context, "Failed to save backup: $e", Toast.LENGTH_LONG).show()
Toast.makeText(context, context.getString(R.string.failed_to_save_backup, e), Toast.LENGTH_LONG).show()
}
}
}
@@ -86,8 +86,8 @@ fun BackupPage(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
if (showImportDialog.value) {
AlertDialog(
title = { Text("Restore backup") },
text = { Text("This will replace existing cards by data from backup file. Continue?") },
title = { Text(stringResource(R.string.ask_do_restore)) },
text = { Text(stringResource(R.string.restore_caution)) },
confirmButton = {
TextButton(
onClick = {
@@ -105,17 +105,17 @@ fun BackupPage(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
db.clearDatabase()
db.addCards(cards)
Toast.makeText(context, "Data successfully restored from backup", Toast.LENGTH_SHORT).show()
Toast.makeText(context, context.getString(R.string.backup_successfully_restored), Toast.LENGTH_SHORT).show()
activityContext!!.finish()
}
} catch (e: Exception) {
Toast.makeText(context, "Failed to restore data from backup: $e", Toast.LENGTH_LONG).show()
Toast.makeText(context, context.getString(R.string.failed_to_restore_backup, e), Toast.LENGTH_LONG).show()
}
}
}
) {
Text("Yes")
Text(stringResource(R.string.yes))
}
},
dismissButton = {
@@ -124,7 +124,7 @@ fun BackupPage(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
showImportDialog.value = false
}
) {
Text("No")
Text(stringResource(R.string.no))
}
},
onDismissRequest = { showImportDialog.value = false },
@@ -137,14 +137,14 @@ fun BackupPage(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
createBackupLauncher.launch("omnicards-backup.json")
}
) {
Text("Backup to file")
Text(stringResource(R.string.do_backup))
}
FullWidthButton(
onClick = {
restoreFromBackupLauncher.launch("application/json")
}
) {
Text("Restore from file")
Text(stringResource(R.string.do_restore))
}
}
}
mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt
+16 -12
View File
@@ -34,6 +34,8 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.core.graphics.toColorInt
import com.github.skydoves.colorpicker.compose.ColorEnvelope
@@ -79,6 +81,8 @@ fun CardEditable(
color: String?,
onColorChange: (String?) -> Unit
) {
val context = LocalContext.current
var isCodeTypeDropdownExpanded by rememberSaveable { mutableStateOf(false) }
var isColorPickerExpanded by rememberSaveable { mutableStateOf(false) }
var isColorEnabled by rememberSaveable { mutableStateOf(color != null) }
@@ -105,7 +109,7 @@ fun CardEditable(
value = cardName,
onValueChange = onCardNameChange,
modifier = fieldModifier,
label = { Text("Name") }
label = { Text(stringResource(R.string.card_name)) }
)
Row(
horizontalArrangement = Arrangement.spacedBy(8.dp)
@@ -114,21 +118,21 @@ fun CardEditable(
value = codeValue,
onValueChange = onCodeValueChange,
modifier = Modifier.weight(1f),
label = { Text("Value") }
label = { Text(stringResource(R.string.card_value)) }
)
Button(
modifier = Modifier.align(Alignment.CenterVertically),
onClick = {
scanLauncher.launch(
ScanOptions().apply {
setPrompt("Scan your card")
setPrompt(context.getString(R.string.scan_your_card))
setBeepEnabled(true)
setOrientationLocked(false)
}
)
}
) {
Text("Scan")
Text(stringResource(R.string.do_scan_card))
}
}
@@ -139,7 +143,7 @@ fun CardEditable(
value = codeType.name,
onValueChange = {},
modifier = fieldModifier,
label = { Text("Code type") },
label = { Text(stringResource(R.string.card_code_type)) },
readOnly = true,
)
Box(
@@ -176,7 +180,7 @@ fun CardEditable(
isColorPickerExpanded = !isColorPickerExpanded
}
) {
Text("Choose color")
Text(stringResource(R.string.do_choose_color))
}
Switch(
checked = isColorEnabled,
@@ -215,7 +219,7 @@ fun AddCard(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
val context = LocalActivity.current
Page(
"New card",
stringResource(R.string.new_card_title),
innerPadding
) {
Column(
@@ -244,11 +248,11 @@ fun AddCard(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
getDbFun().addCard(cardName, codeValue, codeType, color)
context!!.finish()
} else {
Toast.makeText(context, err, Toast.LENGTH_SHORT).show()
Toast.makeText(context, context!!.getString(err), Toast.LENGTH_SHORT).show()
}
}
) {
Text("Save")
Text(stringResource(R.string.do_save))
}
}
}
@@ -264,7 +268,7 @@ fun EditCard(cardInfo: CardInfo, innerPadding: PaddingValues, getDbFun: () -> Db
val context = LocalActivity.current
Page(
"Editing card id${cardInfo.id}",
stringResource(R.string.editing_card_title, cardInfo.id),
innerPadding
) {
Column(
@@ -293,11 +297,11 @@ fun EditCard(cardInfo: CardInfo, innerPadding: PaddingValues, getDbFun: () -> Db
getDbFun().editCard(cardInfo.id, cardName, codeValue, codeType, color)
context!!.finish()
} else {
Toast.makeText(context, err, Toast.LENGTH_SHORT).show()
Toast.makeText(context, context!!.getString(err), Toast.LENGTH_SHORT).show()
}
}
) {
Text("Save")
Text(stringResource(R.string.do_save))
}
}
}
mobile/src/main/java/ru/omni_devel/cards/Elements.kt
+3 -2
View File
@@ -31,6 +31,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
@@ -128,7 +129,7 @@ fun CardButton(cardInfo: CardInfo, onDeleteCard: (Int) -> Unit) {
onDismissRequest = { menuExpanded = false }
) {
DropdownMenuItem(
text = { Text("Edit") },
text = { Text(stringResource(R.string.do_edit_card)) },
onClick = {
menuExpanded = false
@@ -140,7 +141,7 @@ fun CardButton(cardInfo: CardInfo, onDeleteCard: (Int) -> Unit) {
}
)
DropdownMenuItem(
text = { Text("Delete") },
text = { Text(stringResource(R.string.do_delete_card)) },
onClick = {
menuExpanded = false
mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt
+12 -9
View File
@@ -33,6 +33,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.stringResource
import kotlinx.serialization.json.Json
import ru.omni_devel.cards.ui.theme.OmniCardsTheme
@@ -87,7 +88,7 @@ fun MainPage(
modifier = Modifier.fillMaxSize()
) {
Page(
"OmniCards",
stringResource(R.string.app_name),
innerPadding
) {
Column(
@@ -95,7 +96,9 @@ fun MainPage(
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
if (cards.isEmpty()) {
Text("Add new card to get started")
Text(
stringResource(R.string.add_card_to_get_started)
)
} else {
for (card in cards) {
CardButton(card, onDeleteCard)
@@ -126,24 +129,24 @@ fun MainPage(
context.startActivity(intent)
}
) {
Text("Add card")
Text(stringResource(R.string.do_add_card))
}
FullWidthButton(
onClick = {
Toast.makeText(context, "Sync in progress...", Toast.LENGTH_SHORT).show()
Toast.makeText(context, context.getString(R.string.sync_in_progress), Toast.LENGTH_SHORT).show()
sendToWatch(context, "/updateCards", Json.encodeToString(getDbFun().getCards())) { isSuccess ->
if (isSuccess) {
Toast.makeText(context, "Successfully synced!", Toast.LENGTH_SHORT).show()
Toast.makeText(context, context.getString(R.string.sync_is_successful), Toast.LENGTH_SHORT).show()
} else {
Toast.makeText(context, "Sync failed! Please, check your connection", Toast.LENGTH_LONG).show()
Toast.makeText(context, context.getString(R.string.sync_is_fail), Toast.LENGTH_LONG).show()
}
}
isActionBarShowed = false
}
) {
Text("Sync with WearOS")
Text(stringResource(R.string.do_sync))
}
FullWidthButton(
onClick = {
@@ -154,7 +157,7 @@ fun MainPage(
isActionBarShowed = false
}
) {
Text("Backup")
Text(stringResource(R.string.open_backup_menu))
}
FullWidthButton(
onClick = {
@@ -163,7 +166,7 @@ fun MainPage(
isActionBarShowed = false
}
) {
Text("Source code")
Text(stringResource(R.string.source_code))
}
FullWidthButton(
onClick = {
mobile/src/main/java/ru/omni_devel/cards/ShowCardActivity.kt
+2 -1
View File
@@ -22,6 +22,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import ru.omni_devel.cards.ui.theme.OmniCardsTheme
@@ -105,7 +106,7 @@ fun ShowCardPage(innerPadding: PaddingValues, cardInfo: CardInfo) {
)
} else {
Text(
"Failed to generate code. Check card data",
stringResource(R.string.failed_to_generate_card_code),
modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.error
mobile/src/main/java/ru/omni_devel/cards/Utils.kt
+5 -4
View File
@@ -2,6 +2,7 @@ package ru.omni_devel.cards
import android.content.Context
import android.graphics.Bitmap
import androidx.compose.ui.platform.LocalContext
import com.google.android.gms.wearable.Wearable
import com.google.zxing.BarcodeFormat
import com.google.zxing.MultiFormatWriter
@@ -49,13 +50,13 @@ fun sendToWatch(context: Context, path: String, message: String, onResult: (Bool
}
}
fun checkCardData(name: String, value: String): String? {
fun checkCardData(name: String, value: String): Int? {
if (name.isEmpty()) {
return "Name should not be empty"
return R.string.card_name_should_not_be_empty
} else if (value.isEmpty()) {
return "Code value should not be empty"
return R.string.card_value_should_not_be_empty
} else if (name.length > 32) {
return "Name must be shorter than 32 symbols"
return R.string.name_must_be_shorter_than_32_symbols
}
return null