Skip to content

Commit 6af8a94

Browse files
committed
chore: make gradientRadialBackground private and rename gradientLinearBackground
1 parent bb7d971 commit 6af8a94

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+114
-114
lines changed

app/src/main/java/to/bitkit/ui/components/BottomSheet.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import androidx.compose.ui.unit.Dp
2929
import androidx.compose.ui.unit.dp
3030
import to.bitkit.ui.scaffold.SheetTopBar
3131
import to.bitkit.ui.shared.modifiers.sheetHeight
32-
import to.bitkit.ui.shared.util.gradientLinearBackground
32+
import to.bitkit.ui.shared.util.gradientBackground
3333
import to.bitkit.ui.theme.AppShapes
3434
import to.bitkit.ui.theme.AppThemeSurface
3535
import to.bitkit.ui.theme.Colors
@@ -107,7 +107,7 @@ private fun Preview() {
107107
Column(
108108
modifier = Modifier
109109
.sheetHeight(isModal = true)
110-
.gradientLinearBackground()
110+
.gradientBackground()
111111
.padding(horizontal = 16.dp)
112112
) {
113113
SheetTopBar("Sheet Title")

app/src/main/java/to/bitkit/ui/components/SuggestionCard.kt

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.animation.core.infiniteRepeatable
77
import androidx.compose.animation.core.rememberInfiniteTransition
88
import androidx.compose.animation.core.tween
99
import androidx.compose.foundation.Image
10+
import androidx.compose.foundation.background
1011
import androidx.compose.foundation.border
1112
import androidx.compose.foundation.layout.Arrangement
1213
import androidx.compose.foundation.layout.Box
@@ -26,6 +27,7 @@ import androidx.compose.runtime.Composable
2627
import androidx.compose.runtime.getValue
2728
import androidx.compose.ui.Modifier
2829
import androidx.compose.ui.draw.clip
30+
import androidx.compose.ui.graphics.Brush
2931
import androidx.compose.ui.graphics.Color
3032
import androidx.compose.ui.layout.ContentScale
3133
import androidx.compose.ui.platform.testTag
@@ -37,8 +39,7 @@ import androidx.compose.ui.unit.dp
3739
import to.bitkit.R
3840
import to.bitkit.models.Suggestion
3941
import to.bitkit.ui.shared.util.clickableAlpha
40-
import to.bitkit.ui.shared.util.gradientLinearBackground
41-
import to.bitkit.ui.shared.util.gradientRadialBackground
42+
import to.bitkit.ui.shared.util.gradientBackground
4243
import to.bitkit.ui.theme.Colors
4344

4445
private const val GLOW_ANIMATION_MILLIS = 1100
@@ -78,7 +79,7 @@ fun SuggestionCard(
7879
.clip(ShapeDefaults.Large)
7980
.then(
8081
if (isDismissible || disableGlow) {
81-
Modifier.gradientLinearBackground(gradientColor)
82+
Modifier.gradientBackground(gradientColor)
8283
} else {
8384
val (shadowColor, borderColor, gradientSelectedColor) = when (gradientColor) {
8485
Colors.Purple24 -> Triple(
@@ -154,6 +155,21 @@ fun SuggestionCard(
154155
}
155156
}
156157

158+
private fun Modifier.gradientRadialBackground(
159+
centerColor: Color,
160+
glowAlpha: Float = 1f,
161+
): Modifier {
162+
return this
163+
.background(
164+
brush = Brush.radialGradient(
165+
colors = listOf(
166+
centerColor.copy(alpha = glowAlpha * 0.10f),
167+
centerColor.copy(alpha = glowAlpha),
168+
),
169+
)
170+
)
171+
}
172+
157173
@Preview(showSystemUi = true)
158174
@Composable
159175
private fun Preview() {

app/src/main/java/to/bitkit/ui/components/SyncNodeView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import androidx.compose.ui.tooling.preview.Preview
1313
import androidx.compose.ui.unit.dp
1414
import to.bitkit.R
1515
import to.bitkit.ui.screens.transfer.components.TransferAnimationView
16-
import to.bitkit.ui.shared.util.gradientLinearBackground
16+
import to.bitkit.ui.shared.util.gradientBackground
1717
import to.bitkit.ui.theme.AppThemeSurface
1818
import to.bitkit.ui.theme.Colors
1919

@@ -55,7 +55,7 @@ private fun Preview() {
5555
SyncNodeView(
5656
modifier = Modifier
5757
.fillMaxSize()
58-
.gradientLinearBackground()
58+
.gradientBackground()
5959
.padding(horizontal = 16.dp)
6060
)
6161
}

app/src/main/java/to/bitkit/ui/screens/scanner/CameraPermissionView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import to.bitkit.ui.components.Title
3434
import to.bitkit.ui.components.VerticalSpacer
3535
import to.bitkit.ui.scaffold.AppTopBar
3636
import to.bitkit.ui.scaffold.SheetTopBar
37-
import to.bitkit.ui.shared.util.gradientLinearBackground
37+
import to.bitkit.ui.shared.util.gradientBackground
3838
import to.bitkit.ui.theme.AppThemeSurface
3939
import to.bitkit.ui.theme.Colors
4040
import to.bitkit.ui.utils.withBold
@@ -70,7 +70,7 @@ fun DeniedContent(
7070
) {
7171
Column(
7272
modifier = Modifier
73-
.then(if (inSheet) Modifier.gradientLinearBackground() else Modifier.background(Colors.Black))
73+
.then(if (inSheet) Modifier.gradientBackground() else Modifier.background(Colors.Black))
7474
.then(if (inSheet) Modifier.navigationBarsPadding() else Modifier.systemBarsPadding())
7575
) {
7676
if (!inSheet) {

app/src/main/java/to/bitkit/ui/screens/scanner/QrScanningScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ import to.bitkit.ui.components.VerticalSpacer
7575
import to.bitkit.ui.scaffold.AppAlertDialog
7676
import to.bitkit.ui.scaffold.AppTopBar
7777
import to.bitkit.ui.scaffold.SheetTopBar
78-
import to.bitkit.ui.shared.util.gradientLinearBackground
78+
import to.bitkit.ui.shared.util.gradientBackground
7979
import to.bitkit.ui.theme.Colors
8080
import to.bitkit.utils.Logger
8181
import to.bitkit.viewmodels.AppViewModel
@@ -213,7 +213,7 @@ fun QrScanningScreen(
213213
grantedContent = {
214214
Column(
215215
modifier = Modifier
216-
.then(if (inSheet) Modifier.gradientLinearBackground() else Modifier)
216+
.then(if (inSheet) Modifier.gradientBackground() else Modifier)
217217
.then(if (inSheet) Modifier.navigationBarsPadding() else Modifier.systemBarsPadding())
218218
) {
219219
if (inSheet) {

app/src/main/java/to/bitkit/ui/screens/shop/shopDiscover/ShopDiscoverScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import to.bitkit.ui.scaffold.AppTopBar
4949
import to.bitkit.ui.scaffold.CloseNavIcon
5050
import to.bitkit.ui.scaffold.ScreenColumn
5151
import to.bitkit.ui.shared.util.clickableAlpha
52-
import to.bitkit.ui.shared.util.gradientLinearBackground
52+
import to.bitkit.ui.shared.util.gradientBackground
5353
import to.bitkit.ui.theme.AppThemeSurface
5454
import to.bitkit.ui.theme.Colors
5555
import to.bitkit.ui.theme.Shapes
@@ -71,7 +71,7 @@ fun ShopDiscoverScreen(
7171
)
7272

7373
ScreenColumn(
74-
modifier = Modifier.gradientLinearBackground(),
74+
modifier = Modifier.gradientBackground(),
7575
) {
7676
AppTopBar(
7777
titleText = stringResource(R.string.other__shop__discover__nav_title),

app/src/main/java/to/bitkit/ui/screens/wallets/activity/DateRangeSelectorSheet.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import to.bitkit.ui.components.PrimaryButton
3131
import to.bitkit.ui.components.SecondaryButton
3232
import to.bitkit.ui.components.SheetSize
3333
import to.bitkit.ui.shared.modifiers.sheetHeight
34-
import to.bitkit.ui.shared.util.gradientLinearBackground
34+
import to.bitkit.ui.shared.util.gradientBackground
3535
import to.bitkit.ui.theme.AppThemeSurface
3636
import to.bitkit.ui.theme.Colors
3737
import kotlin.time.Duration.Companion.days
@@ -79,7 +79,7 @@ private fun Content(
7979
modifier = Modifier
8080
.fillMaxWidth()
8181
.sheetHeight(SheetSize.CALENDAR)
82-
.gradientLinearBackground()
82+
.gradientBackground()
8383
.navigationBarsPadding()
8484
.padding(horizontal = 16.dp)
8585
) {

app/src/main/java/to/bitkit/ui/screens/wallets/activity/TagSelectorSheet.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import to.bitkit.ui.components.SheetSize
2828
import to.bitkit.ui.components.TagButton
2929
import to.bitkit.ui.scaffold.SheetTopBar
3030
import to.bitkit.ui.shared.modifiers.sheetHeight
31-
import to.bitkit.ui.shared.util.gradientLinearBackground
31+
import to.bitkit.ui.shared.util.gradientBackground
3232
import to.bitkit.ui.theme.AppThemeSurface
3333

3434
@Composable
@@ -64,7 +64,7 @@ private fun Content(
6464
modifier = Modifier
6565
.fillMaxWidth()
6666
.sheetHeight(SheetSize.SMALL)
67-
.gradientLinearBackground()
67+
.gradientBackground()
6868
.navigationBarsPadding()
6969
.padding(horizontal = 16.dp)
7070
) {

app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityAddTagSheet.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import to.bitkit.ui.components.BottomSheetPreview
1515
import to.bitkit.ui.components.SheetSize
1616
import to.bitkit.ui.screens.wallets.send.AddTagContent
1717
import to.bitkit.ui.shared.modifiers.sheetHeight
18-
import to.bitkit.ui.shared.util.gradientLinearBackground
18+
import to.bitkit.ui.shared.util.gradientBackground
1919
import to.bitkit.ui.theme.AppThemeSurface
2020
import to.bitkit.viewmodels.ActivityDetailViewModel
2121
import to.bitkit.viewmodels.ActivityListViewModel
@@ -66,7 +66,7 @@ fun ActivityAddTagSheet(
6666
addButtonTestTag = "ActivityTagsSubmit",
6767
modifier = Modifier
6868
.sheetHeight(SheetSize.SMALL, isModal = true)
69-
.gradientLinearBackground()
69+
.gradientBackground()
7070
)
7171
}
7272
}
@@ -86,7 +86,7 @@ private fun Preview() {
8686
onBack = {},
8787
modifier = Modifier
8888
.sheetHeight(SheetSize.SMALL, isModal = true)
89-
.gradientLinearBackground()
89+
.gradientBackground()
9090
)
9191
}
9292
}

app/src/main/java/to/bitkit/ui/screens/wallets/receive/EditInvoiceScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import to.bitkit.ui.currencyViewModel
6262
import to.bitkit.ui.scaffold.SheetTopBar
6363
import to.bitkit.ui.shared.modifiers.sheetHeight
6464
import to.bitkit.ui.shared.util.clickableAlpha
65-
import to.bitkit.ui.shared.util.gradientLinearBackground
65+
import to.bitkit.ui.shared.util.gradientBackground
6666
import to.bitkit.ui.theme.AppTextFieldDefaults
6767
import to.bitkit.ui.theme.AppThemeSurface
6868
import to.bitkit.ui.theme.Colors
@@ -181,7 +181,7 @@ fun EditInvoiceContent(
181181
BoxWithConstraints(
182182
modifier = modifier
183183
.fillMaxSize()
184-
.gradientLinearBackground()
184+
.gradientBackground()
185185
.navigationBarsPadding()
186186
) {
187187
val maxHeight = this.maxHeight

0 commit comments

Comments
 (0)