add option buttons to records container

Author: Razeeman

app/src/main/java/com/example/util/simpletimetracker/di/NavigationDialogMapModule.kt

@@ -4,6 +4,7 @@ import com.example.util.simpletimetracker.R
 import com.example.util.simpletimetracker.feature_data_edit.dialog.DataEditTagSelectionDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.archive.view.ArchiveDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.cardOrder.view.CardOrderDialogFragment
+import com.example.util.simpletimetracker.feature_dialogs.chartFilter.view.ChartFilterDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.colorSelection.view.ColorSelectionDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.csvExportSettings.view.CsvExportSettingsDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.customRangeSelection.view.CustomRangeSelectionDialogFragment
@@ -86,7 +87,7 @@ class NavigationDialogMapModule {
     fun chartFilterDialog(): NavigationData {
         return NavigationData(
             R.id.chartFilerDialogFragment,
-            BundleCreator.empty(),
+            bundleCreatorDelegate(ChartFilterDialogFragment::createBundle),
         )
     }
 

core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt

@@ -16,7 +16,6 @@ import com.example.util.simpletimetracker.feature_base_adapter.category.TagType
 import com.example.util.simpletimetracker.feature_base_adapter.empty.EmptyViewData
 import com.example.util.simpletimetracker.feature_base_adapter.hint.HintViewData
 import com.example.util.simpletimetracker.feature_base_adapter.hintBig.HintBigViewData
-import com.example.util.simpletimetracker.feature_base_adapter.info.InfoViewData
 import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon
 import javax.inject.Inject
 

core/src/main/res/drawable/close.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

core/src/main/res/drawable/more.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>

data_local/src/main/java/com/example/util/simpletimetracker/data_local/mapper/ComplexRuleDataLocalMapper.kt

@@ -2,7 +2,6 @@ package com.example.util.simpletimetracker.data_local.mapper
 
 import com.example.util.simpletimetracker.data_local.model.ComplexRuleDBO
 import com.example.util.simpletimetracker.domain.model.ComplexRule
-import com.example.util.simpletimetracker.domain.model.DayOfWeek
 import javax.inject.Inject
 
 class ComplexRuleDataLocalMapper @Inject constructor(

data_local/src/main/java/com/example/util/simpletimetracker/data_local/mapper/RecordTypeGoalDataLocalMapper.kt

@@ -2,7 +2,6 @@ package com.example.util.simpletimetracker.data_local.mapper
 
 import com.example.util.simpletimetracker.data_local.model.RecordTypeGoalDBO
 import com.example.util.simpletimetracker.domain.extension.orZero
-import com.example.util.simpletimetracker.domain.model.DayOfWeek
 import com.example.util.simpletimetracker.domain.model.RecordTypeGoal
 import javax.inject.Inject
 

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

@@ -22,6 +22,10 @@ class PrefsRepoImpl @Inject constructor(
         Calendar.getInstance().firstDayOfWeek
     }
 
+    override var recordTypesFilteredOnList: Set<String> by prefs.delegate(
+        KEY_RECORD_TYPES_FILTERED_ON_LIST, emptySet(),
+    )
+
     override var recordTypesFilteredOnChart: Set<String> by prefs.delegate(
         KEY_RECORD_TYPES_FILTERED_ON_CHART, emptySet(),
     )
@@ -526,6 +530,7 @@ class PrefsRepoImpl @Inject constructor(
         private const val POMODORO_DEFAULT_UNTIL_LONG_BREAK: Long = 4
         private const val RANGE_LAST_DAYS_DEFAULT: Int = 7
 
+        private const val KEY_RECORD_TYPES_FILTERED_ON_LIST = "recordTypesFilteredOnList"
         private const val KEY_RECORD_TYPES_FILTERED_ON_CHART = "recordTypesFilteredOnChart"
         private const val KEY_CATEGORIES_TYPES_FILTERED_ON_CHART = "categoriesFilteredOnChart"
         private const val KEY_TAGS_FILTERED_ON_CHART = "tagsFilteredOnChart"

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

@@ -49,10 +49,9 @@ class AddRunningRecordMediator @Inject constructor(
         comment: String,
         timeStarted: Long? = null,
     ) {
-        val actualTimeStarted = timeStarted ?: System.currentTimeMillis()
         val rulesResult = processRules(
             typeId = typeId,
-            timeStarted = actualTimeStarted,
+            timeStarted = timeStarted ?: System.currentTimeMillis(),
         )
         processMultitasking(
             typeId = typeId,
@@ -72,7 +71,7 @@ class AddRunningRecordMediator @Inject constructor(
             typeId = typeId,
             comment = comment,
             tagIds = actualTags,
-            timeStarted = actualTimeStarted,
+            timeStarted = timeStarted ?: System.currentTimeMillis(),
         )
         // Show goal count only on timer start, otherwise it would show on change also.
         notificationGoalCountInteractor.checkAndShow(typeId)

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

@@ -20,6 +20,16 @@ class PrefsInteractor @Inject constructor(
     private val isSystemInDarkModeInteractor: IsSystemInDarkModeInteractor,
 ) {
 
+    suspend fun getFilteredTypesOnList(): List<Long> = withContext(Dispatchers.IO) {
+        prefsRepo.recordTypesFilteredOnList
+            .mapNotNull(String::toLongOrNull)
+    }
+
+    suspend fun setFilteredTypesOnList(typeIdsFiltered: List<Long>) = withContext(Dispatchers.IO) {
+        prefsRepo.recordTypesFilteredOnList = typeIdsFiltered
+            .map(Long::toString).toSet()
+    }
+
     suspend fun getFilteredTypes(): List<Long> = withContext(Dispatchers.IO) {
         prefsRepo.recordTypesFilteredOnChart
             .mapNotNull(String::toLongOrNull)

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

@@ -0,0 +1,22 @@
+package com.example.util.simpletimetracker.domain.interactor
+
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecordsShareUpdateInteractor @Inject constructor() {
+
+    val shareClicked: SharedFlow<Unit> get() = _shareClicked.asSharedFlow()
+    private val _shareClicked = MutableSharedFlow<Unit>(
+        extraBufferCapacity = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST,
+    )
+
+    suspend fun sendShareClicked() {
+        _shareClicked.emit(Unit)
+    }
+}