-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- i18n update and layout/margin improvements in Trade flow
- Loading branch information
1 parent
5992c4b
commit 550586e
Showing
18 changed files
with
299 additions
and
258 deletions.
There are no files selected for viewing
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
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
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
53 changes: 25 additions & 28 deletions
53
...work/bisq/mobile/presentation/ui/components/organisms/trades/TradeFlow01AccountDetails.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 |
|---|---|---|
| @@ -1,56 +1,53 @@ | ||
| package network.bisq.mobile.presentation.ui.components.organisms.trades | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.* | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.unit.dp | ||
| import cafe.adriel.lyricist.LocalStrings | ||
| import network.bisq.mobile.presentation.ui.components.atoms.BisqButton | ||
| import network.bisq.mobile.presentation.ui.components.atoms.BisqText | ||
| import network.bisq.mobile.presentation.ui.components.atoms.BisqTextField | ||
| import network.bisq.mobile.presentation.ui.theme.BisqTheme | ||
| import network.bisq.mobile.presentation.ui.theme.BisqUIConstants | ||
| import network.bisq.mobile.presentation.ui.uicases.trades.ITradeFlowPresenter | ||
| import org.koin.compose.koinInject | ||
|
|
||
| @Composable | ||
| fun TradeFlow01AccountDetails( | ||
| onNext: () -> Unit | ||
| ) { | ||
| val strings = LocalStrings.current.bisqEasyTradeState | ||
| val stringsBisqEasy = LocalStrings.current.bisqEasy | ||
| val presenter: ITradeFlowPresenter = koinInject() | ||
|
|
||
| Column { | ||
| BisqText.smallRegular( | ||
| text = "Waiting for the seller to provide their account information. Meanwhile you can provide your settlement details." | ||
| ) | ||
| Spacer(modifier = Modifier.height(BisqUIConstants.ScreenPadding)) | ||
| BisqText.baseRegular(text = strings.bisqEasy_tradeState_info_buyer_phase1a_seller_wait_message) | ||
| Spacer(modifier = Modifier.height(BisqUIConstants.ScreenPadding2X)) | ||
| BisqText.h6Regular( | ||
| text = "Fill in your Lightning invoice" | ||
| text = strings.bisqEasy_tradeState_info_buyer_phase1a_bitcoinPayment_headline_LN | ||
| ) | ||
| Spacer(modifier = Modifier.height(BisqUIConstants.ScreenPadding)) | ||
| BisqTextField( | ||
| placeholder = "", | ||
| value = "lncb21h345t34io", | ||
| onValueChanged = {}, | ||
| label = "Lightning Invoice" | ||
| label = strings.bisqEasy_tradeState_info_buyer_phase1a_bitcoinPayment_description_LN, | ||
| value = presenter.receiveAddress.collectAsState().value, | ||
| onValueChanged = { presenter.setReceiveAddress(it) }, | ||
| ) | ||
| Spacer(modifier = Modifier.height(BisqUIConstants.ScreenPadding)) | ||
| BisqButton( | ||
| text = "Send to seller", | ||
| text = strings.bisqEasy_tradeState_info_buyer_phase1a_send, | ||
| onClick = onNext, | ||
| padding = PaddingValues( | ||
| horizontal = 18.dp, | ||
| vertical = 6.dp | ||
| ) | ||
| ) | ||
| Row( | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| horizontalArrangement = Arrangement.spacedBy(8.dp) | ||
| ) { | ||
| BisqText.xsmallMedium( | ||
| text = "If you don’t have a wallet yet, refer to our" | ||
| ) | ||
| BisqText.xsmallMedium( | ||
| text = "Wallet guide", | ||
| modifier = Modifier.clip(shape = RoundedCornerShape(4.dp)) | ||
| .background(color = BisqTheme.colors.primary) | ||
| .padding(vertical = 2.dp, horizontal = 8.dp) | ||
| ) | ||
| } | ||
| Spacer(modifier = Modifier.height(BisqUIConstants.ScreenPadding)) | ||
| BisqText.smallMedium( | ||
| text = strings.bisqEasy_tradeState_info_buyer_phase1a_wallet_prompt_prefix | ||
| ) | ||
| // TODO: Make a small variation of the button | ||
| BisqButton(text = stringsBisqEasy.bisqEasy_walletGuide_tabs_headline, onClick = {}) | ||
| } | ||
| } |
Oops, something went wrong.