update: [ANDROAPP-4826] design system version updated, custom message…

… added in form
dhis2 · Feb 13, 2024 · 031e2ca · 031e2ca
1 parent e8f0244
commit 031e2ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
diff --git a/form/src/main/java/org/dhis2/form/ui/Form.kt b/form/src/main/java/org/dhis2/form/ui/Form.kt
@@ -11,9 +11,11 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Icon
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ErrorOutline
@@ -25,6 +27,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.focus.FocusManager
 import androidx.compose.ui.graphics.Color
@@ -43,6 +46,8 @@ import org.hisp.dhis.mobile.ui.designsystem.component.InfoBar
 import org.hisp.dhis.mobile.ui.designsystem.component.InfoBarData
 import org.hisp.dhis.mobile.ui.designsystem.component.Section
 import org.hisp.dhis.mobile.ui.designsystem.component.SectionState
+import org.hisp.dhis.mobile.ui.designsystem.theme.Radius
+import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -114,6 +119,7 @@ fun Form(
                     state = section.state,
                     errorCount = section.errorCount(),
                     warningCount = section.warningCount(),
+                    warningMessage = resources.getString(R.string.form_without_fields),
                     onNextSection = onNextSection,
                     onSectionClick = {
                         intentHandler.invoke(FormIntent.OnSection(section.uid))
@@ -144,42 +150,18 @@ fun Form(
                                     },
                                 )
                             }
-                        } else {
-                            Column(
-                                modifier = Modifier
-                                    .height(120.dp),
-                            ) {
-                                InfoBar(
-                                    infoBarData = InfoBarData(
-                                        text = resources.getString(R.string.form_without_fields),
-                                        icon = {
-                                            Icon(
-                                                imageVector = Icons.Outlined.ErrorOutline,
-                                                contentDescription = "no fields",
-                                                tint = SurfaceColor.Warning,
-                                            )
-                                        },
-                                        color = SurfaceColor.Warning,
-                                        backgroundColor = SurfaceColor.WarningContainer,
-                                        actionText = null,
-                                        onClick = null,
-                                    ),
-                                    modifier = Modifier
-                                        .background(SurfaceColor.WarningContainer),
-                                )
-                            }
                         }
                     },
                 )
             }
             item(sections.size - 1) {
-                Spacer(modifier = Modifier.height(120.dp))
+                Spacer(modifier = Modifier.height(Spacing.Spacing120))
             }
         }
     } else {
         Column(
             modifier = Modifier
-                .height(120.dp),
+                .padding(Spacing.Spacing16),
         ) {
             InfoBar(
                 infoBarData = InfoBarData(
@@ -197,6 +179,7 @@ fun Form(
                     onClick = null,
                 ),
                 modifier = Modifier
+                    .clip(shape = RoundedCornerShape(Radius.Full))
                     .background(SurfaceColor.WarningContainer),
             )
         }
@@ -226,4 +209,4 @@ private fun getNextSection(section: FormSection, sections: List<FormSection>): F
         return sections[currentIndex + 1]
     }
     return null
-}
+}
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-20240208.105715-18"
+designSystem = "0.2-20240212.145552-20"
 dhis2sdk = "1.10.0-20240129.132841-8"
 ruleEngine = "2.1.9"
 appcompat = "1.6.1"