Merge pull request #39 from ponces/dev-fix-fabs

feat: add reboot FAB after direct flash, make them undraggable and align them at the right side if not already
bmax121 · Jan 6, 2024 · 3e1480b · 3e1480b
2 parents 17b248a + 470c142
commit 3e1480b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/app/src/main/java/me/bmax/apatch/ui/screen/Home.kt b/app/src/main/java/me/bmax/apatch/ui/screen/Home.kt
@@ -206,9 +206,6 @@ fun StartPatch(showDialog: MutableState<Boolean>, navigator: DestinationsNavigat
 fun FloatButton(navigator: DestinationsNavigator) {
     val state by APApplication.apStateLiveData.observeAsState(APApplication.State.UNKNOWN_STATE)
 
-    var patchOff by remember { mutableStateOf(IntOffset.Zero) }
-    var skeyOff by remember { mutableStateOf(IntOffset.Zero) }
-
     var showAuthKeyDialog = remember { mutableStateOf(false)  }
     var showSetKeyDialog = remember { mutableStateOf(false)  }
     var permissionRequest = remember { mutableStateOf(false)  }
@@ -239,16 +236,8 @@ fun FloatButton(navigator: DestinationsNavigator) {
         StartPatch(showDialog = showSetKeyDialog, navigator)
     }
 
-    Column() {
-        Box(Modifier
-            .offset { patchOff }
-            .pointerInput(Unit) {
-                detectDragGestures { change, dragAmount ->
-                    change.consume()
-                    patchOff += dragAmount.round()
-                }
-            }
-        ) {
+    Column(horizontalAlignment = Alignment.End) {
+        Box() {
             ExtendedFloatingActionButton(
                 onClick = {
                     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
@@ -262,15 +251,7 @@ fun FloatButton(navigator: DestinationsNavigator) {
             )
         }
         Spacer(Modifier.height(8.dp))
-        Box(Modifier
-            .offset { skeyOff }
-            .pointerInput(Unit) {
-                detectDragGestures { change, dragAmount ->
-                    change.consume()
-                    skeyOff += dragAmount.round()
-                }
-            }
-        ) {
+        Box() {
             ExtendedFloatingActionButton(
                 onClick = {
                     if(state != APApplication.State.UNKNOWN_STATE) {

diff --git a/app/src/main/java/me/bmax/apatch/ui/screen/Patch.kt b/app/src/main/java/me/bmax/apatch/ui/screen/Patch.kt
@@ -34,6 +34,7 @@ import kotlinx.coroutines.withContext
 import me.bmax.apatch.R
 import me.bmax.apatch.TAG
 import me.bmax.apatch.apApp
+import me.bmax.apatch.util.reboot
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -61,8 +62,8 @@ fun PatchScreen(navigator: DestinationsNavigator, uri: Uri?, superKey: String) {
                     text += '\n'
                 }
             })
-            if(ret) {
-//                showFloatAction = true
+            if(ret && uri == null) {
+                showFloatAction = true
             }
         }
     }
@@ -79,7 +80,7 @@ fun PatchScreen(navigator: DestinationsNavigator, uri: Uri?, superKey: String) {
                     onClick = {
                         scope.launch {
                             withContext(Dispatchers.IO) {
-//                                reboot()
+                                reboot()
                             }
                         }
                     },