From 4b3e06076a287b2a7240a3965d178c467070a5a5 Mon Sep 17 00:00:00 2001 From: razeeman Date: Sat, 11 Jul 2020 15:15:51 +0300 Subject: [PATCH] fix keyboard visibility --- .../com/example/util/simpletimetracker/AddRecordTypeTest.kt | 4 ---- .../example/util/simpletimetracker/DeleteRecordTypeTest.kt | 3 ++- .../com/example/util/simpletimetracker/MainScreenEmptyTest.kt | 1 - .../java/com/example/util/simpletimetracker/MainScreenTest.kt | 4 ++-- .../java/com/example/util/simpletimetracker/MessagesTest.kt | 3 ++- .../com/example/util/simpletimetracker/RecordsRangesTest.kt | 1 - .../example/util/simpletimetracker/StatisticsRangesTest.kt | 1 - .../java/com/example/util/simpletimetracker/utils/NavUtils.kt | 4 ---- .../viewModel/ChangeRecordTypeViewModel.kt | 4 ++-- 9 files changed, 8 insertions(+), 17 deletions(-) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt index d0d63666..dc7ba63e 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt @@ -1,7 +1,6 @@ package com.example.util.simpletimetracker import android.view.View -import androidx.test.espresso.Espresso.pressBack import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText @@ -48,9 +47,6 @@ class AddRecordTypeTest : BaseUiTest() { typeTextIntoView(R.id.etChangeRecordTypeName, name) checkPreviewUpdated(withText(name)) - // Hide keyboard - pressBack() - // Open color chooser clickOnViewWithText(R.string.change_record_type_color_hint) checkViewIsDisplayed(withId(R.id.rvChangeRecordTypeColor)) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/DeleteRecordTypeTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/DeleteRecordTypeTest.kt index 589bf5c5..4ec75d2c 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/DeleteRecordTypeTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/DeleteRecordTypeTest.kt @@ -1,5 +1,6 @@ package com.example.util.simpletimetracker +import androidx.test.espresso.Espresso.closeSoftKeyboard import androidx.test.espresso.Espresso.pressBack import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText @@ -29,7 +30,7 @@ class DeleteRecordTypeTest : BaseUiTest() { clickOnViewWithText(R.string.running_records_add_type) checkViewIsNotDisplayed(withId(R.id.btnChangeRecordTypeDelete)) - pressBack() + closeSoftKeyboard() pressBack() // Add item diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenEmptyTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenEmptyTest.kt index e8ded232..4bc7979a 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenEmptyTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenEmptyTest.kt @@ -104,7 +104,6 @@ class MainScreenEmptyTest : BaseUiTest() { NavUtils.openRunningRecordsScreen() clickOnView(withText(R.string.running_records_add_type)) typeTextIntoView(R.id.etChangeRecordTypeName, name) - pressBack() clickOnView(withText(R.string.change_record_type_save)) checkViewIsDisplayed(withText(R.string.running_records_empty)) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenTest.kt index b8b079dd..bbcdd422 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenTest.kt @@ -1,5 +1,6 @@ package com.example.util.simpletimetracker +import androidx.test.espresso.Espresso.closeSoftKeyboard import androidx.test.espresso.Espresso.pressBack import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA @@ -28,12 +29,11 @@ class MainScreenTest : BaseUiTest() { // Add activity clickOnView(withText(R.string.running_records_add_type)) - pressBack() + closeSoftKeyboard() pressBack() clickOnView(withText(R.string.running_records_add_type)) typeTextIntoView(R.id.etChangeRecordTypeName, name) - pressBack() clickOnView(withText(R.string.change_record_type_save)) // Start timer diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/MessagesTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/MessagesTest.kt index 6c016da0..9dd59904 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/MessagesTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/MessagesTest.kt @@ -1,5 +1,6 @@ package com.example.util.simpletimetracker +import androidx.test.espresso.Espresso.closeSoftKeyboard import androidx.test.espresso.Espresso.pressBack import androidx.test.ext.junit.runners.AndroidJUnit4 import com.example.util.simpletimetracker.utils.BaseUiTest @@ -19,7 +20,7 @@ class MessagesTest : BaseUiTest() { clickOnViewWithText(R.string.running_records_add_type) clickOnViewWithText(R.string.change_record_type_save) toastTextShowing(R.string.change_record_message_choose_name) - pressBack() + closeSoftKeyboard() pressBack() // Add record diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordsRangesTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordsRangesTest.kt index 81a1b676..1ef14b89 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordsRangesTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordsRangesTest.kt @@ -29,7 +29,6 @@ class RecordsRangesTest : BaseUiTest() { NavUtils.openRunningRecordsScreen() clickOnView(withText(R.string.running_records_add_type)) typeTextIntoView(R.id.etChangeRecordTypeName, name) - pressBack() clickOnView(withText(R.string.change_record_type_save)) // Start timer diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt index 5fb6833a..0e124b63 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt @@ -31,7 +31,6 @@ class StatisticsRangesTest : BaseUiTest() { NavUtils.openRunningRecordsScreen() clickOnView(withText(R.string.running_records_add_type)) typeTextIntoView(R.id.etChangeRecordTypeName, name) - pressBack() clickOnView(withText(R.string.change_record_type_save)) // Start timer diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt index fbccb861..74e7a2c9 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt @@ -1,7 +1,6 @@ package com.example.util.simpletimetracker.utils import androidx.test.espresso.Espresso.onView -import androidx.test.espresso.Espresso.pressBack import androidx.test.espresso.matcher.ViewMatchers.hasDescendant import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText @@ -35,9 +34,6 @@ object NavUtils { // Name typeTextIntoView(R.id.etChangeRecordTypeName, name) - // Hide keyboard - pressBack() - // Color clickOnViewWithText(R.string.change_record_type_color_hint) scrollRecyclerToView(R.id.rvChangeRecordTypeColor, withCardColor(color)) diff --git a/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt b/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt index a9e95a24..1b73140a 100644 --- a/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt +++ b/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt @@ -61,8 +61,8 @@ class ChangeRecordTypeViewModel @Inject constructor( val flipIconChooser: LiveData = MutableLiveData() val deleteButtonEnabled: LiveData = MutableLiveData(true) val saveButtonEnabled: LiveData = MutableLiveData(true) - val deleteIconVisibility: LiveData get() = MutableLiveData(extra.id != 0L) - val keyboardVisibility: LiveData get() = MutableLiveData(extra.id == 0L) + val deleteIconVisibility: LiveData by lazy { MutableLiveData(extra.id != 0L) } + val keyboardVisibility: LiveData by lazy { MutableLiveData(extra.id == 0L) } private var newName: String = "" private var newIconName: String = "" -- 2.51.2