From 968b93a41c3476c90e4a194a2927dbb959470dfa Mon Sep 17 00:00:00 2001 From: julian Date: Fri, 17 Mar 2023 12:56:40 -0600 Subject: [PATCH] chan fixes --- .../coins/{epiccash => epicCash}/kiss.lottie.json | 0 .../coins/{epiccash => epicCash}/plain.lottie.json | 0 lib/main.dart | 5 ++++- lib/utilities/assets.dart | 2 -- lib/widgets/background.dart | 11 +++-------- pubspec.yaml | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) rename assets/lottie/coins/{epiccash => epicCash}/kiss.lottie.json (100%) rename assets/lottie/coins/{epiccash => epicCash}/plain.lottie.json (100%) diff --git a/assets/lottie/coins/epiccash/kiss.lottie.json b/assets/lottie/coins/epicCash/kiss.lottie.json similarity index 100% rename from assets/lottie/coins/epiccash/kiss.lottie.json rename to assets/lottie/coins/epicCash/kiss.lottie.json diff --git a/assets/lottie/coins/epiccash/plain.lottie.json b/assets/lottie/coins/epicCash/plain.lottie.json similarity index 100% rename from assets/lottie/coins/epiccash/plain.lottie.json rename to assets/lottie/coins/epicCash/plain.lottie.json diff --git a/lib/main.dart b/lib/main.dart index 733e6ebaa..d4404c859 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -57,6 +57,7 @@ import 'package:stackwallet/utilities/enums/backup_frequency_type.dart'; import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'; import 'package:stackwallet/utilities/logger.dart'; import 'package:stackwallet/utilities/stack_file_system.dart'; +import 'package:stackwallet/utilities/theme/chan_colors.dart'; import 'package:stackwallet/utilities/theme/color_theme.dart'; import 'package:stackwallet/utilities/theme/dark_colors.dart'; import 'package:stackwallet/utilities/theme/forest_colors.dart'; @@ -353,8 +354,10 @@ class _MaterialAppWithThemeState extends ConsumerState case "forest": colorTheme = ForestColors(); break; - case "light": case "chan": + colorTheme = ChanColors(); + break; + case "light": default: colorTheme = LightColors(); } diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index 84ee87ecb..8a51f5964 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -373,8 +373,6 @@ class _SVG { class _PNG { const _PNG(); - String stack(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/stack.png"; String get splash => "assets/images/splash.png"; String get glasses => "assets/images/glasses.png"; diff --git a/lib/widgets/background.dart b/lib/widgets/background.dart index a0ae868e3..ed74e36ff 100644 --- a/lib/widgets/background.dart +++ b/lib/widgets/background.dart @@ -20,14 +20,6 @@ class Background extends StatelessWidget { bool shouldPad = false; switch (Theme.of(context).extension()!.themeType) { - case ThemeType.light: - case ThemeType.dark: - case ThemeType.oledBlack: - color = Theme.of(context).extension()!.background; - break; - case ThemeType.forest: - color = Theme.of(context).extension()!.background; - break; case ThemeType.oceanBreeze: shouldPad = true; color = null; @@ -35,6 +27,9 @@ class Background extends StatelessWidget { case ThemeType.fruitSorbet: color = null; break; + default: + color = Theme.of(context).extension()!.background; + break; } final bgAsset = Assets.svg.background(context); diff --git a/pubspec.yaml b/pubspec.yaml index dee4057b4..7ea6ee057 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -367,7 +367,7 @@ flutter: - assets/lottie/coins/bitcoin/ - assets/lottie/coins/bitcoincash/ - assets/lottie/coins/dogecoin/ - - assets/lottie/coins/epiccash/ + - assets/lottie/coins/epicCash/ - assets/lottie/coins/ethereum/ - assets/lottie/coins/firo/ - assets/lottie/coins/litecoin/