remove setting to show calendar button on the records tab

Author: Razeeman

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

@@ -16,7 +16,6 @@ import com.example.util.simpletimetracker.utils.clickOnViewWithId
 import com.example.util.simpletimetracker.utils.clickOnViewWithText
 import com.example.util.simpletimetracker.utils.tryAction
 import dagger.hilt.android.testing.HiltAndroidTest
-import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.allOf
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -326,7 +325,6 @@ class RecordsOptionsTest : BaseUiTest() {
         val name = "Test"
 
         // Add data
-        runBlocking { prefsInteractor.setShowCalendarButtonOnRecordsTab(true) }
         testUtils.addActivity(name = name)
         testUtils.addRecord(name)
 

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

@@ -2322,44 +2322,6 @@ class SettingsTest : BaseUiTest() {
         checkViewIsDisplayed(allOf(withText(coreR.string.title_today), isCompletelyDisplayed()))
     }
 
-    @Test
-    fun showCalendarSwitchOnTheSameTab() {
-        // Check setting
-        NavUtils.openSettingsScreen()
-        NavUtils.openSettingsDisplay()
-        scrollSettingsRecyclerToText(coreR.string.settings_show_calendar_button_on_records_tab)
-        checkCheckboxIsNotChecked(settingsCheckboxBesideText(coreR.string.settings_show_calendar_button_on_records_tab))
-
-        // Check not shown
-        NavUtils.openRecordsScreen()
-        clickOnViewWithId(recordsR.id.btnRecordAdd)
-        checkViewDoesNotExist(withText(R.string.records_switch_to_calendar))
-        pressBack()
-
-        // Change settings
-        NavUtils.openSettingsScreen()
-        scrollSettingsRecyclerToText(coreR.string.settings_show_calendar_button_on_records_tab)
-        clickOnSettingsCheckboxBesideText(coreR.string.settings_show_calendar_button_on_records_tab)
-        checkCheckboxIsChecked(settingsCheckboxBesideText(coreR.string.settings_show_calendar_button_on_records_tab))
-
-        // Check shown
-        NavUtils.openRecordsScreen()
-        clickOnViewWithId(recordsR.id.btnRecordAdd)
-        checkViewIsDisplayed(withText(R.string.records_switch_to_calendar))
-        pressBack()
-
-        // Change back
-        NavUtils.openSettingsScreen()
-        scrollSettingsRecyclerToText(coreR.string.settings_show_calendar_button_on_records_tab)
-        clickOnSettingsCheckboxBesideText(coreR.string.settings_show_calendar_button_on_records_tab)
-        checkCheckboxIsNotChecked(settingsCheckboxBesideText(coreR.string.settings_show_calendar_button_on_records_tab))
-
-        // Check not shown
-        NavUtils.openRecordsScreen()
-        clickOnViewWithId(recordsR.id.btnRecordAdd)
-        checkViewDoesNotExist(withText(R.string.records_switch_to_calendar))
-    }
-
     @Test
     fun keepStatisticsRange() {
         val name = "Test"

data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupPrefsRepo.kt

@@ -57,7 +57,6 @@ import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Compani
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_REVERSE_ORDER_IN_CALENDAR
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_SELECTED_PREDEFINED_FILTERS
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_SHOW_ACTIVITY_FILTERS
-import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_SHOW_CALENDAR_BUTTON_ON_RECORDS_TAB
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_SHOW_CATEGORIES_AS_PREDEFINED_FILTERS
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_SHOW_COMMENT_INPUT
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_SHOW_COMMENT_INPUT_EXCLUDE_ACTIVITIES
@@ -180,7 +179,6 @@ class BackupPrefsRepo @Inject constructor(
             PrefsProcessor(KEY_SHOW_UNTRACKED_IN_RECORDS, ::showUntrackedInRecords),
             PrefsProcessor(KEY_SHOW_UNTRACKED_IN_STATISTICS, ::showUntrackedInStatistics),
             PrefsProcessor(KEY_SHOW_RECORDS_CALENDAR, ::showRecordsCalendar),
-            PrefsProcessor(KEY_SHOW_CALENDAR_BUTTON_ON_RECORDS_TAB, ::showCalendarButtonOnRecordsTab),
             PrefsProcessor(KEY_REVERSE_ORDER_IN_CALENDAR, ::reverseOrderInCalendar),
             PrefsProcessor(KEY_DAYS_IN_CALENDAR, ::daysInCalendar),
             PrefsProcessor(KEY_SHOW_ACTIVITY_FILTERS, ::showActivityFilters),

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

@@ -169,10 +169,6 @@ class PrefsRepoImpl @Inject constructor(
         KEY_SHOW_RECORDS_CALENDAR, false,
     )
 
-    override var showCalendarButtonOnRecordsTab: Boolean by prefs.delegate(
-        KEY_SHOW_CALENDAR_BUTTON_ON_RECORDS_TAB, false,
-    )
-
     override var reverseOrderInCalendar: Boolean by prefs.delegate(
         KEY_REVERSE_ORDER_IN_CALENDAR, false,
     )
@@ -646,7 +642,6 @@ class PrefsRepoImpl @Inject constructor(
         const val KEY_SHOW_UNTRACKED_IN_RECORDS = "showUntrackedInRecords"
         const val KEY_SHOW_UNTRACKED_IN_STATISTICS = "showUntrackedInStatistics"
         const val KEY_SHOW_RECORDS_CALENDAR = "showRecordsCalendar"
-        const val KEY_SHOW_CALENDAR_BUTTON_ON_RECORDS_TAB = "showCalendarButtonOnRecordsTab"
         const val KEY_REVERSE_ORDER_IN_CALENDAR = "reverseOrderInCalendar"
         const val KEY_DAYS_IN_CALENDAR = "daysInCalendar"
         const val KEY_SHOW_ACTIVITY_FILTERS = "showActivityFilters"
@@ -731,5 +726,6 @@ class PrefsRepoImpl @Inject constructor(
         private const val KEY_RECORD_TAG_SELECTION_EVEN_FOR_GENERAL_TAGS = "recordTagSelectionEvenForGeneralTags"
         private const val KEY_SHOW_NOTIFICATION_WITH_SWITCH = "showNotificationWithSwitch" // Boolean
         private const val KEY_SHOW_NOTIFICATION_WITH_SWITCH_HIDE = "showNotificationWithSwitchHide" // Boolean
+        private const val KEY_SHOW_CALENDAR_BUTTON_ON_RECORDS_TAB = "showCalendarButtonOnRecordsTab" // Boolean
     }
 }

domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt

@@ -318,14 +318,6 @@ class PrefsInteractor @Inject constructor(
         prefsRepo.showRecordsCalendar = isEnabled
     }
 
-    suspend fun getShowCalendarButtonOnRecordsTab(): Boolean = withContext(Dispatchers.IO) {
-        prefsRepo.showCalendarButtonOnRecordsTab
-    }
-
-    suspend fun setShowCalendarButtonOnRecordsTab(isEnabled: Boolean) = withContext(Dispatchers.IO) {
-        prefsRepo.showCalendarButtonOnRecordsTab = isEnabled
-    }
-
     suspend fun getReverseOrderInCalendar(): Boolean = withContext(Dispatchers.IO) {
         prefsRepo.reverseOrderInCalendar
     }

domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt

@@ -58,8 +58,6 @@ interface PrefsRepo {
 
     var showRecordsCalendar: Boolean
 
-    var showCalendarButtonOnRecordsTab: Boolean
-
     var reverseOrderInCalendar: Boolean
 
     var daysInCalendar: Int

features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/mapper/RecordsContainerOptionsListMapper.kt

@@ -20,20 +20,16 @@ class RecordsContainerOptionsListMapper @Inject constructor(
         val isCalendar = prefsInteractor.getShowRecordsCalendar()
         val filterType = prefsInteractor.getListFilterType()
 
-        result += if (prefsInteractor.getShowCalendarButtonOnRecordsTab()) {
-            OptionsListParams.Item(
-                id = RecordsContainerOptionsListItem.CalendarView,
-                text = if (isCalendar) {
-                    R.string.records_switch_to_list
-                } else {
-                    R.string.records_switch_to_calendar
-                }.let(resourceRepo::getString),
-                icon = if (isCalendar) R.drawable.list else R.drawable.calendar,
-                isIconCheckVisible = false,
-            )
-        } else {
-            null
-        }
+        result += OptionsListParams.Item(
+            id = RecordsContainerOptionsListItem.CalendarView,
+            text = if (isCalendar) {
+                R.string.records_switch_to_list
+            } else {
+                R.string.records_switch_to_calendar
+            }.let(resourceRepo::getString),
+            icon = if (isCalendar) R.drawable.list else R.drawable.calendar,
+            isIconCheckVisible = false,
+        )
 
         result += OptionsListParams.Item(
             id = RecordsContainerOptionsListItem.Share,

features/feature_settings/api/src/main/java/com/example/util/simpletimetracker/feature_settings/api/SettingsBlock.kt

@@ -43,7 +43,6 @@ enum class SettingsBlock {
     DisplayUntrackedRangeStart,
     DisplayUntrackedRangeEnd,
     DisplayCalendarView,
-    DisplayCalendarButtonOnRecordsTab,
     DisplayReverseOrder,
     DisplayDaysInCalendar,
     DisplayShowActivityFilters,

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt

@@ -99,14 +99,6 @@ class SettingsDisplayViewDataInteractor @Inject constructor(
                 title = resourceRepo.getString(R.string.settings_show_records_calendar),
                 subtitle = "",
                 isChecked = showRecordsCalendar,
-                bottomSpaceIsVisible = false,
-                dividerIsVisible = false,
-            )
-            result += SettingsCheckboxViewData(
-                block = SettingsBlock.DisplayCalendarButtonOnRecordsTab,
-                title = resourceRepo.getString(R.string.settings_show_calendar_button_on_records_tab),
-                subtitle = "",
-                isChecked = prefsInteractor.getShowCalendarButtonOnRecordsTab(),
                 bottomSpaceIsVisible = !showRecordsCalendar,
                 dividerIsVisible = !showRecordsCalendar,
             )

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsDisplayViewModelDelegate.kt

@@ -62,7 +62,6 @@ class SettingsDisplayViewModelDelegate @Inject constructor(
             SettingsBlock.DisplayUntrackedInStatistics -> onShowUntrackedInStatisticsClicked()
             SettingsBlock.DisplayUntrackedRangeCheckbox -> onUntrackedRangeClicked()
             SettingsBlock.DisplayCalendarView -> onShowRecordsCalendarClicked()
-            SettingsBlock.DisplayCalendarButtonOnRecordsTab -> onShowCalendarButtonOnRecordsTabClicked()
             SettingsBlock.DisplayReverseOrder -> onReverseOrderInCalendarClicked()
             SettingsBlock.DisplayShowActivityFilters -> onShowActivityFiltersClicked()
             SettingsBlock.DisplayEnablePomodoroMode -> onEnablePomodoroModeClicked()
@@ -256,14 +255,6 @@ class SettingsDisplayViewModelDelegate @Inject constructor(
         }
     }
 
-    private fun onShowCalendarButtonOnRecordsTabClicked() {
-        delegateScope.launch {
-            val newValue = !prefsInteractor.getShowCalendarButtonOnRecordsTab()
-            prefsInteractor.setShowCalendarButtonOnRecordsTab(newValue)
-            parent?.updateContent()
-        }
-    }
-
     private fun onReverseOrderInCalendarClicked() {
         delegateScope.launch {
             val newValue = !prefsInteractor.getReverseOrderInCalendar()