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

fix: fixed card values dropping at adding/editing after rotating phone

Browse Source
This commit is contained in:
omni
2026-06-14 19:21:20 +03:00
parent bb7807e2a4
commit b18e99156a
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/build.gradle.kts
+2 -2
View File
@@ -12,8 +12,8 @@ android {
applicationId = "ru.omni_devel.cards" applicationId = "ru.omni_devel.cards"
minSdk = 30 minSdk = 30
targetSdk = 36 targetSdk = 36
versionCode = 60 // 0 at end for mobile versionCode = 70 // 0 at end for mobile
versionName = "2.1.1" versionName = "2.2.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt
+12 -11
View File
@@ -33,6 +33,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
@@ -82,9 +83,9 @@ fun CardEditable(
color: String?, color: String?,
onColorChange: (String?) -> Unit onColorChange: (String?) -> Unit
) { ) {
var isCodeTypeDropdownExpanded by remember { mutableStateOf(false) } var isCodeTypeDropdownExpanded by rememberSaveable { mutableStateOf(false) }
var isColorPickerExpanded by remember { mutableStateOf(false) } var isColorPickerExpanded by rememberSaveable { mutableStateOf(false) }
var isColorEnabled by remember { mutableStateOf(color != null) } var isColorEnabled by rememberSaveable { mutableStateOf(color != null) }
val colorPickerController = rememberColorPickerController() val colorPickerController = rememberColorPickerController()
@@ -210,10 +211,10 @@ fun CardEditable(
@Composable @Composable
fun AddCard(innerPadding: PaddingValues, getDbFun: () -> DbHelper) { fun AddCard(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
var cardName by remember { mutableStateOf("") } var cardName by rememberSaveable { mutableStateOf("") }
var codeValue by remember { mutableStateOf("") } var codeValue by rememberSaveable { mutableStateOf("") }
var codeType by remember { mutableStateOf(BarcodeFormat.QR_CODE) } var codeType by rememberSaveable { mutableStateOf(BarcodeFormat.QR_CODE) }
var color by remember { mutableStateOf<String?>(null) } var color by rememberSaveable { mutableStateOf<String?>(null) }
val context = LocalActivity.current val context = LocalActivity.current
@@ -257,10 +258,10 @@ fun AddCard(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
@Composable @Composable
fun EditCard(cardInfo: CardInfo, innerPadding: PaddingValues, getDbFun: () -> DbHelper) { fun EditCard(cardInfo: CardInfo, innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
var cardName by remember { mutableStateOf(cardInfo.name) } var cardName by rememberSaveable { mutableStateOf(cardInfo.name) }
var codeValue by remember { mutableStateOf(cardInfo.codeValue) } var codeValue by rememberSaveable { mutableStateOf(cardInfo.codeValue) }
var codeType by remember { mutableStateOf(cardInfo.codeType) } var codeType by rememberSaveable { mutableStateOf(cardInfo.codeType) }
var color by remember { mutableStateOf(cardInfo.color) } var color by rememberSaveable { mutableStateOf(cardInfo.color) }
val context = LocalActivity.current val context = LocalActivity.current