Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ANDROAPP-5494-mobile-ui-Metadata-Avatar #62

Merged
merged 6 commits into from
Sep 26, 2023
Merged

ANDROAPP-5494-mobile-ui-Metadata-Avatar #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
289c147
Change `MetadataAvatar` corner radius based on size
msasikanth Sep 14, 2023
b891567
Add white background below the box background color
msasikanth Sep 19, 2023
0eac03e
Clip icon in MetadataAvatar to a rounded corner shape
msasikanth Sep 19, 2023
a0654c9
Add a negative metadata avatar sample to scree
msasikanth Sep 19, 2023
30d3edd
Rename `IconCardsScreen` to `MetadataAvatarScreen`
msasikanth Sep 19, 2023
4188474
Remove hardcoded spacing values in `MetadataAvatar`
msasikanth Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import org.hisp.dhis.common.screens.Components
import org.hisp.dhis.common.screens.FormShellsScreen
import org.hisp.dhis.common.screens.FormsComponentsScreen
import org.hisp.dhis.common.screens.IconButtonScreen
import org.hisp.dhis.common.screens.IconCardsScreen
import org.hisp.dhis.common.screens.InputIntegerScreen
import org.hisp.dhis.common.screens.InputLetterScreen
import org.hisp.dhis.common.screens.InputLongTextScreen
Expand All @@ -45,6 +44,7 @@ import org.hisp.dhis.common.screens.InputScreen
import org.hisp.dhis.common.screens.InputTextScreen
import org.hisp.dhis.common.screens.LegendDescriptionScreen
import org.hisp.dhis.common.screens.LegendScreen
import org.hisp.dhis.common.screens.MetadataAvatarScreen
import org.hisp.dhis.common.screens.ProgressScreen
import org.hisp.dhis.common.screens.RadioButtonScreen
import org.hisp.dhis.common.screens.SectionScreen
Expand Down Expand Up @@ -124,7 +124,7 @@ fun Main() {
Components.LEGEND_DESCRIPTION -> LegendDescriptionScreen()
Components.FORM_SHELLS -> FormShellsScreen()
Components.BUTTON_BLOCK -> ButtonBlockScreen()
Components.ICON_CARDS -> IconCardsScreen()
Components.METADATA_AVATAR -> MetadataAvatarScreen()
Components.BOTTOM_SHEET_HEADER -> BottomSheetHeaderScreen()
Components.TAGS -> TagsScreen()
Components.SECTIONS -> SectionScreen()
Expand Down
2 changes: 1 addition & 1 deletion common/src/commonMain/kotlin/org/hisp/dhis/common/screens/Components.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ enum class Components(val label: String) {
BUTTON_BLOCK("Button block"),
CHIPS("Chips"),
BADGES("Badges"),
ICON_CARDS("Icon Cards"),
METADATA_AVATAR("Metadata Avatar"),
INPUT_RADIO_BUTTON("Input Radio Button"),
SWITCH("Switch"),
}
25 changes: 24 additions & 1 deletion ...sp/dhis/common/screens/IconCardsScreen.kt → ...is/common/screens/MetadataAvatarScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package org.hisp.dhis.common.screens

import androidx.compose.material3.Icon
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import org.hisp.dhis.mobile.ui.designsystem.component.AvatarSize
import org.hisp.dhis.mobile.ui.designsystem.component.ColumnComponentContainer
import org.hisp.dhis.mobile.ui.designsystem.component.MetadataAvatar
Expand All @@ -10,7 +11,7 @@ import org.hisp.dhis.mobile.ui.designsystem.resource.provideDHIS2Icon
import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor

@Composable
fun IconCardsScreen() {
fun MetadataAvatarScreen() {
ColumnComponentContainer(title = "Metadata Avatar") {
RowComponentContainer {
MetadataAvatar(
Expand Down Expand Up @@ -56,5 +57,27 @@ fun IconCardsScreen() {
size = AvatarSize.Large,
)
}
RowComponentContainer {
MetadataAvatar(
icon = {
Icon(
painter = provideDHIS2Icon("dhis2_medicines_negative"),
contentDescription = "",
)
},
iconTint = Color(0xFFE12F58),
size = AvatarSize.Normal,
)
MetadataAvatar(
icon = {
Icon(
painter = provideDHIS2Icon("dhis2_medicines_negative"),
contentDescription = "",
)
},
iconTint = Color(0xFFE12F58),
size = AvatarSize.Large,
)
}
}
}
22 changes: 14 additions & 8 deletions ...em/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/MetadataAvatar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import org.hisp.dhis.mobile.ui.designsystem.component.AvatarSize.Large
import org.hisp.dhis.mobile.ui.designsystem.component.AvatarSize.Normal
import org.hisp.dhis.mobile.ui.designsystem.theme.Radius
Expand All @@ -34,28 +34,34 @@ fun MetadataAvatar(
size: AvatarSize = Normal,
) {
val backgroundPadding = when (size) {
Normal -> 0.dp
Large -> 4.dp
Normal -> Spacing.Spacing0
Large -> Spacing.Spacing4
}
val cornerRadius = when (size) {
Normal -> Radius.XS
Large -> Radius.S
}
val boxBackgroundColor = if (backgroundColor != Color.Unspecified) {
backgroundColor
} else {
iconTint.copy(alpha = 0.1f)
}

Box(
modifier = modifier
.background(
color = boxBackgroundColor,
shape = RoundedCornerShape(Radius.XS),
)
.clip(RoundedCornerShape(cornerRadius))
.background(color = Color.White)
.background(color = boxBackgroundColor)
.padding(backgroundPadding)
.size(Spacing.Spacing40),
contentAlignment = Alignment.Center,
) {
CompositionLocalProvider(
LocalContentColor provides iconTint,
) {
icon()
Box(modifier = Modifier.clip(RoundedCornerShape(Radius.XS))) {
icon()
}
}
}
}
Expand Down
Loading