Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions lib/utils/new_wallet/info_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class NewWalletInfoPage {
required final String title,
}) =>
NewWalletInfoPage(
topText: L.seed,
topText: L.verify_seed,
topAction: null,
topActionText: null,
svgIcon: null,
Expand All @@ -110,22 +110,18 @@ class NewWalletInfoPage {
),
],
texts: [
SizedBox(height: 16),
YellowWarning(
text: L.save_words_warning,
padding: EdgeInsets.zero,
),
SizedBox(height: 32),
Text(
title,
style: TextStyle(
fontSize: 24,
color: T.colorScheme.onSurface,
),
),
SizedBox(height: 16),
SeedPhraseGridWidget(list: text.split(" ")),
Spacer(),
],
);

Expand Down
23 changes: 10 additions & 13 deletions lib/views/animated_qr_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,20 @@ class AnimatedURPage extends AbstractView {

@override
Widget body(final BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.only(top: 64.0, left: 32, right: 32),
child: Observer(
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 32.0),
child: Column(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Observer(
builder: (final context) {
return URQR(
frames: viewModel.urqr,
);
},
),
),
Padding(
padding: const EdgeInsets.only(left: 32, right: 32, top: 64),
child: Text(
Text(
L.animated_qr_note,
textAlign: TextAlign.center,
style: TextStyle(
Expand All @@ -50,9 +48,8 @@ class AnimatedURPage extends AbstractView {
fontWeight: FontWeight.w400,
),
),
),
const SizedBox(height: 32),
],
],
),
);
}

Expand Down
9 changes: 8 additions & 1 deletion lib/views/new_wallet_info.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class NewWalletInfoScreen extends AbstractView {
builder: (final context) => AppBar(
title: Text(viewModel.screenName),
automaticallyImplyLeading: canPop,
backgroundColor: Colors.transparent,
actions: _getActionButton(),
),
),
Expand Down Expand Up @@ -94,7 +95,13 @@ class NewWalletInfoScreen extends AbstractView {
builder: (final context) => Column(
children: [
if (viewModel.page.svgIcon != null) viewModel.page.svgIcon!,
...viewModel.page.texts,
Expanded(
child: SingleChildScrollView(
child: Column(
children: viewModel.page.texts,
),
),
),
],
),
),
Expand Down
3 changes: 1 addition & 2 deletions lib/views/onboarding_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ class OnboardingScreen extends AbstractView {
return Padding(
padding: const EdgeInsets.all(24.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
const SizedBox(height: 60),
_getIconForPage(index),
const SizedBox(height: 24),
Text(
pageData.description,
style: T.textTheme.bodyLarge?.copyWith(
Expand Down
116 changes: 59 additions & 57 deletions lib/views/unconfirmed_transaction.dart
Original file line number Diff line number Diff line change
Expand Up @@ -61,71 +61,73 @@ class UnconfirmedTransactionView {
color: Color(0xff1B284A),
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: double.maxFinite,
child: Stack(
alignment: Alignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Padding(
padding: const EdgeInsets.only(right: 16, top: 16),
child: Container(
width: 34,
height: 34,
decoration: BoxDecoration(
color: T.colorScheme.surfaceContainer,
borderRadius: BorderRadius.circular(512),
),
child: IconButton(
onPressed: () => viewModel.cancel(context),
icon: Icon(
Icons.close,
color: T.colorScheme.onSurface,
size: 18,
child: SafeArea(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: double.maxFinite,
child: Stack(
alignment: Alignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Padding(
padding: const EdgeInsets.only(right: 16, top: 16),
child: Container(
width: 34,
height: 34,
decoration: BoxDecoration(
color: T.colorScheme.surfaceContainer,
borderRadius: BorderRadius.circular(512),
),
child: IconButton(
onPressed: () => viewModel.cancel(context),
icon: Icon(
Icons.close,
color: T.colorScheme.onSurface,
size: 18,
),
),
),
),
],
),
Container(
width: 40,
height: 4,
margin: const EdgeInsets.symmetric(vertical: 12),
decoration: BoxDecoration(
color: Colors.white.withAlpha(76),
borderRadius: BorderRadius.circular(2),
),
],
),
Container(
width: 40,
height: 4,
margin: const EdgeInsets.symmetric(vertical: 12),
decoration: BoxDecoration(
color: Colors.white.withAlpha(76),
borderRadius: BorderRadius.circular(2),
),
),
],
],
),
),
),
Padding(
padding: const EdgeInsets.only(bottom: 32, top: 16),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
viewModel.wallet.coin.strings.svg.svg(height: 32),
const SizedBox(width: 8),
Text(
L.confirm_transaction,
style: TextStyle(
color: T.colorScheme.onSurface,
fontSize: 22,
fontWeight: FontWeight.w600,
Padding(
padding: const EdgeInsets.only(bottom: 32, top: 16),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
viewModel.wallet.coin.strings.svg.svg(height: 32),
const SizedBox(width: 8),
Text(
L.confirm_transaction,
style: TextStyle(
color: T.colorScheme.onSurface,
fontSize: 22,
fontWeight: FontWeight.w600,
),
),
),
],
],
),
),
),
_buildContent(context),
_buildFooter(context),
],
_buildContent(context),
_buildFooter(context),
],
),
),
);
}
Expand Down
48 changes: 23 additions & 25 deletions lib/views/wallet_home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -116,31 +116,29 @@ class WalletHome extends AbstractView {
AppBar? get appBar => null;

Widget _bottomActions(final BuildContext context) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
_actionButton(
context,
pngAsset: Assets.icons.menuDeposit.image(),
pressedPngAsset: Assets.icons.menuDepositPressed.image(),
onPressed: () => Receive(coinWallet: viewModel.wallet).push(context),
),
_actionButton(
context,
pngAsset: Assets.icons.menuQr.image(),
pressedPngAsset: Assets.icons.menuQrPressed.image(),
onPressed: () => BarcodeScanner(wallet: viewModel.wallet).push(context),
),
_actionButton(
context,
pngAsset: Assets.icons.menuMenu.image(),
pressedPngAsset: Assets.icons.menuMenuPressed.image(),
onPressed: () => _showBottomSheet(context),
),
],
),
return Row(
spacing: 6,
mainAxisAlignment: MainAxisAlignment.center,
children: [
_actionButton(
context,
pngAsset: Assets.icons.menuDeposit.image(),
pressedPngAsset: Assets.icons.menuDepositPressed.image(),
onPressed: () => Receive(coinWallet: viewModel.wallet).push(context),
),
_actionButton(
context,
pngAsset: Assets.icons.menuQr.image(),
pressedPngAsset: Assets.icons.menuQrPressed.image(),
onPressed: () => BarcodeScanner(wallet: viewModel.wallet).push(context),
),
_actionButton(
context,
pngAsset: Assets.icons.menuMenu.image(),
pressedPngAsset: Assets.icons.menuMenuPressed.image(),
onPressed: () => _showBottomSheet(context),
),
],
);
}

Expand Down
Loading
Loading