wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7827 from thunderbird/remove_SuccessView

Browse source 
Remove `Icons.Outlined.Celebration`
This commit is contained in:
cketti 2024-05-08 18:08:30 +02:00 committed by GitHub
commit 50dfae2dfc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 6 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/ButtonItems.kt
View file

@ -77,8 +77,8 @@ fun LazyGridScope.buttonItems() {
horizontalArrangement = Arrangement.spacedBy(MainTheme.spacings.default),
modifier = Modifier.itemDefaultPadding(),
) {
ButtonIcon(onClick = { }, imageVector = Icons.Outlined.Celebration)
ButtonIcon(onClick = { }, imageVector = Icons.Outlined.Celebration, enabled = false)
ButtonIcon(onClick = { }, imageVector = Icons.Outlined.Info)
ButtonIcon(onClick = { }, imageVector = Icons.Outlined.Info, enabled = false)
}
}
}

2
app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/items/AppBarItems.kt
View file

@ -20,7 +20,7 @@ fun LazyGridScope.appBarItems() {
ItemOutlined {
TopAppBarItem(
title = "Title",
actionIcon = Icons.Outlined.Celebration,
actionIcon = Icons.Outlined.Info,
)
}
}

4
core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/IconPreview.kt
View file

@ -10,7 +10,7 @@ import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes
internal fun IconPreview() {
PreviewWithThemes {
Icon(
imageVector = Icons.Outlined.Celebration,
imageVector = Icons.Outlined.Info,
)
}
}
@ -20,7 +20,7 @@ internal fun IconPreview() {
internal fun IconTintedPreview() {
PreviewWithThemes {
Icon(
imageVector = Icons.Outlined.Celebration,
imageVector = Icons.Outlined.Info,
tint = Color.Magenta,
)
}

2
core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/organism/TopAppBarPreview.kt
View file

@ -33,7 +33,7 @@ internal fun TopAppBarWithActionsPreview() {
)
ButtonIcon(
onClick = {},
imageVector = Icons.Outlined.Celebration,
imageVector = Icons.Outlined.Visibility,
)
},
)

4
core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/icon/Icons.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.filled.Outbox
import androidx.compose.material.icons.filled.VisibilityOff
import androidx.compose.material.icons.outlined.AccountCircle
import androidx.compose.material.icons.outlined.Celebration
import androidx.compose.material.icons.outlined.Check
import androidx.compose.material.icons.outlined.ErrorOutline
import androidx.compose.material.icons.outlined.ExpandLess
@ -39,9 +38,6 @@ object Icons {
val Check: ImageVector
get() = MaterialIcons.Outlined.Check
val Celebration: ImageVector
get() = MaterialIcons.Outlined.Celebration
val ErrorOutline: ImageVector
get() = MaterialIcons.Outlined.ErrorOutline

15
feature/account/common/src/debug/kotlin/app/k9mail/feature/account/common/ui/view/SuccessViewPreview.kt
View file

@ -1,15 +0,0 @@
package app.k9mail.feature.account.common.ui.view
import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import app.k9mail.core.ui.compose.designsystem.PreviewWithThemes
@Composable
@Preview(showBackground = true)
internal fun SuccessViewPreview() {
PreviewWithThemes {
SuccessView(
message = "The app tried really hard and managed to successfully complete the operation.",
)
}
}

45
feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/view/SuccessView.kt
View file

@ -1,45 +0,0 @@
package app.k9mail.feature.account.common.ui.view
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextAlign
import app.k9mail.core.ui.compose.designsystem.atom.icon.Icon
import app.k9mail.core.ui.compose.designsystem.atom.icon.Icons
import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleMedium
import app.k9mail.core.ui.compose.theme2.MainTheme
@Composable
fun SuccessView(
message: String,
modifier: Modifier = Modifier,
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(MainTheme.spacings.default)
.then(modifier),
horizontalAlignment = Alignment.CenterHorizontally,
) {
TextTitleMedium(
text = message,
textAlign = TextAlign.Center,
)
Row(
modifier = Modifier.height(MainTheme.sizes.larger),
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
imageVector = Icons.Outlined.Celebration,
tint = MainTheme.colors.secondary,
modifier = Modifier.requiredSize(MainTheme.sizes.large),
)
}
}
}