Skip to content

Commit

Permalink
Merge pull request #1139 from Foundation-Devices/ENV-1074_Adjust_the_…
Browse files Browse the repository at this point in the history 
…CTA_positions_in_new_1.7_screens_so_they_are_like_in_Figma

ENV-1074: Fix a lot of button paddings
  • Loading branch information
@icota
icota committed May 22, 2024
2 parents c98914e + 1344906 commit b6d3246
Show file tree
Hide file tree
Showing 18 changed files with 275 additions and 148 deletions.
23 changes: 15 additions & 8 deletions lib/ui/pages/import_pp/single_import_pp_intro.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,21 @@ class SingleImportPpIntroPage extends StatelessWidget {
position: 0.toDouble(),
),
),
EnvoyButton(
S().accounts_empty_text_learn_more,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const SingleImportPpScanPage();
}));
},
Padding(
padding: const EdgeInsets.only(
bottom: EnvoySpacing.medium1,
left: EnvoySpacing.small,
right: EnvoySpacing.small,
),
child: EnvoyButton(
S().accounts_empty_text_learn_more,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const SingleImportPpScanPage();
}));
},
),
)
],
),
Expand Down
8 changes: 5 additions & 3 deletions lib/ui/pages/legal/passport_tou.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,11 @@ class TouPage extends StatelessWidget {
),
Padding(
padding: const EdgeInsets.only(
top: EnvoySpacing.small,
left: EnvoySpacing.small,
right: EnvoySpacing.small),
top: EnvoySpacing.small,
left: 20,
right: 20,
bottom: EnvoySpacing.medium2,
),
child: OnboardingButton(
label: S().envoy_account_tos_cta,
onTap: () {
Expand Down
29 changes: 18 additions & 11 deletions lib/ui/pages/pin/pin_intro.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later

import 'package:envoy/ui/theme/envoy_spacing.dart';
import 'package:flutter/material.dart';
import 'package:envoy/ui/onboard/onboarding_page.dart';
import 'package:envoy/generated/l10n.dart';
Expand All @@ -24,17 +25,23 @@ class PinIntroPage extends StatelessWidget {
text: S().envoy_pin_intro_subheading),
],
buttons: [
OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
if (mustUpdateFirmware) {
return FwIntroPage();
} else {
return const PpSetupIntroPage();
}
}));
}),
Padding(
padding: const EdgeInsets.only(
bottom: EnvoySpacing.medium2,
),
child: OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
if (mustUpdateFirmware) {
return FwIntroPage();
} else {
return const PpSetupIntroPage();
}
}));
}),
),
],
);
}
Expand Down
19 changes: 12 additions & 7 deletions lib/ui/pages/pp/pp_new_seed.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:envoy/ui/pages/pp/pp_new_seed_backup.dart';
import 'package:flutter/material.dart';
import 'package:envoy/ui/onboard/onboarding_page.dart';
import 'package:envoy/generated/l10n.dart';
import 'package:envoy/ui/theme/envoy_spacing.dart';

class PpNewSeedPage extends StatelessWidget {
const PpNewSeedPage({super.key});
Expand All @@ -23,13 +24,17 @@ class PpNewSeedPage extends StatelessWidget {
navigationDots: 3,
navigationDotsIndex: 0,
buttons: [
OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return const PpNewSeedBackupPage();
}));
}),
Padding(
padding: const EdgeInsets.only(bottom: EnvoySpacing.medium2),
child: OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const PpNewSeedBackupPage();
}));
}),
),
],
);
}
Expand Down
21 changes: 14 additions & 7 deletions lib/ui/pages/pp/pp_new_seed_backup.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import 'package:envoy/ui/pages/pp/pp_new_seed_success.dart';
import 'package:envoy/ui/theme/envoy_spacing.dart';
import 'package:flutter/material.dart';
import 'package:envoy/ui/onboard/onboarding_page.dart';
import 'package:envoy/generated/l10n.dart';
Expand All @@ -28,13 +29,19 @@ class PpNewSeedBackupPage extends StatelessWidget {
navigationDots: 3,
navigationDotsIndex: 1,
buttons: [
OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return const PpNewSeedSuccessPage();
}));
}),
Padding(
padding: const EdgeInsets.only(
bottom: EnvoySpacing.medium2,
),
child: OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const PpNewSeedSuccessPage();
}));
}),
),
],
);
}
Expand Down
25 changes: 16 additions & 9 deletions lib/ui/pages/pp/pp_new_seed_success.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import 'package:envoy/ui/pages/import_pp/single_import_pp_intro.dart';
import 'package:envoy/ui/theme/envoy_spacing.dart';
import 'package:flutter/material.dart';
import 'package:envoy/ui/onboard/onboarding_page.dart';
import 'package:envoy/generated/l10n.dart';
Expand All @@ -28,15 +29,21 @@ class PpNewSeedSuccessPage extends StatelessWidget {
navigationDots: 3,
navigationDotsIndex: 2,
buttons: [
OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return const SingleImportPpIntroPage(
isExistingDevice: false,
);
}));
}),
Padding(
padding: const EdgeInsets.only(
bottom: EnvoySpacing.medium2,
),
child: OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const SingleImportPpIntroPage(
isExistingDevice: false,
);
}));
}),
),
],
);
}
Expand Down
21 changes: 14 additions & 7 deletions lib/ui/pages/pp/pp_restore_backup.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import 'package:envoy/ui/pages/pp/pp_restore_backup_password.dart';
import 'package:envoy/ui/theme/envoy_spacing.dart';
import 'package:flutter/material.dart';
import 'package:envoy/ui/onboard/onboarding_page.dart';
import 'package:envoy/generated/l10n.dart';
Expand All @@ -23,13 +24,19 @@ class PpRestoreBackupPage extends StatelessWidget {
navigationDots: 3,
navigationDotsIndex: 0,
buttons: [
OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return const PpRestoreBackupPasswordPage();
}));
}),
Padding(
padding: const EdgeInsets.only(
bottom: EnvoySpacing.medium2,
),
child: OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const PpRestoreBackupPasswordPage();
}));
}),
),
],
);
}
Expand Down
21 changes: 14 additions & 7 deletions lib/ui/pages/pp/pp_restore_backup_password.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import 'package:envoy/ui/pages/pp/pp_restore_backup_success.dart';
import 'package:envoy/ui/theme/envoy_spacing.dart';
import 'package:flutter/material.dart';
import 'package:envoy/ui/onboard/onboarding_page.dart';
import 'package:envoy/generated/l10n.dart';
Expand All @@ -23,13 +24,19 @@ class PpRestoreBackupPasswordPage extends StatelessWidget {
navigationDots: 3,
navigationDotsIndex: 1,
buttons: [
OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return const PpRestoreBackupSuccessPage();
}));
}),
Padding(
padding: const EdgeInsets.only(
bottom: EnvoySpacing.medium2,
),
child: OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const PpRestoreBackupSuccessPage();
}));
}),
),
],
);
}
Expand Down
21 changes: 14 additions & 7 deletions lib/ui/pages/pp/pp_restore_backup_success.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import 'package:envoy/ui/pages/import_pp/single_import_pp_intro.dart';
import 'package:envoy/ui/theme/envoy_spacing.dart';
import 'package:flutter/material.dart';
import 'package:envoy/ui/onboard/onboarding_page.dart';
import 'package:envoy/generated/l10n.dart';
Expand All @@ -28,13 +29,19 @@ class PpRestoreBackupSuccessPage extends StatelessWidget {
navigationDots: 3,
navigationDotsIndex: 2,
buttons: [
OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return const SingleImportPpIntroPage(isExistingDevice: false);
}));
}),
Padding(
padding: const EdgeInsets.only(
bottom: EnvoySpacing.medium2,
),
child: OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const SingleImportPpIntroPage(isExistingDevice: false);
}));
}),
),
],
);
}
Expand Down
21 changes: 14 additions & 7 deletions lib/ui/pages/pp/pp_restore_seed.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import 'package:envoy/ui/pages/pp/pp_restore_seed_backup.dart';
import 'package:envoy/ui/theme/envoy_spacing.dart';
import 'package:flutter/material.dart';
import 'package:envoy/ui/onboard/onboarding_page.dart';
import 'package:envoy/generated/l10n.dart';
Expand All @@ -23,13 +24,19 @@ class PpRestoreSeedPage extends StatelessWidget {
navigationDots: 3,
navigationDotsIndex: 0,
buttons: [
OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return const PpRestoreSeedBackupPage();
}));
}),
Padding(
padding: const EdgeInsets.only(
bottom: EnvoySpacing.medium2,
),
child: OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const PpRestoreSeedBackupPage();
}));
}),
),
],
);
}
Expand Down
21 changes: 14 additions & 7 deletions lib/ui/pages/pp/pp_restore_seed_backup.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later

import 'package:envoy/ui/pages/pp/pp_restore_seed_success.dart';
import 'package:envoy/ui/theme/envoy_spacing.dart';
import 'package:flutter/material.dart';
import 'package:envoy/ui/onboard/onboarding_page.dart';
import 'package:envoy/generated/l10n.dart';
Expand All @@ -28,13 +29,19 @@ class PpRestoreSeedBackupPage extends StatelessWidget {
navigationDots: 3,
navigationDotsIndex: 1,
buttons: [
OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) {
return const PpRestoreSeedSuccessPage();
}));
}),
Padding(
padding: const EdgeInsets.only(
bottom: EnvoySpacing.medium2,
),
child: OnboardingButton(
label: S().component_continue,
onTap: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) {
return const PpRestoreSeedSuccessPage();
}));
}),
),
],
);
}
Expand Down
Loading

0 comments on commit b6d3246

Please sign in to comment.