bug fixes

Android-Boot-Manager · Jul 27, 2024 · a000483 · a000483
1 parent c16e90b
commit a000483
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/app/src/main/java/org/andbootmgr/app/CreatePartFlow.kt b/app/src/main/java/org/andbootmgr/app/CreatePartFlow.kt
@@ -253,7 +253,7 @@ private fun Start(c: CreatePartDataHolder) {
 					}, isError = eu, label = {
 						Text(stringResource(R.string.end_sector))
 					})
-					RangeSlider(modifier = Modifier.fillMaxWidth(), value = lu, onValueChange = {
+					RangeSlider(modifier = Modifier.fillMaxWidth(), value =  lu, onValueChange = {
 						l = it.start.toLong().toString()
 						u = it.endInclusive.toLong().toString()
 						el = !l.matches(Regex("\\d+"))
@@ -308,7 +308,7 @@ private fun Start(c: CreatePartDataHolder) {
 						c.l = l
 						c.u = u
 						c.t = t
-						c.f = c.p.size - c.u.toLong()
+						c.f = (c.p.size - c.u.toLong()).coerceAtLeast(0) // TODO fix range slider inaccuracies instead
 						c.vm.navigate("flash")
 					}) {
 						Text(stringResource(id = R.string.create))
@@ -333,7 +333,7 @@ private fun Start(c: CreatePartDataHolder) {
 						c.l = l
 						c.u = u
 						c.t = null
-						c.f = c.p.size - c.u.toLong()
+						c.f = (c.p.size - c.u.toLong()).coerceAtLeast(0) // TODO fix range slider inaccuracies instead
 						c.vm.navigate("shop")
 					}) {
 						Text(stringResource(R.string.cont))
@@ -994,6 +994,7 @@ private fun Flash(c: CreatePartDataHolder) {
 				} else /*percent*/ {
 					(BigDecimal(c.p.size - (offset + c.f)).multiply(BigDecimal(b).divide(BigDecimal(100)))).toLong()
 				}
+				terminal.add("c.p.size=${c.p.size} offset=$offset c.f=${c.f} b=$b k=$k logSectorSizeBytes=${c.meta!!.logicalSectorSizeBytes}")
 
 				vm.logic.unmount(vm.deviceInfo!!)
 				val r = Shell.cmd(SDUtils.umsd(c.meta!!) + " && " + c.p.create(offset, offset + k, code, "")).to(terminal).exec()

diff --git a/app/src/main/java/org/andbootmgr/app/MainActivity.kt b/app/src/main/java/org/andbootmgr/app/MainActivity.kt
@@ -22,7 +22,6 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.HorizontalAlignmentLine
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -92,7 +91,6 @@ class MainActivityState {
 	var isReady = false
 	var name by mutableStateOf("") /* default value moved to onCreate() */
 	var navController: NavHostController? = null
-	@OptIn(ExperimentalMaterial3Api::class)
 	var drawerState: DrawerState? = null
 	var scope: CoroutineScope? = null
 	var root = false
@@ -103,7 +101,6 @@ class MainActivityState {
 
 class MainActivity : ComponentActivity() {
 
-	@OptIn(ExperimentalMaterial3Api::class)
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		val vm = MainActivityState()
@@ -429,7 +426,6 @@ private fun Start(vm: MainActivityState) {
 	}
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun PartTool(vm: MainActivityState) {
 	var filterUnifiedView by remember { mutableStateOf(true) }
@@ -973,7 +969,7 @@ private fun PartTool(vm: MainActivityState) {
 					}
 				}
 			)
-		} else if (editEntryID != null && filterUnifiedView) {
+		} else if (editEntryID != null) {
 			val e = editEntryID!!
 			AlertDialog(
 				onDismissRequest = {
@@ -1111,7 +1107,6 @@ private fun PartTool(vm: MainActivityState) {
 	}
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun Settings(vm: MainActivityState) {
 	val ctx = LocalContext.current