Compare commits
2
Commits
edcaf6e02c
...
564245aa08
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
564245aa08 | ||
|
|
2277ae340c |
@@ -29,6 +29,9 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
debug {
|
||||||
|
applicationIdSuffix = ".debug"
|
||||||
|
}
|
||||||
release {
|
release {
|
||||||
isMinifyEnabled = false
|
isMinifyEnabled = false
|
||||||
proguardFiles(
|
proguardFiles(
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -131,7 +131,7 @@ fun BackupPage(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
Page("Backup", innerPadding) {
|
Page(stringResource(R.string.backup), innerPadding) {
|
||||||
FullWidthButton(
|
FullWidthButton(
|
||||||
onClick = {
|
onClick = {
|
||||||
createBackupLauncher.launch("omnicards-backup.json")
|
createBackupLauncher.launch("omnicards-backup.json")
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package ru.omni_devel.cards
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.graphics.Bitmap
|
import android.graphics.Bitmap
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import com.google.android.gms.wearable.Wearable
|
import com.google.android.gms.wearable.Wearable
|
||||||
import com.google.zxing.BarcodeFormat
|
import com.google.zxing.BarcodeFormat
|
||||||
import com.google.zxing.MultiFormatWriter
|
import com.google.zxing.MultiFormatWriter
|
||||||
@@ -10,7 +9,13 @@ import com.journeyapps.barcodescanner.BarcodeEncoder
|
|||||||
|
|
||||||
fun generateCode(value: String, format: BarcodeFormat): Bitmap {
|
fun generateCode(value: String, format: BarcodeFormat): Bitmap {
|
||||||
val writer = MultiFormatWriter()
|
val writer = MultiFormatWriter()
|
||||||
val matrix = writer.encode(value, format, 800, 400)
|
|
||||||
|
val (width, height) = when (format) {
|
||||||
|
BarcodeFormat.QR_CODE, BarcodeFormat.DATA_MATRIX, BarcodeFormat.AZTEC -> 800 to 800
|
||||||
|
else -> 800 to 400
|
||||||
|
}
|
||||||
|
|
||||||
|
val matrix = writer.encode(value, format, width, height)
|
||||||
|
|
||||||
return BarcodeEncoder().createBitmap(matrix)
|
return BarcodeEncoder().createBitmap(matrix)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,8 @@
|
|||||||
<string name="sync_is_successful">Успешная синхронизация</string>
|
<string name="sync_is_successful">Успешная синхронизация</string>
|
||||||
<string name="sync_is_fail">Ошибка синхронизации. Проверьте подключение к часам</string>
|
<string name="sync_is_fail">Ошибка синхронизации. Проверьте подключение к часам</string>
|
||||||
|
|
||||||
<string name="open_backup_menu">Бэкап/восстановление</string>
|
<string name="backup">Резервное копирование</string>
|
||||||
|
<string name="open_backup_menu">Резервное копирование</string>
|
||||||
<string name="do_backup">Сохранить данные</string>
|
<string name="do_backup">Сохранить данные</string>
|
||||||
<string name="do_restore">Восстановить данные</string>
|
<string name="do_restore">Восстановить данные</string>
|
||||||
<string name="ask_do_restore">Восстановить данные?</string>
|
<string name="ask_do_restore">Восстановить данные?</string>
|
||||||
|
|||||||
@@ -16,7 +16,8 @@
|
|||||||
<string name="sync_is_successful">Sync successful</string>
|
<string name="sync_is_successful">Sync successful</string>
|
||||||
<string name="sync_is_fail">Sync failed. Check your watch connection</string>
|
<string name="sync_is_fail">Sync failed. Check your watch connection</string>
|
||||||
|
|
||||||
<string name="open_backup_menu">Backup / Restore</string>
|
<string name="backup">Backup</string>
|
||||||
|
<string name="open_backup_menu">Backup</string>
|
||||||
<string name="do_backup">Save data</string>
|
<string name="do_backup">Save data</string>
|
||||||
<string name="do_restore">Restore data</string>
|
<string name="do_restore">Restore data</string>
|
||||||
<string name="ask_do_restore">Restore data?</string>
|
<string name="ask_do_restore">Restore data?</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user