ANDROAPP-5714-Font-weight-of-accordian-title (#147)

* update: [ANDROAPP-5714] section title font weight modified * update: [ANDROAPP-5714] title font weight updated * update: [ANDROAPP-5714] typography changed * update: [ANDROAPP-5714] code formatted * update: [ANDROAPP-5714] styles modified
dhis2 · Nov 15, 2023 · 1b8bebc · 1b8bebc
1 parent 2e2d4ed
commit 1b8bebc
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 27 deletions.
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/LegendDescriptionScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/LegendDescriptionScreen.kt
@@ -10,7 +10,6 @@ import org.hisp.dhis.mobile.ui.designsystem.component.LegendRange
 import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle
 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
-import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor
 
 @Composable
 fun LegendDescriptionScreen() {
@@ -44,7 +43,7 @@ fun LegendDescriptionScreen() {
                     IntRange(0, 5),
                 ),
                 LegendDescriptionData(SurfaceColor.CustomYellow, "Medium", IntRange(5, 10)),
-                LegendDescriptionData(TextColor.OnWarning, "High", IntRange(10, 20)),
+                LegendDescriptionData(SurfaceColor.Warning, "High", IntRange(10, 20)),
                 LegendDescriptionData(SurfaceColor.CustomPink, "Very high", IntRange(20, 40)),
                 LegendDescriptionData(SurfaceColor.CustomBrown, "Extreme", IntRange(40, 120)),
                 LegendDescriptionData(

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/LegendScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/LegendScreen.kt
@@ -11,7 +11,6 @@ import org.hisp.dhis.mobile.ui.designsystem.component.LegendDescriptionData
 import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle
 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
-import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor
 
 @Composable
 fun LegendScreen() {
@@ -21,7 +20,7 @@ fun LegendScreen() {
         Spacer(Modifier.size(Spacing.Spacing18))
 
         SubTitle("Orange Legend")
-        Legend(LegendData(TextColor.OnWarning, "Legend"))
+        Legend(LegendData(SurfaceColor.Warning, "Legend"))
         Spacer(Modifier.size(Spacing.Spacing18))
 
         SubTitle("Pink Legend")

diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/LegendSampleList.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/previews/LegendSampleList.kt
@@ -2,7 +2,6 @@ package org.hisp.dhis.common.screens.previews
 
 import org.hisp.dhis.mobile.ui.designsystem.component.LegendDescriptionData
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
-import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor
 
 val regularLegendList = listOf(
     LegendDescriptionData(
@@ -16,7 +15,7 @@ val regularLegendList = listOf(
         IntRange(5, 10),
     ),
     LegendDescriptionData(
-        TextColor.OnWarning,
+        SurfaceColor.Warning,
         "High",
         IntRange(10, 20),
     ),
@@ -49,7 +48,7 @@ val longLegendList = listOf(
         IntRange(5, 10),
     ),
     LegendDescriptionData(
-        TextColor.OnWarning,
+        SurfaceColor.Warning,
         "High",
         IntRange(10, 20),
     ),
@@ -79,7 +78,7 @@ val longLegendList = listOf(
         IntRange(5, 10),
     ),
     LegendDescriptionData(
-        TextColor.OnWarning,
+        SurfaceColor.Warning,
         "High",
         IntRange(10, 20),
     ),
@@ -109,7 +108,7 @@ val longLegendList = listOf(
         IntRange(5, 10),
     ),
     LegendDescriptionData(
-        TextColor.OnWarning,
+        SurfaceColor.Warning,
         "High",
         IntRange(10, 20),
     ),
@@ -139,7 +138,7 @@ val longLegendList = listOf(
         IntRange(5, 10),
     ),
     LegendDescriptionData(
-        TextColor.OnWarning,
+        SurfaceColor.Warning,
         "High",
         IntRange(10, 20),
     ),

diff --git a/...system/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputShell.kt b/...system/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputShell.kt
@@ -214,5 +214,5 @@ enum class InputShellState(val color: Color) {
     UNFOCUSED(TextColor.OnSurfaceVariant),
     ERROR(SurfaceColor.Error),
     DISABLED(TextColor.OnDisabledSurface),
-    WARNING(TextColor.OnWarning),
+    WARNING(SurfaceColor.Warning),
 }
diff --git a/...gnsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt b/...gnsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt
@@ -504,7 +504,7 @@ enum class AdditionalInfoItemColor(val color: Color) {
     DEFAULT_KEY(TextColor.OnSurfaceLight),
     DEFAULT_VALUE(TextColor.OnSurface),
     ERROR(SurfaceColor.Error),
-    WARNING(TextColor.OnWarning),
+    WARNING(SurfaceColor.Warning),
     DISABLED(TextColor.OnDisabledSurface),
     SUCCESS(SurfaceColor.CustomGreen),
 }
diff --git a/...em/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt b/...em/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt
@@ -160,7 +160,7 @@ fun SupportingText(
 
 enum class SupportingTextState(val color: Color) {
     DEFAULT(TextColor.OnSurfaceVariant),
-    WARNING(TextColor.OnWarning),
+    WARNING(SurfaceColor.Warning),
     ERROR(SurfaceColor.Error),
 }
 

diff --git a/...gnsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/SurfaceColor.kt b/...gnsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/SurfaceColor.kt
@@ -3,13 +3,14 @@ package org.hisp.dhis.mobile.ui.designsystem.theme
 object SurfaceColor {
     val Primary = Color.Blue500
     val Error = Color.Red600
+    val Warning = Color.Orange800
     val PrimaryContainer = Color.Blue50
     val Surface = Color.NeutralVariant
     val SurfaceBright = Color.NeutralWhite
-    val SurfaceDim = Color.Ash500
+    val SurfaceDim = Color.Ash400
     val DisabledSurface = Color.Ash300
     val DisabledSurfaceBright = Color.Ash200
-    val ErrorContainer = Color.Red200
+    val ErrorContainer = Color.Red100
     val WarningContainer = Color.Orange50
     val ContainerLowest = Color.NeutralWhite
     val ContainerLow = Color.Blue50

diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/TextColor.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/TextColor.kt
@@ -7,8 +7,8 @@ object TextColor {
     val OnSurfaceVariant = Color.Charcoal500
     val OnSurfaceLight = Color.Charcoal300
     val OnError = Color.NeutralWhite
-    val OnErrorContainer = Color.Red900
+    val OnErrorContainer = Color.Red700
     val OnDisabledSurface = Color.Ash800
-    val OnWarning = Color.Orange800
+    val OnWarning = Color.NeutralWhite
     val OnWarningContainer = Color.Orange900
 }
diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt
@@ -58,7 +58,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) {
                 color = TextColor.OnSurface,
             ),
             titleLarge = TextStyle(
-                fontSize = 22.sp,
+                fontSize = 20.sp,
                 lineHeight = 28.sp,
                 fontFamily = provideFontResource(),
                 fontWeight = FontWeight.Medium,
@@ -137,19 +137,21 @@ fun DHIS2Theme(content: @Composable () -> Unit) {
 
 internal object DHIS2SCustomTextStyles {
 
-    val titleBold = TextStyle(
+    val titleMediumBold = TextStyle(
         fontSize = 16.sp,
         lineHeight = 24.sp,
-        fontWeight = FontWeight.Medium,
+        fontWeight = FontWeight.Bold,
         color = TextColor.OnSurface,
         letterSpacing = 0.15.sp,
     )
 
-    val bodyLargeBold
-        @Composable
-        get() = MaterialTheme.typography.bodyLarge.copy(
-            fontWeight = FontWeight.Bold,
-        )
+    val bodyLargeBold = TextStyle(
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        fontWeight = FontWeight.Bold,
+        color = TextColor.OnSurface,
+        letterSpacing = 0.5.sp,
+    )
 
     val clickableSupportingText = SpanStyle(
         fontSize = 14.sp,

diff --git a/...tem/src/desktopTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCardTest.kt b/...tem/src/desktopTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCardTest.kt
@@ -48,11 +48,11 @@ class ListCardTest {
                 Icon(
                     imageVector = Icons.Outlined.SyncProblem,
                     contentDescription = "Icon Button",
-                    tint = TextColor.OnWarning,
+                    tint = SurfaceColor.Warning,
                 )
             },
             value = "Sync warning",
-            color = TextColor.OnWarning,
+            color = SurfaceColor.Warning,
             isConstantItem = true,
         ),
         AdditionalInfoItem(