github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-28 06:28:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new-world' into CAKE-49-refactor-send-and-exchange-screen

Browse Source 
# Conflicts:
#	lib/di.dart
#	lib/src/screens/base_page.dart
#	lib/src/screens/exchange/widgets/base_exchange_widget.dart
#	lib/src/screens/send/widgets/base_send_widget.dart
#	pubspec.lock
This commit is contained in:
OleksandrSobol
2020-09-22 21:59:13 +03:00
parent 585f90b2fb c53b6676b2
commit a0164ec33f
338 changed files with 3759 additions and 9080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/widgets/address_text_field.dart
+77 -86
View File
@@ -1,31 +1,30 @@
import 'package:cake_wallet/routes.dart';
import 'package:flutter/material.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/domain/common/contact.dart';
import 'package:cake_wallet/src/domain/monero/subaddress.dart';
import 'package:cake_wallet/src/domain/common/qr_scanner.dart';
import 'package:flutter/services.dart';
import 'package:flutter/material.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/entities/contact.dart';
import 'package:cake_wallet/entities/qr_scanner.dart';
enum AddressTextFieldOption { paste, qrCode, addressBook, subaddressList }
enum AddressTextFieldOption { paste, qrCode, addressBook }
class AddressTextField extends StatelessWidget {
AddressTextField(
{@required this.controller,
this.isActive = true,
this.placeholder,
this.options = const [
AddressTextFieldOption.qrCode,
AddressTextFieldOption.addressBook
],
this.onURIScanned,
this.focusNode,
this.isBorderExist = true,
this.buttonColor,
this.borderColor,
this.iconColor,
this.textStyle,
this.hintStyle,
this.validator});
this.isActive = true,
this.placeholder,
this.options = const [
AddressTextFieldOption.qrCode,
AddressTextFieldOption.addressBook
],
this.onURIScanned,
this.focusNode,
this.isBorderExist = true,
this.buttonColor,
this.borderColor,
this.iconColor,
this.textStyle,
this.hintStyle,
this.validator});
static const prefixIconWidth = 34.0;
static const prefixIconHeight = 34.0;
@@ -54,35 +53,35 @@ class AddressTextField extends StatelessWidget {
enabled: isActive,
controller: controller,
focusNode: focusNode,
style: textStyle ?? TextStyle(
fontSize: 16,
color: Theme.of(context).primaryTextTheme.title.color
),
style: textStyle ??
TextStyle(
fontSize: 16,
color: Theme.of(context).primaryTextTheme.title.color),
decoration: InputDecoration(
suffixIcon: SizedBox(
width: prefixIconWidth * options.length +
(spaceBetweenPrefixIcons * options.length),
),
hintStyle: hintStyle ?? TextStyle(
fontSize: 16,
color: Theme.of(context).hintColor
),
hintStyle: hintStyle ??
TextStyle(fontSize: 16, color: Theme.of(context).hintColor),
hintText: placeholder ?? S.current.widgets_address,
focusedBorder: isBorderExist
? UnderlineInputBorder(
borderSide: BorderSide(
color: borderColor ?? Theme.of(context).dividerColor,
width: 1.0))
borderSide: BorderSide(
color: borderColor ?? Theme.of(context).dividerColor,
width: 1.0))
: InputBorder.none,
disabledBorder: isBorderExist
? UnderlineInputBorder(
borderSide:
BorderSide(color: borderColor ?? Theme.of(context).dividerColor, width: 1.0))
borderSide: BorderSide(
color: borderColor ?? Theme.of(context).dividerColor,
width: 1.0))
: InputBorder.none,
enabledBorder: isBorderExist
? UnderlineInputBorder(
borderSide:
BorderSide(color: borderColor ?? Theme.of(context).dividerColor, width: 1.0))
borderSide: BorderSide(
color: borderColor ?? Theme.of(context).dividerColor,
width: 1.0))
: InputBorder.none,
),
validator: validator,
@@ -97,9 +96,7 @@ class AddressTextField extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
SizedBox(width: 5),
if (this
.options
.contains(AddressTextFieldOption.paste)) ...[
if (this.options.contains(AddressTextFieldOption.paste)) ...[
Container(
width: prefixIconWidth,
height: prefixIconHeight,
@@ -109,12 +106,20 @@ class AddressTextField extends StatelessWidget {
child: Container(
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
color: buttonColor ??
Theme.of(context)
.accentTextTheme
.title
.color,
borderRadius:
BorderRadius.all(Radius.circular(6))),
BorderRadius.all(Radius.circular(6))),
child: Image.asset(
'assets/images/duplicate.png',
color: iconColor ?? Theme.of(context).primaryTextTheme.display1.decorationColor,
'assets/images/duplicate.png',
color: iconColor ??
Theme.of(context)
.primaryTextTheme
.display1
.decorationColor,
)),
)),
],
@@ -128,11 +133,20 @@ class AddressTextField extends StatelessWidget {
child: Container(
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
color: buttonColor ??
Theme.of(context)
.accentTextTheme
.title
.color,
borderRadius:
BorderRadius.all(Radius.circular(6))),
child: Image.asset('assets/images/qr_code_icon.png',
color: iconColor ?? Theme.of(context).primaryTextTheme.display1.decorationColor,
BorderRadius.all(Radius.circular(6))),
child: Image.asset(
'assets/images/qr_code_icon.png',
color: iconColor ??
Theme.of(context)
.primaryTextTheme
.display1
.decorationColor,
)),
))
],
@@ -148,40 +162,26 @@ class AddressTextField extends StatelessWidget {
child: Container(
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
color: buttonColor ??
Theme.of(context)
.accentTextTheme
.title
.color,
borderRadius:
BorderRadius.all(Radius.circular(6))),
BorderRadius.all(Radius.circular(6))),
child: Image.asset(
'assets/images/open_book.png',
color: iconColor ?? Theme.of(context).primaryTextTheme.display1.decorationColor,
'assets/images/open_book.png',
color: iconColor ??
Theme.of(context)
.primaryTextTheme
.display1
.decorationColor,
)),
))
],
if (this
.options
.contains(AddressTextFieldOption.subaddressList)) ...[
Container(
width: prefixIconWidth,
height: prefixIconHeight,
padding: EdgeInsets.only(top: 0),
child: InkWell(
onTap: () async => _presetSubaddressListPicker(context),
child: Container(
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
borderRadius:
BorderRadius.all(Radius.circular(6))),
child: Image.asset(
'assets/images/receive_icon_raw.png',
color: iconColor ?? Theme.of(context).primaryTextTheme.display1.decorationColor,
)),
)),
],
]
],
),
)
)
))
],
);
}
@@ -217,15 +217,6 @@ class AddressTextField extends StatelessWidget {
}
}
Future<void> _presetSubaddressListPicker(BuildContext context) async {
final subaddress = await Navigator.of(context, rootNavigator: true)
.pushNamed(Routes.subaddressList);
if (subaddress is Subaddress && subaddress.address != null) {
controller.text = subaddress.address;
}
}
Future<void> _pasteAddress(BuildContext context) async {
String address;
@@ -235,4 +226,4 @@ class AddressTextField extends StatelessWidget {
controller.text = address;
}
}
}
}
lib/src/widgets/alert_with_one_action.dart
+1 -2
View File
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
import 'package:cake_wallet/palette.dart';
class AlertWithOneAction extends BaseAlertDialog {
AlertWithOneAction({
@@ -32,7 +31,7 @@ class AlertWithOneAction extends BaseAlertDialog {
width: 300,
height: 52,
padding: EdgeInsets.only(left: 12, right: 12),
color: Palette.blueCraiola,
color: Theme.of(context).accentTextTheme.body2.color,
child: ButtonTheme(
minWidth: double.infinity,
child: FlatButton(
lib/src/widgets/base_alert_dialog.dart
+3 -3
View File
@@ -47,7 +47,7 @@ class BaseAlertDialog extends StatelessWidget {
child: Container(
height: 52,
padding: EdgeInsets.only(left: 6, right: 6),
color: Palette.blueCraiola,
color: Theme.of(context).accentTextTheme.body2.decorationColor,
child: ButtonTheme(
minWidth: double.infinity,
child: FlatButton(
@@ -72,7 +72,7 @@ class BaseAlertDialog extends StatelessWidget {
child: Container(
height: 52,
padding: EdgeInsets.only(left: 6, right: 6),
color: Palette.alizarinRed,
color: Theme.of(context).accentTextTheme.body2.color,
child: ButtonTheme(
minWidth: double.infinity,
child: FlatButton(
@@ -92,7 +92,7 @@ class BaseAlertDialog extends StatelessWidget {
)),
),
)
)
),
],
);
}
lib/src/widgets/blockchain_height_widget.dart
+1 -1
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/domain/monero/get_height_by_date.dart';
import 'package:cake_wallet/monero/get_height_by_date.dart';
import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
class BlockchainHeightWidget extends StatefulWidget {
lib/src/widgets/seed_widget.dart
+4 -4
View File
@@ -4,7 +4,7 @@ import 'package:flutter/services.dart';
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/core/seed_validator.dart';
import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/src/domain/common/mnemonic_item.dart';
import 'package:cake_wallet/entities/mnemonic_item.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:flutter/widgets.dart';
@@ -398,7 +398,7 @@ class SeedWidgetState extends State<SeedWidget> {
child: PrimaryButton(
onPressed: clear,
text: S.of(context).clear,
color: Colors.red,
color: Colors.orange,
textColor: Colors.white,
isDisabled: items.isEmpty,
),
@@ -413,7 +413,7 @@ class SeedWidgetState extends State<SeedWidget> {
onPressed: () => widget.onFinish != null
? widget.onFinish()
: null,
color: Palette.blueCraiola,
color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white)
: PrimaryButton(
text: selectedItem != null
@@ -424,7 +424,7 @@ class SeedWidgetState extends State<SeedWidget> {
: null,
onDisabledPressed: () => showErrorIfExist(),
isDisabled: !isCurrentMnemonicValid,
color: Palette.blueCraiola,
color: Theme.of(context).accentTextTheme.body2.color,
textColor: Colors.white),
),
)
lib/src/widgets/template_tile.dart
+1 -1
View File
@@ -128,7 +128,7 @@ class TemplateTileState extends State<TemplateTile> {
child: Container(
height: 40,
padding: EdgeInsets.only(left: 24, right: 10),
color: Colors.red,
color: Colors.orange,
child: content,
),
),