CAKE-33 | applied new design to welcome page; called restore wallet options page from welcome page; changed title of the restore wallet options page
Oleksandr Sobol committed
Sep 4, 2020 at 19:26 UTC
c5980234cb5582d4884525d70cc33202f15c834d
2 files changed
+18
-20
lib/src/screens/restore/restore_wallet_options_page.dart
+1
-1
@@ -15,7 +15,7 @@ class RestoreWalletOptionsPage extends BasePage {
15
final Function(BuildContext context) onRestoreFromKeys;
16
17
@override
18
- String get title => S.current.restore_seed_keys_restore;
18
+ String get title => S.current.restore_restore_wallet;
19
20
final imageSeed = Image.asset('assets/images/restore_seed.png');
21
final imageKeys = Image.asset('assets/images/restore_keys.png');
lib/src/screens/welcome/welcome_page.dart
+17
-19
@@ -1,12 +1,10 @@
1
+import 'package:cake_wallet/di.dart';
2
+import 'package:cake_wallet/store/settings_store.dart';
3
import 'package:flutter/material.dart';
2
-import 'package:cake_wallet/palette.dart';
4
import 'package:cake_wallet/routes.dart';
5
import 'package:cake_wallet/src/widgets/primary_button.dart';
6
import 'package:cake_wallet/src/screens/base_page.dart';
7
import 'package:cake_wallet/generated/i18n.dart';
7
-import 'package:provider/provider.dart';
8
-import 'package:cake_wallet/themes.dart';
9
-import 'package:cake_wallet/theme_changer.dart';
8
9
class WelcomePage extends BasePage {
10
static const aspectRatioImage = 1.25;
@@ -23,14 +21,13 @@ class WelcomePage extends BasePage {
21
22
@override
23
Widget body(BuildContext context) {
26
- final _themeChanger = Provider.of<ThemeChanger>(context);
27
- final welcomeImage = _themeChanger.getTheme() == Themes.darkTheme
28
- ? welcomeImageDark : welcomeImageLight;
24
+ final welcomeImage = getIt.get<SettingsStore>().isDarkTheme
25
+ ? welcomeImageDark : welcomeImageLight;
26
27
final newWalletImage = Image.asset('assets/images/new_wallet.png',
28
height: 12,
29
width: 12,
33
- color: Palette.oceanBlue);
30
+ color: Theme.of(context).accentTextTheme.headline.decorationColor);
31
final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
32
height: 12,
33
width: 12,
@@ -60,13 +57,14 @@ class WelcomePage extends BasePage {
57
S.of(context).welcome,
58
style: TextStyle(
59
fontSize: 18,
63
- color: Theme.of(context).primaryTextTheme.caption.color,
60
+ fontWeight: FontWeight.w500,
61
+ color: Theme.of(context).accentTextTheme.display3.color,
62
),
63
textAlign: TextAlign.center,
64
),
65
),
66
Padding(
69
- padding: EdgeInsets.only(top: 10),
67
+ padding: EdgeInsets.only(top: 5),
68
child: Text(
69
S.of(context).cake_wallet,
70
style: TextStyle(
@@ -78,13 +76,13 @@ class WelcomePage extends BasePage {
76
),
77
),
78
Padding(
81
- padding: EdgeInsets.only(top: 14),
79
+ padding: EdgeInsets.only(top: 5),
80
child: Text(
81
S.of(context).first_wallet_text,
82
style: TextStyle(
83
fontSize: 16,
86
- fontWeight: FontWeight.w600,
87
- color: Theme.of(context).primaryTextTheme.caption.color,
84
+ fontWeight: FontWeight.w500,
85
+ color: Theme.of(context).accentTextTheme.display3.color,
86
),
87
textAlign: TextAlign.center,
88
),
@@ -97,7 +95,8 @@ class WelcomePage extends BasePage {
95
S.of(context).please_make_selection,
96
style: TextStyle(
97
fontSize: 12,
100
- color: Theme.of(context).primaryTextTheme.caption.color,
98
+ fontWeight: FontWeight.normal,
99
+ color: Theme.of(context).accentTextTheme.display3.color,
100
),
101
textAlign: TextAlign.center,
102
),
@@ -107,18 +106,17 @@ class WelcomePage extends BasePage {
106
onPressed: () => Navigator.pushNamed(context, Routes.newWalletFromWelcome),
107
image: newWalletImage,
108
text: S.of(context).create_new,
110
- color: Colors.white,
111
- textColor: Palette.oceanBlue,
112
- borderColor: Palette.oceanBlue,
109
+ color: Theme.of(context).accentTextTheme.subtitle.decorationColor,
110
+ textColor: Theme.of(context).accentTextTheme.headline.decorationColor,
111
),
112
),
113
Padding(
114
padding: EdgeInsets.only(top: 10),
115
child: PrimaryImageButton(
118
- onPressed: () => Navigator.pushNamed(context, Routes.restoreOptions),
116
+ onPressed: () => Navigator.pushNamed(context, Routes.restoreWalletOptionsFromWelcome),
117
image: restoreWalletImage,
118
text: S.of(context).restore_wallet,
121
- color: Theme.of(context).primaryTextTheme.overline.color,
119
+ color: Theme.of(context).accentTextTheme.caption.color,
120
textColor: Theme.of(context).primaryTextTheme.title.color),
121
)
122
],