Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3b45a24
feat: add pending suggestion types
jvsena42 Aug 14, 2025
ce5b469
feat: handle pending suggestion types WIP
jvsena42 Aug 14, 2025
112a2eb
chore: lint
jvsena42 Aug 14, 2025
d9d6ba8
chore: lint
jvsena42 Aug 14, 2025
594157d
chore: lint
jvsena42 Aug 14, 2025
22d46da
feat: in progress transfer cache logic
jvsena42 Aug 14, 2025
c68e983
feat: in progress transfer cache logic
jvsena42 Aug 14, 2025
10dc3fd
feat: cache in progress transfers
jvsena42 Aug 14, 2025
d8928cd
feat: cache in progress transfers
jvsena42 Aug 14, 2025
c2b9ce3
feat: update in progress transfers
jvsena42 Aug 14, 2025
2727791
feat: collect TO_SPENDING event
jvsena42 Aug 14, 2025
b3766ad
Merge branch 'master' into feat/card-pending-transactions
jvsena42 Aug 14, 2025
7066512
feat: collect transfer events and update suggestion list
jvsena42 Aug 15, 2025
a60e6d7
Merge branch 'master' into feat/card-pending-transactions
jvsena42 Aug 15, 2025
f66bbef
feat: add duration
jvsena42 Aug 15, 2025
c3763db
refactor: bg color
jvsena42 Aug 15, 2025
d233497
feat: glow effect
jvsena42 Aug 15, 2025
a9bd3cc
refactor: dismissable parameter
jvsena42 Aug 15, 2025
d857fa0
feat: handle duration
jvsena42 Aug 15, 2025
9bd0445
refactor: simplify glow effect
jvsena42 Aug 17, 2025
0207706
refactor: rename gradient modifier
jvsena42 Aug 17, 2025
7822bf2
feat: remove intermediary gradient colors
jvsena42 Aug 18, 2025
cd2273b
Merge branch 'master' into feat/card-pending-transactions
jvsena42 Aug 18, 2025
0c669fd
feat: radial card border
jvsena42 Aug 18, 2025
389100e
feat: disable glow
jvsena42 Aug 18, 2025
db6e253
feat: update shop card colors
jvsena42 Aug 18, 2025
1bbfd18
feat: animation time
jvsena42 Aug 18, 2025
eb410c0
feat: card gradient colors
jvsena42 Aug 18, 2025
5686b7e
chore: add todo
jvsena42 Aug 18, 2025
096f18d
feat: display LIGHTNING_READY card
jvsena42 Aug 18, 2025
d4a02a0
fix: existing item validation
jvsena42 Aug 18, 2025
615377d
refactor: remove duration
jvsena42 Aug 18, 2025
4ff454f
chore: remove logs
jvsena42 Aug 18, 2025
399b58d
chore: remove comment
jvsena42 Aug 18, 2025
3179d5d
chore: add TODO
jvsena42 Aug 18, 2025
d98cd54
chore: remove comment
jvsena42 Aug 18, 2025
5d6f680
chore: lint
jvsena42 Aug 18, 2025
756b8ed
chore: lint
jvsena42 Aug 18, 2025
876e050
chore: comment
jvsena42 Aug 18, 2025
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
34 changes: 32 additions & 2 deletions app/src/main/java/to/bitkit/models/Suggestion.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
@StringRes val title: Int,
@StringRes val description: Int,
@DrawableRes val icon: Int,
val color: Color
val color: Color,
) {
BUY(
title = R.string.cards__buyBitcoin__title,
description = R.string.cards__buyBitcoin__description,
color = Colors.Brand,
icon = R.drawable.b_emboss
),
SPEND(
SPEND( //Lightning ready from RN
title = R.string.cards__lightning__title,
description = R.string.cards__lightning__description,
color = Colors.Purple,
Expand Down Expand Up @@ -66,6 +66,36 @@
color = Colors.Green,
icon = R.drawable.fast_forward
),

/**Replaces SPEND when a LN channel is being force closed*/
TRANSFER_PENDING(
title = R.string.cards__lightningSettingUp__title,
description = R.string.cards__transferPending__description,
color = Colors.Purple24,
icon = R.drawable.transfer
),

/**When the LN channel could not be cooped closed immediately*/
TRANSFER_CLOSING_CHANNEL(
title = R.string.cards__transferClosingChannel__title,
description = R.string.cards__transferClosingChannel__description,
color = Colors.Red24,
icon = R.drawable.transfer
),

/**Replaces SPEND when the transfer to spending balance is in progress*/
LIGHTNING_SETTING_UP(
title = R.string.cards__lightningSettingUp__title,
description = R.string.cards__lightningSettingUp__description,
color = Colors.Purple24,
icon = R.drawable.transfer
),
LIGHTNING_READY(
title = R.string.cards__lightningReady__title,
description = R.string.cards__lightningReady__description,
color = Colors.Purple24,
icon = R.drawable.transfer
),
}

fun String.toSuggestionOrNull() = Suggestion.entries.firstOrNull { it.name == this }
6 changes: 6 additions & 0 deletions app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
import to.bitkit.ui.sheets.BackupRoute
import to.bitkit.ui.sheets.HighBalanceWarningSheet
import to.bitkit.ui.sheets.PinRoute
import to.bitkit.ui.sheets.PinRoute.Prompt
import to.bitkit.ui.theme.AppThemeSurface
import to.bitkit.ui.theme.Colors
import to.bitkit.ui.utils.withAccent
Expand Down Expand Up @@ -221,6 +222,11 @@
rootNavController.navigate(Routes.QuickPaySettings)
}
}

Suggestion.TRANSFER_PENDING -> Unit
Suggestion.TRANSFER_CLOSING_CHANNEL -> Unit
Suggestion.LIGHTNING_SETTING_UP -> TODO()
Suggestion.LIGHTNING_READY -> TODO()
}
},
onClickAddWidget = {
Expand Down