Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-22 11:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Issues with imaging (#1723)

Browse source
This commit is contained in:
David Adegoke 2024-10-04 17:39:29 +01:00 committed by GitHub
parent 3348213e39
commit fc14bf4e2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/src/screens/new_wallet/wallet_group_description_page.dart
View file

@ -7,7 +7,6 @@ import 'package:cake_wallet/themes/theme_base.dart';
import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:flutter_svg/svg.dart';
class WalletGroupDescriptionPage extends BasePage { class WalletGroupDescriptionPage extends BasePage {
WalletGroupDescriptionPage({required this.selectedWalletType}); WalletGroupDescriptionPage({required this.selectedWalletType});
@ -21,12 +20,6 @@ class WalletGroupDescriptionPage extends BasePage {
@override @override
Widget body(BuildContext context) { Widget body(BuildContext context) {
final lightImage = 'assets/images/wallet_group_light.png';
final darkImage = 'assets/images/wallet_group_dark.png';
final brightImage = 'assets/images/wallet_group_bright.png';
final image = currentTheme.type == ThemeType.light ? lightImage : darkImage;
return Container( return Container(
alignment: Alignment.center, alignment: Alignment.center,
padding: EdgeInsets.all(24), padding: EdgeInsets.all(24),

41
lib/src/screens/new_wallet/wallet_group_display_page.dart
View file

@ -4,11 +4,11 @@ import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart'; import 'package:cake_wallet/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart';
import 'package:cake_wallet/src/widgets/primary_button.dart'; import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/themes/theme_base.dart';
import 'package:cake_wallet/view_model/wallet_groups_display_view_model.dart'; import 'package:cake_wallet/view_model/wallet_groups_display_view_model.dart';
import 'package:cw_core/wallet_type.dart'; import 'package:cw_core/wallet_type.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter_mobx/flutter_mobx.dart';
import '../../../themes/extensions/cake_text_theme.dart'; import '../../../themes/extensions/cake_text_theme.dart';
class WalletGroupsDisplayPage extends BasePage { class WalletGroupsDisplayPage extends BasePage {
@ -16,22 +16,24 @@ class WalletGroupsDisplayPage extends BasePage {
final WalletGroupsDisplayViewModel walletGroupsDisplayViewModel; final WalletGroupsDisplayViewModel walletGroupsDisplayViewModel;
final walletTypeImage = Image.asset('assets/images/wallet_type.png');
final walletTypeLightImage = Image.asset('assets/images/wallet_type_light.png');
@override @override
String get title => S.current.wallet_group; String get title => S.current.wallet_group;
@override @override
Widget body(BuildContext context) => WalletGroupsDisplayBody( Widget body(BuildContext context) => WalletGroupsDisplayBody(
walletGroupsDisplayViewModel: walletGroupsDisplayViewModel, walletGroupsDisplayViewModel: walletGroupsDisplayViewModel,
currentTheme: currentTheme,
); );
} }
class WalletGroupsDisplayBody extends StatelessWidget { class WalletGroupsDisplayBody extends StatelessWidget {
WalletGroupsDisplayBody({required this.walletGroupsDisplayViewModel}); WalletGroupsDisplayBody({
required this.walletGroupsDisplayViewModel,
required this.currentTheme,
});
final WalletGroupsDisplayViewModel walletGroupsDisplayViewModel; final WalletGroupsDisplayViewModel walletGroupsDisplayViewModel;
final ThemeBase currentTheme;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -47,7 +49,9 @@ class WalletGroupsDisplayBody extends StatelessWidget {
return Column( return Column(
children: [ children: [
if (walletGroupsDisplayViewModel.hasNoFilteredWallet) ...{ if (walletGroupsDisplayViewModel.hasNoFilteredWallet) ...{
WalletGroupEmptyStateWidget(), WalletGroupEmptyStateWidget(
currentTheme: currentTheme,
),
}, },
...walletGroupsDisplayViewModel.multiWalletGroups.map( ...walletGroupsDisplayViewModel.multiWalletGroups.map(
(walletGroup) { (walletGroup) {
@ -153,17 +157,17 @@ class WalletGroupsDisplayBody extends StatelessWidget {
} }
class WalletGroupEmptyStateWidget extends StatelessWidget { class WalletGroupEmptyStateWidget extends StatelessWidget {
const WalletGroupEmptyStateWidget({ const WalletGroupEmptyStateWidget({required this.currentTheme, super.key});
super.key,
}); final ThemeBase currentTheme;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Column(
children: [ children: [
Image.asset( Image.asset(
'assets/images/wallet_group.png', _getThemedWalletGroupImage(currentTheme.type),
scale: 0.8, scale: 1.8,
), ),
SizedBox(height: 32), SizedBox(height: 32),
Text.rich( Text.rich(
@ -190,4 +194,19 @@ class WalletGroupEmptyStateWidget extends StatelessWidget {
], ],
); );
} }
String _getThemedWalletGroupImage(ThemeType theme) {
final lightImage = 'assets/images/wallet_group_light.png';
final darkImage = 'assets/images/wallet_group_dark.png';
final brightImage = 'assets/images/wallet_group_bright.png';
switch (theme) {
case ThemeType.bright:
return brightImage;
case ThemeType.light:
return lightImage;
default:
return darkImage;
}
}
} }