From c11cf500bee8e5dbe1c794b89bcb64f48f40f441 Mon Sep 17 00:00:00 2001 From: A404M Date: Wed, 18 Dec 2024 15:31:58 +0330 Subject: fixed division --- app/build.gradle.kts | 4 ++-- app/release/app-release.apk | Bin 694150 -> 694078 bytes app/release/baselineProfiles/0/app-release.dm | Bin 3531 -> 3518 bytes app/release/baselineProfiles/1/app-release.dm | Bin 3474 -> 3467 bytes app/release/output-metadata.json | 4 ++-- .../java/com/a404m/calculator/util/MathHelper.kt | 13 ++----------- 6 files changed, 6 insertions(+), 15 deletions(-) (limited to 'app') diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8503827..1c36cd3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "com.a404m.calculator" minSdk = 21 targetSdk = 35 - versionCode = 4 - versionName = "0.1.2" + versionCode = 5 + versionName = "0.1.3" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/app-release.apk b/app/release/app-release.apk index ec63e14..543e3ca 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm index c34e6d1..a0dcf66 100644 Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm index 10d60b7..bbee40d 100644 Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 37c4baa..6b3d116 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 4, - "versionName": "0.1.2", + "versionCode": 5, + "versionName": "0.1.3", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/com/a404m/calculator/util/MathHelper.kt b/app/src/main/java/com/a404m/calculator/util/MathHelper.kt index 77244b0..51aec93 100644 --- a/app/src/main/java/com/a404m/calculator/util/MathHelper.kt +++ b/app/src/main/java/com/a404m/calculator/util/MathHelper.kt @@ -180,7 +180,7 @@ object MathHelper { value = expression.substring( start, i - ).toBigDecimal() + ).toBigDecimal().multiply(BigDecimal("1.0")) ) ) --i @@ -310,16 +310,7 @@ object MathHelper { val value: MathNumberType, ) { override fun toString(): String { - var str = value.toString() - if(str.contains('.')){ - while (str.last() == '0'){ - str = str.removeRange(str.length-1,str.length) - } - if(str.last() == '.'){ - str = str.removeRange(str.length-1,str.length) - } - } - return str + return value.stripTrailingZeros().toString() } } -- cgit v1.2.3