CWA-202 | applied new design to nodes_list_page and new_node_page; created node_list_row widget, alert_with_one_action and alert_with_two_action; deleted reconnect_alert_dialog, wallet_creation_dialog, restore_alert_dialog and pin_alert_dialog

This commit is contained in:
Oleksandr Sobol
2020-05-04 23:12:36 +03:00
parent 262e6ca156
commit 8f54e53918
29 changed files with 549 additions and 539 deletions
@@ -8,7 +8,7 @@ import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/stores/settings/settings_store.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/src/screens/setup_pin_code/widgets/pin_alert_dialog.dart';
import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
class SetupPinCodePage extends BasePage {
SetupPinCodePage({this.onPinCodeSetup});
@@ -64,27 +64,28 @@ class _SetupPinCodeFormState<WidgetType extends SetupPinCodeForm>
showDialog<void>(
context: context,
builder: (BuildContext context) {
return PinAlertDialog(
pinTitleText: S.current.setup_pin,
pinContentText: S.of(context).setup_successful,
pinActionButtonText: S.of(context).ok,
pinBarrierDismissible: false,
pinAction: () {
return AlertWithOneAction(
alertTitle: S.current.setup_pin,
alertContent: S.of(context).setup_successful,
buttonText: S.of(context).ok,
buttonAction: () {
Navigator.of(context).pop();
widget.onPinCodeSetup(context, pin);
reset();
});
},
alertBarrierDismissible: false,
);
});
} else {
showDialog<void>(
context: context,
builder: (BuildContext context) {
return PinAlertDialog(
pinTitleText: S.current.setup_pin,
pinContentText: S.of(context).pin_is_incorrect,
pinActionButtonText: S.of(context).ok,
pinBarrierDismissible: true,
pinAction: () => Navigator.of(context).pop());
return AlertWithOneAction(
alertTitle: S.current.setup_pin,
alertContent: S.of(context).pin_is_incorrect,
buttonText: S.of(context).ok,
buttonAction: () => Navigator.of(context).pop()
);
});
reset();
@@ -1,60 +0,0 @@
import 'dart:ui';
import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class PinAlertDialog extends BaseAlertDialog {
PinAlertDialog({
@required this.pinTitleText,
@required this.pinContentText,
@required this.pinActionButtonText,
@required this.pinAction,
@required this.pinBarrierDismissible
});
final String pinTitleText;
final String pinContentText;
final String pinActionButtonText;
final VoidCallback pinAction;
final bool pinBarrierDismissible;
@override
String get titleText => pinTitleText;
@override
String get contentText => pinContentText;
@override
bool get barrierDismissible => pinBarrierDismissible;
@override
Widget actionButtons(BuildContext context) {
return Container(
width: 300,
height: 52,
padding: EdgeInsets.only(left: 12, right: 12),
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(24),
bottomRight: Radius.circular(24)
),
color: Colors.white
),
child: ButtonTheme(
minWidth: double.infinity,
child: FlatButton(
onPressed: pinAction,
highlightColor: Colors.transparent,
splashColor: Colors.transparent,
child: Text(
pinActionButtonText,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 15,
fontWeight: FontWeight.w600,
color: Colors.blue,
decoration: TextDecoration.none,
),
)),
),
);
}
}