fix: Issues with imaging (#1723)
David Adegoke committed
Oct 4, 2024 at 17:39 UTC
fc14bf4e2b9f1f0906328481d7810e5e0a642b5a
2 files changed
+30
-18
lib/src/screens/new_wallet/wallet_group_description_page.dart
-7
@@ -7,7 +7,6 @@ import 'package:cake_wallet/themes/theme_base.dart';
7
import 'package:cake_wallet/generated/i18n.dart';
8
import 'package:cake_wallet/routes.dart';
9
import 'package:cake_wallet/src/screens/base_page.dart';
10
-import 'package:flutter_svg/svg.dart';
10
11
class WalletGroupDescriptionPage extends BasePage {
12
WalletGroupDescriptionPage({required this.selectedWalletType});
@@ -21,12 +20,6 @@ class WalletGroupDescriptionPage extends BasePage {
20
@override
21
Widget body(BuildContext context) {
22
24
- final lightImage = 'assets/images/wallet_group_light.png';
25
- final darkImage = 'assets/images/wallet_group_dark.png';
26
- final brightImage = 'assets/images/wallet_group_bright.png';
27
-
28
- final image = currentTheme.type == ThemeType.light ? lightImage : darkImage;
29
-
23
return Container(
24
alignment: Alignment.center,
25
padding: EdgeInsets.all(24),
lib/src/screens/new_wallet/wallet_group_display_page.dart
+30
-11
@@ -4,11 +4,11 @@ import 'package:cake_wallet/routes.dart';
4
import 'package:cake_wallet/src/screens/base_page.dart';
5
import 'package:cake_wallet/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart';
6
import 'package:cake_wallet/src/widgets/primary_button.dart';
7
+import 'package:cake_wallet/themes/theme_base.dart';
8
import 'package:cake_wallet/view_model/wallet_groups_display_view_model.dart';
9
import 'package:cw_core/wallet_type.dart';
10
import 'package:flutter/material.dart';
11
import 'package:flutter_mobx/flutter_mobx.dart';
11
-
12
import '../../../themes/extensions/cake_text_theme.dart';
13
14
class WalletGroupsDisplayPage extends BasePage {
@@ -16,22 +16,24 @@ class WalletGroupsDisplayPage extends BasePage {
16
17
final WalletGroupsDisplayViewModel walletGroupsDisplayViewModel;
18
19
- final walletTypeImage = Image.asset('assets/images/wallet_type.png');
20
- final walletTypeLightImage = Image.asset('assets/images/wallet_type_light.png');
21
-
19
@override
20
String get title => S.current.wallet_group;
21
22
@override
23
Widget body(BuildContext context) => WalletGroupsDisplayBody(
24
walletGroupsDisplayViewModel: walletGroupsDisplayViewModel,
25
+ currentTheme: currentTheme,
26
);
27
}
28
29
class WalletGroupsDisplayBody extends StatelessWidget {
32
- WalletGroupsDisplayBody({required this.walletGroupsDisplayViewModel});
30
+ WalletGroupsDisplayBody({
31
+ required this.walletGroupsDisplayViewModel,
32
+ required this.currentTheme,
33
+ });
34
35
final WalletGroupsDisplayViewModel walletGroupsDisplayViewModel;
36
+ final ThemeBase currentTheme;
37
38
@override
39
Widget build(BuildContext context) {
@@ -47,7 +49,9 @@ class WalletGroupsDisplayBody extends StatelessWidget {
49
return Column(
50
children: [
51
if (walletGroupsDisplayViewModel.hasNoFilteredWallet) ...{
50
- WalletGroupEmptyStateWidget(),
52
+ WalletGroupEmptyStateWidget(
53
+ currentTheme: currentTheme,
54
+ ),
55
},
56
...walletGroupsDisplayViewModel.multiWalletGroups.map(
57
(walletGroup) {
@@ -153,17 +157,17 @@ class WalletGroupsDisplayBody extends StatelessWidget {
157
}
158
159
class WalletGroupEmptyStateWidget extends StatelessWidget {
156
- const WalletGroupEmptyStateWidget({
157
- super.key,
158
- });
160
+ const WalletGroupEmptyStateWidget({required this.currentTheme, super.key});
161
+
162
+ final ThemeBase currentTheme;
163
164
@override
165
Widget build(BuildContext context) {
166
return Column(
167
children: [
168
Image.asset(
165
- 'assets/images/wallet_group.png',
166
- scale: 0.8,
169
+ _getThemedWalletGroupImage(currentTheme.type),
170
+ scale: 1.8,
171
),
172
SizedBox(height: 32),
173
Text.rich(
@@ -190,4 +194,19 @@ class WalletGroupEmptyStateWidget extends StatelessWidget {
194
],
195
);
196
}
197
+
198
+ String _getThemedWalletGroupImage(ThemeType theme) {
199
+ final lightImage = 'assets/images/wallet_group_light.png';
200
+ final darkImage = 'assets/images/wallet_group_dark.png';
201
+ final brightImage = 'assets/images/wallet_group_bright.png';
202
+
203
+ switch (theme) {
204
+ case ThemeType.bright:
205
+ return brightImage;
206
+ case ThemeType.light:
207
+ return lightImage;
208
+ default:
209
+ return darkImage;
210
+ }
211
+ }
212
}