add сomplex rules

Author: Razeeman

README.md

@@ -78,10 +78,12 @@ Simple app that helps track how much time you spend on all the useless activitie
     │   ├── feature_categories                # Screen for categories and tags.
     │   ├── feature_change_activity_filter    # Edit activity filter screen.
     │   ├── feature_change_category           # Edit category screen.
+    │   ├── feature_change_complex_rule       # Edit complex rule screen.
     │   ├── feature_change_record             # Edit record screen.
     │   ├── feature_change_record_tag         # Edit tag screen.
     │   ├── feature_change_record_type        # Edit type screen.
     │   ├── feature_change_running_record     # Edit timer screen.
+    │   ├── feature_complex_rules             # Screen for complex rules list.
     │   ├── feature_date_edit                 # Data edit screen.
     │   ├── feature_dialogs                   # Dialogs.
     │   ├── feature_goals                     # Separate screen for goals.

app/build.gradle.kts

@@ -112,6 +112,8 @@ dependencies {
     implementation(project(":feature_records_filter"))
     implementation(project(":feature_goals"))
     implementation(project(":feature_pomodoro"))
+    implementation(project(":feature_complex_rules"))
+    implementation(project(":feature_change_complex_rule"))
     "playImplementation"(project(":feature_wear"))
 
     implementation(Deps.Androidx.room)

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

@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.di
 import com.example.util.simpletimetracker.R
 import com.example.util.simpletimetracker.feature_change_activity_filter.view.ChangeActivityFilterFragment
 import com.example.util.simpletimetracker.feature_change_category.view.ChangeCategoryFragment
+import com.example.util.simpletimetracker.feature_change_complex_rule.view.ChangeComplexRuleFragment
 import com.example.util.simpletimetracker.feature_change_record.view.ChangeRecordFragment
 import com.example.util.simpletimetracker.feature_change_record_tag.view.ChangeRecordTagFragment
 import com.example.util.simpletimetracker.feature_change_record_type.view.ChangeRecordTypeFragment
@@ -17,6 +18,7 @@ import com.example.util.simpletimetracker.navigation.params.screen.CategoriesPar
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeActivityFilterParams
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeCategoryFromChangeActivityParams
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeCategoryFromTagsParams
+import com.example.util.simpletimetracker.navigation.params.screen.ChangeComplexRuleParams
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeRecordFromMainParams
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeRecordFromRecordsAllParams
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeRecordTagFromChangeRecordParams
@@ -25,6 +27,7 @@ import com.example.util.simpletimetracker.navigation.params.screen.ChangeRecordT
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeRecordTypeParams
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeRunningRecordFromMainParams
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeRunningRecordFromRecordsAllParams
+import com.example.util.simpletimetracker.navigation.params.screen.ComplexRulesParams
 import com.example.util.simpletimetracker.navigation.params.screen.DataEditParams
 import com.example.util.simpletimetracker.navigation.params.screen.PomodoroParams
 import com.example.util.simpletimetracker.navigation.params.screen.RecordsAllParams
@@ -149,6 +152,16 @@ class NavigationScreenMapModule {
         )
     }
 
+    @IntoMap
+    @Provides
+    @ScreenKey(ComplexRulesParams::class)
+    fun complexRules(): NavigationData {
+        return NavigationData(
+            R.id.action_to_complexRulesFragment,
+            BundleCreator.empty(),
+        )
+    }
+
     @IntoMap
     @Provides
     @ScreenKey(ChangeCategoryFromTagsParams::class)
@@ -228,4 +241,24 @@ class NavigationScreenMapModule {
             BundleCreator.empty(),
         )
     }
+
+    @IntoMap
+    @Provides
+    @ScreenKey(ChangeComplexRuleParams.Change::class)
+    fun changeComplexRuleChange(): NavigationData {
+        return NavigationData(
+            R.id.action_to_changeComplexRuleFragment,
+            bundleCreatorDelegate(ChangeComplexRuleFragment::createBundle),
+        )
+    }
+
+    @IntoMap
+    @Provides
+    @ScreenKey(ChangeComplexRuleParams.New::class)
+    fun changeComplexRuleNew(): NavigationData {
+        return NavigationData(
+            R.id.action_to_changeComplexRuleFragment,
+            bundleCreatorDelegate(ChangeComplexRuleFragment::createBundle),
+        )
+    }
 }

app/src/main/res/navigation/nav_graph.xml

@@ -29,6 +29,14 @@
         app:popEnterAnim="@anim/slide_in_left"
         app:popExitAnim="@anim/slide_out_right" />
 
+    <action
+        android:id="@+id/action_to_complexRulesFragment"
+        app:destination="@id/complexRulesFragment"
+        app:enterAnim="@anim/slide_in_right"
+        app:exitAnim="@anim/slide_out_left"
+        app:popEnterAnim="@anim/slide_in_left"
+        app:popExitAnim="@anim/slide_out_right" />
+
     <action
         android:id="@+id/action_to_statisticsDetailFragment"
         app:destination="@id/statisticsDetailFragment"
@@ -53,6 +61,14 @@
         app:popEnterAnim="@anim/slide_in_left"
         app:popExitAnim="@anim/slide_out_right" />
 
+    <action
+        android:id="@+id/action_to_changeComplexRuleFragment"
+        app:destination="@id/changeComplexRuleFragment"
+        app:enterAnim="@anim/slide_in_right"
+        app:exitAnim="@anim/slide_out_left"
+        app:popEnterAnim="@anim/slide_in_left"
+        app:popExitAnim="@anim/slide_out_right" />
+
     <fragment
         android:id="@+id/mainFragment"
         android:name="com.example.util.simpletimetracker.feature_main.view.MainFragment"
@@ -191,6 +207,16 @@
         android:name="com.example.util.simpletimetracker.feature_data_edit.view.DataEditFragment"
         android:label="DataEditFragment"
         tools:layout="@layout/data_edit_fragment" />
+    <fragment
+        android:id="@+id/complexRulesFragment"
+        android:name="com.example.util.simpletimetracker.feature_complex_rules.view.ComplexRulesFragment"
+        android:label="DataEditFragment"
+        tools:layout="@layout/complex_rules_fragment" />
+    <fragment
+        android:id="@+id/changeComplexRuleFragment"
+        android:name="com.example.util.simpletimetracker.feature_change_complex_rule.view.ChangeComplexRuleFragment"
+        android:label="ChangeComplexRuleFragment"
+        tools:layout="@layout/change_complex_rule_fragment" />
     <fragment
         android:id="@+id/changeActivityFilterFragment"
         android:name="com.example.util.simpletimetracker.feature_change_activity_filter.view.ChangeActivityFilterFragment"

core/src/main/java/com/example/util/simpletimetracker/core/dialog/TypesSelectionDialogListener.kt

@@ -2,5 +2,5 @@ package com.example.util.simpletimetracker.core.dialog
 
 interface TypesSelectionDialogListener {
 
-    fun onTypesSelected(typeIds: List<Long>, tag: String?)
+    fun onDataSelected(dataIds: List<Long>, tag: String?)
 }

core/src/main/java/com/example/util/simpletimetracker/core/extension/CollectionExtensions.kt

@@ -5,4 +5,8 @@ package com.example.util.simpletimetracker.core.extension
  */
 fun <T> MutableList<T>.addOrRemove(item: T) {
     if (item in this) remove(item) else add(item)
+}
+
+fun <T> MutableSet<T>.addOrRemove(item: T) {
+    if (item in this) remove(item) else add(item)
 }

core/src/main/java/com/example/util/simpletimetracker/core/viewData/SettingsBlock.kt

@@ -78,6 +78,7 @@ enum class SettingsBlock {
     AdditionalAutomatedTracking,
     AdditionalSendEvents,
     AdditionalDataEdit,
+    AdditionalComplexRules,
     AdditionalBottom,
 
     BackupTop,