Merged btc and 4.1.0 branches.

lib/src/screens/base_page.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/palette.dart';
@@ -9,13 +10,13 @@ enum AppBarStyle { regular, withShadow, transparent }
 
 abstract class BasePage extends StatelessWidget {
   BasePage()
-      : _scaffoldKey = GlobalKey<ScaffoldState>(),
-        _closeButtonImage = Image.asset('assets/images/close_button.png'),
-        _closeButtonImageDarkTheme =
-            Image.asset('assets/images/close_button_dark_theme.png');
+      : _scaffoldKey = GlobalKey<ScaffoldState>();
   final GlobalKey<ScaffoldState> _scaffoldKey;
-  final Image _closeButtonImage;
-  final Image _closeButtonImageDarkTheme;
+
+  final Image closeButtonImage =
+    Image.asset('assets/images/close_button.png');
+  final Image closeButtonImageDarkTheme =
+    Image.asset('assets/images/close_button_dark_theme.png');
 
   String get title => null;
 
@@ -37,7 +38,7 @@ abstract class BasePage extends StatelessWidget {
 
   Widget Function(BuildContext, Widget) get rootWrapper => null;
 
-  bool get isDarkTheme => getIt.get<SettingsStore>().isDarkTheme;
+  ThemeBase get currentTheme => getIt.get<SettingsStore>().currentTheme;
 
   void onOpenEndDrawer() => _scaffoldKey.currentState.openEndDrawer();
 
@@ -51,8 +52,8 @@ abstract class BasePage extends StatelessWidget {
     final _backButton = Icon(Icons.arrow_back_ios,
       color: titleColor ?? Theme.of(context).primaryTextTheme.title.color,
       size: 16,);
-    final _closeButton =
-        isDarkTheme ? _closeButtonImageDarkTheme : _closeButtonImage;
+    final _closeButton = currentTheme.type == ThemeType.dark
+        ? closeButtonImageDarkTheme : closeButtonImage;
 
     return SizedBox(
       height: 37,
@@ -88,8 +89,8 @@ abstract class BasePage extends StatelessWidget {
   Widget floatingActionButton(BuildContext context) => null;
 
   ObstructingPreferredSizeWidget appBar(BuildContext context) {
-    final appBarColor =
-        isDarkTheme ? backgroundDarkColor : backgroundLightColor;
+    final appBarColor = currentTheme.type == ThemeType.dark
+        ? backgroundDarkColor : backgroundLightColor;
 
     switch (appBarStyle) {
       case AppBarStyle.regular:
@@ -131,10 +132,12 @@ abstract class BasePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final _backgroundColor = currentTheme.type == ThemeType.dark
+        ? backgroundDarkColor : backgroundLightColor;
+
     final root = Scaffold(
         key: _scaffoldKey,
-        backgroundColor:
-            isDarkTheme ? backgroundDarkColor : backgroundLightColor,
+        backgroundColor: _backgroundColor,
         resizeToAvoidBottomPadding: resizeToAvoidBottomPadding,
         extendBodyBehindAppBar: extendBodyBehindAppBar,
         endDrawer: endDrawer,

lib/src/screens/dashboard/dashboard_page.dart

@@ -1,5 +1,6 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
@@ -20,7 +21,8 @@ class DashboardPage extends BasePage {
   });
 
   @override
-  Color get backgroundLightColor => Colors.transparent;
+  Color get backgroundLightColor => currentTheme.type == ThemeType.bright
+      ? Colors.transparent : Colors.white;
 
   @override
   Color get backgroundDarkColor => Colors.transparent;
@@ -50,7 +52,8 @@ class DashboardPage extends BasePage {
   @override
   Widget trailing(BuildContext context) {
     final menuButton =
-        Image.asset('assets/images/menu.png', color: Colors.white);
+        Image.asset('assets/images/menu.png',
+            color: Theme.of(context).accentTextTheme.display3.backgroundColor);
 
     return Container(
         alignment: Alignment.centerRight,
@@ -65,12 +68,6 @@ class DashboardPage extends BasePage {
 
   final DashboardViewModel walletViewModel;
   final WalletAddressListViewModel addressListViewModel;
-  final sendImage = Image.asset('assets/images/upload.png',
-      height: 22.24, width: 24, color: Colors.white);
-  final exchangeImage = Image.asset('assets/images/transfer.png',
-      height: 24.27, width: 22.25, color: Colors.white);
-  final receiveImage = Image.asset('assets/images/download.png',
-      height: 22.24, width: 24, color: Colors.white);
   final controller = PageController(initialPage: 1);
 
   var pages = <Widget>[];
@@ -78,6 +75,15 @@ class DashboardPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
+    final sendImage = Image.asset('assets/images/upload.png',
+        height: 22.24, width: 24,
+        color: Theme.of(context).accentTextTheme.display3.backgroundColor);
+    final exchangeImage = Image.asset('assets/images/transfer.png',
+        height: 24.27, width: 22.25,
+        color: Theme.of(context).accentTextTheme.display3.backgroundColor);
+    final receiveImage = Image.asset('assets/images/download.png',
+        height: 22.24, width: 24,
+        color: Theme.of(context).accentTextTheme.display3.backgroundColor);
     _setEffects();
 
     return SafeArea(
@@ -100,7 +106,8 @@ class DashboardPage extends BasePage {
                   dotWidth: 6.0,
                   dotHeight: 6.0,
                   dotColor: Theme.of(context).indicatorColor,
-                  activeDotColor: Colors.white),
+                  activeDotColor: Theme.of(context).accentTextTheme.display1
+                      .backgroundColor),
             )),
         Container(
           padding: EdgeInsets.only(left: 45, right: 45, bottom: 24),

lib/src/screens/dashboard/widgets/action_button.dart

@@ -39,7 +39,10 @@ class ActionButton extends StatelessWidget {
           SizedBox(height: 15),
           Text(
             title,
-            style: TextStyle(fontSize: 14, color: Colors.white),
+            style: TextStyle(
+                fontSize: 14,
+                color: Theme.of(context).accentTextTheme.display3
+                    .backgroundColor),
           )
         ],
       ),

lib/src/screens/dashboard/widgets/address_page.dart

@@ -44,12 +44,18 @@ class AddressPage extends StatelessWidget {
                             style: TextStyle(
                                 fontSize: 14,
                                 fontWeight: FontWeight.w500,
-                                color: Colors.white),
+                                color: Theme.of(context)
+                                    .accentTextTheme
+                                    .display3
+                                    .backgroundColor),
                           )),
                   Icon(
                     Icons.arrow_forward_ios,
                     size: 14,
-                    color: Colors.white,
+                    color: Theme.of(context)
+                        .accentTextTheme
+                        .display3
+                        .backgroundColor,
                   )
                 ],
               ),

lib/src/screens/dashboard/widgets/balance_page.dart

@@ -34,7 +34,10 @@ class BalancePage extends StatelessWidget {
                   style: TextStyle(
                       fontSize: 40,
                       fontWeight: FontWeight.bold,
-                      color: Theme.of(context).indicatorColor,
+                      color: Theme.of(context)
+                          .accentTextTheme
+                          .display2
+                          .backgroundColor,
                       height: 1),
                 );
               }),
@@ -44,21 +47,26 @@ class BalancePage extends StatelessWidget {
                   style: TextStyle(
                       fontSize: 12,
                       fontWeight: FontWeight.w600,
-                      color: Theme.of(context).indicatorColor,
+                      color: Theme.of(context)
+                          .accentTextTheme
+                          .display2
+                          .backgroundColor,
                       height: 1),
                 );
               }),
               SizedBox(height: 10),
               Observer(builder: (_) {
                 return AutoSizeText(
-                    dashboardViewModel.balanceViewModel.cryptoBalance,
-                    style: TextStyle(
-                        fontSize: 54,
-                        fontWeight: FontWeight.bold,
-                        color: Colors.white,
-                        height: 1),
-                    maxLines: 1,
-                    textAlign: TextAlign.center);
+                  dashboardViewModel.balanceViewModel.cryptoBalance,
+                  style: TextStyle(
+                      fontSize: 40,
+                      fontWeight: FontWeight.bold,
+                      color: Theme.of(context)
+                          .accentTextTheme
+                          .display3
+                          .backgroundColor,
+                      height: 1),
+                );
               }),
               SizedBox(height: 10),
               Observer(builder: (_) {

lib/src/screens/dashboard/widgets/header_row.dart

@@ -27,14 +27,15 @@ class HeaderRow extends StatelessWidget {
             style: TextStyle(
               fontSize: 20,
               fontWeight: FontWeight.w500,
-              color: Colors.white
+              color: Theme.of(context).accentTextTheme.display3.backgroundColor
             ),
           ),
           GestureDetector(
             onTap: () {
               showPopUp<void>(
                 context: context,
-                builder: (context) => FilterWidget(dashboardViewModel: dashboardViewModel)
+                builder: (context) =>
+                    FilterWidget(dashboardViewModel: dashboardViewModel)
               );
             },
             child: Container(

lib/src/screens/dashboard/widgets/trade_row.dart

@@ -48,14 +48,16 @@ class TradeRow extends StatelessWidget {
                                       style: TextStyle(
                                           fontSize: 16,
                                           fontWeight: FontWeight.w500,
-                                          color: Colors.white
+                                          color: Theme.of(context).accentTextTheme.
+                                          display3.backgroundColor
                                       )),
                                   formattedAmount != null
                                       ? Text(formattedAmount + ' ' + amountCrypto,
                                       style: TextStyle(
                                           fontSize: 16,
                                           fontWeight: FontWeight.w500,
-                                          color: Colors.white
+                                          color: Theme.of(context).accentTextTheme.
+                                          display3.backgroundColor
                                       ))
                                       : Container()
                                 ]),

lib/src/screens/dashboard/widgets/transaction_raw.dart

@@ -60,12 +60,14 @@ class TransactionRow extends StatelessWidget {
                                   style: TextStyle(
                                       fontSize: 16,
                                       fontWeight: FontWeight.w500,
-                                      color: Colors.white)),
+                                      color: Theme.of(context).accentTextTheme.
+                                      display3.backgroundColor)),
                               Text(formattedAmount,
                                   style: TextStyle(
                                       fontSize: 16,
                                       fontWeight: FontWeight.w500,
-                                      color: Colors.white))
+                                      color: Theme.of(context).accentTextTheme.
+                                      display3.backgroundColor))
                             ]),
                         Row(
                             mainAxisAlignment: MainAxisAlignment.spaceBetween,

lib/src/screens/exchange/exchange_page.dart

@@ -95,9 +95,8 @@ class ExchangePage extends BasePage {
     return KeyboardActions(
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: isDarkTheme
-                ? Color.fromRGBO(48, 51, 60, 1.0)
-                : Color.fromRGBO(98, 98, 98, 1.0),
+            keyboardBarColor: Theme.of(context).accentTextTheme.body2
+                .backgroundColor,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(

lib/src/screens/exchange/widgets/exchange_card.dart

@@ -166,8 +166,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                         fontSize: 16,
                         fontWeight: FontWeight.w600,
                         color: Theme.of(context)
-                            .textTheme
-                            .subhead
+                            .accentTextTheme
+                            .display4
                             .decorationColor),
                     validator: _isAmountEditable
                         ? widget.currencyValueValidator
@@ -211,8 +211,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                         fontSize: 10,
                         height: 1.2,
                         color: Theme.of(context)
-                            .textTheme
-                            .subhead
+                            .accentTextTheme
+                            .display4
                             .decorationColor),
                   )
                 : Offstage(),
@@ -224,8 +224,8 @@ class ExchangeCardState extends State<ExchangeCard> {
                         fontSize: 10,
                         height: 1.2,
                         color: Theme.of(context)
-                            .textTheme
-                            .subhead
+                            .accentTextTheme
+                            .display4
                             .decorationColor))
                 : Offstage(),
           ]),
@@ -239,7 +239,10 @@ class ExchangeCardState extends State<ExchangeCard> {
                   fontSize: 14,
                   fontWeight: FontWeight.w500,
                   color:
-                  Theme.of(context).textTheme.subhead.decorationColor),
+                  Theme.of(context)
+                      .accentTextTheme
+                      .display4
+                      .decorationColor),
             ))
             : Offstage(),
         _isAddressEditable
@@ -263,7 +266,10 @@ class ExchangeCardState extends State<ExchangeCard> {
                       fontSize: 16,
                       fontWeight: FontWeight.w600,
                       color:
-                          Theme.of(context).textTheme.subhead.decorationColor),
+                      Theme.of(context)
+                          .accentTextTheme
+                          .display4
+                          .decorationColor),
                   buttonColor: widget.addressButtonsColor,
                   validator: widget.addressTextFieldValidator,
                 ),

lib/src/screens/new_wallet/new_wallet_page.dart

@@ -1,6 +1,5 @@
-import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:mobx/mobx.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -22,17 +21,24 @@ class NewWalletPage extends BasePage {
 
   final WalletNewVM _walletNewVM;
 
+  final walletNameImage = Image.asset('assets/images/wallet_name.png');
+  final walletNameLightImage =
+    Image.asset('assets/images/wallet_name_light.png');
+
   @override
   String get title => S.current.new_wallet;
 
   @override
-  Widget body(BuildContext context) => WalletNameForm(_walletNewVM);
+  Widget body(BuildContext context) => WalletNameForm(_walletNewVM,
+      currentTheme.type == ThemeType.dark
+          ? walletNameImage : walletNameLightImage);
 }
 
 class WalletNameForm extends StatefulWidget {
-  WalletNameForm(this._walletNewVM);
+  WalletNameForm(this._walletNewVM, this.walletImage);
 
   final WalletNewVM _walletNewVM;
+  final Image walletImage;
 
   @override
   _WalletNameFormState createState() => _WalletNameFormState(_walletNewVM);
@@ -43,9 +49,6 @@ class _WalletNameFormState extends State<WalletNameForm> {
 
   static const aspectRatioImage = 1.22;
 
-  final walletNameImage = Image.asset('assets/images/wallet_name.png');
-  final walletNameLightImage =
-      Image.asset('assets/images/wallet_name_light.png');
   final _formKey = GlobalKey<FormState>();
   final _languageSelectorKey = GlobalKey<SeedLanguageSelectorState>();
   ReactionDisposer _stateReaction;
@@ -78,10 +81,6 @@ class _WalletNameFormState extends State<WalletNameForm> {
 
   @override
   Widget build(BuildContext context) {
-    final walletImage = getIt.get<SettingsStore>().isDarkTheme
-        ? walletNameImage
-        : walletNameLightImage;
-
     return Container(
       padding: EdgeInsets.only(top: 24),
       child: ScrollableWithBottomSection(
@@ -92,7 +91,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
               padding: EdgeInsets.only(left: 12, right: 12),
               child: AspectRatio(
                   aspectRatio: aspectRatioImage,
-                  child: FittedBox(child: walletImage, fit: BoxFit.fill)),
+                  child: FittedBox(child: widget.walletImage, fit: BoxFit.fill)),
             ),
             Padding(
               padding: EdgeInsets.only(top: 24),

lib/src/screens/new_wallet/new_wallet_type_page.dart

@@ -6,6 +6,8 @@ import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/view_model/wallet_new_vm.dart';
 import 'package:flushbar/flushbar.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -15,28 +17,36 @@ import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/screens/new_wallet/widgets/select_button.dart';
 
 class NewWalletTypePage extends BasePage {
-  NewWalletTypePage(this.walletNewVM,
-      {this.onTypeSelected, this.isNewWallet});
+  NewWalletTypePage(this.walletNewVM, {this.onTypeSelected, this.isNewWallet});
 
   final void Function(BuildContext, WalletType) onTypeSelected;
   final bool isNewWallet;
   final WalletNewVM walletNewVM;
 
+  final walletTypeImage = Image.asset('assets/images/wallet_type.png');
+  final walletTypeLightImage =
+      Image.asset('assets/images/wallet_type_light.png');
+
   @override
   String get title =>
       isNewWallet ? S.current.new_wallet : S.current.wallet_list_restore_wallet;
 
   @override
-  Widget body(BuildContext context) =>
-      WalletTypeForm(walletNewVM, isNewWallet, onTypeSelected: onTypeSelected);
+  Widget body(BuildContext context) => WalletTypeForm(walletNewVM, isNewWallet,
+      onTypeSelected: onTypeSelected,
+      walletImage: currentTheme.type == ThemeType.dark
+          ? walletTypeImage
+          : walletTypeLightImage);
 }
 
 class WalletTypeForm extends StatefulWidget {
-  WalletTypeForm(this.walletNewVM, this.isNewWallet, {this.onTypeSelected});
+  WalletTypeForm(this.walletNewVM, this.isNewWallet,
+      {this.onTypeSelected, this.walletImage});
 
   final void Function(BuildContext, WalletType) onTypeSelected;
   final WalletNewVM walletNewVM;
   final bool isNewWallet;
+  final Image walletImage;
 
   @override
   WalletTypeFormState createState() => WalletTypeFormState();
@@ -65,10 +75,6 @@ class WalletTypeFormState extends State<WalletTypeForm> {
 
   @override
   Widget build(BuildContext context) {
-    final walletImage = getIt.get<SettingsStore>().isDarkTheme
-        ? walletTypeImage
-        : walletTypeLightImage;
-
     return Container(
       padding: EdgeInsets.only(top: 24, bottom: 24),
       child: ScrollableWithBottomSection(
@@ -80,7 +86,8 @@ class WalletTypeFormState extends State<WalletTypeForm> {
               padding: EdgeInsets.only(left: 12, right: 12),
               child: AspectRatio(
                   aspectRatio: aspectRatioImage,
-                  child: FittedBox(child: walletImage, fit: BoxFit.fill)),
+                  child:
+                      FittedBox(child: widget.walletImage, fit: BoxFit.fill)),
             ),
             Padding(
               padding: EdgeInsets.only(top: 48),
@@ -107,10 +114,7 @@ class WalletTypeFormState extends State<WalletTypeForm> {
         bottomSection: PrimaryButton(
           onPressed: () => onTypeSelected(),
           text: S.of(context).seed_language_next,
-          color: Theme.of(context)
-              .accentTextTheme
-              .subtitle
-              .decorationColor,
+          color: Theme.of(context).accentTextTheme.body2.color,
           textColor: Colors.white,
           isDisabled: selected == null,
         ),
@@ -132,9 +136,9 @@ class WalletTypeFormState extends State<WalletTypeForm> {
   Future<void> onTypeSelected() async {
     if (!widget.isNewWallet) {
       widget.onTypeSelected(context, selected);
-      return;  
+      return;
     }
-    
+
     try {
       _changeProcessText(S.of(context).creating_new_wallet);
       widget.walletNewVM.type = selected;

lib/src/screens/receive/receive_page.dart

@@ -1,4 +1,5 @@
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
@@ -27,16 +28,47 @@ class ReceivePage extends BasePage {
   String get title => S.current.receive;
 
   @override
-  Color get backgroundLightColor => Colors.transparent;
+  Color get backgroundLightColor => currentTheme.type == ThemeType.bright
+      ? Colors.transparent : Colors.white;
 
   @override
   Color get backgroundDarkColor => Colors.transparent;
 
-  @override
-  Color get titleColor => Colors.white;
-
   final FocusNode _cryptoAmountFocus;
 
+  @override
+  Widget leading(BuildContext context) {
+    final _backButton = Icon(Icons.arrow_back_ios,
+      color: Theme.of(context).accentTextTheme.display3.backgroundColor,
+      size: 16,);
+
+    return SizedBox(
+      height: 37,
+      width: 37,
+      child: ButtonTheme(
+        minWidth: double.minPositive,
+        child: FlatButton(
+            highlightColor: Colors.transparent,
+            splashColor: Colors.transparent,
+            padding: EdgeInsets.all(0),
+            onPressed: () => onClose(context),
+            child: _backButton),
+      ),
+    );
+  }
+
+  @override
+  Widget middle(BuildContext context) {
+    return Text(
+      title,
+      style: TextStyle(
+          fontSize: 18.0,
+          fontWeight: FontWeight.bold,
+          fontFamily: 'Lato',
+          color: Theme.of(context).accentTextTheme.display3.backgroundColor),
+    );
+  }
+
   @override
   Widget Function(BuildContext, Widget) get rootWrapper =>
       (BuildContext context, Widget scaffold) => Container(
@@ -51,7 +83,8 @@ class ReceivePage extends BasePage {
   @override
   Widget trailing(BuildContext context) {
     final shareImage =
-        Image.asset('assets/images/share.png', color: Colors.white);
+        Image.asset('assets/images/share.png',
+            color: Theme.of(context).accentTextTheme.display3.backgroundColor);
 
     return SizedBox(
       height: 20.0,
@@ -74,9 +107,8 @@ class ReceivePage extends BasePage {
     return KeyboardActions(
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: isDarkTheme
-                ? Color.fromRGBO(48, 51, 60, 1.0)
-                : Color.fromRGBO(98, 98, 98, 1.0),
+            keyboardBarColor: Theme.of(context).accentTextTheme.body2
+                .backgroundColor,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(

lib/src/screens/receive/widgets/qr_widget.dart

@@ -47,8 +47,8 @@ class QRWidget extends StatelessWidget {
                           child: QrImage(
                             data: addressListViewModel.uri.toString(),
                             backgroundColor: Colors.transparent,
-                            foregroundColor: Colors.white,
-                            //Theme.of(context).textTheme.headline.color,
+                            foregroundColor: Theme.of(context).accentTextTheme.
+                            display3.backgroundColor,
                           ))))),
           Spacer(flex: 3)
         ]),
@@ -67,11 +67,12 @@ class QRWidget extends StatelessWidget {
                                     decimal: true),
                                 inputFormatters: [
                                   BlacklistingTextInputFormatter(
-                                      RegExp('[\\-|\\ |\\,]'))
+                                      RegExp('[\\-|\\ ]'))
                                 ],
                                 textAlign: TextAlign.center,
                                 hintText: S.of(context).receive_amount,
-                                textColor: Colors.white,
+                                textColor: Theme.of(context).accentTextTheme.
+                                display3.backgroundColor,
                                 borderColor: Theme.of(context)
                                     .textTheme
                                     .headline
@@ -110,7 +111,8 @@ class QRWidget extends StatelessWidget {
                                 style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.w500,
-                                    color: Colors.white),
+                                    color: Theme.of(context).accentTextTheme.
+                                    display3.backgroundColor),
                               ),
                             ),
                             Padding(

lib/src/screens/seed/pre_seed_page.dart

@@ -1,6 +1,5 @@
-import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -8,8 +7,8 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 
 class PreSeedPage extends BasePage {
-  static final imageLight = Image.asset('assets/images/pre_seed_light.png');
-  static final imageDark = Image.asset('assets/images/pre_seed_dark.png');
+  final imageLight = Image.asset('assets/images/pre_seed_light.png');
+  final imageDark = Image.asset('assets/images/pre_seed_dark.png');
 
   @override
   Widget leading(BuildContext context) => null;
@@ -19,8 +18,7 @@ class PreSeedPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    final image =
-        getIt.get<SettingsStore>().isDarkTheme ? imageDark : imageLight;
+    final image = currentTheme.type == ThemeType.dark ? imageDark : imageLight;
 
     return WillPopScope(
         onWillPop: () async => false,

lib/src/screens/seed/wallet_seed_page.dart

@@ -1,7 +1,6 @@
-import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
-import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/cupertino.dart';
@@ -17,8 +16,8 @@ import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
 class WalletSeedPage extends BasePage {
   WalletSeedPage(this.walletSeedViewModel, {@required this.isNewWalletCreated});
 
-  static final imageLight = Image.asset('assets/images/crypto_lock_light.png');
-  static final imageDark = Image.asset('assets/images/crypto_lock.png');
+  final imageLight = Image.asset('assets/images/crypto_lock_light.png');
+  final imageDark = Image.asset('assets/images/crypto_lock.png');
 
   @override
   String get title => S.current.seed_title;
@@ -83,8 +82,7 @@ class WalletSeedPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    final image =
-        getIt.get<SettingsStore>().isDarkTheme ? imageDark : imageLight;
+    final image = currentTheme.type == ThemeType.dark ? imageDark : imageLight;
 
     return WillPopScope(onWillPop: () async => false, child:  Container(
         padding: EdgeInsets.all(24),

lib/src/screens/seed_language/seed_language_page.dart

@@ -1,6 +1,5 @@
-import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/src/widgets/seed_language_selector.dart';
-import 'package:cake_wallet/store/settings_store.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
@@ -15,17 +14,26 @@ class SeedLanguage extends BasePage {
 
   final Function(BuildContext, String) onConfirm;
 
+  final walletNameImage = Image.asset('assets/images/wallet_name.png');
+  final walletNameLightImage =
+  Image.asset('assets/images/wallet_name_light.png');
+
   @override
   String get title => S.current.wallet_list_restore_wallet;
 
   @override
-  Widget body(BuildContext context) => SeedLanguageForm(onConfirm: onConfirm);
+  Widget body(BuildContext context) =>
+      SeedLanguageForm(
+          onConfirm: onConfirm,
+          walletImage: currentTheme.type == ThemeType.dark
+              ? walletNameImage : walletNameLightImage);
 }
 
 class SeedLanguageForm extends StatefulWidget {
-  SeedLanguageForm({this.onConfirm});
+  SeedLanguageForm({this.onConfirm, this.walletImage});
 
   final Function(BuildContext, String) onConfirm;
+  final Image walletImage;
 
   @override
   SeedLanguageFormState createState() => SeedLanguageFormState();
@@ -33,18 +41,10 @@ class SeedLanguageForm extends StatefulWidget {
 
 class SeedLanguageFormState extends State<SeedLanguageForm> {
   static const aspectRatioImage = 1.22;
-
-  final walletNameImage = Image.asset('assets/images/wallet_name.png');
-  final walletNameLightImage =
-      Image.asset('assets/images/wallet_name_light.png');
   final _languageSelectorKey = GlobalKey<SeedLanguageSelectorState>();
 
   @override
   Widget build(BuildContext context) {
-    final walletImage = getIt.get<SettingsStore>().isDarkTheme
-        ? walletNameImage
-        : walletNameLightImage;
-
     return Container(
       padding: EdgeInsets.only(top: 24),
       child: ScrollableWithBottomSection(
@@ -55,7 +55,8 @@ class SeedLanguageFormState extends State<SeedLanguageForm> {
               padding: EdgeInsets.only(left: 12, right: 12),
               child: AspectRatio(
                   aspectRatio: aspectRatioImage,
-                  child: FittedBox(child: walletImage, fit: BoxFit.fill)),
+                  child: FittedBox(child: widget.walletImage,
+                      fit: BoxFit.fill)),
             ),
             Padding(
               padding: EdgeInsets.only(top: 40),

lib/src/screens/send/send_page.dart

@@ -83,9 +83,8 @@ class SendPage extends BasePage {
     return KeyboardActions(
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: isDarkTheme
-                ? Color.fromRGBO(48, 51, 60, 1.0)
-                : Color.fromRGBO(98, 98, 98, 1.0),
+            keyboardBarColor: Theme.of(context).accentTextTheme.body2
+                .backgroundColor,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(
@@ -498,14 +497,8 @@ class SendPage extends BasePage {
                       }
                     },
                     text: S.of(context).send,
-                    color: Theme.of(context)
-                        .accentTextTheme
-                        .subtitle
-                        .decorationColor,
-                    textColor: Theme.of(context)
-                        .accentTextTheme
-                        .headline
-                        .decorationColor,
+                    color: Theme.of(context).accentTextTheme.body2.color,
+                    textColor: Colors.white,
                     isLoading: sendViewModel.state is IsExecutingState ||
                         sendViewModel.state is TransactionCommitting,
                     isDisabled:

lib/src/screens/send/send_template_page.dart

@@ -49,9 +49,8 @@ class SendTemplatePage extends BasePage {
     return KeyboardActions(
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: isDarkTheme
-                ? Color.fromRGBO(48, 51, 60, 1.0)
-                : Color.fromRGBO(98, 98, 98, 1.0),
+            keyboardBarColor: Theme.of(context).accentTextTheme.body2
+                .backgroundColor,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(
@@ -247,9 +246,8 @@ class SendTemplatePage extends BasePage {
                 }
               },
               text: S.of(context).save,
-              color: Theme.of(context).accentTextTheme.subtitle.decorationColor,
-              textColor:
-                  Theme.of(context).accentTextTheme.headline.decorationColor,
+              color: Colors.green,
+              textColor: Colors.white,
             ),
           ),
         ));

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -1,5 +1,4 @@
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
-import 'package:cake_wallet/src/screens/wallet_list/widgets/wallet_menu_alert.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -15,7 +14,6 @@ import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
-import 'package:cake_wallet/src/screens/wallet_list/wallet_menu.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 
 class WalletListPage extends BasePage {
@@ -51,7 +49,7 @@ class WalletListBodyState extends State<WalletListBody> {
     final newWalletImage = Image.asset('assets/images/new_wallet.png',
         height: 12,
         width: 12,
-        color: Theme.of(context).accentTextTheme.headline.decorationColor);
+        color: Colors.white);
     final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
         height: 12,
         width: 12,
@@ -168,9 +166,8 @@ class WalletListBodyState extends State<WalletListBody> {
               onPressed: () => Navigator.of(context).pushNamed(Routes.newWalletType),
               image: newWalletImage,
               text: S.of(context).wallet_list_create_new_wallet,
-              color: Theme.of(context).accentTextTheme.subtitle.decorationColor,
-              textColor:
-                  Theme.of(context).accentTextTheme.headline.decorationColor,
+              color: Theme.of(context).accentTextTheme.body2.color,
+              textColor: Colors.white,
             ),
             SizedBox(height: 10.0),
             PrimaryImageButton(

lib/src/screens/welcome/welcome_page.dart

@@ -1,5 +1,4 @@
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
@@ -23,9 +22,7 @@ class WelcomePage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    final welcomeImage = getIt
-        .get<SettingsStore>()
-        .isDarkTheme
+    final welcomeImage = currentTheme.type == ThemeType.dark
         ? welcomeImageDark : welcomeImageLight;
 
     final newWalletImage = Image.asset('assets/images/new_wallet.png',

lib/src/widgets/alert_with_one_action.dart

@@ -31,7 +31,7 @@ class AlertWithOneAction extends BaseAlertDialog {
       width: 300,
       height: 52,
       padding: EdgeInsets.only(left: 12, right: 12),
-      color: Theme.of(context).accentTextTheme.body2.color,
+      color: Theme.of(context).accentTextTheme.body1.backgroundColor,
       child: ButtonTheme(
         minWidth: double.infinity,
         child: FlatButton(
@@ -44,7 +44,8 @@ class AlertWithOneAction extends BaseAlertDialog {
               style: TextStyle(
                 fontSize: 15,
                 fontWeight: FontWeight.w600,
-                color: Colors.white,
+                color: Theme.of(context).primaryTextTheme.body1
+                    .backgroundColor,
                 decoration: TextDecoration.none,
               ),
             )),

lib/src/widgets/base_alert_dialog.dart

@@ -61,18 +61,24 @@ class BaseAlertDialog extends StatelessWidget {
                         fontSize: 15,
                         fontFamily: 'Lato',
                         fontWeight: FontWeight.w600,
-                        color: Colors.white,
+                        color: Theme.of(context).primaryTextTheme.body2
+                            .backgroundColor,
                         decoration: TextDecoration.none,
                       ),
                     )),
               ),
             )
         ),
+        Container(
+          width: 1,
+          height: 52,
+          color: Theme.of(context).dividerColor,
+        ),
         Flexible(
             child: Container(
               height: 52,
               padding: EdgeInsets.only(left: 6, right: 6),
-              color: Theme.of(context).accentTextTheme.body2.color,
+              color: Theme.of(context).accentTextTheme.body1.backgroundColor,
               child: ButtonTheme(
                 minWidth: double.infinity,
                 child: FlatButton(
@@ -86,7 +92,8 @@ class BaseAlertDialog extends StatelessWidget {
                         fontSize: 15,
                         fontFamily: 'Lato',
                         fontWeight: FontWeight.w600,
-                        color: Colors.white,
+                        color: Theme.of(context).primaryTextTheme.body1
+                            .backgroundColor,
                         decoration: TextDecoration.none,
                       ),
                     )),
@@ -133,6 +140,10 @@ class BaseAlertDialog extends StatelessWidget {
                             ],
                           ),
                         ),
+                        Container(
+                          height: 1,
+                          color: Theme.of(context).dividerColor,
+                        ),
                         actionButtons(context)
                       ],
                     ),

lib/src/widgets/trail_button.dart

@@ -21,7 +21,10 @@ class TrailButton extends StatelessWidget {
         child: Text(
           caption,
           style: TextStyle(
-            color: Theme.of(context).textTheme.subhead.decorationColor,
+            color: Theme.of(context)
+                .accentTextTheme
+                .display4
+                .decorationColor,
             fontWeight: FontWeight.w500,
             fontSize: 14),
         ),