From 6639238ca7547b1c74079dca17c7f1244bcc6f2c Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Tue, 15 Dec 2020 21:43:50 +0200 Subject: [PATCH] CAKE-182 | moved themes directory from src to lib --- lib/main.dart | 2 +- lib/src/screens/base_page.dart | 2 +- lib/src/screens/new_wallet/new_wallet_page.dart | 2 +- lib/src/screens/new_wallet/new_wallet_type_page.dart | 2 +- lib/src/screens/seed/pre_seed_page.dart | 2 +- lib/src/screens/seed/wallet_seed_page.dart | 2 +- lib/src/screens/seed_language/seed_language_page.dart | 2 +- lib/src/screens/welcome/welcome_page.dart | 2 +- lib/store/settings_store.dart | 4 ++-- lib/{src => }/themes/bright_theme.dart | 2 +- lib/{src => }/themes/dark_theme.dart | 2 +- lib/{src => }/themes/light_theme.dart | 2 +- lib/{src => }/themes/theme_base.dart | 0 lib/{src => }/themes/theme_list.dart | 8 ++++---- lib/view_model/settings/settings_view_model.dart | 4 ++-- 15 files changed, 19 insertions(+), 19 deletions(-) rename lib/{src => }/themes/bright_theme.dart (99%) rename lib/{src => }/themes/dark_theme.dart (99%) rename lib/{src => }/themes/light_theme.dart (99%) rename lib/{src => }/themes/theme_base.dart (100%) rename lib/{src => }/themes/theme_list.dart (66%) diff --git a/lib/main.dart b/lib/main.dart index fae053798..3c52f4ad1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:cake_wallet/src/themes/theme_base.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:hive/hive.dart'; diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart index 7af4b1a50..77e0e92fe 100644 --- a/lib/src/screens/base_page.dart +++ b/lib/src/screens/base_page.dart @@ -1,4 +1,4 @@ -import 'package:cake_wallet/src/themes/theme_base.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:cake_wallet/palette.dart'; diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart index 638fdf028..e6e1a958d 100644 --- a/lib/src/screens/new_wallet/new_wallet_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_page.dart @@ -1,5 +1,5 @@ import 'package:cake_wallet/routes.dart'; -import 'package:cake_wallet/src/themes/theme_base.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'; diff --git a/lib/src/screens/new_wallet/new_wallet_type_page.dart b/lib/src/screens/new_wallet/new_wallet_type_page.dart index 49ed74a9a..59c803871 100644 --- a/lib/src/screens/new_wallet/new_wallet_type_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart @@ -1,5 +1,5 @@ import 'package:cake_wallet/entities/wallet_type.dart'; -import 'package:cake_wallet/src/themes/theme_base.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'; diff --git a/lib/src/screens/seed/pre_seed_page.dart b/lib/src/screens/seed/pre_seed_page.dart index b04206e8b..0a2bc0161 100644 --- a/lib/src/screens/seed/pre_seed_page.dart +++ b/lib/src/screens/seed/pre_seed_page.dart @@ -1,5 +1,5 @@ import 'package:cake_wallet/routes.dart'; -import 'package:cake_wallet/src/themes/theme_base.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'; diff --git a/lib/src/screens/seed/wallet_seed_page.dart b/lib/src/screens/seed/wallet_seed_page.dart index f783442ae..5bdd07be6 100644 --- a/lib/src/screens/seed/wallet_seed_page.dart +++ b/lib/src/screens/seed/wallet_seed_page.dart @@ -1,5 +1,5 @@ import 'package:cake_wallet/palette.dart'; -import 'package:cake_wallet/src/themes/theme_base.dart'; +import 'package:cake_wallet/themes/theme_base.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'; diff --git a/lib/src/screens/seed_language/seed_language_page.dart b/lib/src/screens/seed_language/seed_language_page.dart index 5cc614e00..541c9b8c1 100644 --- a/lib/src/screens/seed_language/seed_language_page.dart +++ b/lib/src/screens/seed_language/seed_language_page.dart @@ -1,4 +1,4 @@ -import 'package:cake_wallet/src/themes/theme_base.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; import 'package:cake_wallet/src/widgets/seed_language_selector.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/screens/welcome/welcome_page.dart b/lib/src/screens/welcome/welcome_page.dart index 9a12d5b69..35934f64f 100644 --- a/lib/src/screens/welcome/welcome_page.dart +++ b/lib/src/screens/welcome/welcome_page.dart @@ -1,4 +1,4 @@ -import 'package:cake_wallet/src/themes/theme_base.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'; diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart index d8f009273..f6cc7c1fe 100644 --- a/lib/store/settings_store.dart +++ b/lib/store/settings_store.dart @@ -1,6 +1,6 @@ import 'package:cake_wallet/entities/preferences_key.dart'; -import 'package:cake_wallet/src/themes/theme_base.dart'; -import 'package:cake_wallet/src/themes/theme_list.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; +import 'package:cake_wallet/themes/theme_list.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; diff --git a/lib/src/themes/bright_theme.dart b/lib/themes/bright_theme.dart similarity index 99% rename from lib/src/themes/bright_theme.dart rename to lib/themes/bright_theme.dart index 97ffb0b72..39c33f8f1 100644 --- a/lib/src/themes/bright_theme.dart +++ b/lib/themes/bright_theme.dart @@ -1,4 +1,4 @@ -import 'package:cake_wallet/src/themes/theme_base.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/palette.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/themes/dark_theme.dart b/lib/themes/dark_theme.dart similarity index 99% rename from lib/src/themes/dark_theme.dart rename to lib/themes/dark_theme.dart index 409dd699b..09fb5526f 100644 --- a/lib/src/themes/dark_theme.dart +++ b/lib/themes/dark_theme.dart @@ -1,4 +1,4 @@ -import 'package:cake_wallet/src/themes/theme_base.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/palette.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/themes/light_theme.dart b/lib/themes/light_theme.dart similarity index 99% rename from lib/src/themes/light_theme.dart rename to lib/themes/light_theme.dart index ae64d74d8..7d1486a91 100644 --- a/lib/src/themes/light_theme.dart +++ b/lib/themes/light_theme.dart @@ -1,4 +1,4 @@ -import 'package:cake_wallet/src/themes/theme_base.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/palette.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/themes/theme_base.dart b/lib/themes/theme_base.dart similarity index 100% rename from lib/src/themes/theme_base.dart rename to lib/themes/theme_base.dart diff --git a/lib/src/themes/theme_list.dart b/lib/themes/theme_list.dart similarity index 66% rename from lib/src/themes/theme_list.dart rename to lib/themes/theme_list.dart index 2e1aa1fb8..b4cea1391 100644 --- a/lib/src/themes/theme_list.dart +++ b/lib/themes/theme_list.dart @@ -1,7 +1,7 @@ -import 'package:cake_wallet/src/themes/bright_theme.dart'; -import 'package:cake_wallet/src/themes/dark_theme.dart'; -import 'package:cake_wallet/src/themes/light_theme.dart'; -import 'package:cake_wallet/src/themes/theme_base.dart'; +import 'package:cake_wallet/themes/bright_theme.dart'; +import 'package:cake_wallet/themes/dark_theme.dart'; +import 'package:cake_wallet/themes/light_theme.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; class ThemeList { static final all = [lightTheme, brightTheme, darkTheme]; diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart index 472e99767..c416dd096 100644 --- a/lib/view_model/settings/settings_view_model.dart +++ b/lib/view_model/settings/settings_view_model.dart @@ -1,5 +1,5 @@ -import 'package:cake_wallet/src/themes/theme_base.dart'; -import 'package:cake_wallet/src/themes/theme_list.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; +import 'package:cake_wallet/themes/theme_list.dart'; import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:mobx/mobx.dart';