From eafbecfad2ea26c90156660e0c9c89ebb878e48f Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 5 Nov 2020 21:19:55 +0100 Subject: [PATCH 1/5] updating commons, kotlin, gradle --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 4 ++++ build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 656ed613..79f15473 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.30.1' + implementation 'com.simplemobiletools:commons:5.31.24' implementation 'me.grantland:autofittextview:0.2.1' testImplementation 'junit:junit:4.12' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 523e2bfd..9c738fa1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,10 @@ android:name="android.permission.USE_FINGERPRINT" tools:node="remove"/> + + Date: Thu, 5 Nov 2020 21:21:00 +0100 Subject: [PATCH 2/5] limit result to 20 characters, do not allow too small numbers --- app/src/main/res/layout/activity_main.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3d41dd1e..917ffa39 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -27,6 +27,7 @@ android:layout_weight="1.8" android:fontFamily="sans-serif-light" android:gravity="center_vertical|end" + android:maxLength="20" android:maxLines="1" android:paddingLeft="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin" From c65e92d1d285838dfcc7ff17c6014b0084a3b3ce Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 5 Nov 2020 21:22:54 +0100 Subject: [PATCH 3/5] limit the formula to 30 characters --- app/src/main/res/layout/activity_main.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 917ffa39..3d16efd9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,6 +15,7 @@ android:layout_weight="2.1" android:fontFamily="sans-serif-light" android:gravity="end|bottom" + android:maxLength="30" android:maxLines="1" android:paddingLeft="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin" From b3be3860e864ec3334ca0b0df695e729c608d0f6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 5 Nov 2020 21:25:02 +0100 Subject: [PATCH 4/5] removing a weird old debug log --- .../com/simplemobiletools/calculator/helpers/CalculatorImpl.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt index c009db1d..858dd7eb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -1,7 +1,6 @@ package com.simplemobiletools.calculator.helpers import android.content.Context -import android.util.Log import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.operation.OperationFactory import com.simplemobiletools.commons.extensions.toast @@ -115,7 +114,6 @@ class CalculatorImpl(calculator: Calculator, val context: Context) { if (update) updateFormula() val operation = OperationFactory.forId(lastOperation!!, baseValue, secondValue) - Log.i("ANGELINA", "oper $lastOperation") if (operation != null) { updateResult(operation.getResult()) } From 95211501abe2d416a788a071597e8b00171de16d Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 5 Nov 2020 21:26:41 +0100 Subject: [PATCH 5/5] catch exceptions thrown at some operations in general --- .../simplemobiletools/calculator/helpers/CalculatorImpl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt index 858dd7eb..91147177 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -115,7 +115,11 @@ class CalculatorImpl(calculator: Calculator, val context: Context) { val operation = OperationFactory.forId(lastOperation!!, baseValue, secondValue) if (operation != null) { - updateResult(operation.getResult()) + try { + updateResult(operation.getResult()) + } catch (e: Exception) { + context.toast(R.string.unknown_error_occurred) + } } isFirstOperation = false