make relevant methods private, improve naming

dhis2 · Oct 5, 2023 · 77ffbdc · 77ffbdc
1 parent 5aea3d4
commit 77ffbdc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/ListCardScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/ListCardScreen.kt
@@ -30,7 +30,6 @@ import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
 import org.hisp.dhis.mobile.ui.designsystem.component.MetadataAvatar
 import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle
 import org.hisp.dhis.mobile.ui.designsystem.resource.provideDHIS2Icon
-import org.hisp.dhis.mobile.ui.designsystem.resource.provideImage
 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
@@ -76,7 +75,7 @@ fun ListCardScreen() {
         ListCard(
             listAvatar = {
                 ListAvatar(
-                    imagePainter = provideImage("dog"),
+                    imagePainter = provideDHIS2Icon("dhis2_microscope_outline"),
                     style = ListAvatarStyle.IMAGE,
                 )
             },

diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt
@@ -13,8 +13,3 @@ import org.jetbrains.compose.resources.painterResource
 @Composable
 fun provideDHIS2Icon(resourceName: String): Painter =
     painterResource("drawable/$resourceName.xml")
-
-@OptIn(ExperimentalResourceApi::class)
-@Composable
-fun provideImage(resourceName: String): Painter =
-    painterResource("drawable/$resourceName.jpg")
diff --git a/designsystem/src/commonMain/resources/drawable/dog.jpg b/designsystem/src/commonMain/resources/drawable/dog.jpg