Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-12-24 04:19:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

swb desktop layout tweaks

Browse source
This commit is contained in:
julian 2022-11-07 16:30:17 -06:00
parent 3c627a5ddb
commit 2f6b1278fe
4 changed files with 115 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pages/settings_views/global_settings_view/stack_backup_views/create_backup_view.dart
View file

@ -157,7 +157,7 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
.textDark3), .textDark3),
), ),
), ),
// child, child,
const SizedBox(height: 20), const SizedBox(height: 20),
Row( Row(
children: [ children: [
@ -442,7 +442,7 @@ class _RestoreFromFileViewState extends State<CreateBackupView> {
const SizedBox( const SizedBox(
height: 16, height: 16,
), ),
const Spacer(), if (!isDesktop) const Spacer(),
TextButton( TextButton(
style: shouldEnableCreate style: shouldEnableCreate
? Theme.of(context) ? Theme.of(context)

4
lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart
View file

@ -142,7 +142,7 @@ class _RestoreFromFileViewState extends ConsumerState<RestoreFromFileView> {
textAlign: TextAlign.left, textAlign: TextAlign.left,
), ),
), ),
// child, child,
const SizedBox(height: 20), const SizedBox(height: 20),
Row( Row(
children: [ children: [
@ -285,7 +285,7 @@ class _RestoreFromFileViewState extends ConsumerState<RestoreFromFileView> {
const SizedBox( const SizedBox(
height: 16, height: 16,
), ),
const Spacer(), if (!isDesktop) const Spacer(),
TextButton( TextButton(
style: passwordController.text.isEmpty || style: passwordController.text.isEmpty ||
fileLocationController.text.isEmpty fileLocationController.text.isEmpty

58
lib/pages_desktop_specific/home/settings_menu/backup_and_restore/backup_and_restore_settings.dart
View file

@ -64,6 +64,9 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
height: 48, height: 48,
), ),
Center( Center(
child: Row(
children: [
Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10), padding: const EdgeInsets.all(10),
child: RichText( child: RichText(
@ -72,8 +75,8 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
children: [ children: [
TextSpan( TextSpan(
text: "Auto Backup", text: "Auto Backup",
style: style: STextStyles.desktopTextSmall(
STextStyles.desktopTextSmall(context), context),
), ),
TextSpan( TextSpan(
text: text:
@ -81,13 +84,15 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
"To ensure maximum security, we recommend using a unique password that you haven't used anywhere " "To ensure maximum security, we recommend using a unique password that you haven't used anywhere "
"else on the internet before. Your password is not stored.", "else on the internet before. Your password is not stored.",
style: STextStyles style: STextStyles
.desktopTextExtraExtraSmall(context), .desktopTextExtraExtraSmall(
context),
), ),
TextSpan( TextSpan(
text: text:
"\n\nFor more information, please see our website ", "\n\nFor more information, please see our website ",
style: STextStyles style: STextStyles
.desktopTextExtraExtraSmall(context), .desktopTextExtraExtraSmall(
context),
), ),
TextSpan( TextSpan(
text: "stackwallet.com", text: "stackwallet.com",
@ -98,8 +103,8 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
launchUrl( launchUrl(
Uri.parse( Uri.parse(
"https://stackwallet.com/"), "https://stackwallet.com/"),
mode: mode: LaunchMode
LaunchMode.externalApplication, .externalApplication,
); );
}, },
), ),
@ -108,6 +113,9 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
), ),
), ),
), ),
],
),
),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -148,6 +156,9 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
), ),
Center( Center(
child: Row(
children: [
Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10), padding: const EdgeInsets.all(10),
child: RichText( child: RichText(
@ -156,8 +167,8 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
children: [ children: [
TextSpan( TextSpan(
text: "Manual Backup", text: "Manual Backup",
style: style: STextStyles.desktopTextSmall(
STextStyles.desktopTextSmall(context), context),
), ),
TextSpan( TextSpan(
text: text:
@ -165,22 +176,29 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
"You will create a backup file that can be later used in the Restore option. " "You will create a backup file that can be later used in the Restore option. "
"Use a strong password to encrypt your data.", "Use a strong password to encrypt your data.",
style: STextStyles style: STextStyles
.desktopTextExtraExtraSmall(context), .desktopTextExtraExtraSmall(
context),
), ),
], ],
), ),
), ),
), ),
), ),
],
),
),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.all( padding: const EdgeInsets.all(
10, 10,
), ),
child: createBackup child: createBackup
? const CreateBackupView() ? const SizedBox(
width: 512,
child: CreateBackupView(),
)
: PrimaryButton( : PrimaryButton(
desktopMed: true, desktopMed: true,
width: 200, width: 200,
@ -217,6 +235,9 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
), ),
Center( Center(
child: Row(
children: [
Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10), padding: const EdgeInsets.all(10),
child: RichText( child: RichText(
@ -225,21 +246,25 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
children: [ children: [
TextSpan( TextSpan(
text: "Restore Backup", text: "Restore Backup",
style: style: STextStyles.desktopTextSmall(
STextStyles.desktopTextSmall(context), context),
), ),
TextSpan( TextSpan(
text: text:
"\n\nUse your Stack Wallet backup file to restore your wallets, address book " "\n\nUse your Stack Wallet backup file to restore your wallets, address book "
"and wallet preferences.", "and wallet preferences.",
style: STextStyles style: STextStyles
.desktopTextExtraExtraSmall(context), .desktopTextExtraExtraSmall(
context),
), ),
], ],
), ),
), ),
), ),
), ),
],
),
),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -248,7 +273,10 @@ class _BackupRestoreSettings extends ConsumerState<BackupRestoreSettings> {
10, 10,
), ),
child: restoreBackup child: restoreBackup
? RestoreFromFileView() ? const SizedBox(
width: 512,
child: RestoreFromFileView(),
)
: PrimaryButton( : PrimaryButton(
desktopMed: true, desktopMed: true,
width: 200, width: 200,

3
lib/pages_desktop_specific/home/settings_menu/backup_and_restore/enable_backup_dialog.dart
View file

@ -61,8 +61,7 @@ class EnableBackupDialog extends StatelessWidget {
child: SecondaryButton( child: SecondaryButton(
label: "Cancel", label: "Cancel",
onPressed: () { onPressed: () {
int count = 0; Navigator.of(context).pop();
Navigator.of(context).popUntil((_) => count++ >= 2);
}, },
), ),
), ),