omni/OmniCards
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: added color preview on card edit page

Browse Source
This commit is contained in:
omni
2026-06-24 20:29:04 +03:00
parent 2a538fdf1c
commit c1a4414f10
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt
+7 -1
View File
@@ -46,6 +46,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.core.graphics.toColorInt
import com.google.zxing.BarcodeFormat import com.google.zxing.BarcodeFormat
import com.journeyapps.barcodescanner.ScanContract import com.journeyapps.barcodescanner.ScanContract
import com.journeyapps.barcodescanner.ScanOptions import com.journeyapps.barcodescanner.ScanOptions
@@ -96,6 +97,11 @@ fun CardEditable(
val fieldModifier = Modifier.fillMaxWidth() val fieldModifier = Modifier.fillMaxWidth()
val cardColor = if (color == null)
MaterialTheme.colorScheme.primary
else
Color(color.toColorInt())
val scanLauncher = rememberLauncherForActivityResult( val scanLauncher = rememberLauncherForActivityResult(
contract = ScanContract() contract = ScanContract()
) { result -> ) { result ->
@@ -267,7 +273,7 @@ fun CardEditable(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp) horizontalArrangement = Arrangement.spacedBy(8.dp)
) { ) {
CardIcon(if (icon == null) null else base64ToImageBitmap(icon), MaterialTheme.colorScheme.primary) CardIcon(if (icon == null) null else base64ToImageBitmap(icon), cardColor)
Text(stringResource(R.string.do_select_icon)) Text(stringResource(R.string.do_select_icon))
} }