-4

app/src/androidTest/java/com/example/util/simpletimetracker/AddRecordTypeTest.kt

Reviewed

··· 1 1 package com.example.util.simpletimetracker 2 2 3 3 import android.view.View 4 4 - import androidx.test.espresso.Espresso.pressBack 5 4 import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA 6 5 import androidx.test.espresso.matcher.ViewMatchers.withId 7 6 import androidx.test.espresso.matcher.ViewMatchers.withText ··· 47 46 // Typing name 48 47 typeTextIntoView(R.id.etChangeRecordTypeName, name) 49 48 checkPreviewUpdated(withText(name)) 50 50 - 51 51 - // Hide keyboard 52 52 - pressBack() 53 49 54 50 // Open color chooser 55 51 clickOnViewWithText(R.string.change_record_type_color_hint)

+2 -1

app/src/androidTest/java/com/example/util/simpletimetracker/DeleteRecordTypeTest.kt

Reviewed

··· 1 1 package com.example.util.simpletimetracker 2 2 3 3 + import androidx.test.espresso.Espresso.closeSoftKeyboard 3 4 import androidx.test.espresso.Espresso.pressBack 4 5 import androidx.test.espresso.matcher.ViewMatchers.withId 5 6 import androidx.test.espresso.matcher.ViewMatchers.withText ··· 29 30 30 31 clickOnViewWithText(R.string.running_records_add_type) 31 32 checkViewIsNotDisplayed(withId(R.id.btnChangeRecordTypeDelete)) 32 32 - pressBack() 33 33 + closeSoftKeyboard() 33 34 pressBack() 34 35 35 36 // Add item

-1

app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenEmptyTest.kt

Reviewed

··· 104 104 NavUtils.openRunningRecordsScreen() 105 105 clickOnView(withText(R.string.running_records_add_type)) 106 106 typeTextIntoView(R.id.etChangeRecordTypeName, name) 107 107 - pressBack() 108 107 clickOnView(withText(R.string.change_record_type_save)) 109 108 checkViewIsDisplayed(withText(R.string.running_records_empty)) 110 109

+2 -2

app/src/androidTest/java/com/example/util/simpletimetracker/MainScreenTest.kt

Reviewed

··· 1 1 package com.example.util.simpletimetracker 2 2 3 3 + import androidx.test.espresso.Espresso.closeSoftKeyboard 3 4 import androidx.test.espresso.Espresso.pressBack 4 5 import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed 5 6 import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA ··· 28 29 29 30 // Add activity 30 31 clickOnView(withText(R.string.running_records_add_type)) 31 31 - pressBack() 32 32 + closeSoftKeyboard() 32 33 pressBack() 33 34 34 35 clickOnView(withText(R.string.running_records_add_type)) 35 36 typeTextIntoView(R.id.etChangeRecordTypeName, name) 36 36 - pressBack() 37 37 clickOnView(withText(R.string.change_record_type_save)) 38 38 39 39 // Start timer

+2 -1

app/src/androidTest/java/com/example/util/simpletimetracker/MessagesTest.kt

Reviewed

··· 1 1 package com.example.util.simpletimetracker 2 2 3 3 + import androidx.test.espresso.Espresso.closeSoftKeyboard 3 4 import androidx.test.espresso.Espresso.pressBack 4 5 import androidx.test.ext.junit.runners.AndroidJUnit4 5 6 import com.example.util.simpletimetracker.utils.BaseUiTest ··· 19 20 clickOnViewWithText(R.string.running_records_add_type) 20 21 clickOnViewWithText(R.string.change_record_type_save) 21 22 toastTextShowing(R.string.change_record_message_choose_name) 22 22 - pressBack() 23 23 + closeSoftKeyboard() 23 24 pressBack() 24 25 25 26 // Add record

-1

app/src/androidTest/java/com/example/util/simpletimetracker/RecordsRangesTest.kt

Reviewed

··· 29 29 NavUtils.openRunningRecordsScreen() 30 30 clickOnView(withText(R.string.running_records_add_type)) 31 31 typeTextIntoView(R.id.etChangeRecordTypeName, name) 32 32 - pressBack() 33 32 clickOnView(withText(R.string.change_record_type_save)) 34 33 35 34 // Start timer

-1

app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt

Reviewed

··· 31 31 NavUtils.openRunningRecordsScreen() 32 32 clickOnView(withText(R.string.running_records_add_type)) 33 33 typeTextIntoView(R.id.etChangeRecordTypeName, name) 34 34 - pressBack() 35 34 clickOnView(withText(R.string.change_record_type_save)) 36 35 37 36 // Start timer

-4

app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt

Reviewed

··· 1 1 package com.example.util.simpletimetracker.utils 2 2 3 3 import androidx.test.espresso.Espresso.onView 4 4 - import androidx.test.espresso.Espresso.pressBack 5 4 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant 6 5 import androidx.test.espresso.matcher.ViewMatchers.withId 7 6 import androidx.test.espresso.matcher.ViewMatchers.withText ··· 34 33 35 34 // Name 36 35 typeTextIntoView(R.id.etChangeRecordTypeName, name) 37 37 - 38 38 - // Hide keyboard 39 39 - pressBack() 40 36 41 37 // Color 42 38 clickOnViewWithText(R.string.change_record_type_color_hint)

+2 -2

feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt

Reviewed

··· 61 61 val flipIconChooser: LiveData<Boolean> = MutableLiveData() 62 62 val deleteButtonEnabled: LiveData<Boolean> = MutableLiveData(true) 63 63 val saveButtonEnabled: LiveData<Boolean> = MutableLiveData(true) 64 64 - val deleteIconVisibility: LiveData<Boolean> get() = MutableLiveData(extra.id != 0L) 65 65 - val keyboardVisibility: LiveData<Boolean> get() = MutableLiveData(extra.id == 0L) 64 64 + val deleteIconVisibility: LiveData<Boolean> by lazy { MutableLiveData(extra.id != 0L) } 65 65 + val keyboardVisibility: LiveData<Boolean> by lazy { MutableLiveData(extra.id == 0L) } 66 66 67 67 private var newName: String = "" 68 68 private var newIconName: String = ""