change comment selection suggestions

Author: Razeeman

buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt

@@ -5,7 +5,7 @@ object Base {
     const val namespace = "com.example.util.simpletimetracker"
 
     // Raise by 2 to account for wear version code.
-    const val versionCode = 95
+    const val versionCode = 97
     const val versionName = "1.48"
     const val minSDK = 21
     const val currentSDK = 34

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/category/CategoryShowSuggestionsAdapterDelegate.kt

@@ -72,6 +72,7 @@ enum class SettingsBlock {
     AdditionalTagSelectionExcludeActivities,
     AdditionalCloseAfterOneTag,
     AdditionalShowCommentInput,
+    AdditionalShowCommentSuggestions,
     AdditionalCommentInputExcludeActivities,
     AdditionalKeepStatisticsRange,
     AdditionalRetroactiveTrackingMode,

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

@@ -92,12 +92,22 @@ class SettingsAdditionalViewDataInteractor @Inject constructor(
                     title = resourceRepo.getString(R.string.settings_show_comment_input),
                     subtitle = resourceRepo.getString(R.string.settings_show_comment_input_hint),
                     isChecked = showCommentInput,
-                    bottomSpaceIsVisible = true,
-                    dividerIsVisible = true,
+                    bottomSpaceIsVisible = !showCommentInput,
+                    dividerIsVisible = !showCommentInput,
                 ),
                 buttonBlock = SettingsBlock.AdditionalCommentInputExcludeActivities,
                 isButtonVisible = showCommentInput,
             )
+            if (showCommentInput) {
+                result += SettingsCheckboxViewData(
+                    block = SettingsBlock.AdditionalShowCommentSuggestions,
+                    title = resourceRepo.getString(R.string.settings_show_comment_suggestions),
+                    subtitle = "",
+                    isChecked = prefsInteractor.getIsCommentSelectionSuggestionsEnabled(),
+                    bottomSpaceIsVisible = true,
+                    dividerIsVisible = true,
+                )
+            }
 
             result += SettingsCheckboxViewData(
                 block = SettingsBlock.AdditionalKeepStatisticsRange,

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

@@ -67,6 +67,7 @@ class SettingsAdditionalViewModelDelegate @Inject constructor(
             SettingsBlock.AdditionalCloseAfterOneTag -> onRecordTagSelectionCloseClicked()
             SettingsBlock.AdditionalTagSelectionExcludeActivities -> onRecordTagSelectionExcludeActivitiesClicked()
             SettingsBlock.AdditionalShowCommentInput -> onShowCommentInputClicked()
+            SettingsBlock.AdditionalShowCommentSuggestions -> onShowCommentSuggestionsClicked()
             SettingsBlock.AdditionalCommentInputExcludeActivities -> onCommentInputExcludeActivitiesClicked()
             SettingsBlock.AdditionalKeepStatisticsRange -> onKeepStatisticsRangeClicked()
             SettingsBlock.AdditionalRetroactiveTrackingMode -> onRetroactiveTrackingModeClicked()
@@ -225,6 +226,14 @@ class SettingsAdditionalViewModelDelegate @Inject constructor(
         }
     }
 
+    private fun onShowCommentSuggestionsClicked() {
+        delegateScope.launch {
+            val newValue = !prefsInteractor.getIsCommentSelectionSuggestionsEnabled()
+            prefsInteractor.setIsCommentSelectionSuggestionsEnabled(newValue)
+            parent?.updateContent()
+        }
+    }
+
     private fun onCommentInputExcludeActivitiesClicked() = delegateScope.launch {
         TypesSelectionDialogParams(
             tag = SettingsViewModel.COMMENT_EXCLUDE_ACTIVITIES_TYPES_SELECTION,

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

@@ -5,7 +5,6 @@ import com.example.util.simpletimetracker.core.interactor.RecordTagViewDataInter
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
-import com.example.util.simpletimetracker.feature_base_adapter.category.CategoryShowSuggestionsViewData
 import com.example.util.simpletimetracker.feature_base_adapter.commentField.CommentFieldViewData
 import com.example.util.simpletimetracker.feature_base_adapter.emptySpace.EmptySpaceViewData
 import com.example.util.simpletimetracker.feature_tag_selection.R
@@ -30,7 +29,6 @@ class RecordTagSelectionViewDataInteractor @Inject constructor(
         val typeId = extra.typeId
         val closeAfterOneTagSelected = prefsInteractor.getRecordTagSelectionCloseAfterOne()
         val showSuggestions = prefsInteractor.getIsCommentSelectionSuggestionsEnabled()
-        val isDarkTheme = prefsInteractor.getDarkMode()
         val shouldShowCommentSelection = RecordTagSelectionParams.Field.Comment in extra.fields
         val shouldShowTagSelection = RecordTagSelectionParams.Field.Tags in extra.fields
 
@@ -48,15 +46,6 @@ class RecordTagSelectionViewDataInteractor @Inject constructor(
                 marginHorizontal = resourceRepo.getDimenInDp(R.dimen.edit_screen_margin_horizontal),
             )
 
-            result += CategoryShowSuggestionsViewData(
-                name = resourceRepo.getString(R.string.change_record_last_comments_hint),
-                color = if (showSuggestions) {
-                    resourceRepo.getThemedAttr(R.attr.appActiveColor, isDarkTheme)
-                } else {
-                    resourceRepo.getThemedAttr(R.attr.appInactiveColor, isDarkTheme)
-                },
-            )
-
             if (showSuggestions) {
                 result += recordCommentSearchViewDataInteractor.getSearchData(comment)
                 result += recordCommentSearchViewDataInteractor.getFavouriteData()

features/feature_tag_selection/src/main/java/com/example/util/simpletimetracker/feature_tag_selection/interactor/RecordTagSelectionViewDataInteractor.kt

@@ -13,7 +13,6 @@ import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
 import com.example.util.simpletimetracker.feature_base_adapter.category.createCategoryAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.category.createCategoryShowAllAdapterDelegate
-import com.example.util.simpletimetracker.feature_base_adapter.category.createCategoryShowSuggestionsAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.commentField.createCommentFieldAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.divider.createDividerAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.empty.createEmptyAdapterDelegate
@@ -50,7 +49,6 @@ class RecordTagSelectionFragment : BaseFragment<Binding>() {
             createLoaderAdapterDelegate(),
             createCategoryAdapterDelegate(viewModel::onCategoryClick),
             createCategoryShowAllAdapterDelegate { viewModel.onShowAllTagsClick() },
-            createCategoryShowSuggestionsAdapterDelegate { viewModel.onShowSuggestionsClick() },
             createDividerAdapterDelegate(),
             createInfoAdapterDelegate(),
             createHintAdapterDelegate(),

features/feature_tag_selection/src/main/java/com/example/util/simpletimetracker/feature_tag_selection/view/RecordTagSelectionFragment.kt

@@ -75,12 +75,6 @@ class RecordTagSelectionViewModel @Inject constructor(
         updateViewData()
     }
 
-    fun onShowSuggestionsClick() = viewModelScope.launch {
-        val newValue = !prefsInteractor.getIsCommentSelectionSuggestionsEnabled()
-        prefsInteractor.setIsCommentSelectionSuggestionsEnabled(newValue)
-        updateViewData()
-    }
-
     fun onSaveClick() {
         viewModelScope.launch {
             saveClicked()

features/feature_tag_selection/src/main/java/com/example/util/simpletimetracker/feature_tag_selection/viewModel/RecordTagSelectionViewModel.kt

@@ -349,6 +349,7 @@
     <string name="settings_show_record_tag_close_hint">أغلق بعد اختيار وسم واحد.</string>
     <string name="settings_show_comment_input">إظهار إدخال التعليق</string>
     <string name="settings_show_comment_input_hint">عند بدء تشغيل مؤقت - سيتم عرض مربع حوار إدخال التعليق.</string>
+    <string name="settings_show_comment_suggestions">عرض الاقتراحات</string>
     <string name="settings_rate">قيمنا</string>
     <string name="settings_rate_description">قيم التطبيق واترك مراجعة.</string>
     <string name="settings_support_development">دعم التنمية</string>

resources/src/main/res/values-ar/strings.xml

@@ -349,6 +349,7 @@
     <string name="settings_show_record_tag_close_hint">Tanca després de seleccionar una etiqueta</string>
     <string name="settings_show_comment_input">Mostra l\'entrada de comentaris</string>
     <string name="settings_show_comment_input_hint">Quan s\'inicia un temporitzador, es mostrarà un diàleg d\'entrada de comentaris.</string>
+    <string name="settings_show_comment_suggestions">Mostra suggeriments</string>
     <string name="settings_rate">Valoreu-nos</string>
     <string name="settings_rate_description">Valoreu l\'aplicació i deixeu un comentari</string>
     <string name="settings_support_development">Suport al desenvolupament</string>