add category goals to goals tab

Author: Razeeman

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

@@ -152,8 +152,8 @@ class GoalViewDataMapper @Inject constructor(
         return StatisticsGoalViewData(
             id = goal.id,
             name = dataHolder.name,
-            icon = dataHolder.icon.orEmpty()
-                .let(iconMapper::mapIcon),
+            icon = dataHolder.icon
+                ?.let(iconMapper::mapIcon),
             color = dataHolder.color
                 .let { colorMapper.mapToColorInt(it, isDarkTheme) },
             goal = mapGoal(

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/statisticsGoal/StatisticsGoalAdapterDelegate.kt

@@ -13,10 +13,16 @@ fun createStatisticsGoalAdapterDelegate() = createRecyclerBindingAdapterDelegate
 
         itemColor = item.color
         itemName = item.name
-        itemIcon = item.icon
         itemGoalCurrent = item.goal.goalCurrent
         itemGoal = item.goal.goal
         itemGoalPercent = item.goal.goalPercent
         itemGoalTimeComplete = item.goal.goalComplete
+
+        if (item.icon != null) {
+            itemIconVisible = true
+            itemIcon = item.icon
+        } else {
+            itemIconVisible = false
+        }
     }
 }

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/statisticsGoal/StatisticsGoalViewData.kt

@@ -8,7 +8,7 @@ data class StatisticsGoalViewData(
     val id: Long,
     val name: String,
     @ColorInt val color: Int,
-    val icon: RecordTypeIcon,
+    val icon: RecordTypeIcon?,
     val goal: Goal,
 ) : ViewHolderType {
 

features/feature_goals/src/main/java/com/example/util/simpletimetracker/feature_goals/interactor/GoalsViewDataInteractor.kt

@@ -29,15 +29,18 @@ class GoalsViewDataInteractor @Inject constructor(
 ) {
 
     suspend fun getViewData(): List<ViewHolderType> = withContext(Dispatchers.Default) {
-        val filterType = ChartFilterType.ACTIVITY
         val isDarkTheme = prefsInteractor.getDarkMode()
         val useProportionalMinutes = prefsInteractor.getUseProportionalMinutes()
         val showSeconds = prefsInteractor.getShowSeconds()
         val types = recordTypeInteractor.getAll().associateBy(RecordType::id)
-        val goals = recordTypeGoalInteractor.getAllTypeGoals()
+        val goals = recordTypeGoalInteractor.getAll()
 
-        val dataHolders = statisticsMediator.getDataHolders(
-            filterType = filterType,
+        val typeDataHolders = statisticsMediator.getDataHolders(
+            filterType = ChartFilterType.ACTIVITY,
+            types = types,
+        )
+        val categoryDataHolders = statisticsMediator.getDataHolders(
+            filterType = ChartFilterType.CATEGORY,
             types = types,
         )
 
@@ -66,9 +69,9 @@ class GoalsViewDataInteractor @Inject constructor(
                 getViewDataForRange(
                     goals = goals,
                     types = types,
-                    filterType = filterType,
                     rangeLength = rangeLength,
-                    dataHolders = dataHolders,
+                    typeDataHolders = typeDataHolders,
+                    categoryDataHolders = categoryDataHolders,
                     isDarkTheme = isDarkTheme,
                     useProportionalMinutes = useProportionalMinutes,
                     showSeconds = showSeconds,
@@ -85,32 +88,52 @@ class GoalsViewDataInteractor @Inject constructor(
     private suspend fun getViewDataForRange(
         goals: List<RecordTypeGoal>,
         types: Map<Long, RecordType>,
-        filterType: ChartFilterType,
         rangeLength: RangeLength,
-        dataHolders: Map<Long, StatisticsDataHolder>,
+        typeDataHolders: Map<Long, StatisticsDataHolder>,
+        categoryDataHolders: Map<Long, StatisticsDataHolder>,
         isDarkTheme: Boolean,
         useProportionalMinutes: Boolean,
         showSeconds: Boolean,
     ): List<ViewHolderType> {
-        val statistics = statisticsMediator.getStatistics(
-            filterType = filterType,
+        val result = mutableListOf<ViewHolderType>()
+        val typeStatistics = statisticsMediator.getStatistics(
+            filterType = ChartFilterType.ACTIVITY,
             filteredIds = emptyList(),
             rangeLength = rangeLength,
             shift = 0,
         )
-        val result = mutableListOf<ViewHolderType>()
-        val items = goalViewDataMapper.mapStatisticsList(
+        val typeItems = goalViewDataMapper.mapStatisticsList(
+            goals = goals,
+            types = types,
+            filterType = ChartFilterType.ACTIVITY,
+            filteredIds = emptyList(),
+            rangeLength = rangeLength,
+            statistics = typeStatistics,
+            data = typeDataHolders,
+            isDarkTheme = isDarkTheme,
+            useProportionalMinutes = useProportionalMinutes,
+            showSeconds = showSeconds,
+        )
+        val categoryStatistics = statisticsMediator.getStatistics(
+            filterType = ChartFilterType.CATEGORY,
+            filteredIds = emptyList(),
+            rangeLength = rangeLength,
+            shift = 0,
+        )
+        val categoryItems = goalViewDataMapper.mapStatisticsList(
             goals = goals,
             types = types,
-            filterType = filterType,
+            filterType = ChartFilterType.CATEGORY,
             filteredIds = emptyList(),
             rangeLength = rangeLength,
-            statistics = statistics,
-            data = dataHolders,
+            statistics = categoryStatistics,
+            data = categoryDataHolders,
             isDarkTheme = isDarkTheme,
             useProportionalMinutes = useProportionalMinutes,
             showSeconds = showSeconds,
         )
+        val items = (typeItems + categoryItems)
+            .sortedBy { it.goal.percent }
 
         if (items.isNotEmpty()) {
             val title = when (rangeLength) {

features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/StatisticsGoalView.kt

@@ -44,6 +44,12 @@ class StatisticsGoalView @JvmOverloads constructor(
             field = value
         }
 
+    var itemIconVisible: Boolean = false
+        set(value) {
+            binding.ivStatisticsGoalItemIcon.visible = value
+            field = value
+        }
+
     var itemGoalCurrent: String = ""
         set(value) {
             binding.tvStatisticsGoalItemCurrent.text = value
@@ -105,6 +111,9 @@ class StatisticsGoalView @JvmOverloads constructor(
                     getString(R.styleable.StatisticsGoalView_itemIconText).orEmpty()
                         .let(RecordTypeIcon::Text)
 
+                if (hasValue(R.styleable.StatisticsGoalView_itemIconVisible)) itemIconVisible =
+                    getBoolean(R.styleable.StatisticsGoalView_itemIconVisible, false)
+
                 if (hasValue(R.styleable.StatisticsGoalView_itemGoalCurrent)) itemGoalCurrent =
                     getString(R.styleable.StatisticsGoalView_itemGoalCurrent).orEmpty()
 

features/feature_views/src/main/res/values/attrs.xml

@@ -93,6 +93,7 @@
         <attr name="itemIcon" />
         <attr name="itemIconText" />
         <attr name="itemColor" />
+        <attr name="itemIconVisible" />
         <attr name="itemGoalCurrent" format="string" />
         <attr name="itemGoal" format="string" />
         <attr name="itemGoalPercent" format="string" />