mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2024-12-23 12:09:43 +00:00
- Remove old wallet menu widgets
- Remove Rescan option from Electrum wallets
This commit is contained in:
OmarHatem
parent
c45a988481
commit
d4e720f5c0
3 changed files with 7 additions and 247 deletions
|
|
@ -2,6 +2,7 @@ import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arro
|
||||||
import 'package:cake_wallet/utils/show_pop_up.dart';
|
import 'package:cake_wallet/utils/show_pop_up.dart';
|
||||||
import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
|
import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
|
||||||
import 'package:cw_core/node.dart';
|
import 'package:cw_core/node.dart';
|
||||||
|
import 'package:cw_core/wallet_type.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter_mobx/flutter_mobx.dart';
|
import 'package:flutter_mobx/flutter_mobx.dart';
|
||||||
|
|
@ -35,6 +36,8 @@ class ConnectionSyncPage extends BasePage {
|
||||||
handler: (context) => _presentReconnectAlert(context),
|
handler: (context) => _presentReconnectAlert(context),
|
||||||
),
|
),
|
||||||
StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
|
StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
|
||||||
|
if (dashboardViewModel.type != WalletType.bitcoin &&
|
||||||
|
dashboardViewModel.type != WalletType.litecoin)
|
||||||
SettingsCellWithArrow(
|
SettingsCellWithArrow(
|
||||||
title: S.current.rescan,
|
title: S.current.rescan,
|
||||||
handler: (context) => Navigator.of(context).pushNamed(Routes.rescan),
|
handler: (context) => Navigator.of(context).pushNamed(Routes.rescan),
|
||||||
|
|
|
||||||
|
|
@ -1,131 +0,0 @@
|
||||||
import 'package:cake_wallet/src/screens/wallet_list/wallet_menu_item.dart';
|
|
||||||
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
|
|
||||||
import 'package:cake_wallet/utils/show_pop_up.dart';
|
|
||||||
import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:cake_wallet/routes.dart';
|
|
||||||
import 'package:cake_wallet/generated/i18n.dart';
|
|
||||||
import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
|
|
||||||
import 'package:cake_wallet/src/screens/auth/auth_page.dart';
|
|
||||||
import 'package:cake_wallet/palette.dart';
|
|
||||||
|
|
||||||
class WalletMenu {
|
|
||||||
WalletMenu(this.context, this.walletListViewModel);
|
|
||||||
|
|
||||||
final WalletListViewModel walletListViewModel;
|
|
||||||
final BuildContext context;
|
|
||||||
|
|
||||||
final List<WalletMenuItem> menuItems = [
|
|
||||||
WalletMenuItem(
|
|
||||||
title: S.current.wallet_list_load_wallet,
|
|
||||||
firstGradientColor: Palette.cornflower,
|
|
||||||
secondGradientColor: Palette.royalBlue,
|
|
||||||
image: Image.asset('assets/images/load.png',
|
|
||||||
height: 24, width: 24, color: Colors.white)),
|
|
||||||
WalletMenuItem(
|
|
||||||
title: S.current.show_seed,
|
|
||||||
firstGradientColor: Palette.moderateOrangeYellow,
|
|
||||||
secondGradientColor: Palette.moderateOrange,
|
|
||||||
image: Image.asset('assets/images/eye_action.png',
|
|
||||||
height: 24, width: 24, color: Colors.white)),
|
|
||||||
WalletMenuItem(
|
|
||||||
title: S.current.remove,
|
|
||||||
firstGradientColor: Palette.lightRed,
|
|
||||||
secondGradientColor: Palette.persianRed,
|
|
||||||
image: Image.asset('assets/images/trash.png',
|
|
||||||
height: 24, width: 24, color: Colors.white)),
|
|
||||||
WalletMenuItem(
|
|
||||||
title: S.current.rescan,
|
|
||||||
firstGradientColor: Palette.shineGreen,
|
|
||||||
secondGradientColor: Palette.moderateGreen,
|
|
||||||
image: Image.asset('assets/images/scanner.png',
|
|
||||||
height: 24, width: 24, color: Colors.white))
|
|
||||||
];
|
|
||||||
|
|
||||||
List<WalletMenuItem> generateItemsForWalletMenu(bool isCurrentWallet) {
|
|
||||||
final items = <WalletMenuItem>[];
|
|
||||||
|
|
||||||
if (!isCurrentWallet) items.add(menuItems[0]);
|
|
||||||
if (isCurrentWallet) items.add(menuItems[1]);
|
|
||||||
if (!isCurrentWallet) items.add(menuItems[2]);
|
|
||||||
if (isCurrentWallet) items.add(menuItems[3]);
|
|
||||||
|
|
||||||
return items;
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> action(
|
|
||||||
int index, WalletListItem wallet) async {
|
|
||||||
switch (index) {
|
|
||||||
case 0:
|
|
||||||
await Navigator.of(context).pushNamed(Routes.auth, arguments:
|
|
||||||
(bool isAuthenticatedSuccessfully, AuthPageState auth) async {
|
|
||||||
if (!isAuthenticatedSuccessfully) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
auth.changeProcessText(
|
|
||||||
S.of(context).wallet_list_loading_wallet(wallet.name));
|
|
||||||
await walletListViewModel.loadWallet(wallet);
|
|
||||||
auth.close();
|
|
||||||
Navigator.of(context).pop();
|
|
||||||
} catch (e) {
|
|
||||||
auth.changeProcessText(S
|
|
||||||
.of(context)
|
|
||||||
.wallet_list_failed_to_load(wallet.name, e.toString()));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
await Navigator.of(context).pushNamed(Routes.auth, arguments:
|
|
||||||
(bool isAuthenticatedSuccessfully, AuthPageState auth) async {
|
|
||||||
if (!isAuthenticatedSuccessfully) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auth.close();
|
|
||||||
await Navigator.of(context).pushNamed(Routes.seed, arguments: false);
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
final isComfirmed = await showPopUp<bool>(
|
|
||||||
context: context,
|
|
||||||
builder: (BuildContext context) {
|
|
||||||
return AlertWithTwoActions(
|
|
||||||
alertTitle: 'Remove wallet',
|
|
||||||
alertContent: S.of(context).confirm_delete_wallet,
|
|
||||||
leftButtonText: S.of(context).cancel,
|
|
||||||
rightButtonText: S.of(context).remove,
|
|
||||||
actionLeftButton: () => Navigator.of(context).pop(false),
|
|
||||||
actionRightButton: () => Navigator.of(context).pop(true));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (isComfirmed == null || !isComfirmed) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await Navigator.of(context).pushNamed(Routes.auth, arguments:
|
|
||||||
(bool isAuthenticatedSuccessfully, AuthPageState auth) async {
|
|
||||||
if (!isAuthenticatedSuccessfully) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
auth.changeProcessText(
|
|
||||||
S.of(context).wallet_list_removing_wallet(wallet.name));
|
|
||||||
await walletListViewModel.remove(wallet);
|
|
||||||
auth.close();
|
|
||||||
} catch (e) {
|
|
||||||
auth.changeProcessText(S
|
|
||||||
.of(context)
|
|
||||||
.wallet_list_failed_to_remove(wallet.name, e.toString()));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
await Navigator.of(context).pushNamed(Routes.rescan);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,112 +0,0 @@
|
||||||
import 'dart:ui';
|
|
||||||
import 'package:cake_wallet/palette.dart';
|
|
||||||
import 'package:cake_wallet/src/screens/wallet_list/wallet_menu.dart';
|
|
||||||
import 'package:cake_wallet/src/screens/wallet_list/wallet_menu_item.dart';
|
|
||||||
import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
|
|
||||||
import 'package:flutter/cupertino.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:cake_wallet/src/widgets/alert_background.dart';
|
|
||||||
import 'package:cake_wallet/src/widgets/alert_close_button.dart';
|
|
||||||
|
|
||||||
class WalletMenuAlert extends StatelessWidget {
|
|
||||||
WalletMenuAlert({
|
|
||||||
required this.wallet,
|
|
||||||
required this.walletMenu,
|
|
||||||
required this.items
|
|
||||||
});
|
|
||||||
|
|
||||||
final WalletListItem wallet;
|
|
||||||
final WalletMenu walletMenu;
|
|
||||||
final List<WalletMenuItem> items;
|
|
||||||
final closeButton = Image.asset('assets/images/close.png',
|
|
||||||
color: Palette.darkBlueCraiola,
|
|
||||||
);
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return AlertBackground(
|
|
||||||
child: Stack(
|
|
||||||
alignment: Alignment.center,
|
|
||||||
children: <Widget>[
|
|
||||||
Padding(
|
|
||||||
padding: EdgeInsets.only(
|
|
||||||
left: 24,
|
|
||||||
right: 24,
|
|
||||||
),
|
|
||||||
child: ClipRRect(
|
|
||||||
borderRadius: BorderRadius.all(Radius.circular(14)),
|
|
||||||
child: Container(
|
|
||||||
color: Theme.of(context).textTheme!.bodyText1!.decorationColor!,
|
|
||||||
padding: EdgeInsets.only(left: 24),
|
|
||||||
child: ListView.separated(
|
|
||||||
shrinkWrap: true,
|
|
||||||
physics: const NeverScrollableScrollPhysics(),
|
|
||||||
itemCount: items.length,
|
|
||||||
separatorBuilder: (context, _) => Container(
|
|
||||||
height: 1,
|
|
||||||
color: Theme.of(context).accentTextTheme!.subtitle1!.backgroundColor!,
|
|
||||||
),
|
|
||||||
itemBuilder: (_, index) {
|
|
||||||
final item = items[index];
|
|
||||||
|
|
||||||
return GestureDetector(
|
|
||||||
onTap: () {
|
|
||||||
Navigator.of(context).pop();
|
|
||||||
walletMenu.action(
|
|
||||||
walletMenu.menuItems.indexOf(item),
|
|
||||||
wallet);
|
|
||||||
},
|
|
||||||
child: Container(
|
|
||||||
height: 60,
|
|
||||||
child: Row(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
|
||||||
children: <Widget>[
|
|
||||||
Container(
|
|
||||||
height: 32,
|
|
||||||
width: 32,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
borderRadius: BorderRadius.all(
|
|
||||||
Radius.circular(4)),
|
|
||||||
gradient: LinearGradient(
|
|
||||||
begin: Alignment.topCenter,
|
|
||||||
end: Alignment.bottomCenter,
|
|
||||||
colors: [
|
|
||||||
item.firstGradientColor,
|
|
||||||
item.secondGradientColor
|
|
||||||
]
|
|
||||||
)
|
|
||||||
),
|
|
||||||
child: Center(
|
|
||||||
child: item.image,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
SizedBox(width: 12),
|
|
||||||
Expanded(
|
|
||||||
child: Text(
|
|
||||||
item.title,
|
|
||||||
style: TextStyle(
|
|
||||||
color: Theme.of(context).primaryTextTheme!.headline6!.color!,
|
|
||||||
fontSize: 18,
|
|
||||||
fontFamily: 'Lato',
|
|
||||||
fontWeight: FontWeight.w500,
|
|
||||||
decoration: TextDecoration.none
|
|
||||||
),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
AlertCloseButton(image: closeButton)
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue