owen/Calculator-Hide-Files
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed - Realtime Calculation Update

Browse Source
This commit is contained in:
Binondi
2025-06-07 21:34:26 +05:30
parent 27a538f7c6
commit 28ccdda1bf
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/devs/org/calculator/activities/MainActivity.kt
View File

@@ -150,7 +150,7 @@ class MainActivity : AppCompatActivity(), DialogActionsCallback, DialogUtil.Dial
} }
private fun clearDisplay() { private fun clearDisplay() {
currentExpression = "" currentExpression = "0"
binding.total.text = "" binding.total.text = ""
lastWasOperator = false lastWasOperator = false
lastWasPercent = false lastWasPercent = false
@@ -335,13 +335,17 @@ class MainActivity : AppCompatActivity(), DialogActionsCallback, DialogUtil.Dial
} }
try { try {
if (currentExpression.isEmpty() || if (currentExpression.isEmpty()) {
(isOperator(currentExpression.last().toString()) && currentExpression.last() != '%')) {
binding.total.text = "" binding.total.text = ""
return return
} }
var processedExpression = currentExpression.replace("×", "*") var processedExpression = currentExpression.replace("×", "*")
if (isOperator(processedExpression.last().toString())) {
processedExpression = processedExpression.substring(0, processedExpression.length - 1)
}
if (processedExpression.contains("%")) { if (processedExpression.contains("%")) {
processedExpression = preprocessExpression(processedExpression) processedExpression = preprocessExpression(processedExpression)
} }

2
app/src/main/res/layout/activity_main.xml
View File

@@ -48,7 +48,7 @@
android:gravity="end|bottom" android:gravity="end|bottom"
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:padding="10dp" android:padding="10dp"
android:text="" android:text="0"
android:textSize="70sp" android:textSize="70sp"
tools:ignore="Suspicious0dp" /> tools:ignore="Suspicious0dp" />
</LinearLayout> </LinearLayout>