feat: multiple choice questions have clickable labels, added horizontal divider between questions (and all dividers in the app are now the same), add camera choice in settings

kkostov · kkostov · commit 2f91be09a9ec · 2025-12-20T13:11:56.000+01:00
diff --git a/pretixscan/composeApp/src/commonMain/composeResources/values/strings.xml b/pretixscan/composeApp/src/commonMain/composeResources/values/strings.xml
@@ -224,4 +224,7 @@
     <string name="badge_printing_selected_printer_not_available">The selected printer is currently unavailable. Please
         check that the device is online and connected to the system.
     </string>
+    <string name="settings_section_camera">Camera</string>
+    <string name="settings_preferred_camera_label">Preferred camera</string>
+    <string name="settings_camera_auto">Auto</string>
 </resources>
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/desktop/app/ui/ListDivider.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/desktop/app/ui/ListDivider.kt
@@ -0,0 +1,18 @@
+package eu.pretix.desktop.app.ui
+
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ListDivider(currentIndex: Int? = null, lastIndex: Int? = null) {
+    if (lastIndex != null && currentIndex != null && currentIndex < lastIndex) {
+        // show divider between rows except the last row
+        HorizontalDivider(Modifier, thickness = 1.dp, color = Color.Gray)
+    } else if (lastIndex == null && currentIndex == null) {
+        // always show when no index is set
+        HorizontalDivider(Modifier, thickness = 1.dp, color = Color.Gray)
+    }
+}
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/main/presentation/selectevent/SelectEventList.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/main/presentation/selectevent/SelectEventList.kt
@@ -10,9 +10,10 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollbarAdapter
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material.Divider
+import androidx.compose.material3.Divider
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -24,6 +25,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import eu.pretix.desktop.app.ui.ListDivider
 import eu.pretix.desktop.app.ui.SelectListRow
 import eu.pretix.libpretixsync.setup.RemoteEvent
 import eu.pretix.scan.tickets.presentation.formatDateForDisplay
@@ -137,9 +139,7 @@ fun SelectEventList(
                                 Text(dateText)
                             }
                         }
-                        if (index < list.lastIndex) {
-                            Divider(color = Color.Gray, thickness = 1.dp)
-                        }
+                        ListDivider(index, list.lastIndex)
                     }
                 }
 
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/main/presentation/selectlist/SelectCheckInList.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/main/presentation/selectlist/SelectCheckInList.kt
@@ -11,9 +11,10 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollbarAdapter
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material.Divider
+import androidx.compose.material3.Divider
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -24,6 +25,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import eu.pretix.desktop.app.ui.ListDivider
 import eu.pretix.desktop.app.ui.SelectListRow
 import eu.pretix.libpretixsync.sqldelight.CheckInList
 import org.jetbrains.compose.resources.stringResource
@@ -105,9 +107,7 @@ fun SelectCheckInList(
                                 Text(item.name ?: "", fontWeight = FontWeight.Bold)
                             }
                         }
-                        if (index < list.lastIndex) {
-                            Divider(color = Color.Gray, thickness = 1.dp)
-                        }
+                        ListDivider(index, list.lastIndex)
                     }
                 }
 
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/settings/data/ConfigurableSettings.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/settings/data/ConfigurableSettings.kt
@@ -14,4 +14,6 @@ data class ConfigurableSettings(
     val offlineMode: Boolean = false,
     val uiReduceMotion: Boolean = false,
     val uiHideNames: Boolean = false,
+    val cameras: List<String> = emptyList(),
+    val preferredCamera: String? = null,
 )
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/settings/presentation/SettingsScreen.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/settings/presentation/SettingsScreen.kt
@@ -240,6 +240,29 @@ fun SettingsScreen(
                         }
                     }
 
+                    item {
+                        Section(stringResource(Res.string.settings_section_camera)) {
+                            Setting {
+                                Column(
+                                    horizontalAlignment = Alignment.Start
+                                ) {
+                                    Text(
+                                        stringResource(Res.string.settings_preferred_camera_label)
+                                    )
+                                    FieldSpinner(
+                                        selectedValue = form.preferredCamera,
+                                        availableOptions = listOf(SelectableValue("-", stringResource(Res.string.settings_camera_auto))) + form.cameras.map { SelectableValue(it, it) },
+                                        onSelect = {
+                                            coroutineScope.launch {
+                                                viewModel.setPreferredCamera(it?.value)
+                                            }
+                                        },
+                                    )
+                                }
+                            }
+                        }
+                    }
+
                     item {
                         Section(stringResource(Res.string.settings_label_about)) {
                             Setting {
@@ -337,7 +360,7 @@ fun Section(heading: String, content: @Composable () -> Unit) {
             fontWeight = FontWeight.Medium
         )
         content()
-        HorizontalDivider()
+        ListDivider()
     }
 }
 
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/settings/presentation/SettingsViewModel.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/settings/presentation/SettingsViewModel.kt
@@ -2,22 +2,28 @@ package eu.pretix.scan.settings.presentation
 
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import eu.pretix.desktop.app.sync.SyncRootService
 import eu.pretix.desktop.app.ui.SelectableValue
 import eu.pretix.desktop.cache.AppCache
 import eu.pretix.desktop.cache.DataStoreConfigStore
 import eu.pretix.desktop.cache.Version
+import eu.pretix.desktop.webcam.data.VideoSource
 import eu.pretix.scan.settings.data.ConfigurableSettings
 import eu.pretix.scan.settings.data.PrinterSource
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 
 
 class SettingsViewModel(
     private val appConfig: DataStoreConfigStore,
     private val printerSource: PrinterSource,
+    private val videoSource: VideoSource,
     private val appCache: AppCache,
     private val syncRootService: SyncRootService
 ) : ViewModel() {
@@ -32,6 +38,15 @@ class SettingsViewModel(
         _uiState.update { SettingsUiState.Start }
     }
 
+    private fun loadCameras() {
+        viewModelScope.launch(Dispatchers.IO) {
+            videoSource.getAvailableWebcam().collectLatest { webcams ->
+                val cameraNames = webcams.map { it.name }
+                _form.update { it.copy(cameras = cameraNames) }
+            }
+        }
+    }
+
     suspend fun loadSettings() {
         val badgePrinterWasSelected = appConfig.printBadges && appConfig.badgePrinterName != null
         _form.value = _form.value.copy(
@@ -46,9 +61,10 @@ class SettingsViewModel(
             offlineMode = appConfig.offlineMode,
             uiReduceMotion = appConfig.uiReduceMotion,
             uiHideNames = appConfig.uiHideNames,
+            preferredCamera = appConfig.preferredCameraName.takeIf { it != "-" },
         )
+        loadCameras()
 
-        // check if printer setup is correct
         if (_form.value.printBadges && badgePrinterWasSelected && _form.value.badgePrinter == null) {
             _uiState.update { SettingsUiState.ErrorSelectedPrinterNotAvailable }
         }
@@ -119,6 +135,11 @@ class SettingsViewModel(
         loadSettings()
     }
 
+    suspend fun setPreferredCamera(name: String?) {
+        appConfig.preferredCameraName = name ?: "-"
+        loadSettings()
+    }
+
     fun logout() {
         syncRootService.skipFutureSyncs()
         appCache.reset()
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/QuestionCheckbox.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/QuestionCheckbox.kt
@@ -1,12 +1,17 @@
 package eu.pretix.scan.tickets.presentation
 
 
+import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.selection.selectable
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.unit.dp
 
 
 @Composable
@@ -17,17 +22,27 @@ fun QuestionCheckbox(
     onSelect: (String?) -> Unit
 ) {
     Row(
+        modifier = modifier
+            .padding(vertical = 4.dp)
+            .selectable(
+                selected = checked,
+                onClick = {
+                    if (checked) {
+                        onSelect("False")
+                    } else {
+                        onSelect("True")
+                    }
+                },
+                indication = LocalIndication.current,
+                interactionSource = null,
+                role = Role.Checkbox
+            ),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Checkbox(
             checked = checked,
-            onCheckedChange = { updatedChecked ->
-                if (updatedChecked) {
-                    onSelect("True")
-                } else {
-                    onSelect("False")
-                }
-            }
+            onCheckedChange = null,
+            modifier = Modifier.padding(end = 4.dp)
         )
         Text(
             label
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/QuestionsDialogView.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/QuestionsDialogView.kt
@@ -6,11 +6,14 @@ import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollbarAdapter
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Person
+import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -19,6 +22,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.BlendMode.Companion.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import eu.pretix.desktop.app.ui.*
@@ -27,14 +31,14 @@ import eu.pretix.libpretixsync.db.Answer
 import eu.pretix.scan.tickets.data.ResultStateData
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
+import org.jetbrains.compose.ui.tooling.preview.PreviewParameter
 import org.koin.compose.viewmodel.koinViewModel
 import pretixscan.composeapp.generated.resources.Res
 import pretixscan.composeapp.generated.resources.cancel
 import pretixscan.composeapp.generated.resources.cont
 import pretixscan.composeapp.generated.resources.yes
 
 
-@Preview
 @Composable
 fun QuestionsDialogView(
     data: ResultStateData,
@@ -109,7 +113,7 @@ fun QuestionsDialogView(
                     }
                 }
             }
-            items(form) { field ->
+            itemsIndexed(form) { index, field ->
                 SelectListRow {
                     when (field.fieldType) {
                         QuestionType.N -> {
@@ -332,7 +336,9 @@ fun QuestionsDialogView(
                         }
                     }
                 }
+                ListDivider(index, form.lastIndex)
             }
+
         }
 
         VerticalScrollbar(

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,6 @@ data class ConfigurableSettings(`
`14`	`14`	`val offlineMode: Boolean = false,`
`15`	`15`	`val uiReduceMotion: Boolean = false,`
`16`	`16`	`val uiHideNames: Boolean = false,`
	`17`	`+ val cameras: List<String> = emptyList(),`
	`18`	`+ val preferredCamera: String? = null,`
`17`	`19`	`)`