Refactored

umer0586 · Jan 16, 2025 · c10b4d3 · c10b4d3
1 parent 9c4ce2e
commit c10b4d3
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/...java/com/github/umer0586/droidpad/ui/screens/controlpadplayscreen/ControlPadPlayScreen.kt b/...java/com/github/umer0586/droidpad/ui/screens/controlpadplayscreen/ControlPadPlayScreen.kt
@@ -118,12 +118,6 @@ fun ControlPadPlayScreen(
     }
 
 
-
-    BackHandler {
-        viewModel.onEvent(ControlPadPlayScreenEvent.OnBackPress)
-        onBackPress?.invoke()
-    }
-
     ControlPlayScreenContent(
         uiState = uiState,
         onUiEvent = {event->
@@ -152,6 +146,11 @@ fun ControlPlayScreenContent(
             snackbarHostState.showSnackbar(uiState.connectionState.toString())
     }
 
+    // When device back button is pressed
+    BackHandler {
+        onUiEvent(ControlPadPlayScreenEvent.OnBackPress)
+    }
+
     Scaffold(
         snackbarHost = { SnackbarHost(snackbarHostState) },
         bottomBar = {
@@ -501,9 +500,9 @@ fun ControlPadPlayScreenContentPreview(modifier: Modifier = Modifier) {
     var uiState by remember { mutableStateOf(
         ControlPadPlayScreenState(
         controlPadItems = controlPadItems,
-        connectionState = ConnectionState.BLUETOOTH_ADVERTISEMENT_SUCCESS,
-        connectionType = ConnectionType.TCP,
-        isConnecting = true,
+        connectionState = ConnectionState.WEBSOCKET_CONNECTED,
+        connectionType = ConnectionType.WEBSOCKET,
+        isConnecting = false,
         isConnected = true,
         hostAddress = "org.mosquitto.org:80807",
         controlPadBackgroundColor = controlPad.backgroundColor