fix: [CUSTOM-ICONS] use default color if not defined (#3576)

* fix: [CUSTOM-ICONS] use default color if not defined * fix: [CUSTOM-ICONS] update design system
dhis2 · Apr 9, 2024 · 0c49910 · 0c49910
1 parent 04d679c
commit 0c49910
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/commons/src/main/java/org/dhis2/commons/resources/MetadataIconProvider.kt b/commons/src/main/java/org/dhis2/commons/resources/MetadataIconProvider.kt
@@ -11,10 +11,14 @@ import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.common.ObjectStyle
 import org.hisp.dhis.android.core.icon.Icon
 import org.hisp.dhis.mobile.ui.designsystem.component.internal.ImageCardData
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import timber.log.Timber
 import java.io.File
 class MetadataIconProvider(private val d2: D2) {
-    operator fun invoke(style: ObjectStyle) = style.icon()?.let {
+
+    operator fun invoke(style: ObjectStyle) = invoke(style, SurfaceColor.Primary)
+
+    operator fun invoke(style: ObjectStyle, defaultColor: Color?) = style.icon()?.let {
         d2.iconModule().icons().key(it).blockingGet()
     }.let { icon ->
         val imageCardData = when {
@@ -29,7 +33,7 @@ class MetadataIconProvider(private val d2: D2) {
                     uid = "",
                     label = "",
                     iconRes = FILE_NOT_LOADED,
-                    iconTint = style.color()?.toColor() ?: Color.Unspecified,
+                    iconTint = style.color()?.toColor() ?: defaultColor ?: Color.Unspecified,
                 )
             }
 
@@ -42,7 +46,7 @@ class MetadataIconProvider(private val d2: D2) {
         }
         MetadataIconData(
             imageCardData = imageCardData,
-            color = style.color()?.toColor() ?: Color.Unspecified,
+            color = style.color()?.toColor() ?: defaultColor ?: Color.Unspecified,
         )
     }
 

diff --git a/form/src/main/java/org/dhis2/form/data/EventRepository.kt b/form/src/main/java/org/dhis2/form/data/EventRepository.kt
@@ -5,6 +5,7 @@ import io.reactivex.Flowable
 import io.reactivex.Single
 import org.dhis2.bindings.blockingGetValueCheck
 import org.dhis2.bindings.userFriendlyValue
+import org.dhis2.commons.bindings.program
 import org.dhis2.commons.date.DateUtils
 import org.dhis2.commons.extensions.inDateRange
 import org.dhis2.commons.extensions.inOrgUnit
@@ -19,6 +20,7 @@ import org.dhis2.form.model.FieldUiModel
 import org.dhis2.form.model.OptionSetConfiguration
 import org.dhis2.form.model.PeriodSelector
 import org.dhis2.form.ui.FieldViewModelFactory
+import org.dhis2.ui.toColor
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.Category
@@ -36,6 +38,7 @@ import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.SectionRenderingType
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 import java.util.Date
 
 class EventRepository(
@@ -60,6 +63,12 @@ class EventRepository(
             .blockingGet()
     }
 
+    private val defaultStyleColor by lazy {
+        programStage?.program()?.uid()?.let {
+            d2.program(it)?.style()?.color()?.toColor()
+        } ?: SurfaceColor.Primary
+    }
+
     override fun firstSectionToOpen(): String? {
         return when (eventMode) {
             EventMode.NEW -> super.firstSectionToOpen()
@@ -558,7 +567,7 @@ class EventRepository(
                     .orderBySortOrder(RepositoryScope.OrderByDirection.ASC).blockingGet()
 
                 val metadataIconMap =
-                    options.associate { it.uid() to metadataIconProvider(it.style()) }
+                    options.associate { it.uid() to metadataIconProvider(it.style(), defaultStyleColor) }
 
                 OptionSetConfiguration.OptionConfigData(
                     options = options,

diff --git a/form/src/main/java/org/dhis2/form/data/metadata/EnrollmentConfiguration.kt b/form/src/main/java/org/dhis2/form/data/metadata/EnrollmentConfiguration.kt
@@ -9,10 +9,12 @@ import org.dhis2.commons.bindings.teiAttribute
 import org.dhis2.commons.bindings.trackedEntityType
 import org.dhis2.commons.resources.MetadataIconProvider
 import org.dhis2.form.model.OptionSetConfiguration
+import org.dhis2.ui.toColor
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
 class EnrollmentConfiguration(
     private val d2: D2,
@@ -30,6 +32,10 @@ class EnrollmentConfiguration(
         d2.program(it)
     }
 
+    private val defaultStyleColor by lazy {
+        program()?.style()?.color()?.toColor() ?: SurfaceColor.Primary
+    }
+
     fun tei() = enrollment()?.trackedEntityInstance()?.let { d2.tei(it) }
     fun trackedEntityType() = d2.trackedEntityType(program()?.trackedEntityType()?.uid()!!)
     fun sections() = d2.programModule().programSections()
@@ -126,7 +132,7 @@ class EnrollmentConfiguration(
                         .orderBySortOrder(RepositoryScope.OrderByDirection.ASC)
                         .blockingGet()
 
-                    val metadataIconMap = options.associate { it.uid() to metadataIconProvider(it.style()) }
+                    val metadataIconMap = options.associate { it.uid() to metadataIconProvider(it.style(), defaultStyleColor) }
 
                     OptionSetConfiguration.OptionConfigData(
                         options = options,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ kotlin = '1.9.21'
 hilt = '2.47'
 hiltCompiler = '1.0.0'
 jacoco = '0.8.10'
-designSystem = "0.2-20240314.101140-42"
+designSystem = "0.2-20240405.110637-52"
 dhis2sdk = "1.10.0-20240318.115339-36"
 ruleEngine = "3.0.0-20240119.134348-12"
 expressionParser = "1.1.0-20240219.115041-14"