-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[TEMPURA-2060] Contribute to Backpack library Badge icon with Painter (…
…#2157) * [TEMPURA-2060] Add Painter image to composable Badge * [TEMPURA-2060] UI test badge for custom image * [TEMPURA-2060] defaultIconSize copied from BpkButtonImpl * Updated snapshots * [TEMPURA-2060] brand icon in badge story updated, --------- Co-authored-by: Anton Sobolev <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
- Loading branch information
3 people
authored
Nov 28, 2024
1 parent
7ec7f19
commit d46678c
Showing
9 changed files
with
230 additions
and
95 deletions.
There are no files selected for viewing
Binary file added
BIN
+2.6 KB
...debug/default/net.skyscanner.backpack.compose.badge.BpkBadgeTest_customIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.63 KB
.../oss/debug/dm/net.skyscanner.backpack.compose.badge.BpkBadgeTest_customIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
...ck-compose/src/main/kotlin/net/skyscanner/backpack/compose/badge/internal/BpkBadgeImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| /** | ||
| * Backpack for Android - Skyscanner's Design System | ||
| * | ||
| * Copyright 2018 Skyscanner Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.skyscanner.backpack.compose.badge.internal | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.RowScope | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.requiredSize | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.painter.Painter | ||
| import androidx.compose.ui.semantics.semantics | ||
| import androidx.compose.ui.text.style.TextOverflow | ||
| import net.skyscanner.backpack.compose.badge.BpkBadgeType | ||
| import net.skyscanner.backpack.compose.icon.BpkIcon | ||
| import net.skyscanner.backpack.compose.text.BpkText | ||
| import net.skyscanner.backpack.compose.theme.BpkTheme | ||
| import net.skyscanner.backpack.compose.tokens.BpkBorderRadius | ||
| import net.skyscanner.backpack.compose.tokens.BpkBorderSize | ||
| import net.skyscanner.backpack.compose.tokens.BpkSpacing | ||
| import net.skyscanner.backpack.compose.tokens.internal.BpkBadgeColors | ||
|
|
||
| @Composable | ||
| internal fun BpkBadgeImpl( | ||
| text: String, | ||
| modifier: Modifier = Modifier, | ||
| type: BpkBadgeType = BpkBadgeType.Normal, | ||
| icon: @Composable (RowScope.() -> Unit)?, | ||
| ) { | ||
| Row( | ||
| modifier = modifier | ||
| .semantics(mergeDescendants = true) { } | ||
| .border(BpkBorderSize.Sm, type.borderColor, BadgeShape) | ||
| .background(type.backgroundColor, BadgeShape) | ||
| .padding(horizontal = BpkSpacing.Md, vertical = BpkSpacing.Sm), | ||
| horizontalArrangement = Arrangement.spacedBy(BpkSpacing.Sm), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| val contentColor = type.contentColor | ||
|
|
||
| icon?.let { it() } | ||
|
|
||
| BpkText( | ||
| text = text, | ||
| color = contentColor, | ||
| style = BpkTheme.typography.footnote, | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| internal fun BadgeIcon( | ||
| icon: BpkIcon, | ||
| type: BpkBadgeType, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| BpkIcon( | ||
| icon = icon, | ||
| contentDescription = null, | ||
| modifier = modifier, | ||
| tint = type.iconColor, | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| internal fun BadgeDrawable( | ||
| icon: Painter, | ||
| type: BpkBadgeType, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Icon( | ||
| painter = icon, | ||
| contentDescription = null, | ||
| tint = type.iconColor, | ||
| modifier = modifier.requiredSize(BpkSpacing.Base, BpkSpacing.Base), | ||
| ) | ||
| } | ||
|
|
||
| private val BpkBadgeType.iconColor: Color | ||
| @Composable | ||
| get() = when (this) { | ||
| BpkBadgeType.Warning -> BpkTheme.colors.statusWarningSpot | ||
| BpkBadgeType.Destructive -> BpkTheme.colors.statusDangerSpot | ||
| BpkBadgeType.Success -> BpkTheme.colors.statusSuccessSpot | ||
| else -> { | ||
| contentColor | ||
| } | ||
| } | ||
|
|
||
| private val BpkBadgeType.contentColor: Color | ||
| @Composable | ||
| get() = when (this) { | ||
| BpkBadgeType.Normal -> BpkTheme.colors.textPrimary | ||
| BpkBadgeType.Strong -> BpkTheme.colors.textOnDark | ||
| BpkBadgeType.Success -> BpkTheme.colors.textPrimary | ||
| BpkBadgeType.Warning -> BpkTheme.colors.textPrimary | ||
| BpkBadgeType.Destructive -> BpkTheme.colors.textPrimary | ||
| BpkBadgeType.Inverse -> BpkTheme.colors.textPrimary | ||
| BpkBadgeType.Outline -> BpkTheme.colors.textOnDark | ||
| BpkBadgeType.Brand -> BpkTheme.colors.textPrimaryInverse | ||
| } | ||
|
|
||
| private val BpkBadgeType.backgroundColor: Color | ||
| @Composable | ||
| get() = when (this) { | ||
| BpkBadgeType.Normal -> BpkBadgeColors.backgroundNormal | ||
| BpkBadgeType.Strong -> BpkTheme.colors.corePrimary | ||
| BpkBadgeType.Success -> BpkBadgeColors.backgroundNormal | ||
| BpkBadgeType.Warning -> BpkBadgeColors.backgroundNormal | ||
| BpkBadgeType.Destructive -> BpkBadgeColors.backgroundNormal | ||
| BpkBadgeType.Inverse -> BpkTheme.colors.surfaceDefault | ||
| BpkBadgeType.Outline -> Color.Transparent | ||
| BpkBadgeType.Brand -> BpkTheme.colors.coreAccent | ||
| } | ||
|
|
||
| private val BpkBadgeType.borderColor: Color | ||
| @Composable | ||
| get() = when (this) { | ||
| BpkBadgeType.Outline -> BpkTheme.colors.textOnDark | ||
| else -> Color.Transparent | ||
| } | ||
|
|
||
| private val BadgeShape = RoundedCornerShape(BpkBorderRadius.Xs) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.