From 20e152505fcebeaad690aece1e999e65976a3ff0 Mon Sep 17 00:00:00 2001 From: hmalik144 Date: Mon, 27 Feb 2023 18:44:26 +0000 Subject: [PATCH] Bug fix for negative numbers limit Code clean up --- .../java/com/example/sumtest/robots/SumTestRobot.kt | 3 ++- .../androidTest/java/com/example/sumtest/steps/SumTestSteps.kt | 1 - app/src/main/java/com/example/sumtest/SumViewModel.kt | 3 +-- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/themes.xml | 2 +- app/src/test/java/com/example/sumtest/ExampleUnitTest.kt | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/androidTest/java/com/example/sumtest/robots/SumTestRobot.kt b/app/src/androidTest/java/com/example/sumtest/robots/SumTestRobot.kt index b9553e3..70e8623 100644 --- a/app/src/androidTest/java/com/example/sumtest/robots/SumTestRobot.kt +++ b/app/src/androidTest/java/com/example/sumtest/robots/SumTestRobot.kt @@ -1,6 +1,7 @@ package com.example.sumtest.robots -import androidx.test.espresso.matcher.ViewMatchers.Visibility.* +import androidx.test.espresso.matcher.ViewMatchers.Visibility.GONE +import androidx.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE import com.example.sumtest.R fun sumTest(func: SumTestRobot.() -> Unit) = SumTestRobot().apply { func() } diff --git a/app/src/androidTest/java/com/example/sumtest/steps/SumTestSteps.kt b/app/src/androidTest/java/com/example/sumtest/steps/SumTestSteps.kt index 9cd40ad..cdf1149 100644 --- a/app/src/androidTest/java/com/example/sumtest/steps/SumTestSteps.kt +++ b/app/src/androidTest/java/com/example/sumtest/steps/SumTestSteps.kt @@ -1,6 +1,5 @@ package com.example.sumtest.steps -import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle.State.RESUMED import androidx.test.core.app.ActivityScenario import androidx.test.espresso.IdlingRegistry diff --git a/app/src/main/java/com/example/sumtest/SumViewModel.kt b/app/src/main/java/com/example/sumtest/SumViewModel.kt index 5ad0bef..928ed1d 100644 --- a/app/src/main/java/com/example/sumtest/SumViewModel.kt +++ b/app/src/main/java/com/example/sumtest/SumViewModel.kt @@ -3,7 +3,6 @@ package com.example.sumtest import android.os.Handler import android.os.Looper import androidx.lifecycle.ViewModel -import com.example.sumtest.utils.BasicIdlingResource import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow @@ -60,7 +59,7 @@ class SumViewModel : ViewModel() { return Error.InvalidInput } - if (firstAsInt > 1000 || secondAsInt > 1000) { + if (firstAsInt > 1000 || secondAsInt > 1000 || firstAsInt < -1000 || secondAsInt < -1000) { return Error.Overflow } diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index d116b97..6972d8a 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,4 +1,4 @@ - +