fix: 修复输入小数点报 Unknown Operator Exception

refactor: 按钮回调优化

Author: kineks0-0

app/src/main/java/io/github/kineks/composecalculator/ui/DefaultView.kt

@@ -120,7 +120,9 @@ fun DefaultView() {
 
             // 菜单
             Box(
-                modifier = Modifier.fillMaxHeight().statusBarsPadding(),
+                modifier = Modifier
+                    .fillMaxHeight()
+                    .statusBarsPadding(),
                 contentAlignment = Alignment.TopEnd
             ) {
                 var dropdownMenuExpanded by remember {
@@ -199,56 +201,8 @@ fun DefaultView() {
 
         // 计算器按钮
         CalculatorButton(
-            onNumberClick = { text: String -> state.add(text) },
-            onOperatorClick = { text: String ->
-                when (true) {
-                    // 复位
-                    isOperatorAC() -> {
-                        state.clearTextField()
-                    }
-                    // 删除键
-                    isOperatorBackSpace() -> {
-                        state.deleteLast()
-                    }
-                    // 括号
-                    isOperatorBrackets() -> {
-                        when (true) {
-                            (operatorBracketsCounts != 0 && !state.last.isOperatorBracketStart()) -> {
-                                state.add(")")
-                                operatorBracketsCounts--
-                            }
-                            else -> {
-                                state.add("(")
-                                operatorBracketsCounts++
-                            }
-                        }
-                    }
-                    // 其他符号
-                    isOperator() -> {
-                        state.apply {
-                            when (true) {
-                                isOperatorPercentage() -> {
-                                    if (last.isNumber())
-                                        add(text)
-                                }
-                                //  对于需要输入负数的情况
-                                (isOperatorMIN() && last.isOperator()) -> {
-                                    add(text, lastSecond.isOperator())
-                                }
-                                // 替换 --
-                                (last.isOperatorMIN() && lastSecond.isOperator()) -> {
-                                    deleteLast()
-                                    add(text, true)
-                                }
-                                (last.isOperator() && !last.isOperatorPercentage()) -> add(text, true)
-                                else -> add(text)
-                            }
-                        }
-                    }
-                    else -> throw Exception("Unknown Operator : $text")
-                }
-
-            },
+            onNumberClick = { onClick(this, state) },
+            onOperatorClick = { onClick(this, state) },
             startCalculatingEquations = { startCalculatingEquations(state) },
             modifier = Modifier
                 .isHorizontal {
@@ -260,7 +214,8 @@ fun DefaultView() {
                 .isNotHorizontal {
                     weight(1.1f)
                         .padding(10.dp)
-                })
+                }
+        )
 
 
     }
@@ -269,6 +224,63 @@ fun DefaultView() {
 }
 
 
+val onClick: String.(String, CalculatorTextFieldState) -> Unit = { text, state ->
+    if (state.value.text == getString(R.string.data_error))
+        state.clearTextField()
+    when (true) {
+        // 复位
+        isOperatorAC() -> {
+            state.clearTextField()
+        }
+        // 删除键
+        isOperatorBackSpace() -> {
+            state.deleteLast()
+        }
+        isNumber() -> {
+            state.add(text)
+        }
+        // 括号
+        isOperatorBrackets() -> {
+            when (true) {
+                (operatorBracketsCounts != 0 && !state.last.isOperatorBracketStart()) -> {
+                    state.add(")")
+                    operatorBracketsCounts--
+                }
+                else -> {
+                    state.add("(")
+                    operatorBracketsCounts++
+                }
+            }
+        }
+        // 其他符号
+        isOperator() -> {
+            state.apply {
+                when (true) {
+                    isOperatorPercentage() -> {
+                        if (last.isNumber())
+                            add(text)
+                    }
+                    //  对于需要输入负数的情况
+                    (isOperatorMIN() && last.isOperator()) -> {
+                        add(text, lastSecond.isOperator())
+                    }
+                    // 替换 --
+                    (last.isOperatorMIN() && lastSecond.isOperator()) -> {
+                        deleteLast()
+                        add(text, true)
+                    }
+                    (last.isOperator() && !last.isOperatorPercentage()) -> add(text, true)
+                    else -> add(text)
+                }
+            }
+        }
+        else -> throw Exception("Unknown Operator : $text")
+    }
+
+}
+
+
+
 @Preview(showBackground = true)
 @Composable
 fun DefaultPreview() {

app/src/main/java/io/github/kineks/composecalculator/ui/view/CalculatorButton.kt

@@ -79,7 +79,7 @@ fun CalculatorButton(
         }
         item { NumberButton(text = "0", clickable = onNumberClick) }
         item {
-            NumberButton(text = "•", clickable = { onNumberClick(".") })
+            NumberButton(text = "•", clickable = { ".".apply { onNumberClick(".") } })
         }
         item {
             OperatorButton(

app/src/main/java/io/github/kineks/composecalculator/ui/view/CalculatorTextField.kt

@@ -170,20 +170,20 @@ fun CalculatorTextField(
     state.apply {
         TextField(
             value = value,
-            onValueChange = {
+            onValueChange = { textFieldValue ->
                 // 避免键盘或者输入法删除括号导致计数错误
                 operatorBracketsCounts = 0
-                it.text.forEach {
+                textFieldValue.text.forEach {
                     when(it) {
                         '(' -> operatorBracketsCounts++
                         ')' -> operatorBracketsCounts--
                     }
                 }
-                value = it
+                value = textFieldValue
             },
             label = {
                 Text(
-                    text = if (label.isNotEmpty()) "$label=" else label,
+                    text = if (label.isNotEmpty()) "$label =" else label,
                     style = MaterialTheme.typography.headlineMedium,
                     modifier = Modifier
                         .alpha(0.8f)