feat(顶部): 历史记录

Author: jiaoyaning

app/src/main/java/com/jyn/composecalculator/DateViewModel.kt

@@ -1,15 +1,20 @@
 package com.jyn.composecalculator
 
 import android.app.Application
+import android.widget.Toast
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.AndroidViewModel
 import com.udojava.evalex.Expression
 
+data class Date(var input: String, var result: String)
+
 class DateViewModel(application: Application) : AndroidViewModel(application) {
     var textBoxHeight = 0.dp
+    var results = mutableListOf<Date>()
     var inputText = mutableStateOf("")
     var resultText = mutableStateOf("")
+    var lastInputText = mutableStateOf("")
 
     fun append(text: String) {
         inputText.value = inputText.value + text
@@ -26,7 +31,13 @@ class DateViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     fun calculate() {
-        val expr = inputText.value.replace('×', '*').replace('÷', '/')
+        if (lastInputText.value == inputText.value) {
+            inputText.value = resultText.value
+            resultText.value = ""
+            return
+        }
+
+        val expr = inputText.value.replace('×', '*').replace('÷', '/').replace("%", "/100")
         val expressions = arrayOf('+', '-', '*', '/')
         if (expr.isEmpty()) return
         if (!expressions.any { expr.contains(it) }) {
@@ -36,8 +47,16 @@ class DateViewModel(application: Application) : AndroidViewModel(application) {
             resultText.value = ""
             return
         }
-        val eval = Expression(expr).eval()
+        try {
+            val eval = Expression(expr).setPrecision(18).eval()
+            resultText.value = eval.toString()
+            lastInputText.value = inputText.value
 
-        resultText.value = eval.toString()
+            if (results.size > 10) results.removeFirst()
+            results.add(0, Date(inputText.value, resultText.value))
+        } catch (e: Exception) {
+            e.printStackTrace()
+            Toast.makeText(getApplication(), "计算错误！", Toast.LENGTH_SHORT).show()
+        }
     }
 }

app/src/main/java/com/jyn/composecalculator/ui/TopResultView.kt

@@ -1,7 +1,10 @@
 package com.jyn.composecalculator.ui
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.FractionalThreshold
@@ -11,6 +14,7 @@ import androidx.compose.material.swipeable
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
@@ -21,6 +25,7 @@ import com.apkfuns.logutils.LogUtils
 import com.jyn.composecalculator.BOTTOM_FRACTION
 import com.jyn.composecalculator.DateViewModel
 import com.jyn.composecalculator.ui.view.InputText
+import com.jyn.composecalculator.ui.view.ItemText
 import com.jyn.composecalculator.ui.view.SlideIndicator
 
 /**
@@ -59,7 +64,7 @@ fun TopResultView() {
                 thresholds = { _, _ -> FractionalThreshold(0.2f) },
                 resistance = resistanceConfig(
                     anchors.keys,
-                    10.dp.value,
+                    5.dp.value,
                     0f
                 ),
                 velocityThreshold = 60.dp
@@ -81,6 +86,19 @@ fun TextBox(process: Float) {
             .padding(10.dp),
         verticalArrangement = Arrangement.Bottom
     ) {
+        LazyColumn(
+            modifier = Modifier
+                .weight(1f)
+                .background(Color.Gray),
+            reverseLayout = true,
+            userScrollEnabled = false
+        ) {
+            items(viewModel.results) {
+                Spacer(modifier = Modifier.height(5.dp))
+                ItemText(input = it.input, result = it.result)
+            }
+        }
+
         InputText(viewModel.inputText.value)
 
         Spacer(modifier = Modifier.height(5.dp))

app/src/main/java/com/jyn/composecalculator/ui/view/ItemTextView.kt

@@ -12,8 +12,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.text.ExperimentalTextApi
+import androidx.compose.ui.text.PlatformTextStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.jyn.composecalculator.DateViewModel
@@ -68,9 +74,38 @@ fun InputText(input: String) {
     }
 }
 
+@OptIn(ExperimentalTextApi::class)
 @Composable
 fun ItemText(input: String, result: String) {
     Column(verticalArrangement = Arrangement.Bottom) {
-        Text(modifier = Modifier.fillMaxWidth(), text = input, textAlign = TextAlign.End)
+        Text(
+            modifier = Modifier.fillMaxWidth(),
+            text = input,
+            fontSize = 20.sp,
+            textAlign = TextAlign.End,
+            style = TextStyle(
+                platformStyle = PlatformTextStyle(
+                    includeFontPadding = false
+                )
+            )
+        )
+
+        Text(
+            modifier = Modifier.fillMaxWidth(),
+            text = result,
+            fontSize = 28.sp,
+            textAlign = TextAlign.End,
+            style = TextStyle(
+                platformStyle = PlatformTextStyle(
+                    includeFontPadding = false
+                )
+            )
+        )
     }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun ItemTextPre() {
+    ItemText("123456+1231231", "67474774747")
 }