feat: implement autoscan to support scanning with a handheld scanner, auto-dismiss (timer), dismiss with space key, continuous scanning (clear search box)

kkostov · kkostov · commit 37006d93db76 · 2025-10-25T14:07:04.000+02:00
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/desktop/app/ui/AutoScanEventListener.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/desktop/app/ui/AutoScanEventListener.kt
@@ -0,0 +1,11 @@
+package eu.pretix.desktop.app.ui
+
+import androidx.compose.ui.Modifier
+
+/**
+ * Modifier that listens for alphanumeric key events globally and triggers a callback.
+ * Used to automatically focus the search field when a handheld scanner inputs data.
+ */
+expect fun Modifier.autoScanEventListener(
+    onAlphanumericKey: (String) -> Unit
+): Modifier
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/main/presentation/MainScreen.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/main/presentation/MainScreen.kt
@@ -9,9 +9,11 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import eu.pretix.desktop.app.navigation.Route
 import eu.pretix.desktop.app.ui.ScreenContentRoot
+import eu.pretix.desktop.app.ui.autoScanEventListener
 import eu.pretix.scan.main.presentation.selectevent.SelectEventDialog
 import eu.pretix.scan.main.presentation.selectlist.SelectCheckInListDialog
 import eu.pretix.scan.main.presentation.selectlist.SelectCheckInListForMultiEventDialog
@@ -76,7 +78,13 @@ fun MainScreen(
 
         is MainUiState.ReadyToScan -> {
             val data = (uiState as MainUiState.ReadyToScan<MainUiStateData>).data
-            Column {
+            Column(
+                modifier = Modifier.autoScanEventListener(
+                    onAlphanumericKey = { _ ->
+                        // Event propagates to SearchTextField which auto-focuses on mount
+                    }
+                )
+            ) {
                 MainToolbar(
                     viewModel = viewModel,
                     eventSelection = data.eventSelection,
@@ -89,30 +97,48 @@ fun MainScreen(
                 )
 
                 ScreenContentRoot {
-                    TicketSearchBar(onSelectedSearchResult = {
-                        coroutineScope.launch {
-                            viewModel.onHandleSearchResult(it)
+                    TicketSearchBar(
+                        onSelectedSearchResult = {
+                            coroutineScope.launch {
+                                viewModel.onHandleSearchResult(it)
+                            }
+                        },
+                        onDirectScan = { secret ->
+                            coroutineScope.launch {
+                                viewModel.onHandleDirectScan(secret)
+                            }
                         }
-                    })
+                    )
                 }
 
             }
         }
 
         is MainUiState.HandlingTicket -> {
             val data = (uiState as MainUiState.HandlingTicket<MainUiStateData>).data
-            Column {
+            Column(
+                modifier = Modifier.autoScanEventListener { _ ->
+                    // Event propagates to SearchTextField which maintains focus
+                }
+            ) {
                 MainToolbar(
                     viewModel = viewModel,
                     eventSelection = data.eventSelection
                 )
 
                 ScreenContentRoot {
-                    TicketSearchBar(onSelectedSearchResult = {
-                        coroutineScope.launch {
-                            viewModel.onHandleSearchResult(it)
+                    TicketSearchBar(
+                        onSelectedSearchResult = {
+                            coroutineScope.launch {
+                                viewModel.onHandleSearchResult(it)
+                            }
+                        },
+                        onDirectScan = { secret ->
+                            coroutineScope.launch {
+                                viewModel.onHandleDirectScan(secret)
+                            }
                         }
-                    })
+                    )
                 }
             }
             TicketHandlingDialog(
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/main/presentation/MainViewModel.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/main/presentation/MainViewModel.kt
@@ -153,6 +153,16 @@ class MainViewModel(
         }
     }
 
+    suspend fun onHandleDirectScan(secret: String) {
+        log.info("AutoScan: Handling direct scan for ticket")
+        val currentState = _uiState.value
+        if (currentState is MainUiState.ReadyToScan) {
+            _uiState.update {
+                MainUiState.HandlingTicket(currentState.data.secret(secret))
+            }
+        }
+    }
+
     fun onHandleTicketHandlingDismissed() {
         val currentState = _uiState.value
         if (currentState is MainUiState.HandlingTicket) {
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/SearchTextField.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/SearchTextField.kt
@@ -20,15 +20,21 @@ import androidx.compose.ui.text.input.ImeAction
 import org.jetbrains.compose.resources.stringResource
 import pretixscan.composeapp.generated.resources.Res
 import pretixscan.composeapp.generated.resources.text_action_clear
+import java.util.logging.Logger
+
+private val log = Logger.getLogger("SearchTextField")
 
 @Composable
 fun SearchTextField(
     modifier: Modifier = Modifier,
     value: String = "",
     hint: String = "",
-    onSearch: (String) -> Unit = {}
+    onSearch: (String) -> Unit = {},
+    onDirectScan: (String) -> Unit = {}
 ) {
     val focusRequester = remember { FocusRequester() }
+    // Barcode pattern from old implementation: alphanumeric plus =+/ with at least 5 chars
+    val barcodePattern = remember { Regex("[a-zA-Z0-9=+/]{5,}") }
 
     LaunchedEffect(Unit) {
         focusRequester.requestFocus()
@@ -50,7 +56,19 @@ fun SearchTextField(
             },
             keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
             keyboardActions = KeyboardActions(onSearch = {
-                onSearch(text)
+                // Check if this looks like a barcode scan
+                if (text.matches(barcodePattern)) {
+                    log.info("AutoScan: Barcode pattern detected, triggering direct scan")
+                    // Direct check-in for barcode
+                    onDirectScan(text)
+                    text = ""
+                    // Clear search results by notifying ViewModel
+                    onSearch("")
+                } else {
+                    log.info("AutoScan: Regular search (not barcode pattern)")
+                    // Normal search
+                    onSearch(text)
+                }
             }),
             maxLines = 1,
             singleLine = true,
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/TicketHandlingDialog.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/TicketHandlingDialog.kt
@@ -2,6 +2,7 @@ package eu.pretix.scan.tickets.presentation
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.CircularProgressIndicator
@@ -10,7 +11,10 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.key.*
 import androidx.compose.ui.unit.dp
 import com.composables.core.*
 import eu.pretix.scan.tickets.data.ResultState
@@ -19,6 +23,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.koin.compose.viewmodel.koinViewModel
+import java.util.logging.Logger
+
+private val log = Logger.getLogger("TicketHandlingDialog")
 
 @Preview
 @Composable
@@ -28,12 +35,46 @@ fun TicketHandlingDialog(secret: String?, onDismiss: () -> Unit) {
     val uiState by viewModel.uiState.collectAsState()
     val coroutineScope = rememberCoroutineScope()
     val dialogState = rememberDialogState(initiallyVisible = true)
+    var remainingTimeProgress by remember { mutableStateOf(1.0f) }
+    val focusRequester = remember { FocusRequester() }
 
     LaunchedEffect(secret) {
         viewModel.resetTicketHandlingState()
         viewModel.handleTicket(secret)
     }
 
+    // Request focus when transitioning to success states so Space key works
+    // Keyed on resultState so it re-runs after questions/unpaid dialogs
+    LaunchedEffect(uiState.resultState) {
+        if (uiState.resultState == ResultState.SUCCESS ||
+            uiState.resultState == ResultState.SUCCESS_EXIT) {
+            log.info("AutoScan: Requesting focus for success state: ${uiState.resultState}")
+            focusRequester.requestFocus()
+        }
+    }
+
+    // Auto-dismiss countdown for successful scans (30 seconds)
+    LaunchedEffect(uiState.resultState) {
+        if (uiState.resultState == ResultState.SUCCESS || uiState.resultState == ResultState.SUCCESS_EXIT) {
+            val totalDuration = 30000L // 30 seconds in milliseconds
+            val updateInterval = 100L // Update every 100ms for smooth animation
+            var elapsed = 0L
+
+            while (elapsed < totalDuration) {
+                kotlinx.coroutines.delay(updateInterval)
+                elapsed += updateInterval
+                remainingTimeProgress = 1.0f - (elapsed.toFloat() / totalDuration.toFloat())
+            }
+
+            // Time's up, dismiss the dialog
+            log.info("AutoScan: 30s auto-dismiss timer expired")
+            onDismiss()
+        } else {
+            // Reset progress for non-success states
+            remainingTimeProgress = 1.0f
+        }
+    }
+
     DisposableEffect(Unit) {
         onDispose {
             viewModel.resetTicketHandlingState()
@@ -56,7 +97,21 @@ fun TicketHandlingDialog(secret: String?, onDismiss: () -> Unit) {
                 .padding(20.dp)
                 .clip(RoundedCornerShape(12.dp))
                 .border(1.dp, Color(0xFFE4E4E4), RoundedCornerShape(12.dp))
-                .background(Color.White),
+                .background(Color.White)
+                .focusRequester(focusRequester)
+                .focusable()
+                .onKeyEvent { keyEvent ->
+                    // Handle Space key to manually dismiss dialog
+                    // Enter key is NOT handled here to allow continuous scanning
+                    if (keyEvent.type == KeyEventType.KeyDown &&
+                        keyEvent.key == Key.Spacebar) {
+                        log.info("AutoScan: Space key pressed, dismissing dialog")
+                        onDismiss()
+                        true  // Consume Space key
+                    } else {
+                        false  // Let other keys (including Enter) propagate for continuous scanning
+                    }
+                },
         ) {
             when (uiState.resultState) {
                 ResultState.EMPTY -> {}
@@ -101,7 +156,8 @@ fun TicketHandlingDialog(secret: String?, onDismiss: () -> Unit) {
                             CoroutineScope(Dispatchers.IO).launch {
                                 viewModel.printBadges()
                             }
-                        }
+                        },
+                        remainingTimeProgress = remainingTimeProgress
                     )
                 }
 
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/TicketSearchBar.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/TicketSearchBar.kt
@@ -19,7 +19,8 @@ import pretixscan.composeapp.generated.resources.searchfield_prompt
 @Composable
 fun TicketSearchBar(
     modifier: Modifier = Modifier,
-    onSelectedSearchResult: (TicketCheckProvider.SearchResult) -> Unit
+    onSelectedSearchResult: (TicketCheckProvider.SearchResult) -> Unit,
+    onDirectScan: (String) -> Unit = {}
 ) {
     val viewModel = koinViewModel<TicketSearchBarViewModel>()
 
@@ -35,7 +36,8 @@ fun TicketSearchBar(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(16.dp),
-                onSearch = viewModel::onSearchTextChange
+                onSearch = viewModel::onSearchTextChange,
+                onDirectScan = onDirectScan
             )
         }
 
@@ -54,7 +56,11 @@ fun TicketSearchBar(
         } else {
             SearchResultsView(
                 searchSuggestions,
-                onSelectedSearchResult = onSelectedSearchResult
+                onSelectedSearchResult = { result ->
+                    // Clear search before handling result (matches old implementation)
+                    viewModel.clearSearch()
+                    onSelectedSearchResult(result)
+                }
             )
         }
     }
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/TicketSearchBarViewModel.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/TicketSearchBarViewModel.kt
@@ -50,6 +50,10 @@ class TicketSearchBarViewModel(
     fun onSearchTextChange(text: String) {
         _searchText.value = text
     }
+
+    fun clearSearch() {
+        _searchText.value = ""
+    }
 }
 
 
diff --git a/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/TicketSuccess.kt b/pretixscan/composeApp/src/commonMain/kotlin/eu/pretix/scan/tickets/presentation/TicketSuccess.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.Button
+import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -25,7 +26,12 @@ import pretixscan.composeapp.generated.resources.settings_label_print_badges
 
 @Preview
 @Composable
-fun TicketSuccess(modifier: Modifier = Modifier, data: ResultStateData, onPrintBadges: () -> Unit) {
+fun TicketSuccess(
+    modifier: Modifier = Modifier,
+    data: ResultStateData,
+    onPrintBadges: () -> Unit,
+    remainingTimeProgress: Float = 1.0f
+) {
 
     Column(
         modifier = Modifier.background(data.resultState.color()),
@@ -93,6 +99,16 @@ fun TicketSuccess(modifier: Modifier = Modifier, data: ResultStateData, onPrintB
         ) {
             Text(data.orderCodeAndPositionId ?: "", style = MaterialTheme.typography.bodyLarge)
         }
+
+        // Countdown progress indicator
+        LinearProgressIndicator(
+            progress = { remainingTimeProgress },
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(4.dp),
+            color = CustomColor.White.asColor().copy(alpha = 0.8f),
+            trackColor = data.resultState.color().copy(alpha = 0.3f)
+        )
     }
 
 }
diff --git a/pretixscan/composeApp/src/desktopMain/kotlin/eu/pretix/desktop/app/ui/AutoScanEventListener.desktop.kt b/pretixscan/composeApp/src/desktopMain/kotlin/eu/pretix/desktop/app/ui/AutoScanEventListener.desktop.kt
@@ -0,0 +1,32 @@
+package eu.pretix.desktop.app.ui
+
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.key.*
+import java.util.logging.Logger
+
+private val log = Logger.getLogger("AutoScanEventListener")
+
+/**
+ * Desktop implementation of auto-scan event listener.
+ * Monitors for alphanumeric key presses to ensure search field can capture scanner input.
+ * Does not consume events, allowing them to propagate to focused elements.
+ */
+actual fun Modifier.autoScanEventListener(
+    onAlphanumericKey: (String) -> Unit
+): Modifier = this.onPreviewKeyEvent { keyEvent ->
+    // Only handle key down events
+    if (keyEvent.type != KeyEventType.KeyDown) {
+        return@onPreviewKeyEvent false
+    }
+
+    // Check if the key is alphanumeric
+    val char = keyEvent.utf16CodePoint.toChar()
+    if (char.isLetterOrDigit()) {
+        log.info("AutoScan: Alphanumeric key detected")
+        // Notify callback but don't consume - let event propagate to search field
+        onAlphanumericKey(char.toString())
+        false // Don't consume, allow normal event handling
+    } else {
+        false
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ import pretixscan.composeapp.generated.resources.searchfield_prompt`
`19`	`19`	`@Composable`
`20`	`20`	`fun TicketSearchBar(`
`21`	`21`	`modifier: Modifier = Modifier,`
`22`		`- onSelectedSearchResult: (TicketCheckProvider.SearchResult) -> Unit`
	`22`	`+ onSelectedSearchResult: (TicketCheckProvider.SearchResult) -> Unit,`
	`23`	`+ onDirectScan: (String) -> Unit = {}`
`23`	`24`	`) {`
`24`	`25`	`val viewModel = koinViewModel<TicketSearchBarViewModel>()`
`25`	`26`
`@@ -35,7 +36,8 @@ fun TicketSearchBar(`
`35`	`36`	`modifier = Modifier`
`36`	`37`	`.fillMaxWidth()`
`37`	`38`	`.padding(16.dp),`
`38`		`- onSearch = viewModel::onSearchTextChange`
	`39`	`+ onSearch = viewModel::onSearchTextChange,`
	`40`	`+ onDirectScan = onDirectScan`
`39`	`41`	`)`
`40`	`42`	`}`
`41`	`43`
`@@ -54,7 +56,11 @@ fun TicketSearchBar(`
`54`	`56`	`} else {`
`55`	`57`	`SearchResultsView(`
`56`	`58`	`searchSuggestions,`
`57`		`- onSelectedSearchResult = onSelectedSearchResult`
	`59`	`+ onSelectedSearchResult = { result ->`
	`60`	`+ // Clear search before handling result (matches old implementation)`
	`61`	`+ viewModel.clearSearch()`
	`62`	`+ onSelectedSearchResult(result)`
	`63`	`+ }`
`58`	`64`	`)`
`59`	`65`	`}`
`60`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ class TicketSearchBarViewModel(`
`50`	`50`	`fun onSearchTextChange(text: String) {`
`51`	`51`	`_searchText.value = text`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ fun clearSearch() {`
	`55`	`+ _searchText.value = ""`
	`56`	`+ }`
`53`	`57`	`}`
`54`	`58`
`55`	`59`