CAKE-220. CAKE-241. CAKE-242.

This commit is contained in:
M
2021-01-18 22:52:12 +02:00
parent 33fb213922
commit 6639d25264
8 changed files with 25 additions and 21 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ class BackupPage extends BasePage {
@override
Widget trailing(BuildContext context) => TrailButton(
caption: S.of(context).edit,
caption: 'Change password',
onPressed: () =>
Navigator.of(context).pushNamed(Routes.editBackupPassword));
@@ -37,7 +37,7 @@ class EditBackupPasswordPage extends BasePage {
autocorrect: false,
keyboardType: TextInputType.visiblePassword,
controller: textEditingController,
style: TextStyle(fontSize: 26, color: Colors.black)))),
style: TextStyle(fontSize: 26, color: Theme.of(context).primaryTextTheme.title.color)))),
Positioned(
child: Observer(
builder: (_) => PrimaryButton(
@@ -1,3 +1,4 @@
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/src/screens/dashboard/wallet_menu_item.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:flutter/material.dart';
@@ -36,6 +37,12 @@ class WalletMenu {
title: S.current.address_book_menu,
image: Image.asset('assets/images/open_book_menu.png',
height: 16, width: 16)),
WalletMenuItem(
title: 'Backup',
image: Image.asset('assets/images/restore_wallet.png',
height: 16,
width: 16,
color: Palette.darkBlue)),
WalletMenuItem(
title: S.current.settings_title,
image: Image.asset('assets/images/settings_menu.png',
@@ -81,6 +88,15 @@ class WalletMenu {
Navigator.of(context).pushNamed(Routes.addressBook);
break;
case 6:
Navigator.of(context).pushNamed(Routes.auth,
arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) {
if (isAuthenticatedSuccessfully) {
auth.close();
Navigator.of(auth.context).pushNamed(Routes.backup);
}
});
break;
case 7:
Navigator.of(context).pushNamed(Routes.settings);
break;
default:
+3 -3
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:cake_wallet/palette.dart';
class TrailButton extends StatelessWidget {
TrailButton({@required this.caption, @required this.onPressed});
@@ -17,9 +18,8 @@ class TrailButton extends StatelessWidget {
child: Text(
caption,
style: TextStyle(
color:
Theme.of(context).accentTextTheme.bodyText2.color,
fontWeight: FontWeight.w500,
color: Palette.blueCraiola,
fontWeight: FontWeight.w600,
fontSize: 14),
),
onPressed: onPressed),