Skip to content

Commit e324b0a

Browse files
committed
change show pomodoro button to true by default
1 parent 564a454 commit e324b0a

File tree

5 files changed

+15
-31
lines changed

5 files changed

+15
-31
lines changed

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

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,11 @@ import com.example.util.simpletimetracker.R as coreR
2424
@RunWith(AndroidJUnit4::class)
2525
class RecordRepeatTest : BaseUiTest() {
2626

27-
@Test
28-
fun visibility() {
29-
val type = "type"
30-
31-
// Add data
32-
testUtils.addActivity(type)
33-
Thread.sleep(1000)
34-
35-
// No records - no button
36-
checkViewIsDisplayed(withText(coreR.string.running_records_add_type))
37-
checkViewDoesNotExist(withText(coreR.string.running_records_repeat))
38-
39-
// Add record
40-
testUtils.addRecord(type)
41-
NavUtils.openRecordsScreen()
42-
checkViewIsDisplayed(allOf(withText(type), isCompletelyDisplayed()))
43-
44-
// Button is shown
45-
NavUtils.openRunningRecordsScreen()
46-
checkViewIsDisplayed(withText(coreR.string.running_records_repeat))
27+
override fun setUp() {
28+
super.setUp()
29+
runBlocking {
30+
prefsInteractor.setEnableRepeatButton(true)
31+
}
4732
}
4833

4934
@Test

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,12 +2021,12 @@ class SettingsTest : BaseUiTest() {
20212021
NavUtils.openSettingsScreen()
20222022
NavUtils.openSettingsDisplay()
20232023
scrollSettingsRecyclerToText(coreR.string.settings_enable_pomodoro_mode)
2024-
checkCheckboxIsNotChecked(settingsCheckboxBesideText(coreR.string.settings_enable_pomodoro_mode))
2024+
checkCheckboxIsChecked(settingsCheckboxBesideText(coreR.string.settings_enable_pomodoro_mode))
20252025

2026-
// Not visible
2026+
// Visible
20272027
NavUtils.openRunningRecordsScreen()
20282028
tryAction {
2029-
checkViewDoesNotExist(
2029+
checkViewIsDisplayed(
20302030
allOf(
20312031
withId(R.id.viewRecordTypeItem),
20322032
hasDescendant(withText(R.string.running_records_pomodoro)),
@@ -2037,10 +2037,10 @@ class SettingsTest : BaseUiTest() {
20372037
// Change
20382038
NavUtils.openSettingsScreen()
20392039
clickOnSettingsCheckboxBesideText(coreR.string.settings_enable_pomodoro_mode)
2040-
checkCheckboxIsChecked(settingsCheckboxBesideText(coreR.string.settings_enable_pomodoro_mode))
2040+
checkCheckboxIsNotChecked(settingsCheckboxBesideText(coreR.string.settings_enable_pomodoro_mode))
20412041
NavUtils.openRunningRecordsScreen()
20422042
tryAction {
2043-
checkViewIsDisplayed(
2043+
checkViewDoesNotExist(
20442044
allOf(
20452045
withId(R.id.viewRecordTypeItem),
20462046
hasDescendant(withText(R.string.running_records_pomodoro)),
@@ -2051,10 +2051,10 @@ class SettingsTest : BaseUiTest() {
20512051
// Change
20522052
NavUtils.openSettingsScreen()
20532053
clickOnSettingsCheckboxBesideText(coreR.string.settings_enable_pomodoro_mode)
2054-
checkCheckboxIsNotChecked(settingsCheckboxBesideText(coreR.string.settings_enable_pomodoro_mode))
2054+
checkCheckboxIsChecked(settingsCheckboxBesideText(coreR.string.settings_enable_pomodoro_mode))
20552055
NavUtils.openRunningRecordsScreen()
20562056
tryAction {
2057-
checkViewDoesNotExist(
2057+
checkViewIsDisplayed(
20582058
allOf(
20592059
withId(R.id.viewRecordTypeItem),
20602060
hasDescendant(withText(R.string.running_records_pomodoro)),
@@ -2078,8 +2078,6 @@ class SettingsTest : BaseUiTest() {
20782078
NavUtils.openSettingsScreen()
20792079
NavUtils.openSettingsDisplay()
20802080
scrollSettingsRecyclerToText(coreR.string.settings_enable_pomodoro_mode)
2081-
clickOnSettingsCheckboxBesideText(coreR.string.settings_enable_pomodoro_mode)
2082-
scrollSettingsRecyclerToText(coreR.string.settings_enable_pomodoro_mode)
20832081
clickOnSettingsButtonBesideText(coreR.string.settings_enable_pomodoro_mode)
20842082
Thread.sleep(1000)
20852083
clickOnViewWithText(name1)

app/src/androidTest/java/com/example/util/simpletimetracker/RecordsFilterTest.kt renamed to app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsDetailFilterTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.R as statist
4040
@Suppress("SameParameterValue")
4141
@HiltAndroidTest
4242
@RunWith(AndroidJUnit4::class)
43-
class RecordsFilterTest : BaseUiTest() {
43+
class StatisticsDetailFilterTest : BaseUiTest() {
4444

4545
@Test
4646
fun filterByType() {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ object NavUtils {
9393
}
9494

9595
fun openDataEditScreen() {
96+
openSettingsAdditional()
9697
scrollSettingsRecyclerToText(coreR.string.settings_data_edit)
9798
clickOnSettingsRecyclerText(coreR.string.settings_data_edit)
9899
}

data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class PrefsRepoImpl @Inject constructor(
131131
)
132132

133133
override var enablePomodoroMode: Boolean by prefs.delegate(
134-
KEY_ENABLE_POMODORO_MODE, false,
134+
KEY_ENABLE_POMODORO_MODE, true,
135135
)
136136

137137
override var pomodoroModeStartedTimestamp: Long by prefs.delegate(

0 commit comments

Comments
 (0)